Index: sources/view/valarmstatus.h
===================================================================
diff -u -rb166776048ef9001ff2cb4b69df81a5dff40849a -r11a0a0a9bb67cc3afbf75426cc6b3ca97365a7ea
--- sources/view/valarmstatus.h	(.../valarmstatus.h)	(revision b166776048ef9001ff2cb4b69df81a5dff40849a)
+++ sources/view/valarmstatus.h	(.../valarmstatus.h)	(revision 11a0a0a9bb67cc3afbf75426cc6b3ca97365a7ea)
@@ -1,49 +1,81 @@
 /*!
- *
+ * 
  * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved.
- * copyright
- *          THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM,
- *          IN PART OR IN WHOLE,
- *          WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
- *
- * file    valarmstatus.h
- * date    3/6/2020
- * author  Behrouz NematiPour
- *
+ * \copyright
+ * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
+ * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
+ * 
+ * \file valarmstatus.h
+ * \author (last) Peter Lucia
+ * \date (last) 29-Jun-2020
+ * \author (original) Behrouz NematiPour
+ * \date (original) 10-Mar-2020
+ * 
  */
 #pragma once
 
 // Qt
 #include <QObject>
 
 // Project
-#include "mmodel.h"
+#include "MModel.h"
 #include "vview.h"
+#include "guiglobals.h"
+#include "messageglobals.h"
+#include "guicontroller.h"
+#include "format.h"
 
+using namespace Can;
 // namespace
-namespace Gui {
+using namespace Gui;
+namespace View {
 
 class VAlarmStatus : public QObject
 {
     Q_OBJECT
+public:
+    VAlarmStatus(QObject *parent = NULL);
 
-    PROPERTY( quint32 , alarm_Priority              ,     0, false)
-    PROPERTY( quint32 , alarm_AlarmID               ,     0, false)
-    PROPERTY( quint32 , alarm_EscalateIn            ,     0, false)
-    PROPERTY( quint32 , alarm_MuteTimeout           ,     0, false)
-    PROPERTY( bool    , alarm_Flag_systemFault      , false, false)
-    PROPERTY( bool    , alarm_Flag_stop             , false, false)
-    PROPERTY( bool    , alarm_Flag_noClear          , false, false)
-    PROPERTY( bool    , alarm_Flag_noResume         , false, false)
-    PROPERTY( bool    , alarm_Flag_noRinseback      , false, false)
-    PROPERTY( bool    , alarm_Flag_noEndTreatment   , false, false)
-    PROPERTY( bool    , alarm_Flag_noNewTreatment   , false, false)
-    PROPERTY( bool    , alarm_Flag_bypassDialyzer   , false, false)
-    PROPERTY( bool    , alarm_Flag_alarmsToEscalate , false, false)
-    PROPERTY( bool    , alarm_Flag_alarmsSilenced   , false, false)
+private:
+    // coco begin validated: Has been validated manually
+    PROPERTY( quint32 , alarm_Priority              ,     0)
+    PROPERTY( quint32 , alarm_AlarmID               ,     0)
+    PROPERTY( quint32 , alarm_EscalateIn            ,     0)
+    PROPERTY( quint32 , alarm_MuteTimeout           ,     0)
+    PROPERTY( bool    , alarm_Flag_systemFault      , false)
+    PROPERTY( bool    , alarm_Flag_stop             , false)
+    PROPERTY( bool    , alarm_Flag_noClear          , false)
+    PROPERTY( bool    , alarm_Flag_noResume         , false)
+    PROPERTY( bool    , alarm_Flag_noRinseback      , false)
+    PROPERTY( bool    , alarm_Flag_noEndTreatment   , false)
+    PROPERTY( bool    , alarm_Flag_noNewTreatment   , false)
+    PROPERTY( bool    , alarm_Flag_bypassDialyzer   , false)
+    PROPERTY( bool    , alarm_Flag_alarmsToEscalate , false)
+    PROPERTY( bool    , alarm_Flag_alarmsSilenced   , false)
+    // coco end
 
-    VIEW_DEC(VAlarmStatus, AlarmStatusData)
+    Q_PROPERTY(QString text READ text NOTIFY alarm_AlarmIDChanged)
+    Q_PROPERTY(QString id READ id NOTIFY alarm_AlarmIDChanged)
 
+signals:
+    void raiseAlarm();
+    void noAlarm();
+    void requestActionTransmit(GuiActionType vAction, const QVariantList &vData);
+
+private:
+    QString alarmPriorityText   (GuiAlarmPriority vEnum);
+    QString alarmIDText         (GuiAlarmID       vEnum);
+
+private slots:
+    void onActionReceive(const AlarmStatusData &vData);
+
+
+public slots:
+    QString text();
+    QString id();
+    void    requestOkay(GuiAlarmID alarmID);
+    void    requestSilence();
+
 };
 
 }