rendered notification delays on the dashboard
Costa Tsaousis (ktsaou) committed
Sep 14, 2016 at 21:39 UTC
86bb195b7e278ea791cd902ba70a02db322db4de
1 file changed
+24
-3
web/index.html
+24
-3
@@ -2711,8 +2711,29 @@ function alarmsUpdateModal() {
2711
+ ((chart.red !== null)?('<tr><td width="10%" style="text-align:right">red threshold</td><td><code>' + chart.red + ' ' + chart.units + '</code></td></tr>'):'');
2712
}
2713
2714
+ var delay = '';
2715
+ if((alarm.delay_up_duration > 0 || alarm.delay_down_duration > 0) && alarm.delay_multiplier != 0 && alarm.delay_max_duration > 0) {
2716
+ if(alarm.delay_up_duration == alarm.delay_down_duration) {
2717
+ delay += '<small><br/>hysteresis ' + frequency_text(alarm.delay_up_duration);
2718
+ }
2719
+ else {
2720
+ delay = '<small><br/>hysteresis ';
2721
+ if(alarm.delay_up_duration > 0) {
2722
+ delay += 'on raise <code>' + frequency_text(alarm.delay_up_duration) + '</code>, ';
2723
+ }
2724
+ if(alarm.delay_down_duration > 0) {
2725
+ delay += 'on recovery <code>' + frequency_text(alarm.delay_down_duration) + '</code>, ';
2726
+ }
2727
+ }
2728
+ if(alarm.delay_multiplier != 1.0) {
2729
+ delay += 'multiplied by <code>' + alarm.delay_multiplier.toString() + '</code>';
2730
+ delay += ', up to <code>' + frequency_text(alarm.delay_max_duration) + '</code>';
2731
+ }
2732
+ delay += '</small>';
2733
+ }
2734
+
2735
html += '<tr><td width="10%" style="text-align:right">check every</td><td>' + frequency_text(alarm.update_every) + '</td></tr>'
2715
- + '<tr><td width="10%" style="text-align:right">execute</td><td><span style="font-family: monospace;">' + alarm.exec + '</span></td></tr>'
2736
+ + '<tr><td width="10%" style="text-align:right">execute</td><td><span style="font-family: monospace;">' + alarm.exec + '</span>' + delay + '</td></tr>'
2737
+ '<tr><td width="10%" style="text-align:right">source</td><td><span style="font-family: monospace;">' + alarm.source + '</span></td></tr>'
2738
+ '</table></td></tr>';
2739
@@ -2777,8 +2798,8 @@ function alarmsUpdateModal() {
2798
var families_sorted = families_sort.sort(function (a, b) {
2799
if (a.priority > b.priority) return -1;
2800
if (a.priority < b.priority) return 1;
2780
- if (a.name < b.name) return 1;
2781
- if (a.name > b.name) return -1;
2801
+ if (a.id > b.id) return 1;
2802
+ if (a.id < b.id) return -1;
2803
return 0;
2804
});
2805