ZoneMinder
/
zoneminder
mirror of https://github.com/ZoneMinder/zoneminder.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

include ExtendAlarmFrames in Presets and enable input for preclusive zones only

pull/338/head
m-bene 2014-03-20 09:53:47 +01:00
parent 26777487dc
commit 2345889d64
5 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
db/zm_update-1.27.0.sql
View File

@ -16,5 +16,6 @@ ALTER TABLE Monitors modify column Type enum('Local','Remote','File','Ffmpeg','L
ALTER TABLE `Monitors` ADD `User` VARCHAR(32) NOT NULL AFTER `SubPath`;
ALTER TABLE `Monitors` ADD `Pass` VARCHAR(32) NOT NULL AFTER `User`;
-- Add extend alarm frame count to zone definition
-- Add extend alarm frame count to zone definition and Presets
ALTER TABLE `Zones` ADD `ExtendAlarmFrames` smallint(5) unsigned not null default 0 AFTER `OverloadFrames`;
ALTER TABLE `ZonePresets` ADD `ExtendAlarmFrames` smallint(5) unsigned not null default 0 AFTER `OverloadFrames`;

4
web/skins/classic/views/js/zone.js
View File

@ -115,6 +115,7 @@ function applyZoneType()
form.elements['newZone[MinBlobs]'].disabled = true;
form.elements['newZone[MaxBlobs]'].disabled = true;
form.elements['newZone[OverloadFrames]'].disabled = true;
form.elements['newZone[ExtendAlarmFrames]'].disabled = true;
}
else if ( form.elements['newZone[Type]'].value == 'Preclusive' )
{
@ -128,6 +129,7 @@ function applyZoneType()
form.elements['newZone[MinAlarmPixels]'].disabled = false;
form.elements['newZone[MaxAlarmPixels]'].disabled = false;
form.elements['newZone[OverloadFrames]'].disabled = false;
form.elements['newZone[ExtendAlarmFrames]'].disabled = false;
applyCheckMethod();
}
else
@ -142,6 +144,7 @@ function applyZoneType()
form.elements['newZone[MinAlarmPixels]'].disabled = false;
form.elements['newZone[MaxAlarmPixels]'].disabled = false;
form.elements['newZone[OverloadFrames]'].disabled = false;
form.elements['newZone[ExtendAlarmFrames]'].disabled = true;
applyCheckMethod();
}
}
@ -208,6 +211,7 @@ function applyPreset()
form.elements['newZone[MinBlobs]'].value = preset['MinBlobs'];
form.elements['newZone[MaxBlobs]'].value = preset['MaxBlobs'];
form.elements['newZone[OverloadFrames]'].value = preset['OverloadFrames'];
form.elements['newZone[ExtendAlarmFrames]'].value = preset['ExtendAlarmFrames'];
applyCheckMethod();
form.elements['newZone[TempArea]'].value = 100;

3
web/skins/classic/views/js/zone.js.php
View File

@ -18,7 +18,8 @@ presets[<?= $preset['Id'] ?>] = {
'MaxBlobPixels': '<?= $preset['MaxBlobPixels'] ?>',
'MinBlobs': '<?= $preset['MinBlobs'] ?>',
'MaxBlobs': '<?= $preset['MaxBlobs'] ?>',
'OverloadFrames': '<?= $preset['OverloadFrames'] ?>'
'OverloadFrames': '<?= $preset['OverloadFrames'] ?>',
'ExtendAlarmFrames': '<?= $preset['ExtendAlarmFrames'] ?>'
};
<?php
}

4
web/skins/flat/views/js/zone.js
View File

@ -115,6 +115,7 @@ function applyZoneType()
form.elements['newZone[MinBlobs]'].disabled = true;
form.elements['newZone[MaxBlobs]'].disabled = true;
form.elements['newZone[OverloadFrames]'].disabled = true;
form.elements['newZone[ExtendAlarmFrames]'].disabled = true;
}
else if ( form.elements['newZone[Type]'].value == 'Preclusive' )
{
@ -128,6 +129,7 @@ function applyZoneType()
form.elements['newZone[MinAlarmPixels]'].disabled = false;
form.elements['newZone[MaxAlarmPixels]'].disabled = false;
form.elements['newZone[OverloadFrames]'].disabled = false;
form.elements['newZone[ExtendAlarmFrames]'].disabled = false;
applyCheckMethod();
}
else
@ -142,6 +144,7 @@ function applyZoneType()
form.elements['newZone[MinAlarmPixels]'].disabled = false;
form.elements['newZone[MaxAlarmPixels]'].disabled = false;
form.elements['newZone[OverloadFrames]'].disabled = false;
form.elements['newZone[ExtendAlarmFrames]'].disabled = true;
applyCheckMethod();
}
}
@ -208,6 +211,7 @@ function applyPreset()
form.elements['newZone[MinBlobs]'].value = preset['MinBlobs'];
form.elements['newZone[MaxBlobs]'].value = preset['MaxBlobs'];
form.elements['newZone[OverloadFrames]'].value = preset['OverloadFrames'];
form.elements['newZone[ExtendAlarmFrames]'].value = preset['ExtendAlarmFrames'];
applyCheckMethod();
form.elements['newZone[TempArea]'].value = 100;

3
web/skins/flat/views/js/zone.js.php
View File

@ -18,7 +18,8 @@ presets[<?= $preset['Id'] ?>] = {
'MaxBlobPixels': '<?= $preset['MaxBlobPixels'] ?>',
'MinBlobs': '<?= $preset['MinBlobs'] ?>',
'MaxBlobs': '<?= $preset['MaxBlobs'] ?>',
'OverloadFrames': '<?= $preset['OverloadFrames'] ?>'
'OverloadFrames': '<?= $preset['OverloadFrames'] ?>',
'ExtendAlarmFrames': '<?= $preset['ExtendAlarmFrames'] ?>'
};
<?php
}