Index: sources/view/valarmstatus.cpp
===================================================================
diff -u -reea63d68fc0fb269f8dec64d99f488bcad117220 -r11909fd034451197eeb590176e4a8c52657cdab8
--- sources/view/valarmstatus.cpp	(.../valarmstatus.cpp)	(revision eea63d68fc0fb269f8dec64d99f488bcad117220)
+++ sources/view/valarmstatus.cpp	(.../valarmstatus.cpp)	(revision 11909fd034451197eeb590176e4a8c52657cdab8)
@@ -17,6 +17,7 @@
 
 // Project
 #include "guicontroller.h"
+#include "format.h"
 
 VIEW_DEF(VAlarmStatus, AlarmStatusData)
 
@@ -59,7 +60,7 @@
     if (key)
         return qPrintable(key);
     else
-        return QString("ALARM_ID_UNDEFINED [%1]").arg(vEnum);
+        return QString("ALARM_PRIORITY_UNDEFINED [%1]").arg(vEnum);
 }
 // coco end
 
@@ -88,19 +89,19 @@
 QString View::VAlarmStatus::text()
 {
     QString text;
-    if (_alarm_AlarmID != GuiAlarmID::ALARM_ID_NO_ALARM)
-        text = alarmIDText (static_cast<GuiAlarmID>(_alarm_AlarmID)) + " , " +
-                _alarm_EscalateIn                            + " , " +
-                _alarm_MuteTimeout                           + " [" +
-                (_alarm_Flag_systemFault        ? "1" : "0" ) + " " +
-                (_alarm_Flag_stop               ? "1" : "0" ) + " " +
-                (_alarm_Flag_noClear            ? "1" : "0" ) + " " +
-                (_alarm_Flag_noResume           ? "1" : "0" ) + " " +
-                (_alarm_Flag_noRinseback        ? "1" : "0" ) + " " +
-                (_alarm_Flag_noEndTreatment     ? "1" : "0" ) + " " +
-                (_alarm_Flag_noNewTreatment     ? "1" : "0" ) + " " +
-                (_alarm_Flag_bypassDialyzer     ? "1" : "0" ) + " " +
-                (_alarm_Flag_alarmsToEscalate   ? "1" : "0" ) + " " +
-                (_alarm_Flag_alarmsSilenced     ? "1" : "0" ) + "]" ;
+    if (alarm_AlarmID() != GuiAlarmID::ALARM_ID_NO_ALARM)
+        text = alarmIDText (static_cast<GuiAlarmID>(alarm_AlarmID())) + " , " +
+                 FSN(alarm_EscalateIn       ())                       + " , " +
+                 FSN(alarm_MuteTimeout      ())                + " ["+
+                (alarm_Flag_systemFault     ()   ? "1" : "0" ) + " " +
+                (alarm_Flag_stop            ()   ? "1" : "0" ) + " " +
+                (alarm_Flag_noClear         ()   ? "1" : "0" ) + " " +
+                (alarm_Flag_noResume        ()   ? "1" : "0" ) + " " +
+                (alarm_Flag_noRinseback     ()   ? "1" : "0" ) + " " +
+                (alarm_Flag_noEndTreatment  ()   ? "1" : "0" ) + " " +
+                (alarm_Flag_noNewTreatment  ()   ? "1" : "0" ) + " " +
+                (alarm_Flag_bypassDialyzer  ()   ? "1" : "0" ) + " " +
+                (alarm_Flag_alarmsToEscalate()   ? "1" : "0" ) + " " +
+                (alarm_Flag_alarmsSilenced  ()   ? "1" : "0" ) + "]" ;
     return text;
 }