Index: sources/view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.cpp =================================================================== diff -u -r27cc308ff5113a9386899d3c8f8b29962a8498e1 -rffc365df26c29ff174ba037f0cf0794b27800792 --- sources/view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.cpp (.../VDisinfectAdjustDisinfect.cpp) (revision 27cc308ff5113a9386899d3c8f8b29962a8498e1) +++ sources/view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.cpp (.../VDisinfectAdjustDisinfect.cpp) (revision ffc365df26c29ff174ba037f0cf0794b27800792) @@ -24,37 +24,91 @@ * \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 : adjustment_DisinfectStartHeat (true); break; + case GuiDisinfectDGStates::DG_DISINFECT_CHEM_STATE : adjustment_DisinfectStartChemical (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() +{ + hasCancel(false); + 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); } /*! @@ -64,7 +118,6 @@ void View::VDisinfectAdjustDisinfect::doDisinfectHeat() { _data.mState = GuiDisinfectDGStates::DG_DISINFECT_HEAT_STATE; - emit didAdjustment(_data); } /*! @@ -74,5 +127,9 @@ void View::VDisinfectAdjustDisinfect::doDisinfectChemical() { _data.mState = GuiDisinfectDGStates::DG_DISINFECT_CHEM_STATE; +} + +void View::VDisinfectAdjustDisinfect::doDisinfectConfirm() +{ emit didAdjustment(_data); }