Index: sources/gui/qml/pages/posttreatment/PostTreatmentStack.qml =================================================================== diff -u -r04fd28f30e37a09450ff5877ae2f805a92898b44 -re3cc544dd969bec78bf057cbe636e372cdfb8502 --- sources/gui/qml/pages/posttreatment/PostTreatmentStack.qml (.../PostTreatmentStack.qml) (revision 04fd28f30e37a09450ff5877ae2f805a92898b44) +++ sources/gui/qml/pages/posttreatment/PostTreatmentStack.qml (.../PostTreatmentStack.qml) (revision e3cc544dd969bec78bf057cbe636e372cdfb8502) @@ -50,11 +50,12 @@ signal disposablesRemovalConfirm () signal disposablesRemovalBack () - onPatientDisconnectionConfirm : { vPostTreatmentAdjustmentPatientDisconnectionConfirm .doNotify ( ) - /* No wait for Rsp, so navigates => */ page( _treatmentReviewConfirm ) - /* After navigation ask for Tx data */ vPostTreatmentAdjustmentTreatmentLog .doRequest( )} + // TODO fix in post treatment + onPatientDisconnectionConfirm : { vPostTreatmentAdjustmentDisposablesRemovalConfirm .doConfirm( ) } +// /* No wait for Rsp, so navigates => */ page( _treatmentReviewConfirm ) +// /* After navigation ask for Tx data */ vPostTreatmentAdjustmentTreatmentLog .doRequest( )} onTreatmentReviewConfirm : { vPostTreatmentAdjustmentPatientDisconnectionConfirm .doConfirm( )} - onDisposablesRemovalConfirm : vPostTreatmentAdjustmentDisposablesRemovalConfirm .doConfirm( ) +// onDisposablesRemovalConfirm : vPostTreatmentAdjustmentDisposablesRemovalConfirm .doConfirm( ) onDisposablesRemovalBack : page( _treatmentReviewConfirm ) onVisibleChanged: { if (visible) { @@ -187,30 +188,32 @@ Connections { target: vPostTreatmentAdjustmentPatientDisconnectionConfirm function onAdjustmentTriggered ( vValue ) { if ( vPostTreatmentAdjustmentPatientDisconnectionConfirm.adjustment_Accepted ) { + _treatmentReviewConfirm.informationText = "" page( _disposablesRemovalConfirm ) - _treatmentReviewConfirm.reasonText = "" + } else { - _treatmentReviewConfirm.reasonText = vPostTreatmentAdjustmentPatientDisconnectionConfirm.text() + _treatmentReviewConfirm.informationText = vPostTreatmentAdjustmentPatientDisconnectionConfirm.text() } } } Connections { target: vPostTreatmentAdjustmentDisposablesRemovalConfirm function onAdjustmentTriggered ( vValue ) { if ( vPostTreatmentAdjustmentDisposablesRemovalConfirm.adjustment_Accepted ) { - _disposablesRemovalConfirm.reasonText = "" + _patientDisconnectionConfirm.informationText = "" + page( _treatmentReviewConfirm ) } else { - _disposablesRemovalConfirm.reasonText = vPostTreatmentAdjustmentDisposablesRemovalConfirm.text() + _patientDisconnectionConfirm.informationText = vPostTreatmentAdjustmentDisposablesRemovalConfirm.text() } } } Connections { target: vPostTreatmentAdjustmentTreatmentLog function onAdjustmentTriggered ( vValue ) { if ( vPostTreatmentAdjustmentTreatmentLog.adjustment_Accepted ) { - _treatmentReviewConfirm.reasonText = "" + _treatmentReviewConfirm.informationText = "" } else { - _treatmentReviewConfirm.reasonText = vPostTreatmentAdjustmentTreatmentLog.text() + _treatmentReviewConfirm.informationText = vPostTreatmentAdjustmentTreatmentLog.text() } } }