Index: sources/view/hd/alarm/VAlarmStatus.cpp
===================================================================
diff -u -r64d87d540594252e8039ab2595016d98f1e3cc28 -rb61d8a3e01fef66eee8095c9cddf835d9bb32b66
--- sources/view/hd/alarm/VAlarmStatus.cpp	(.../VAlarmStatus.cpp)	(revision 64d87d540594252e8039ab2595016d98f1e3cc28)
+++ sources/view/hd/alarm/VAlarmStatus.cpp	(.../VAlarmStatus.cpp)	(revision b61d8a3e01fef66eee8095c9cddf835d9bb32b66)
@@ -26,6 +26,12 @@
 
     connect(this,            SIGNAL(requestActionTransmit(GuiActionType,QVariantList)),
             &_GuiController, SLOT(doActionTransmit(GuiActionType,QVariantList)));
+
+    connect(this,            SIGNAL(requestAlarmAcknowledge(AlarmAcknowledgeRequestData)),
+            &_GuiController, SLOT(doAdjustment(AlarmAcknowledgeRequestData)));
+
+    connect(this,            SIGNAL(requestAlarmSilence(AlarmSilenceRequestData)),
+            &_GuiController, SLOT(doAdjustment(AlarmSilenceRequestData)));
 }
 
 void VAlarmStatus::onActionReceive(const AlarmStatusData &vData)
@@ -37,34 +43,28 @@
         return;
     }
 
-    if (acknowledgedAlarms.contains(alarmID)) {
-        LOG_EVENT(tr("Alarm ID %0 has been acknowledged 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                                      );
-    alarm_MuteTimeout           (vData.mEscalatesIn                                      );
-    alarm_Flag_systemFault      (vData.mFlags.at(AlarmStatusFlag::eFlag_systemFault     ));
-    alarm_Flag_stop             (vData.mFlags.at(AlarmStatusFlag::eFlag_stop            ));
-    alarm_Flag_noClear          (vData.mFlags.at(AlarmStatusFlag::eFlag_noClear         ));
-    alarm_Flag_noResume         (vData.mFlags.at(AlarmStatusFlag::eFlag_noResume        ));
-    alarm_Flag_noRinseback      (vData.mFlags.at(AlarmStatusFlag::eFlag_noRinseback     ));
-    alarm_Flag_noEndTreatment   (vData.mFlags.at(AlarmStatusFlag::eFlag_noEndTreatment  ));
-    alarm_Flag_noNewTreatment   (vData.mFlags.at(AlarmStatusFlag::eFlag_noNewTreatment  ));
-    alarm_Flag_bypassDialyzer   (vData.mFlags.at(AlarmStatusFlag::eFlag_bypassDialyzer  ));
-    alarm_Flag_alarmsToEscalate (vData.mFlags.at(AlarmStatusFlag::eFlag_alarmsToEscalate));
-    alarm_Flag_alarmsSilenced   (vData.mFlags.at(AlarmStatusFlag::eFlag_alarmsSilenced  ));
+    alarm_EscalateIn            (vData.mEscalatesIn                                      );
+    alarm_MuteTimeout           (vData.mMuteTimeout                                      );
+    alarm_Flag_systemFault      (vData.mFlags.at(AlarmStatusFlag::eFlag_systemFault      ));
+    alarm_Flag_stop             (vData.mFlags.at(AlarmStatusFlag::eFlag_stop             ));
+    alarm_Flag_noClear          (vData.mFlags.at(AlarmStatusFlag::eFlag_noClear          ));
+    alarm_Flag_noResume         (vData.mFlags.at(AlarmStatusFlag::eFlag_noResume         ));
+    alarm_Flag_noRinseback      (vData.mFlags.at(AlarmStatusFlag::eFlag_noRinseback      ));
+    alarm_Flag_noEndTreatment   (vData.mFlags.at(AlarmStatusFlag::eFlag_noEndTreatment   ));
+    alarm_Flag_noNewTreatment   (vData.mFlags.at(AlarmStatusFlag::eFlag_noNewTreatment   ));
+    alarm_Flag_bypassDialyzer   (vData.mFlags.at(AlarmStatusFlag::eFlag_bypassDialyzer   ));
+    alarm_Flag_alarmsToEscalate (vData.mFlags.at(AlarmStatusFlag::eFlag_alarmsToEscalate ));
+    alarm_Flag_alarmsSilenced   (vData.mFlags.at(AlarmStatusFlag::eFlag_alarmsSilenced   ));
+    alarm_Flag_UserAcknowledged (vData.mFlags.at(AlarmStatusFlag::eFlag_userAcknowledged ));
 
     emit raiseAlarm();
-
-
 }
 
 /*!
@@ -123,21 +123,33 @@
 
 /*!
  * \brief VAlarmStatus::requestOkay
- *  Send out a request to acknowledge alarms.
+ *  Send out a request to acknowledge this alarmID
  */
-void VAlarmStatus::requestOkay(GuiAlarmID alarmID)
+void VAlarmStatus::onRequestOkay(GuiAlarmID alarmID)
 {
-    acknowledgedAlarms.append(alarmID);
+    AlarmAcknowledgeRequestData data;
+    data.alarmID = (quint32)alarmID;
+    emit requestAlarmAcknowledge(data);
+    onSetMinimize(true); // TODO: Remove once FW implements user acknowledge
 }
 
 /*!
- * \brief VAlarmStatus::requestSilence
- *  Send out a request to silence alarms.
+ * \brief VAlarmStatus::onToggleMinimize
+ * Toggles the whether the alarm should be minimized
  */
-void VAlarmStatus::requestSilence()
+void VAlarmStatus::onSetMinimize(bool minimize)
 {
-    // TODO: Update with needed data. Placeholder for now.
-    QVariantList messageData = {1,2,3,4,5};
-    GuiActionType messageAction = GuiActions::ID_AlarmSilenceReq;
-    emit requestActionTransmit(messageAction, messageData);
+    minimizeAlarm(minimize);
 }
+
+/*!
+ * \brief VAlarmStatus::requestSilence
+ *  Send out a request to silence alarms
+ */
+void VAlarmStatus::onRequestSilence()
+{   
+    AlarmSilenceRequestData data;
+    data.state = 1;
+    emit requestAlarmSilence(data);
+    onSetMinimize(true);
+}