Index: sources/view/hd/alarm/VAlarmStatus.h
===================================================================
diff -u -r79a6cfcb10472261f3ec26eaf0baf6f1245cd311 -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9
--- sources/view/hd/alarm/VAlarmStatus.h	(.../VAlarmStatus.h)	(revision 79a6cfcb10472261f3ec26eaf0baf6f1245cd311)
+++ sources/view/hd/alarm/VAlarmStatus.h	(.../VAlarmStatus.h)	(revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9)
@@ -1,13 +1,13 @@
 /*!
  *
- * Copyright (c) 2020-2022 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)      Behrouz NematiPour
- * \date    (last)      18-Apr-2022
+ * \date    (last)      10-Feb-2023
  * \author  (original)  Behrouz NematiPour
  * \date    (original)  26-Aug-2020
  *
@@ -21,9 +21,10 @@
 #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"
 
 // forward declarations
@@ -49,6 +50,18 @@
     // 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)
@@ -71,16 +84,28 @@
     PROPERTY( bool    , alarm_Flag_alarmsCondition  , false)
     // disabled coco end
 
-    Q_PROPERTY(QString text READ text 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 )
 
-    VIEW_DEC_CLASS_ADJUSTMENT(VAlarmStatus, AlarmStatusData                 )
-    ADJUST_TRANSMT_SIGNAL    (              AlarmSilenceRequestData         )
-    ADJUST_TRANSMT_SIGNAL    (              AlarmUserActionRequestData      )
-    ADJUST_TRANSMT_SIGNAL    (              AlarmClearedConditionRequestData)
+    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 text                ();
-    QString alarmIDText         (GuiAlarmID       vEnum);
+    QString     title               ();
+    QString     message             ();
+    QStringList instructionKeys     ();
+    QStringList instructionValues   ();
+    QString     text                ();
+    QString     alarmIDText         (GuiAlarmID       vEnum);
 
 signals:
     void didAlarmRaise();