Index: sources/view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.cpp
===================================================================
diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -r0404b2da32acb3eaf8d41ef627dd51252c80e9ba
--- sources/view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.cpp	(.../VDisinfectAdjustDisinfect.cpp)	(revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1)
+++ sources/view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.cpp	(.../VDisinfectAdjustDisinfect.cpp)	(revision 0404b2da32acb3eaf8d41ef627dd51252c80e9ba)
@@ -24,9 +24,6 @@
  * \details All the class signal/slot connections are defined here.
 */
 void View::VDisinfectAdjustDisinfect::initConnections() {
-    ADJUST_VIEW_CONNECTION(AdjustDisinfectModeRequestData);
-    ACTION_VIEW_CONNECTION(AdjustDisinfectModeResponseData);
-
     ADJUST_VIEW_CONNECTION(AdjustDisinfectStartRequestData);
     ACTION_VIEW_CONNECTION(AdjustDisinfectStartResponseData);
 }
@@ -36,130 +33,69 @@
  * \details received response model data handler
  * \param   vData - model data
  */
-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        );
 
-    // *** 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.                     ***
-    switch ( _data.mState ) {
-    case GuiDisinfectDGStates::DD_DISINFECT_FLUSH_STATE             : adjustment_DisinfectStartFlush        (true); break;
-    // FIXENUM: case GuiDisinfectDGStates::DD_DISINFECT_HEAT_STATE_ACTIVE_COOL  : adjustment_DisinfectStartHeatActive   (true); break;
-    // FIXENUM: case GuiDisinfectDGStates::DD_DISINFECT_CHEM_STATE              : adjustment_DisinfectStartChemical     (true); break;
-    // FIXENUM: case GuiDisinfectDGStates::DD_DISINFECT_CHEM_FLUSH_STATE        : adjustment_DisinfectStartChemFlush    (true); break;
-    case GuiDisinfectDGStates::DD_DISINFECT_RO_PERMEATE_SAMPLE_STATE: adjustment_DisinfectStartROPermeate   (true); break;
-    // FIXENUM: case GuiDisinfectDGStates::DD_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);
+    adjustment(true);
 }
 
 /*!
- * \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::doSkip
+ * \details the invocable slot to send user's Disinfect Skip Request
 
-/*!
- * \brief View::VDisinfectAdjustDisinfect::doDisinfectClear
  */
-void View::VDisinfectAdjustDisinfect::doDisinfectClear()
+void View::VDisinfectAdjustDisinfect::doSkip()
 {
-    _data.mState = GuiDisinfectDGStates::DD_DISINFECT_NOT_RUNNING_STATE;
+    _data.mState = GuiDisinfectDGStates::DD_DISINFECT_FLUSH_STATE;
+    emit didAdjustment(_data);
 }
 
 /*!
- * \brief   View::VDisinfectAdjustDisinfect::doDisinfectFlush
+ * \brief   View::VDisinfectAdjustDisinfect::doFlush
  * \details the invocable slot to send user's Disinfect Flush Request
 
  */
-void View::VDisinfectAdjustDisinfect::doDisinfectFlush()
+void View::VDisinfectAdjustDisinfect::doFlush()
 {
     _data.mState = GuiDisinfectDGStates::DD_DISINFECT_FLUSH_STATE;
+    emit didAdjustment(_data);
 }
 
 /*!
- * \brief   View::VDisinfectAdjustDisinfect::doDisinfectHeatActiveCool
- * \details the invocable slot to send user's Disinfect Heat Request with active cool
+ * \brief   View::VDisinfectAdjustDisinfect::doHeat
+ * \details the invocable slot to send user's Disinfect Heat Request
  */
-void View::VDisinfectAdjustDisinfect::doDisinfectHeatActiveCool()
+void View::VDisinfectAdjustDisinfect::doHeat()
 {
-    // FIXENUM: _data.mState = GuiDisinfectDGStates::DD_DISINFECT_HEAT_STATE_ACTIVE_COOL;
-}
-
-/*!
- * \brief   View::VDisinfectAdjustDisinfect::doDisinfectChemical
- * \details the invocable slot to send user's Disinfect Chemical Request
- */
-void View::VDisinfectAdjustDisinfect::doDisinfectChemical()
-{
     // FIXENUM: _data.mState = GuiDisinfectDGStates::DD_DISINFECT_CHEM_STATE;
+    emit didAdjustment(_data);
+
 }
 
 /*!
- * \brief   View::VDisinfectAdjustDisinfect::doDisinfectChemFlush
- * \details the invocable slot to send user's Disinfect Chemical Flush Request
+ * \brief   View::VDisinfectAdjustDisinfect::doHeatCitric
+ * \details the invocable slot to send user's Disinfect Heat with citric acid Request
  */
-void View::VDisinfectAdjustDisinfect::doDisinfectChemFlush()
+void View::VDisinfectAdjustDisinfect::doHeatCitric()
 {
     // FIXENUM: _data.mState = GuiDisinfectDGStates::DD_DISINFECT_CHEM_FLUSH_STATE;
+    emit didAdjustment(_data);
+
 }
 
 /*!
- * \brief   View::VDisinfectAdjustDisinfect::doDisinfectROPermeate
- * \details the invocable slot to send user's Disinfect RO Permeate Request
+ * \brief   View::VDisinfectAdjustDisinfect::doSubstitutionPort
+ * \details the invocable slot to send user's Disinfect Substitution port Request
  */
-void View::VDisinfectAdjustDisinfect::doDisinfectROPermeate()
+void View::VDisinfectAdjustDisinfect::doSubstitutionPort()
 {
     _data.mState = GuiDisinfectDGStates::DD_DISINFECT_RO_PERMEATE_SAMPLE_STATE;
-}
+    emit didAdjustment(_data);
 
-/*!
- * \brief   View::VDisinfectAdjustDisinfect::doDisinfectHeatPassiveCool
- * \details the invocable slot to send user's Disinfect Heat Request with passive cool
- */
-void View::VDisinfectAdjustDisinfect::doDisinfectHeatPassiveCool()
-{
-    // FIXENUM: _data.mState = GuiDisinfectDGStates::DD_DISINFECT_HEAT_STATE_PASSIVE_COOL;
 }
 
-void View::VDisinfectAdjustDisinfect::doDisinfectConfirm()
-{
-    emit didAdjustment(_data);
-}
 
+