summaryrefslogtreecommitdiff
path: root/www/js
diff options
context:
space:
mode:
Diffstat (limited to 'www/js')
-rw-r--r--www/js/DataModel.js14
-rw-r--r--www/js/EventCtrl.js5
-rw-r--r--www/js/EventServerSettingsCtrl.js2
-rw-r--r--www/js/LoginCtrl.js9
-rw-r--r--www/js/MontageCtrl.js2
-rw-r--r--www/js/TimelineCtrl.js22
-rw-r--r--www/js/app.js2
7 files changed, 50 insertions, 6 deletions
diff --git a/www/js/DataModel.js b/www/js/DataModel.js
index 56204c98..0a529365 100644
--- a/www/js/DataModel.js
+++ b/www/js/DataModel.js
@@ -58,6 +58,7 @@ angular.module('zmApp.controllers')
'montageHiddenOrder':'',
'montageArraySize':'0',
'graphSize':200,
+ 'minAlarmCount':'1',
};
@@ -201,6 +202,15 @@ angular.module('zmApp.controllers')
if (!isEmpty(loadedData))
{
loginData = loadedData;
+
+ // old version hacks for new variables
+
+ if (typeof loginData.minAlarmCount === 'undefined')
+ {
+ console.log ("MIN ALARM");
+ loginData.minAlarmCount = '1';
+ }
+
zmLog ("DataModel init recovered this loginData as " + JSON.stringify(loginData));
}
else
@@ -783,7 +793,7 @@ angular.module('zmApp.controllers')
if (endTime)
myurl = myurl + "/EndTime <=:"+endTime;
- myurl = myurl + "/AlarmFrames >=:" + $rootScope.minAlarmCount;
+ myurl = myurl + "/AlarmFrames >=:" + loginData.minAlarmCount;
myurl = myurl + ".json";
@@ -861,7 +871,7 @@ angular.module('zmApp.controllers')
if (endTime)
myurl = myurl + "/EndTime <=:"+endTime;
- myurl = myurl + "/AlarmFrames >=:" + $rootScope.minAlarmCount;
+ myurl = myurl + "/AlarmFrames >=:" + loginData.minAlarmCount;
myurl = myurl + ".json";
diff --git a/www/js/EventCtrl.js b/www/js/EventCtrl.js
index 8c1f4a02..fc0224aa 100644
--- a/www/js/EventCtrl.js
+++ b/www/js/EventCtrl.js
@@ -1402,7 +1402,10 @@ angular.module('zmApp.controllers')
$scope.toggleMinAlarmFrameCount = function () {
console.log ("Toggling");
- $rootScope.minAlarmCount = ($rootScope.minAlarmCount == '0') ? '1':'0';
+
+ var ld = ZMDataModel.getLogin();
+ ld.minAlarmCount = ld.minAlarmCount=='0'?'1':'0';
+ ZMDataModel.setLogin(ld);
doRefresh();
};
diff --git a/www/js/EventServerSettingsCtrl.js b/www/js/EventServerSettingsCtrl.js
index 17da1a37..c3971ccb 100644
--- a/www/js/EventServerSettingsCtrl.js
+++ b/www/js/EventServerSettingsCtrl.js
@@ -273,7 +273,7 @@ angular.module('zmApp.controllers').controller('zmApp.EventServerSettingsCtrl',
for (var i = 0; i < res.length; i++) {
if (res[i] == id) {
isThere = true;
- console.log("isRes found: " + id);
+ //console.log("isRes found: " + id);
break;
}
}
diff --git a/www/js/LoginCtrl.js b/www/js/LoginCtrl.js
index c8be575b..67f644a6 100644
--- a/www/js/LoginCtrl.js
+++ b/www/js/LoginCtrl.js
@@ -62,6 +62,15 @@ angular.module('zmApp.controllers').controller('zmApp.LoginCtrl', ['$scope', '$r
$scope.check.isUseAuth = ($scope.loginData.isUseAuth == '1') ? true : false;
$scope.check.isUseEventServer = ($scope.loginData.isUseEventServer == '1') ? true : false;
+ ZMDataModel.zmDebug ("Retrieved state for this profile:" + JSON.stringify($scope.loginData));
+
+ // lets make sure Event Server is loaded
+ // correctly
+
+ // FIXME: But what happens if you don't save?
+ // loginData gets written but auth is not done
+ ZMDataModel.setLogin($scope.loginData);
+
return true;
},
diff --git a/www/js/MontageCtrl.js b/www/js/MontageCtrl.js
index f638a03b..e260b373 100644
--- a/www/js/MontageCtrl.js
+++ b/www/js/MontageCtrl.js
@@ -53,7 +53,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageCtrl', ['$scope', '
return;
}
- console.log ("TEMP MONITORS IS " + JSON.stringify(tempMonitors));
+ // console.log ("TEMP MONITORS IS " + JSON.stringify(tempMonitors));
var tempResponse = ZMDataModel.applyMontageMonitorPrefs(message, 0);
$scope.monitors = tempResponse[0];
montageOrder = tempResponse[1];
diff --git a/www/js/TimelineCtrl.js b/www/js/TimelineCtrl.js
index 048fc03e..b5dc5711 100644
--- a/www/js/TimelineCtrl.js
+++ b/www/js/TimelineCtrl.js
@@ -59,6 +59,19 @@ angular.module('zmApp.controllers').controller('zmApp.TimelineCtrl', ['$ionicPla
// console.log ("*** MS COUNT " + (1000.0/(myframes/mylen)));
return (Math.round(1000 / (myframes / mylen)));
};
+
+
+ $scope.toggleMinAlarmFrameCount = function () {
+ console.log ("Toggling");
+
+ var ld = ZMDataModel.getLogin();
+ ld.minAlarmCount = ld.minAlarmCount=="0"? "1":"0";
+ ZMDataModel.setLogin(ld);
+
+
+ drawGraph(curFromDate, curToDate, curCount);
+
+ };
//-----------------------------------------------------------
// Move/Zoom are used to move the timeline around
@@ -212,6 +225,7 @@ angular.module('zmApp.controllers').controller('zmApp.TimelineCtrl', ['$ionicPla
//console.log ("TIMELINE MONITORS: " + JSON.stringify(message));
var ld = ZMDataModel.getLogin();
+ $scope.loginData = ZMDataModel.getLogin();
if (ld.persistMontageOrder)
{
@@ -245,6 +259,9 @@ angular.module('zmApp.controllers').controller('zmApp.TimelineCtrl', ['$ionicPla
//-------------------------------------------------
//var currentEvent="";
+
+ // keep a record for redraw
+ var curFromDate, curToDate, curCount;
// Make sure sliding for menu is disabled so it
// does not interfere with graph panning
@@ -400,6 +417,11 @@ angular.module('zmApp.controllers').controller('zmApp.TimelineCtrl', ['$ionicPla
//-------------------------------------------------
function drawGraph(fromDate, toDate, count) {
+
+
+ curFromDate = fromDate;
+ curToDate = toDate;
+ curCount = count;
$ionicLoading.show({
template: "Loading graph...",
diff --git a/www/js/app.js b/www/js/app.js
index e236b026..ab2d5f90 100644
--- a/www/js/app.js
+++ b/www/js/app.js
@@ -612,7 +612,7 @@ angular.module('zmApp', [
$rootScope.currentServerGroup = "defaultServer";
$rootScope.validMonitorId = "";
$rootScope.newVersionAvailable = "";
- $rootScope.minAlarmCount = "1";
+ //$rootScope.minAlarmCount = "1";
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-06 20:16:39 +0000