summaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
Diffstat (limited to 'www')
-rw-r--r--www/js/DataModel.js16
-rw-r--r--www/js/EventCtrl.js6
-rw-r--r--www/js/EventModalCtrl.js2
-rw-r--r--www/js/TimelineCtrl.js2
-rw-r--r--www/templates/devoptions.html9
-rw-r--r--www/templates/events-popover.html4
-rw-r--r--www/templates/timeline-popover.html4
7 files changed, 27 insertions, 16 deletions
diff --git a/www/js/DataModel.js b/www/js/DataModel.js
index 7d446bdc..839991b7 100644
--- a/www/js/DataModel.js
+++ b/www/js/DataModel.js
@@ -64,7 +64,8 @@ angular.module('zmApp.controllers')
'montageArraySize':'0',
'graphSize':2000,
- 'minAlarmCount':'1',
+ 'enableAlarmCount':true,
+ 'minAlarmCount':1,
'montageSize':'3',
'useNphZms':true,
'useNphZmsForEvents':true,
@@ -79,6 +80,7 @@ angular.module('zmApp.controllers')
'timelineModalGraphType':'all',
'resumeDelay':300,
+
};
@@ -361,7 +363,7 @@ angular.module('zmApp.controllers')
serverGroupList = $localstorage.getObject("serverGroupList");
- var demoServer = "{\"serverName\":\"zmNinjaDemo\",\"username\":\"zmninja\",\"password\":\"zmNinja$xc129\",\"url\":\"https://demo.zoneminder.com/zm\",\"apiurl\":\"https://demo.zoneminder.com/zm/api\",\"eventServer\":\"\",\"maxMontage\":\"40\",\"streamingurl\":\"https://demo.zoneminder.com/cgi-bin-zm\",\"maxFPS\":\"3\",\"montageQuality\":\"50\",\"singleImageQuality\":\"100\",\"montageHistoryQuality\":\"50\",\"useSSL\":true,\"keepAwake\":true,\"isUseAuth\":\"1\",\"isUseEventServer\":false,\"disablePush\":false,\"eventServerMonitors\":\"\",\"eventServerInterval\":\"\",\"refreshSec\":\"2\",\"enableDebug\":false,\"usePin\":false,\"pinCode\":\"\",\"canSwipeMonitors\":true,\"persistMontageOrder\":false,\"onTapScreen\":\"events\",\"enableh264\":true,\"gapless\":false,\"montageOrder\":\"\",\"montageHiddenOrder\":\"\",\"montageArraySize\":\"0\",\"graphSize\":2000,\"minAlarmCount\":\"1\",\"montageSize\":\"3\",\"useNphZms\":true,\"useNphZmsForEvents\":true,\"packMontage\":false,\"exitOnSleep\":false,\"forceNetworkStop\":false,\"defaultPushSound\":false,\"enableBlog\":true,\"use24hr\":false, \"packeryPositions\":\"\"}";
+ var demoServer = "{\"serverName\":\"zmNinjaDemo\",\"username\":\"zmninja\",\"password\":\"zmNinja$xc129\",\"url\":\"https://demo.zoneminder.com/zm\",\"apiurl\":\"https://demo.zoneminder.com/zm/api\",\"eventServer\":\"\",\"maxMontage\":\"40\",\"streamingurl\":\"https://demo.zoneminder.com/cgi-bin-zm\",\"maxFPS\":\"3\",\"montageQuality\":\"50\",\"singleImageQuality\":\"100\",\"montageHistoryQuality\":\"50\",\"useSSL\":true,\"keepAwake\":true,\"isUseAuth\":\"1\",\"isUseEventServer\":false,\"disablePush\":false,\"eventServerMonitors\":\"\",\"eventServerInterval\":\"\",\"refreshSec\":\"2\",\"enableDebug\":false,\"usePin\":false,\"pinCode\":\"\",\"canSwipeMonitors\":true,\"persistMontageOrder\":false,\"onTapScreen\":\"events\",\"enableh264\":true,\"gapless\":false,\"montageOrder\":\"\",\"montageHiddenOrder\":\"\",\"montageArraySize\":\"0\",\"graphSize\":2000,\"enableAlarmCount\":true,\"montageSize\":\"3\",\"useNphZms\":true,\"useNphZmsForEvents\":true,\"packMontage\":false,\"exitOnSleep\":false,\"forceNetworkStop\":false,\"defaultPushSound\":false,\"enableBlog\":true,\"use24hr\":false, \"packeryPositions\":\"\"}";
var demoS = JSON.parse(demoServer);
console.log ("JSON parsed demo" + JSON.stringify(demoS));
@@ -396,10 +398,10 @@ angular.module('zmApp.controllers')
// old version hacks for new variables
- if (typeof loginData.minAlarmCount === 'undefined')
+ if (typeof loginData.enableAlarmCount === 'undefined')
{
- zmDebug ("minAlarmCount does not exist, setting to 1");
- loginData.minAlarmCount = '1';
+ zmDebug ("enableAlarmCount does not exist, setting to true");
+ loginData.enableAlarmCount = true;
}
@@ -1181,7 +1183,7 @@ angular.module('zmApp.controllers')
if (endTime)
myurl = myurl + "/EndTime <=:"+endTime;
- myurl = myurl + "/AlarmFrames >=:" + loginData.minAlarmCount;
+ myurl = myurl + "/AlarmFrames >=:" + (loginData.enableAlarmCount?loginData.minAlarmCount:0);
myurl = myurl + ".json";
@@ -1259,7 +1261,7 @@ angular.module('zmApp.controllers')
if (endTime)
myurl = myurl + "/EndTime <=:"+endTime;
- myurl = myurl + "/AlarmFrames >=:" + loginData.minAlarmCount;
+ myurl = myurl + "/AlarmFrames >=:" + (loginData.enableAlarmCount?loginData.minAlarmCount:0);
myurl = myurl + ".json";
diff --git a/www/js/EventCtrl.js b/www/js/EventCtrl.js
index c84b9da5..428f9a95 100644
--- a/www/js/EventCtrl.js
+++ b/www/js/EventCtrl.js
@@ -471,7 +471,7 @@ angular.module('zmApp.controllers')
//https://server/zm/api/events/consoleEvents/5%20minute.json
var ld = ZMDataModel.getLogin();
- var af = "/AlarmFrames >=: " + ld.minAlarmCount;
+ var af = "/AlarmFrames >=: " + ld.enableAlarmCount;
var apiurl = ld.apiurl + "/events/consoleEvents/1%20hour"+af+".json";
ZMDataModel.zmDebug ("consoleEvents API:"+apiurl);
@@ -1394,8 +1394,8 @@ angular.module('zmApp.controllers')
var ld = ZMDataModel.getLogin();
- console.log ("Toggling " + ld.minAlarmCount);
- ld.minAlarmCount = ld.minAlarmCount=='0'?'1':'0';
+ console.log ("Toggling " + ld.enableAlarmCount);
+ ld.enableAlarmCount = !ld.enableAlarmCount;
ZMDataModel.setLogin(ld);
$scope.loginData = ZMDataModel.getLogin();
doRefresh();
diff --git a/www/js/EventModalCtrl.js b/www/js/EventModalCtrl.js
index 61b61920..b04abb8e 100644
--- a/www/js/EventModalCtrl.js
+++ b/www/js/EventModalCtrl.js
@@ -406,7 +406,7 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro
$scope.currentProgress = resp.data.status.progress;
// console.log ("STEP 0 progress is " + $scope.currentProgress);
$scope.slides = [];
- // myurl = myurl + "/AlarmFrames >=:" + loginData.minAlarmCount;
+
var apiurl = $scope.loginData.apiurl + "/events/" + $scope.eventId + ".json";
ZMDataModel.zmDebug ("prepared to get frame details using " + apiurl);
$http.get(apiurl)
diff --git a/www/js/TimelineCtrl.js b/www/js/TimelineCtrl.js
index b6b053b4..5dc5129c 100644
--- a/www/js/TimelineCtrl.js
+++ b/www/js/TimelineCtrl.js
@@ -69,7 +69,7 @@ angular.module('zmApp.controllers').controller('zmApp.TimelineCtrl', ['$ionicPla
// console.log("Toggling");
var ld = ZMDataModel.getLogin();
- ld.minAlarmCount = ld.minAlarmCount == "0" ? "1" : "0";
+ ld.enableAlarmCount = ld.enableAlarmCount == "0" ? "1" : "0";
ZMDataModel.setLogin(ld);
diff --git a/www/templates/devoptions.html b/www/templates/devoptions.html
index 15ff0d1d..bec45385 100644
--- a/www/templates/devoptions.html
+++ b/www/templates/devoptions.html
@@ -103,7 +103,16 @@
</label>
<br/>
+ </div>
+
+ <div class="item item-input-inset">
+ Minimum Alarm Count&nbsp;
+ <label class="item-input-wrapper">
+ <input type="tel" placeholder="" ng-model="loginData.minAlarmCount">
+ <br/>
+ </label>
+ <br/>
</div>
<div class="item" style="background-color:#C8F7C5" ng-if="loginData.graphSize > 5000">
diff --git a/www/templates/events-popover.html b/www/templates/events-popover.html
index 866b4516..eec4f52d 100644
--- a/www/templates/events-popover.html
+++ b/www/templates/events-popover.html
@@ -10,8 +10,8 @@
Refresh
</a>
- <a class="item" ng-href="" ng-click="popover.hide();toggleMinAlarmFrameCount();" ng-if="loginData.minAlarmCount=='1'">Show all events</a>
- <a class="item" ng-href="" ng-click="popover.hide();toggleMinAlarmFrameCount();" ng-if="loginData.minAlarmCount=='0'"> Show alarmed events</a>
+ <a class="item" ng-href="" ng-click="popover.hide();toggleMinAlarmFrameCount();" ng-if="loginData.enableAlarmCount">Show all events</a>
+ <a class="item" ng-href="" ng-click="popover.hide();toggleMinAlarmFrameCount();" ng-if="!loginData.enableAlarmCount"> Show alarmed events</a>
</div>
</ion-content>
</ion-popover-view>
diff --git a/www/templates/timeline-popover.html b/www/templates/timeline-popover.html
index 42fbc508..7d8760a3 100644
--- a/www/templates/timeline-popover.html
+++ b/www/templates/timeline-popover.html
@@ -2,8 +2,8 @@
<ion-content>
<div class="list" ng-click="popover.hide()">
- <a class="item" ng-href="" ng-click="popover.hide();toggleMinAlarmFrameCount();" ng-if="loginData.minAlarmCount=='1'">Show all events</a>
- <a class="item" ng-href="" ng-click="popover.hide();toggleMinAlarmFrameCount();" ng-if="loginData.minAlarmCount=='0'"> Show alarmed events</a>
+ <a class="item" ng-href="" ng-click="popover.hide();toggleMinAlarmFrameCount();" ng-if="loginData.enableAlarmCount">Show all events</a>
+ <a class="item" ng-href="" ng-click="popover.hide();toggleMinAlarmFrameCount();" ng-if="!loginData.enableAlarmCount"> Show alarmed events</a>
<a class="item" ng-href="" ng-click="popover.hide();buttonClicked(0);">Month</a>
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-06 21:10:02 +0000