Index: sources/gui/qml/pages/pretreatment/PreTreatmentInstallStack.qml =================================================================== diff -u -r4c6c526a02ea5dec5c13b9a93a58627cfec2a136 -r5e2be6967a98b3d42911645c7f5d7a74c5da63ac --- sources/gui/qml/pages/pretreatment/PreTreatmentInstallStack.qml (.../PreTreatmentInstallStack.qml) (revision 4c6c526a02ea5dec5c13b9a93a58627cfec2a136) +++ sources/gui/qml/pages/pretreatment/PreTreatmentInstallStack.qml (.../PreTreatmentInstallStack.qml) (revision 5e2be6967a98b3d42911645c7f5d7a74c5da63ac) @@ -49,7 +49,7 @@ setPage ( _pretreatmentSalineSubstitution ) break case PreTreatmentInstallStack.Step.SalineSubStitution: - goToNextStep () + vPreTreatmentAdjustmentPatientConnectionConfirm.doConfirm() break default: break @@ -103,14 +103,27 @@ function onAdjustmentTriggered ( vValue ) { if ( vPreTreatmentAdjustmentDisposablesConfirm.adjustment_Accepted ) { _preTreatmentBloodSetTubing.reasonText = "" - if ( vSettings.advancedMode ) { goToNextStep () } + if ( vSettings.advancedMode ) { vPreTreatmentAdjustmentPatientConnectionConfirm.doConfirm() } else { setPage ( _preTreatmentBloodLines ) } } else { _preTreatmentBloodSetTubing.reasonText = vPreTreatmentAdjustmentDisposablesConfirm.text() } } } + Connections { target: vPreTreatmentAdjustmentPatientConnectionConfirm + function onAdjustmentTriggered ( vValue ) { + if ( vPreTreatmentAdjustmentPatientConnectionConfirm.adjustment_Accepted ) { + goToNextStep () + if ( vSettings.advancedMode ) { _preTreatmentBloodSetTubing.reasonText = "" } + else { _pretreatmentSalineSubstitution.reasonText = "" } + } else { + if ( vSettings.advancedMode ) { _preTreatmentBloodSetTubing.reasonText = vPreTreatmentAdjustmentPatientConnectionConfirm.text() } + else { _pretreatmentSalineSubstitution.reasonText = vPreTreatmentAdjustmentPatientConnectionConfirm.text() } + } + } + } + onVisibleChanged: { if (visible) { _headerBar.activeStack = stackView Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentDurationEdit.qml =================================================================== diff -u -rdf03df4194214017799598ad8836e694db195d42 -r5e2be6967a98b3d42911645c7f5d7a74c5da63ac --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentDurationEdit.qml (.../TreatmentAdjustmentDurationEdit.qml) (revision df03df4194214017799598ad8836e694db195d42) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentDurationEdit.qml (.../TreatmentAdjustmentDurationEdit.qml) (revision 5e2be6967a98b3d42911645c7f5d7a74c5da63ac) @@ -111,7 +111,7 @@ unitText : Variables.unitTextDuration unitFontSize : Fonts.fontPixelContainerUnitSmall isActive : true - minimum : Math.ceil(vTreatmentTime.time_Elapsed / step) * step + minimum : Math.ceil((vTreatmentTime.time_Elapsed / 60) / step) * step maximum : Math.floor(vTreatmentRanges.treatmentRanges_Duration_Max / step) * step step : vTreatmentRanges.treatmentDurationRes