Index: sources/view/valarmstatus.cpp
===================================================================
diff -u -ra7aa20b149cfc003091bfbf9a90e26eb0ae032d5 -r11a0a0a9bb67cc3afbf75426cc6b3ca97365a7ea
--- sources/view/valarmstatus.cpp	(.../valarmstatus.cpp)	(revision a7aa20b149cfc003091bfbf9a90e26eb0ae032d5)
+++ sources/view/valarmstatus.cpp	(.../valarmstatus.cpp)	(revision 11a0a0a9bb67cc3afbf75426cc6b3ca97365a7ea)
@@ -2,13 +2,14 @@
  *
  * 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.
+ * 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.cpp
- * \date    3/6/2020
- * \author  Behrouz NematiPour
+ * \file valarmstatus.cpp
+ * \author (last) Peter Lucia
+ * \date (last) 29-Jun-2020
+ * \author (original) Behrouz NematiPour
+ * \date (original) 10-Mar-2020
  *
  */
 #include "valarmstatus.h"
@@ -36,17 +37,11 @@
         return;
     }
 
-    if (acknowledgedAlarms.contains(alarmID)) {
-        qDebug() << "Alarm ID " << alarmID << " has been acknowleged and is visible. ";
-        LOG_EVENT(tr("Alarm ID %0 has been acknowleged and is visible. ").arg(alarmID));
+    if (vData.mTop == GuiAlarmID::ALARM_ID_NO_ALARM) {
+        emit noAlarm();
         return;
     }
 
-    if (vData.mTop <= GuiAlarmID::ALARM_ID_NO_ALARM) {
-        emit hideAlarm();
-        return;
-    }
-
     alarm_Priority              (vData.mState                                            );
     alarm_AlarmID               (vData.mTop                                              );
     alarm_EscalateIn            (vData.mMuteTimeout                                      );
@@ -98,13 +93,7 @@
  */
 QString VAlarmStatus::alarmIDText(GuiAlarmID vEnum)
 {
-    const QMetaObject *mo = qt_getEnumMetaObject(vEnum);
-    int enumIdx = mo->indexOfEnumerator(qt_getEnumName(vEnum));
-    const char *key = mo->enumerator(enumIdx).valueToKey(vEnum);
-    if (key)
-        return Model::MAlarmStatus::toText(vEnum);
-    else
-        return QString("ALARM_ID_UNDEFINED [%1]").arg(vEnum);
+    return Model::MAlarmStatus::toText(vEnum);
 }
 
 /*!
@@ -133,7 +122,8 @@
  */
 void VAlarmStatus::requestOkay(GuiAlarmID alarmID)
 {
-    acknowledgedAlarms.append(alarmID);
+    // This will need to go to the HD
+    qDebug() << __FUNCTION__ << "alarmID: " << alarmID;
 }
 
 /*!
@@ -142,8 +132,7 @@
  */
 void VAlarmStatus::requestSilence()
 {
-    // TODO: Update with needed data. Placeholder for now.
-    QVariantList messageData = {1,2,3,4,5};
-    GuiActionType messageAction = GuiActions::AlarmSilenceReq;
+    QVariantList messageData = {1};
+    GuiActionType messageAction = GuiActions::ID_AlarmSilenceReq;
     emit requestActionTransmit(messageAction, messageData);
 }