Index: sources/view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.cpp
===================================================================
diff -u -r6233e005c77ee0aa10e80c02254a21f2042b840b -rb41595237e9943f367b58b79e3304e5879719abf
--- sources/view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.cpp	(.../VDisinfectAdjustDisinfect.cpp)	(revision 6233e005c77ee0aa10e80c02254a21f2042b840b)
+++ sources/view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.cpp	(.../VDisinfectAdjustDisinfect.cpp)	(revision b41595237e9943f367b58b79e3304e5879719abf)
@@ -1,13 +1,13 @@
 /*!
  *
- * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved.
+ * Copyright (c) 2021-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    VDisinfectAdjustDisinfect.cpp
- * \author  (last)      Behrouz NematiPour
- * \date    (last)      18-Apr-2021
+ * \author  (last)      Dara Navaei
+ * \date    (last)      16-Jul-2024
  * \author  (original)  Behrouz NematiPour
  * \date    (original)  18-Apr-2021
  *
@@ -24,47 +24,102 @@
  * \details All the class signal/slot connections are defined here.
 */
 void View::VDisinfectAdjustDisinfect::initConnections() {
-    ADJUST_VIEW_CONNECTION(AdjustDisinfectRequestData);
-    ACTION_VIEW_CONNECTION(AdjustDisinfectResponseData);
+    ADJUST_VIEW_CONNECTION(AdjustDisinfectModeRequestData);
+    ACTION_VIEW_CONNECTION(AdjustDisinfectModeResponseData);
+
+    ADJUST_VIEW_CONNECTION(AdjustDisinfectStartRequestData);
+    ACTION_VIEW_CONNECTION(AdjustDisinfectStartResponseData);
 }
 
 /*!
  * \brief   VDisinfectAdjustDisinfect::onActionReceive
  * \details received response model data handler
  * \param   vData - model data
  */
-void View::VDisinfectAdjustDisinfect::onActionReceive(const AdjustDisinfectResponseData &vData)
+void View::VDisinfectAdjustDisinfect::onActionReceive(const AdjustDisinfectModeResponseData &vData)
 {
+    adjustment_Accepted         ( vData.mAccepted   );
+    adjustment_Reason           ( vData.mReason     );
+
+    hasCancel                   ( vData.mAccepted   );
+
+    // *** has to be the last to let the information to be set and then emit the signal ***
+    // *** otherwise will use the Previous values before being set.                     ***
+    adjustment_DisinfectMode(true);
+
+}
+
+/*!
+ * \brief   VDisinfectAdjustDisinfect::onActionReceive
+ * \details received response model data handler
+ * \param   vData - model data
+ */
+void View::VDisinfectAdjustDisinfect::onActionReceive(const AdjustDisinfectStartResponseData &vData)
+{
     adjustment_Accepted         ( vData.mAccepted      );
     adjustment_Reason           ( vData.mReason        );
 
-    flush      ( _data.mState == GuiDisinfectDGStates::DG_DISINFECT_FLUSH_STATE );
-    heat       ( _data.mState == GuiDisinfectDGStates::DG_DISINFECT_HEAT_STATE  );
-    chemical   ( _data.mState == GuiDisinfectDGStates::DG_DISINFECT_CHEM_STATE  );
-
     // *** has to be the last to let the information to be set and then emit the signal ***
     // *** otherwise will use the Previous values before being set.                     ***
-    adjustment                  ( true );
+    switch ( _data.mState ) {
+    case GuiDisinfectDGStates::DG_DISINFECT_FLUSH_STATE             : adjustment_DisinfectStartFlush        (true); break;
+    case GuiDisinfectDGStates::DG_DISINFECT_HEAT_STATE_ACTIVE_COOL  : adjustment_DisinfectStartHeatActive   (true); break;
+    case GuiDisinfectDGStates::DG_DISINFECT_CHEM_STATE              : adjustment_DisinfectStartChemical     (true); break;
+    case GuiDisinfectDGStates::DG_DISINFECT_CHEM_FLUSH_STATE        : adjustment_DisinfectStartChemFlush    (true); break;
+    case GuiDisinfectDGStates::DG_DISINFECT_RO_PERMEATE_SAMPLE_STATE: adjustment_DisinfectStartROPermeate   (true); break;
+    case GuiDisinfectDGStates::DG_DISINFECT_HEAT_STATE_PASSIVE_COOL : adjustment_DisinfectStartHeatPassive  (true); break;
+    default:                                                                                                        break;
+    }
 }
 
 /*!
+ * \brief   View::VDisinfectAdjustDisinfect::doDisinfectInitiate
+ * \details Requests the Disinfection mode
+ */
+void View::VDisinfectAdjustDisinfect::doDisinfectInitiate()
+{
+    hasCancel(true);
+    AdjustDisinfectModeRequestData vData;
+    vData.mInititate = Model::MAdjustDisinfectModeReq::eInitiate;
+    emit didAdjustment(vData);
+}
+
+/*!
+ * \brief   View::VDisinfectAdjustDisinfect::doDisinfectCancel
+ * \details Requests the Disinfection mode cancellation.
+ */
+void View::VDisinfectAdjustDisinfect::doDisinfectCancel()
+{
+    AdjustDisinfectModeRequestData vData;
+    vData.mInititate = Model::MAdjustDisinfectModeReq::eCancel;
+    emit didAdjustment(vData);
+}
+
+/*!
+ * \brief View::VDisinfectAdjustDisinfect::doDisinfectClear
+ */
+void View::VDisinfectAdjustDisinfect::doDisinfectClear()
+{
+    _data.mState = GuiDisinfectDGStates::DG_DISINFECT_NOT_RUNNING_STATE;
+}
+
+/*!
  * \brief   View::VDisinfectAdjustDisinfect::doDisinfectFlush
  * \details the invocable slot to send user's Disinfect Flush Request
+
  */
-void View::VDisinfectAdjustDisinfect::doFlush()
+void View::VDisinfectAdjustDisinfect::doDisinfectFlush()
 {
     _data.mState = GuiDisinfectDGStates::DG_DISINFECT_FLUSH_STATE;
-    emit didAdjustment(_data);
 }
 
 /*!
- * \brief   View::VDisinfectAdjustDisinfect::doDisinfectHeat
- * \details the invocable slot to send user's Disinfect Heat Request
+ * \brief   View::VDisinfectAdjustDisinfect::doDisinfectHeatActiveCool
+ * \details the invocable slot to send user's Disinfect Heat Request with active cool
  */
-void View::VDisinfectAdjustDisinfect::doDisinfectHeat()
+void View::VDisinfectAdjustDisinfect::doDisinfectHeatActiveCool()
 {
-    _data.mState = GuiDisinfectDGStates::DG_DISINFECT_HEAT_STATE;
-    emit didAdjustment(_data);
+    _data.mState = GuiDisinfectDGStates::DG_DISINFECT_HEAT_STATE_ACTIVE_COOL;
 }
 
 /*!
@@ -74,5 +129,37 @@
 void View::VDisinfectAdjustDisinfect::doDisinfectChemical()
 {
     _data.mState = GuiDisinfectDGStates::DG_DISINFECT_CHEM_STATE;
+}
+
+/*!
+ * \brief   View::VDisinfectAdjustDisinfect::doDisinfectChemFlush
+ * \details the invocable slot to send user's Disinfect Chemical Flush Request
+ */
+void View::VDisinfectAdjustDisinfect::doDisinfectChemFlush()
+{
+    _data.mState = GuiDisinfectDGStates::DG_DISINFECT_CHEM_FLUSH_STATE;
+}
+
+/*!
+ * \brief   View::VDisinfectAdjustDisinfect::doDisinfectROPermeate
+ * \details the invocable slot to send user's Disinfect RO Permeate Request
+ */
+void View::VDisinfectAdjustDisinfect::doDisinfectROPermeate()
+{
+    _data.mState = GuiDisinfectDGStates::DG_DISINFECT_RO_PERMEATE_SAMPLE_STATE;
+}
+
+/*!
+ * \brief   View::VDisinfectAdjustDisinfect::doDisinfectHeatPassiveCool
+ * \details the invocable slot to send user's Disinfect Heat Request with passive cool
+ */
+void View::VDisinfectAdjustDisinfect::doDisinfectHeatPassiveCool()
+{
+    _data.mState = GuiDisinfectDGStates::DG_DISINFECT_HEAT_STATE_PASSIVE_COOL;
+}
+
+void View::VDisinfectAdjustDisinfect::doDisinfectConfirm()
+{
     emit didAdjustment(_data);
 }
+