summaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
Diffstat (limited to 'www')
-rw-r--r--www/js/LogCtrl.js40
-rw-r--r--www/templates/log.html10
2 files changed, 48 insertions, 2 deletions
diff --git a/www/js/LogCtrl.js b/www/js/LogCtrl.js
index 2858e289..c575b5fb 100644
--- a/www/js/LogCtrl.js
+++ b/www/js/LogCtrl.js
@@ -103,6 +103,46 @@ angular.module('zmApp.controllers').controller('zmApp.LogCtrl', ['$scope', '$roo
});
};
+
+ $scope.attachLogs = function() {
+
+ cordova.plugins.email.isAvailable(
+ function (isAvailable) {
+
+ if (isAvailable) {
+
+
+ $fileLogger.checkFile()
+ .then (function (d) {
+
+ var url = cordova.file.dataDirectory + d.name;
+ console.log ( "URL:"+url);
+ cordova.plugins.email.open({
+ to: zm.authoremail,
+ subject: $rootScope.appName + ' logs attached',
+ body: 'logs are attached',
+ attachments: url
+
+ });
+ },
+ function (e) {
+ NVRDataModel.debug ("Error attaching log file:"+JSON.stringify(e));
+ });
+
+
+
+ } else {
+ // kEmailNotConfigured
+ $rootScope.zmPopup = SecuredPopups.show('alert', {
+ title: $translate.instant('kError'),
+ template: $translate.instant('kEmailNotConfigured'),
+ okText: $translate.instant('kButtonOk'),
+ cancelText: $translate.instant('kButtonCancel'),
+ });
+ }
+
+ });
+ };
//--------------------------------------------------------------------------
// Convenience function to send logs via email
//--------------------------------------------------------------------------
diff --git a/www/templates/log.html b/www/templates/log.html
index 0ad840d8..c67cab4c 100644
--- a/www/templates/log.html
+++ b/www/templates/log.html
@@ -4,7 +4,10 @@
 
<button ng-class="selectOn? 'button button-icon button-clear ion-ios-copy':'button button-icon button-clear ion-ios-copy-outline'"
- ng-click="selectToggle()"></button>
+ ng-click="selectToggle()"></button> &nbsp;
+
+
+
<button data-badge="{{$root.alarmCount}}" class="animated infinite tada button button-icon button-clear ion-ios-bell notification-badge"
ng-click="handleAlarms();" ng-if="$root.isAlarm"></button>
@@ -13,7 +16,7 @@
<a class="button button-icon icon ion-arrow-swap" ng-href="" ng-click="flipLogs()"></a>
<a ng-if="logEntity == $root.appName" class="button button-icon icon ion-trash-a" ng-href="" ng-click="deleteLogs()"></a>
<div ng-if="$root.platformOS!='desktop'">
- <a class="button button-icon icon ion-email" ng-href="" ng-click="sendEmail(log.logString)"> </a>
+ <a class="button button-icon icon ion-email" ng-href="" ng-click="attachLogs()"> </a>
</div>
<div ng-if="$root.platformOS=='desktop'">
<a class="button button-icon icon ion-android-download" ng-href="" ng-click="sendEmail(log.logString)"> </a>
@@ -32,6 +35,9 @@
</button>
<button class="button button-small button-stable icon ion-chevron-right" ng-click="changePage(-1)">
</button>
+
+
+
</div>
<div ng-if="logEntity==$root.appName">