From d12b06e9cd8ed88faa22ff358ed798577bd90650 Mon Sep 17 00:00:00 2001 From: ArkadiuszParafiniuk Date: Wed, 7 Mar 2018 15:35:39 +0100 Subject: [PATCH 1/2] #488 Removed "None" level alarms from alarm list --- src/br/org/scadabr/view/component/AlarmListComponent.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/br/org/scadabr/view/component/AlarmListComponent.java b/src/br/org/scadabr/view/component/AlarmListComponent.java index 5ff5b27be5..a1450eda41 100644 --- a/src/br/org/scadabr/view/component/AlarmListComponent.java +++ b/src/br/org/scadabr/view/component/AlarmListComponent.java @@ -69,6 +69,7 @@ public String generateContent() { private void filter(List list, int alarmLevel) { + removeAlarmLevel(list, AlarmLevels.NONE); if (AlarmLevels.URGENT == alarmLevel) { removeAlarmLevel(list, AlarmLevels.INFORMATION); } From 6b1822c3ea2ed409011fed8b365c0f28ef523dbf Mon Sep 17 00:00:00 2001 From: ArkadiuszParafiniuk Date: Thu, 8 Mar 2018 10:03:13 +0100 Subject: [PATCH 2/2] #488 Removed "None" level alarms from alarm list --- src/br/org/scadabr/view/component/AlarmListComponent.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/br/org/scadabr/view/component/AlarmListComponent.java b/src/br/org/scadabr/view/component/AlarmListComponent.java index a1450eda41..f41c22b888 100644 --- a/src/br/org/scadabr/view/component/AlarmListComponent.java +++ b/src/br/org/scadabr/view/component/AlarmListComponent.java @@ -69,15 +69,20 @@ public String generateContent() { private void filter(List list, int alarmLevel) { - removeAlarmLevel(list, AlarmLevels.NONE); + if (AlarmLevels.INFORMATION == alarmLevel) { + removeAlarmLevel(list, AlarmLevels.NONE); + } if (AlarmLevels.URGENT == alarmLevel) { + removeAlarmLevel(list, AlarmLevels.NONE); removeAlarmLevel(list, AlarmLevels.INFORMATION); } if (AlarmLevels.CRITICAL == alarmLevel) { + removeAlarmLevel(list, AlarmLevels.NONE); removeAlarmLevel(list, AlarmLevels.INFORMATION); removeAlarmLevel(list, AlarmLevels.URGENT); } if (AlarmLevels.LIFE_SAFETY == alarmLevel) { + removeAlarmLevel(list, AlarmLevels.NONE); removeAlarmLevel(list, AlarmLevels.INFORMATION); removeAlarmLevel(list, AlarmLevels.URGENT); removeAlarmLevel(list, AlarmLevels.CRITICAL);