Index: sources/gui/qml/pages/treatment/TreatmentUltrafiltrationItem.qml =================================================================== diff -u -r2a1689f77fc3de1dd4f9e004dc01c6d5ea32b1db -r038d30c2f22add13830b92a9775d70c9615861b2 --- sources/gui/qml/pages/treatment/TreatmentUltrafiltrationItem.qml (.../TreatmentUltrafiltrationItem.qml) (revision 2a1689f77fc3de1dd4f9e004dc01c6d5ea32b1db) +++ sources/gui/qml/pages/treatment/TreatmentUltrafiltrationItem.qml (.../TreatmentUltrafiltrationItem.qml) (revision 038d30c2f22add13830b92a9775d70c9615861b2) @@ -71,13 +71,10 @@ _treatmentAdjustmentUltrafiltrationStart.open() } onContinueClicked : function(vVolume) { - close() - _treatmentAdjustmentUltrafiltrationConfirm.ultrafiltrationVolume = vVolume - _treatmentAdjustmentUltrafiltrationConfirm.open() // send Volume to HD and wait. // if accepted close() // not accepted show error in notification - // vTreatmentAdjustmentUltrafiltrationEdit.doAdjustment(vVolume) + vTreatmentAdjustmentUltrafiltrationEdit.doAdjustment(vVolume) } } @@ -111,11 +108,7 @@ function onAdjustmentTriggered ( vValue ) { if (vTreatmentAdjustmentUltrafiltrationEdit.adjustment_Accepted) { _treatmentAdjustmentUltrafiltrationConfirm.ultrafiltrationVolume = vTreatmentAdjustmentUltrafiltrationEdit.volume - _treatmentAdjustmentUltrafiltrationConfirm.treatmentDuration = vTreatmentAdjustmentUltrafiltrationEdit.duration - _treatmentAdjustmentUltrafiltrationConfirm.treatmentDurationDiff = vTreatmentAdjustmentUltrafiltrationEdit.durationDiff _treatmentAdjustmentUltrafiltrationConfirm.ultrafiltrationRate = vTreatmentAdjustmentUltrafiltrationEdit.rate - _treatmentAdjustmentUltrafiltrationConfirm.ultrafiltrationRateDiff = vTreatmentAdjustmentUltrafiltrationEdit.rateDiff - _treatmentAdjustmentUltrafiltrationConfirm.ultrafiltrationRateOld = vTreatmentAdjustmentUltrafiltrationEdit.rateOld _treatmentAdjustmentUltrafiltrationEdit .close() _treatmentAdjustmentUltrafiltrationConfirm.reset() @@ -131,6 +124,8 @@ if (vTreatmentAdjustmentUltrafiltrationConfirm.adjustment_Accepted) { vTreatmentUltrafiltration.maximum = vTreatmentAdjustmentUltrafiltrationConfirm.volume _treatmentAdjustmentUltrafiltrationConfirm.close() + _treatmentAdjustmentUltrafiltrationEdit .close() + _treatmentAdjustmentUltrafiltrationStart .open() } else { _treatmentAdjustmentUltrafiltrationConfirm.notification.text = vTreatmentAdjustmentUltrafiltrationConfirm.text() }