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

Merge pull request #4079 from IgorA100/patch-149 

TotScore, AvgScore, MaxScore display in one line Event page
pull/4080/head
Isaac Connor 2024-06-15 14:15:26 -04:00 committed by GitHub
parent a5aef97464 12b84255ee
commit 081c3900a1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
web/skins/classic/views/js/event.js
View File

@ -1247,8 +1247,11 @@ function getStat() {
tdString = eventData[key];
}
break;
case 'MaxScore':
tdString = '<a href="?view=frame&amp;eid=' + eventData.Id + '&amp;fid=0">' + eventData[key] + '</a>';
//case 'MaxScore':
// tdString = '<a href="?view=frame&amp;eid=' + eventData.Id + '&amp;fid=0">' + eventData[key] + '</a>';
// break;
case 'Score':
tdString = 'Total:' + eventData['TotScore'] + ' '+ '<a href="?view=frame&amp;eid=' + eventData.Id + '&amp;fid=0">' + 'Max:' + eventData['MaxScore'] + '</a>' + ' Avg:' + eventData['AvgScore'];
break;
case 'n/a':
tdString = 'n/a';

7
web/skins/classic/views/js/event.js.php
View File

@ -66,9 +66,10 @@ var eventDataStrings = {
Length: '<?php echo translate('Duration') ?>',
Frames: '<?php echo translate('AttrFrames') ?>',
AlarmFrames: '<?php echo translate('AttrAlarmFrames') ?>',
TotScore: '<?php echo translate('AttrTotalScore') ?>',
AvgScore: '<?php echo translate('AttrAvgScore') ?>',
MaxScore: '<?php echo translate('AttrMaxScore') ?>',
<!--TotScore: '<?php echo translate('AttrTotalScore') ?>',-->
<!--AvgScore: '<?php echo translate('AttrAvgScore') ?>',-->
<!--MaxScore: '<?php echo translate('AttrMaxScore') ?>',-->
Score: '<?php echo translate('Score') ?>',
Resolution: '<?php echo translate('Resolution') ?>',
DiskSpace: '<?php echo translate('DiskSpace') ?>',
Storage: '<?php echo translate('Storage') ?>',