Merge pull request #489 from SCADA-LTS/feature/#488_Fix_displayed_lev…

…el_of_alarm_on_the_alarm_list Feature/#488 fix displayed level of alarm on the alarm list
SCADA-LTS · Mar 8, 2018 · aa8d000 · aa8d000
2 parents f3e365b + 6b1822c
commit aa8d000
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/src/br/org/scadabr/view/component/AlarmListComponent.java b/src/br/org/scadabr/view/component/AlarmListComponent.java
@@ -69,14 +69,20 @@ public String generateContent() {
 
 	private void filter(List<EventInstance> list, int alarmLevel) {
 
+		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);