Index: sources/gui/qml/pages/disinfect/DisinfectStack.qml =================================================================== diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -r6f6ed243878d66e0b722566213d8b72aad461148 --- sources/gui/qml/pages/disinfect/DisinfectStack.qml (.../DisinfectStack.qml) (revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263) +++ sources/gui/qml/pages/disinfect/DisinfectStack.qml (.../DisinfectStack.qml) (revision 6f6ed243878d66e0b722566213d8b72aad461148) @@ -35,6 +35,7 @@ readonly property string flushTitle : qsTr("Water Flush") readonly property string heatTitle : qsTr("Heat Disinfect") readonly property string chemicalTitle : qsTr("Chemical Disinfect") + readonly property string chemFlushTitle : qsTr("Chemical Flush") function doDisinfectBack () { vDisinfectAdjustDisinfect .doDisinfectClear () @@ -55,6 +56,10 @@ vDisinfectAdjustDisinfect .doDisinfectChemical() page( _disinfectChemical ) } + function doDisinfectChemFlush() { + vDisinfectAdjustDisinfect .doDisinfectChemFlush() + page( _disinfectChemFlush ) + } function doDisplayReasonText(vPage) { if ( vDisinfectAdjustDisinfect.adjustment_Accepted ){ vPage.reasonText = "" } else { vPage.reasonText = vDisinfectAdjustDisinfect.text() } @@ -65,11 +70,13 @@ property int stackStepIndex : 0 header.stepNames : [ _root.disinfectTitle ] title.text : _root.disinfectTitle - footer.childrenWidth : 350 + + footer.childrenWidth : 300 footer.children: [ TouchRect { text.text: _root.flushTitle ; onClicked: { doDisinfectFlush () } }, TouchRect { text.text: _root.heatTitle ; onClicked: { doDisinfectHeat () } }, - TouchRect { text.text: _root.chemicalTitle ; onClicked: { doDisinfectChemical () } } + TouchRect { text.text: _root.chemicalTitle ; onClicked: { doDisinfectChemical () } }, + TouchRect { text.text: _root.chemFlushTitle ; onClicked: { doDisinfectChemFlush () } } ] instructionBased : true header.backVisible : vDisinfectAdjustDisinfect .hasCancel // if initiated by User from setting can be canceled. @@ -109,6 +116,17 @@ onConfirmClicked : doDisinfectConfirm () } + DisinfectBase { id : _disinfectChemFlush + objectName : "_disinfectChemFlush" + header.stepNames : [ _root.disinfectTitle , _root.chemFlushTitle ] + title.text : _root.chemFlushTitle + instructionBased : true + header.backVisible : true + header.confirmVisible : true + onBackClicked : doDisinfectBack () + onConfirmClicked : doDisinfectConfirm () + } + // ----- Navigation Connections { target: vHDOperationMode function onStandbyWaitDisinfectChanged ( vValue ) { page( _disinfectHome , vValue )} // initialItem Index: sources/view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.cpp =================================================================== diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -r6f6ed243878d66e0b722566213d8b72aad461148 --- sources/view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.cpp (.../VDisinfectAdjustDisinfect.cpp) (revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263) +++ sources/view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.cpp (.../VDisinfectAdjustDisinfect.cpp) (revision 6f6ed243878d66e0b722566213d8b72aad461148) @@ -62,10 +62,11 @@ // *** 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::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; + 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; + case GuiDisinfectDGStates::DG_DISINFECT_CHEM_FLUSH_STATE : adjustment_DisinfectStartChemFlush(true); break; + default: break; } } @@ -129,6 +130,15 @@ _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; +} + void View::VDisinfectAdjustDisinfect::doDisinfectConfirm() { emit didAdjustment(_data); Index: sources/view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.h =================================================================== diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -r6f6ed243878d66e0b722566213d8b72aad461148 --- sources/view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.h (.../VDisinfectAdjustDisinfect.h) (revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263) +++ sources/view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.h (.../VDisinfectAdjustDisinfect.h) (revision 6f6ed243878d66e0b722566213d8b72aad461148) @@ -46,6 +46,7 @@ TRIGGER ( bool , adjustment_DisinfectStartFlush , 0) TRIGGER ( bool , adjustment_DisinfectStartHeat , 0) TRIGGER ( bool , adjustment_DisinfectStartChemical , 0) + TRIGGER ( bool , adjustment_DisinfectStartChemFlush, 0) PROPERTY( bool , hasCancel , 0) @@ -61,6 +62,7 @@ void doDisinfectFlush (); void doDisinfectHeat (); void doDisinfectChemical (); + void doDisinfectChemFlush (); void doDisinfectConfirm (); signals: