Index: sources/gui/qml/pages/posttreatment/PostTreatmentStack.qml =================================================================== diff -u -r54c4136d95375116e6daf23b7d4179159cf13d0c -rf68b226e67eb500758ee94fe015df48931240013 --- sources/gui/qml/pages/posttreatment/PostTreatmentStack.qml (.../PostTreatmentStack.qml) (revision 54c4136d95375116e6daf23b7d4179159cf13d0c) +++ sources/gui/qml/pages/posttreatment/PostTreatmentStack.qml (.../PostTreatmentStack.qml) (revision f68b226e67eb500758ee94fe015df48931240013) @@ -35,6 +35,21 @@ signal disposablesRemovalConfirm () signal disposablesRemovalBack () + onPatientDisconnectionConfirm : { vPostTreatmentAdjustmentPatientDisconnectionConfirm .doConfirm( ) + /* No wait for Rsp, so navigates => */ page( _treatmentReviewConfirm ) + /* After navigate ask for Tx data */ vPostTreatmentAdjustmentTreatmentLog .doRequest( )} + onTreatmentReviewConfirm : page( _disposablesRemovalConfirm ) + onDisposablesRemovalConfirm : vPostTreatmentAdjustmentDisposablesRemovalConfirm .doConfirm( ) + onDisposablesRemovalBack : page( _treatmentReviewConfirm ) + onVisibleChanged: { + if (visible) { + _mainMenu.hidden = true + } + else { + stackView.initialItem = null + } + } + PostTreatmentBase { id: _patientDisconnectionConfirm objectName :"_patientDisconnectionConfirm" property int stackStepIndex : 0 @@ -76,24 +91,18 @@ onBackClicked : _root.disposablesRemovalBack () } + // connections Connections { target: vPostTreatmentStates - onPatientDisconnectionChanged : { console.debug("patientDisconnection", vpatientDisconnection )} - onDrainReservoirsChanged : { console.debug("drainReservoirs ", vdrainReservoirs )} - onVerifyChanged : { console.debug("verify ", vverify )} + function onPatientDisconnectionChanged ( vValue ) { console.debug("patientDisconnection", vValue )} + function onDrainReservoirsChanged ( vValue ) { console.debug("drainReservoirs ", vValue )} + function onVerifyChanged ( vValue ) { console.debug("verify ", vValue )} } Connections { target: vHDOperationMode - onPostTreatmentChanged : { page( _patientDisconnectionConfirm , vpostTreatment )} + function onPostTreatmentChanged ( vValue ) { page( _patientDisconnectionConfirm , vValue )} } - onPatientDisconnectionConfirm : { vPostTreatmentAdjustmentPatientDisconnectionConfirm .doConfirm( ) - /* No wait for Rsp, so navigates => */ page( _treatmentReviewConfirm ) - /* After navigate ask for Tx data */ vPostTreatmentAdjustmentTreatmentLog .doRequest( )} - onTreatmentReviewConfirm : { page( _disposablesRemovalConfirm )} - onDisposablesRemovalConfirm : { vPostTreatmentAdjustmentDisposablesRemovalConfirm .doConfirm( )} - onDisposablesRemovalBack : { page( _treatmentReviewConfirm )} - Connections { target: vPostTreatmentAdjustmentDisposablesRemovalConfirm - onAdjustmentTriggered : { + function onAdjustmentTriggered ( vValue ) { if ( vPostTreatmentAdjustmentDisposablesRemovalConfirm.adjustment_Accepted ) { _disposablesRemovalConfirm.reasonText = "" } else { @@ -103,21 +112,12 @@ } Connections { target: vPostTreatmentAdjustmentTreatmentLog - onAdjustmentTriggered : { + function onAdjustmentTriggered ( vValue ) { if ( vPostTreatmentAdjustmentTreatmentLog.adjustment_Accepted ) { _treatmentReviewConfirm.reasonText = "" } else { _treatmentReviewConfirm.reasonText = vPostTreatmentAdjustmentTreatmentLog.text() } } } - - onVisibleChanged: { - if (visible) { - _mainMenu.hidden = true - } - else { - stackView.initialItem = null - } - } }