#488 Removed "None" level alarms from alarm list

SCADA-LTS · Mar 8, 2018 · 6b1822c · 6b1822c
1 parent d12b06e
commit 6b1822c
Showing 1 changed file with 6 additions and 1 deletion.
diff --git 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<EventInstance> 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);