Index: sources/view/valarmstatus.h
===================================================================
diff -u -r6ae83fa9a1a3204864fc5b50fe906ac09e9c1ea5 -rd2035a8728794afeefaa244bf8d1597926d945f5
--- sources/view/valarmstatus.h	(.../valarmstatus.h)	(revision 6ae83fa9a1a3204864fc5b50fe906ac09e9c1ea5)
+++ sources/view/valarmstatus.h	(.../valarmstatus.h)	(revision d2035a8728794afeefaa244bf8d1597926d945f5)
@@ -1,15 +1,16 @@
 /*!
- *
+ * 
  * 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
- *
+ * 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
 
@@ -20,15 +21,23 @@
 #include "MModel.h"
 #include "vview.h"
 #include "guiglobals.h"
+#include "messageglobals.h"
+#include "guicontroller.h"
+#include "format.h"
 
+using namespace Can;
 // namespace
 using namespace Gui;
 namespace View {
 
 class VAlarmStatus : public QObject
 {
     Q_OBJECT
+public:
+    VAlarmStatus(QObject *parent = NULL);
 
+private:
+    // coco begin validated: Has been validated manually
     PROPERTY( quint32 , alarm_Priority              ,     0)
     PROPERTY( quint32 , alarm_AlarmID               ,     0)
     PROPERTY( quint32 , alarm_EscalateIn            ,     0)
@@ -43,17 +52,30 @@
     PROPERTY( bool    , alarm_Flag_bypassDialyzer   , false)
     PROPERTY( bool    , alarm_Flag_alarmsToEscalate , false)
     PROPERTY( bool    , alarm_Flag_alarmsSilenced   , false)
+    // coco end
 
     Q_PROPERTY(QString text READ text NOTIFY alarm_AlarmIDChanged)
+    Q_PROPERTY(QString id READ id NOTIFY alarm_AlarmIDChanged)
 
-    VIEW_DEC(VAlarmStatus, AlarmStatusData)
+signals:
+    void raiseAlarm();
+    void hideAlarm();
+    void requestActionTransmit(GuiActionType vAction, const QVariantList &vData);
 
 private:
     QString alarmPriorityText   (GuiAlarmPriority vEnum);
     QString alarmIDText         (GuiAlarmID       vEnum);
+    QList<GuiAlarmID>           acknowledgedAlarms;
 
+private slots:
+    void onActionReceive(const AlarmStatusData &vData);
+
+
 public slots:
     QString text();
+    QString id();
+    void    requestOkay(GuiAlarmID alarmID);
+    void    requestSilence();
 
 };