Index: denali.pro.user =================================================================== diff -u -r0e528e5f706308c7b0e8f22a4d9dbb5b5715db7c -r474e5b3680d8acbf0ac79062124352d0b3d43b65 --- denali.pro.user (.../denali.pro.user) (revision 0e528e5f706308c7b0e8f22a4d9dbb5b5715db7c) +++ denali.pro.user (.../denali.pro.user) (revision 474e5b3680d8acbf0ac79062124352d0b3d43b65) @@ -1,6 +1,6 @@ - + EnvironmentId Index: sources/gui/guiglobals.h =================================================================== diff -u -r0e528e5f706308c7b0e8f22a4d9dbb5b5715db7c -r474e5b3680d8acbf0ac79062124352d0b3d43b65 --- sources/gui/guiglobals.h (.../guiglobals.h) (revision 0e528e5f706308c7b0e8f22a4d9dbb5b5715db7c) +++ sources/gui/guiglobals.h (.../guiglobals.h) (revision 474e5b3680d8acbf0ac79062124352d0b3d43b65) @@ -119,8 +119,9 @@ }; enum Saline_States { // FW currently doesn't have enum for Saline Bolus when provided better to be replaced. - SALINE_STOP_STATE = 0, ///< Saline is not delivered - SALINE_START_STATE , ///< Saline being Delivered + SALINE_STOP_STATE = 0, ///< Saline is not delivered + SALINE_START_STATE , ///< Saline being Delivered + SALINE_DISABLE_STATE , ///< Saline cumulative volume delivery has reached the maximum }; Q_ENUM(GuiActionsType_Enum) Index: sources/gui/qml/pages/treatment/TreatmentStack.qml =================================================================== diff -u -r0e528e5f706308c7b0e8f22a4d9dbb5b5715db7c -r474e5b3680d8acbf0ac79062124352d0b3d43b65 --- sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision 0e528e5f706308c7b0e8f22a4d9dbb5b5715db7c) +++ sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision 474e5b3680d8acbf0ac79062124352d0b3d43b65) @@ -42,7 +42,7 @@ VTreatmentAdjustmentSaline { id: vTreatmentAdjustmentSaline } VHDTreatmentStates { id: vHDTreatmentStates property bool ufPaused : ufState === GuiActions.UF_PAUSED_STATE - property bool txPaused : subMode === GuiActions.TREATMENT_STOP_STATE + property bool txPaused : subMode === GuiActions.TREATMENT_DIALYSIS_STATE } // Components Index: sources/gui/qml/pages/treatment/sections/TreatmentFluid.qml =================================================================== diff -u -r0e528e5f706308c7b0e8f22a4d9dbb5b5715db7c -r474e5b3680d8acbf0ac79062124352d0b3d43b65 --- sources/gui/qml/pages/treatment/sections/TreatmentFluid.qml (.../TreatmentFluid.qml) (revision 0e528e5f706308c7b0e8f22a4d9dbb5b5715db7c) +++ sources/gui/qml/pages/treatment/sections/TreatmentFluid.qml (.../TreatmentFluid.qml) (revision 474e5b3680d8acbf0ac79062124352d0b3d43b65) @@ -45,10 +45,12 @@ title: qsTr("FLUID MANAGEMENT") TouchRect { id: _startFluidButton + enabled : _root.isTouchable y : 45 width : 340 height : 55 text.text: buttonText + textColor: enabled ? Colors.textButton : Colors.textDisableButton text.font { weight: Font.DemiBold pixelSize : 20 @@ -57,7 +59,8 @@ animated: true duration: 100 onClicked: { - _root.clicked() + if (enabled) + _root.clicked() } } Index: sources/gui/qml/pages/treatment/sections/TreatmentSaline.qml =================================================================== diff -u -r0e528e5f706308c7b0e8f22a4d9dbb5b5715db7c -r474e5b3680d8acbf0ac79062124352d0b3d43b65 --- sources/gui/qml/pages/treatment/sections/TreatmentSaline.qml (.../TreatmentSaline.qml) (revision 0e528e5f706308c7b0e8f22a4d9dbb5b5715db7c) +++ sources/gui/qml/pages/treatment/sections/TreatmentSaline.qml (.../TreatmentSaline.qml) (revision 474e5b3680d8acbf0ac79062124352d0b3d43b65) @@ -17,7 +17,7 @@ import QtQuick 2.12 // Project -import VTreatmentSaline 0.1; +import VTreatmentSaline 0.1; // Qml imports import "qrc:/globals" @@ -27,22 +27,34 @@ * \brief Treatment Screen Saline Management section */ TreatmentFluid { id: _root + // comes from the response accepted + readonly property bool isStarted : vTreatmentAdjustmentSaline.isStarted + // comes from the broadcast Treatment States salineState field + readonly property bool isDisabled : vTreatmentAdjustmentSaline.isDisabled - buttonText : vTreatmentAdjustmentSaline.isStarted || vHDTreatmentStates.salineStarted ? qsTr("STOP BOLUS") : qsTr("START BOLUS") + readonly property string textAfterStarted : qsTr("STOP BOLUS" ) + readonly property string textAfterStopped : qsTr("START BOLUS") + readonly property string textAfterDisabled : qsTr("START BOLUS") // it stays at START but should be disabled. + readonly property string mesgAfterDisabled : qsTr("Maximum cumulative saline bolus volume delivered") + readonly property string mesgRejectReason : vTreatmentAdjustmentSaline.adjustment_ReasonText + + isTouchable : ! _root.isDisabled + buttonText : _root.isStarted ? textAfterStarted : textAfterStopped title : qsTr("SALINE BOLUS") unit : Variables.unitTextSaline - VTreatmentSaline { id: vTreatmentSaline } - valueTarget : vTreatmentSaline.target || vTreatmentAdjustmentSaline.target valueCumulative: vTreatmentSaline.cumulative .toFixed(0) valueDelivered : vTreatmentSaline.delivered .toFixed(0) + VTreatmentSaline { id: vTreatmentSaline } + onClicked: { vTreatmentAdjustmentSaline.doAdjustment() } + notification { - visible: true - text : vTreatmentAdjustmentSaline.adjustment_ReasonText + visible : true + text : isDisabled ? mesgAfterDisabled : mesgRejectReason } } Index: sources/view/hd/adjustment/VTreatmentAdjustmentSaline.cpp =================================================================== diff -u -r0e528e5f706308c7b0e8f22a4d9dbb5b5715db7c -r474e5b3680d8acbf0ac79062124352d0b3d43b65 --- sources/view/hd/adjustment/VTreatmentAdjustmentSaline.cpp (.../VTreatmentAdjustmentSaline.cpp) (revision 0e528e5f706308c7b0e8f22a4d9dbb5b5715db7c) +++ sources/view/hd/adjustment/VTreatmentAdjustmentSaline.cpp (.../VTreatmentAdjustmentSaline.cpp) (revision 474e5b3680d8acbf0ac79062124352d0b3d43b65) @@ -51,7 +51,8 @@ */ void VTreatmentAdjustmentSaline::onActionReceive(const TreatmentStatesData &vData) { - isStarted ( vData.mSalineState == GuiSalineStates::SALINE_START_STATE ); + isStarted ( vData.mSalineState == GuiSalineStates::SALINE_START_STATE ); + isDisabled( vData.mSalineState == GuiSalineStates::SALINE_DISABLE_STATE ); } void View::VTreatmentAdjustmentSaline::doAdjustment() Index: sources/view/hd/adjustment/VTreatmentAdjustmentSaline.h =================================================================== diff -u -r0e528e5f706308c7b0e8f22a4d9dbb5b5715db7c -r474e5b3680d8acbf0ac79062124352d0b3d43b65 --- sources/view/hd/adjustment/VTreatmentAdjustmentSaline.h (.../VTreatmentAdjustmentSaline.h) (revision 0e528e5f706308c7b0e8f22a4d9dbb5b5715db7c) +++ sources/view/hd/adjustment/VTreatmentAdjustmentSaline.h (.../VTreatmentAdjustmentSaline.h) (revision 474e5b3680d8acbf0ac79062124352d0b3d43b65) @@ -39,6 +39,7 @@ PROPERTY( qint32 , target , 0 ) PROPERTY( bool , isStarted , false ) + PROPERTY( bool , isDisabled , false ) // the Saline is disabled due to maximum cumulative volume reached. VIEW_DEC_CLASS_ADJUSTMENT(VTreatmentAdjustmentSaline, AdjustSalineResponseData) VIEW_DEC_SLOT(TreatmentStatesData)