Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateContent.qml =================================================================== diff -u -re088cf2c3809910434bfeb471c1349181beb00a7 -rd76fc8d1b4d561b07b83d2b5b0c82b81969140f3 --- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateContent.qml (.../PreTreatmentCreateContent.qml) (revision e088cf2c3809910434bfeb471c1349181beb00a7) +++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateContent.qml (.../PreTreatmentCreateContent.qml) (revision d76fc8d1b4d561b07b83d2b5b0c82b81969140f3) @@ -57,9 +57,25 @@ _dialysateTemperatureControl .clear() _salineBolusVolumeControl .clear() _bpMeasurementIntervalControl .clear() + clearErrors() enableEditing () } + function clearErrors() { + vTreatmentCreate.bloodFlowRateRejectReason = Variables.noRejectReason + vTreatmentCreate.dialysateFlowRateRejectReason = Variables.noRejectReason + vTreatmentCreate.treatmentDurationRejectReason = Variables.noRejectReason + vTreatmentCreate.heparinDispensingRateRejectReason = Variables.noRejectReason + vTreatmentCreate.heparinBolusVolumeRejectReason = Variables.noRejectReason + vTreatmentCreate.heparinStopTimeRejectReason = Variables.noRejectReason + vTreatmentCreate.acidConcentrateRejectReason = Variables.noRejectReason + vTreatmentCreate.bicarbonateConcentrateRejectReason = Variables.noRejectReason + vTreatmentCreate.dialyzerTypeRejectReason = Variables.noRejectReason + vTreatmentCreate.dialysateTempRejectReason = Variables.noRejectReason + vTreatmentCreate.salineBolusVolumeRejectReason = Variables.noRejectReason + vTreatmentCreate.bloodPressureMeasureIntervalRejectReason = Variables.noRejectReason + } + function confirmReady () { return _bloodFlowRateControl .active && _bloodFlowRate .valid && _dialysateFlowRateControl .active && _dialysateFlowRate .valid && @@ -93,18 +109,7 @@ vPostTreatmentAdjustmentTreatmentLog.heparinDispensingRateOff = vTreatmentCreate.heparinDispensingRateOff = ! vTreatmentCreate.heparinDispensingRate vPostTreatmentAdjustmentTreatmentLog.heparinBolusVolumeOff = vTreatmentCreate.heparinBolusVolumeOff = ! vTreatmentCreate.heparinBolusVolume - vTreatmentCreate.bloodFlowRateRejectReason = Variables.noRejectReason - vTreatmentCreate.dialysateFlowRateRejectReason = Variables.noRejectReason - vTreatmentCreate.treatmentDurationRejectReason = Variables.noRejectReason - vTreatmentCreate.heparinDispensingRateRejectReason = Variables.noRejectReason - vTreatmentCreate.heparinBolusVolumeRejectReason = Variables.noRejectReason - vTreatmentCreate.heparinStopTimeRejectReason = Variables.noRejectReason - vTreatmentCreate.acidConcentrateRejectReason = Variables.noRejectReason - vTreatmentCreate.bicarbonateConcentrateRejectReason = Variables.noRejectReason - vTreatmentCreate.dialyzerTypeRejectReason = Variables.noRejectReason - vTreatmentCreate.dialysateTempRejectReason = Variables.noRejectReason - vTreatmentCreate.salineBolusVolumeRejectReason = Variables.noRejectReason - vTreatmentCreate.bloodPressureMeasureIntervalRejectReason = Variables.noRejectReason + clearErrors() _root.editingEnabled = false } }