Index: sources/gui/qml/pages/disinfect/DisinfectStack.qml =================================================================== diff -u -rc70ae33e19c08779ce89e2f1728f2d1af7b5c100 -rd6ffc1a51ee7f9188c055ea5d3160c8aded861d7 --- sources/gui/qml/pages/disinfect/DisinfectStack.qml (.../DisinfectStack.qml) (revision c70ae33e19c08779ce89e2f1728f2d1af7b5c100) +++ sources/gui/qml/pages/disinfect/DisinfectStack.qml (.../DisinfectStack.qml) (revision d6ffc1a51ee7f9188c055ea5d3160c8aded861d7) @@ -32,21 +32,23 @@ property int stackStepIndex : 1 - readonly property string disinfectTitle : qsTr("Disinfection") - 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") - readonly property string roPermeateTitle: qsTr("RO Permeate Sample") + readonly property string disinfectTitle : qsTr("Disinfection") + readonly property string flushTitle : qsTr("Water Flush") + readonly property string heatActiveTitle : qsTr("Heat Disinfect with Active Cool") + readonly property string chemicalTitle : qsTr("Chemical Disinfect") + readonly property string chemFlushTitle : qsTr("Chemical Flush") + readonly property string roPermeateTitle : qsTr("RO Permeate Sample") + readonly property string heatPassiveTitle: qsTr("Heat Disinfect") - function doDisinfectFlush () { vDisinfectAdjustDisinfect.doDisinfectFlush (); page( _disinfectFlush )} - function doDisinfectHeat () { vDisinfectAdjustDisinfect.doDisinfectHeat (); page( _disinfectHeat )} - function doDisinfectChemical () { vDisinfectAdjustDisinfect.doDisinfectChemical (); page( _disinfectChemical )} - function doDisinfectChemFlush () { vDisinfectAdjustDisinfect.doDisinfectChemFlush (); page( _disinfectChemFlush )} - function doDisinfectROPermeate () { vDisinfectAdjustDisinfect.doDisinfectROPermeate(); page( _disinfectROPermeate )} + function doDisinfectFlush () { vDisinfectAdjustDisinfect.doDisinfectFlush (); page( _disinfectFlush )} + function doDisinfectHeatActiveCool () { vDisinfectAdjustDisinfect.doDisinfectHeatActiveCool (); page( _disinfectHeatActiveCool )} + function doDisinfectChemical () { vDisinfectAdjustDisinfect.doDisinfectChemical (); page( _disinfectChemical )} + function doDisinfectChemFlush () { vDisinfectAdjustDisinfect.doDisinfectChemFlush (); page( _disinfectChemFlush )} + function doDisinfectROPermeate () { vDisinfectAdjustDisinfect.doDisinfectROPermeate (); page( _disinfectROPermeate )} + function doDisinfectHeatPassiveCool () { vDisinfectAdjustDisinfect.doDisinfectHeatPassiveCool (); page( _disinfectHeatPassiveCool )} - function doDisinfectBack () { vDisinfectAdjustDisinfect.doDisinfectClear (); page ( _disinfectHome )} - function doDisinfectConfirm () { vDisinfectAdjustDisinfect.doDisinfectConfirm (); } + function doDisinfectBack () { vDisinfectAdjustDisinfect.doDisinfectClear (); page( _disinfectHome )} + function doDisinfectConfirm () { vDisinfectAdjustDisinfect.doDisinfectConfirm (); } function doDisplayReasonText (vPage) { if ( vDisinfectAdjustDisinfect.adjustment_Accepted ){ vPage.reasonText = "" } @@ -62,11 +64,12 @@ TouchGrid { property bool isVisible: vAdjustmentInstitutionalRecord.enableChemicalDisinfect width : parent.width / 2 + itemWidth : 400 colCount : 1 colSpacing : 0 - itemsText : [ _root.flushTitle , _root.heatTitle , _root.chemicalTitle , _root.chemFlushTitle , _root.roPermeateTitle , ] - itemsVisible : [ true , true , isVisible , isVisible , true , ] - onItemClicked : [ doDisinfectFlush , doDisinfectHeat , doDisinfectChemical , doDisinfectChemFlush , doDisinfectROPermeate , ][vIndex]() + itemsText : [ _root.flushTitle , _root.heatActiveTitle , _root.chemicalTitle , _root.chemFlushTitle , _root.roPermeateTitle , _root.heatPassiveTitle ] + itemsVisible : [ true , true , isVisible , isVisible , true , true ] + onItemClicked : [ doDisinfectFlush , doDisinfectHeatActiveCool , doDisinfectChemical , doDisinfectChemFlush , doDisinfectROPermeate , doDisinfectHeatPassiveCool][vIndex]() } Image { id: _denaliDeviceImage anchors.right : parent.right @@ -92,10 +95,11 @@ onConfirmClicked : doDisinfectConfirm () } - DisinfectBase { id : _disinfectHeat - objectName : "_disinfectHeat" - header.stepNames : [ _root.disinfectTitle , _root.heatTitle ] - title.text : _root.heatTitle + DisinfectBase { id : _disinfectHeatActiveCool + objectName : "_disinfectHeatActiveCool" + header.stepLineLength : 200 + header.stepNames : [ _root.disinfectTitle , _root.heatActiveTitle ] + title.text : _root.heatActiveTitle instructionBased : true header.backVisible : true header.confirmVisible : true @@ -136,19 +140,31 @@ onConfirmClicked : doDisinfectConfirm () } + DisinfectBase { id : _disinfectHeatPassiveCool + objectName : "_disinfectHeatPassiveCool" + header.stepNames : [ _root.disinfectTitle , _root.heatPassiveTitle ] + title.text : _root.heatPassiveTitle + instructionBased : true + header.backVisible : true + header.confirmVisible : true + onBackClicked : doDisinfectBack () + onConfirmClicked : doDisinfectConfirm () + } + // ----- Navigation Connections { target: vHDOperationMode function onStandbyWaitDisinfectChanged ( vValue ) { page( _disinfectHome , vValue )} // initialItem } // ----- Responses Connections { target: vDisinfectAdjustDisinfect - function onAdjustment_DisinfectModeTriggered ( vValue ) { doDisplayReasonText( _disinfectHome )} - function onAdjustment_DisinfectStartFlushTriggered ( vValue ) { doDisplayReasonText( _disinfectFlush )} - function onAdjustment_DisinfectStartHeatTriggered ( vValue ) { doDisplayReasonText( _disinfectHeat )} - function onAdjustment_DisinfectStartChemicalTriggered ( vValue ) { doDisplayReasonText( _disinfectChemical )} - function onAdjustment_DisinfectStartChemFlushTriggered ( vValue ) { doDisplayReasonText( _disinfectChemFlush )} - function onAdjustment_DisinfectStartROPermeateTriggered ( vValue ) { doDisplayReasonText( _disinfectROPermeate)} + function onAdjustment_DisinfectModeTriggered ( vValue ) { doDisplayReasonText( _disinfectHome )} + function onAdjustment_DisinfectStartFlushTriggered ( vValue ) { doDisplayReasonText( _disinfectFlush )} + function onAdjustment_DisinfectStartHeatTriggered ( vValue ) { doDisplayReasonText( _disinfectHeatActiveCool )} + function onAdjustment_DisinfectStartChemicalTriggered ( vValue ) { doDisplayReasonText( _disinfectChemical )} + function onAdjustment_DisinfectStartChemFlushTriggered ( vValue ) { doDisplayReasonText( _disinfectChemFlush )} + function onAdjustment_DisinfectStartROPermeateTriggered ( vValue ) { doDisplayReasonText( _disinfectROPermeate )} + function onAdjustment_DisinfectStartHeatPassiveTriggered ( vValue ) { doDisplayReasonText( _disinfectHeatPassiveCool)} } onVisibleChanged: { Index: sources/view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.cpp =================================================================== diff -u -rc70ae33e19c08779ce89e2f1728f2d1af7b5c100 -rd6ffc1a51ee7f9188c055ea5d3160c8aded861d7 --- sources/view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.cpp (.../VDisinfectAdjustDisinfect.cpp) (revision c70ae33e19c08779ce89e2f1728f2d1af7b5c100) +++ sources/view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.cpp (.../VDisinfectAdjustDisinfect.cpp) (revision d6ffc1a51ee7f9188c055ea5d3160c8aded861d7) @@ -63,10 +63,11 @@ // *** 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_HEAT_STATE_ACTIVE_COOL : 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; 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; } } @@ -113,12 +114,12 @@ } /*! - * \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; + _data.mState = GuiDisinfectDGStates::DG_DISINFECT_HEAT_STATE_ACTIVE_COOL; } /*! @@ -148,7 +149,17 @@ _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); } + Index: sources/view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.h =================================================================== diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -rd6ffc1a51ee7f9188c055ea5d3160c8aded861d7 --- sources/view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.h (.../VDisinfectAdjustDisinfect.h) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) +++ sources/view/hd/adjustment/disinfect/VDisinfectAdjustDisinfect.h (.../VDisinfectAdjustDisinfect.h) (revision d6ffc1a51ee7f9188c055ea5d3160c8aded861d7) @@ -48,24 +48,27 @@ TRIGGER ( bool , adjustment_DisinfectStartChemical , 0) TRIGGER ( bool , adjustment_DisinfectStartChemFlush , 0) TRIGGER ( bool , adjustment_DisinfectStartROPermeate , 0) + TRIGGER ( bool , adjustment_DisinfectStartHeatPassive , 0) + PROPERTY( bool , hasCancel , 0) VIEW_DEC_CLASS(VDisinfectAdjustDisinfect) VIEW_DEC_SLOT(AdjustDisinfectModeResponseData) VIEW_DEC_SLOT(AdjustDisinfectStartResponseData) public slots: - void doDisinfectInitiate (); - void doDisinfectCancel (); + void doDisinfectInitiate (); + void doDisinfectCancel (); - void doDisinfectClear (); - void doDisinfectFlush (); - void doDisinfectHeat (); - void doDisinfectChemical (); - void doDisinfectChemFlush (); - void doDisinfectROPermeate (); - void doDisinfectConfirm (); + void doDisinfectClear (); + void doDisinfectFlush (); + void doDisinfectHeatActiveCool (); + void doDisinfectChemical (); + void doDisinfectChemFlush (); + void doDisinfectROPermeate (); + void doDisinfectConfirm (); + void doDisinfectHeatPassiveCool (); signals: /*!