Index: sources/view/hd/alarm/VAlarmStatus.h
===================================================================
diff -u -r5db87178d372acd2cc4e5d75bf99f4c0cb11f1f2 -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9
--- sources/view/hd/alarm/VAlarmStatus.h	(.../VAlarmStatus.h)	(revision 5db87178d372acd2cc4e5d75bf99f4c0cb11f1f2)
+++ sources/view/hd/alarm/VAlarmStatus.h	(.../VAlarmStatus.h)	(revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9)
@@ -1,15 +1,15 @@
 /*!
  *
- * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved.
+ * Copyright (c) 2020-2024 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
- * \author (last) Peter Lucia
- * \date (last) 29-Jun-2020
- * \author (original) Behrouz NematiPour
- * \date (original) 10-Mar-2020
+ * \file    VAlarmStatus.h
+ * \author  (last)      Behrouz NematiPour
+ * \date    (last)      10-Feb-2023
+ * \author  (original)  Behrouz NematiPour
+ * \date    (original)  26-Aug-2020
  *
  */
 #pragma once
@@ -18,17 +18,22 @@
 #include <QObject>
 
 // Project
-#include "main.h" // Doxygen : don't remove
-#include "MModel.h"
+#include "main.h" // Doxygen : do not remove
 #include "VView.h"
+#include "MTreatmentAdjustRequests.h"
+#include "MAlarmStatusData.h"
+#include "MSettings.h"
 #include "GuiGlobals.h"
 #include "MessageGlobals.h"
-#include "GuiController.h"
 #include "format.h"
 
-using namespace Can;
-// namespace
-using namespace Gui;
+// forward declarations
+class tst_views;
+
+// Project
+#include "main.h" // Doxygen : do not remove
+#include "VAdjustmentResponseBase.h"
+
 namespace View {
 
 /*!
@@ -38,14 +43,27 @@
  * \sa Model::MAlarmStatus
  *
  */
-class VAlarmStatus : public QObject
+class VAlarmStatus : public VAdjustmentResponseBase
 {
     Q_OBJECT
-public:
-    VAlarmStatus(QObject *parent = NULL);
 
-private:
-    // coco begin validated: Has been validated manually
+    // friends
+    friend class ::tst_views;
+
+
+    typedef QMap<QString,QString> InstructionData;
+    struct AlarmData {
+        QString title   = "";
+        QString message = "";
+        InstructionData instructions;
+        bool    hasInstruction() { return instructions.count(); }
+    };
+
+    QMap<quint32, AlarmData> _alarms;
+
+    // ********** DYNAMIC PROPERTIES: The properties which need to be updated by each alarm message received. ********** //
+    READONLY( bool    , hasAlarm                    , false)
+    // disabled coco begin validated: Has been validated manually
     PROPERTY( quint32 , alarm_Priority              ,     0)
     PROPERTY( quint32 , alarm_AlarmID               ,     0)
     PROPERTY( quint32 , alarm_EscalateIn            ,     0)
@@ -57,31 +75,48 @@
     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_UserMustAck      , false)
     PROPERTY( bool    , alarm_Flag_alarmsToEscalate , false)
     PROPERTY( bool    , alarm_Flag_alarmsSilenced   , false)
-    // coco end
+    PROPERTY( bool    , alarm_Flag_alarmsLampOn     , false)
+    // 3 reserved flags are here... //
+    PROPERTY( bool    , alarm_Flag_noMinimize       , false)
+    PROPERTY( bool    , alarm_Flag_alarmsCondition  , false)
+    // disabled coco end
 
-    Q_PROPERTY(QString text READ text NOTIFY alarm_AlarmIDChanged)
-    Q_PROPERTY(QString id READ id NOTIFY alarm_AlarmIDChanged)
+    // ********** STATIC PROPERTIES: The properties which need to be updated by each alarm message received. ********** //
+    Q_PROPERTY(QString      title               READ title              NOTIFY alarm_AlarmIDChanged )
+    Q_PROPERTY(QString      message             READ message            NOTIFY alarm_AlarmIDChanged )
+    Q_PROPERTY(QStringList  instructionKeys     READ instructionKeys    NOTIFY alarm_AlarmIDChanged )
+    Q_PROPERTY(QStringList  instructionValues   READ instructionValues  NOTIFY alarm_AlarmIDChanged )
+    Q_PROPERTY(QString      text                READ text               NOTIFY alarm_AlarmIDChanged )
 
-signals:
-    void raiseAlarm();
-    void hideAlarm();
-    void requestActionTransmit(GuiActionType vAction, const QVariantList &vData);
+    VIEW_DEC_CLASS          ( VAlarmStatus                      )
+    VIEW_DEC_SLOT           ( AlarmStatusData                   )
+    VIEW_DEC_SLOT           ( SettingsData                      )
 
+    ADJUST_TRANSMT_SIGNAL   ( AlarmSilenceRequestData           )
+    ADJUST_TRANSMT_SIGNAL   ( AlarmUserActionRequestData        )
+    ADJUST_TRANSMT_SIGNAL   ( AlarmClearedConditionRequestData  )
+
 private:
-    QString alarmPriorityText   (GuiAlarmPriority vEnum);
-    QString alarmIDText         (GuiAlarmID       vEnum);
-    QList<GuiAlarmID>           acknowledgedAlarms;
+    QString     title               ();
+    QString     message             ();
+    QStringList instructionKeys     ();
+    QStringList instructionValues   ();
+    QString     text                ();
+    QString     alarmIDText         (GuiAlarmID       vEnum);
 
-private slots:
-    void onActionReceive(const AlarmStatusData &vData);
+signals:
+    void didAlarmRaise();
+    void didAlarmEmpty();
 
 public slots:
-    QString text();
-    QString id();
-    void    requestOkay(GuiAlarmID alarmID);
-    void    requestSilence();
+    void doUserActionResume     ();
+    void doUserActionRinseback  ();
+    void doUserActionEnd        ();
+    void doUserActionOk         ();
+    void doSilence              ();
+    void doClearCondition       ();
 };
 }