Index: sources/gui/qml/pages/endtreatment/EndTreatmentRinsebackStack.qml =================================================================== diff -u -r45cc119e54711893ccc2b9d600412b8f51b7764f -rbb2557d984b23c29426f452968ea797e6559ac3b --- sources/gui/qml/pages/endtreatment/EndTreatmentRinsebackStack.qml (.../EndTreatmentRinsebackStack.qml) (revision 45cc119e54711893ccc2b9d600412b8f51b7764f) +++ sources/gui/qml/pages/endtreatment/EndTreatmentRinsebackStack.qml (.../EndTreatmentRinsebackStack.qml) (revision bb2557d984b23c29426f452968ea797e6559ac3b) @@ -70,12 +70,14 @@ Connections { target: vTreatmentAdjustmentRinseback function onAdjustmentTriggered ( vValue ) { - // there is only one message to handle all the sub pages of rinseback - // since the rejection reason will be cleared by each trasition - // so it's fine to set all at the same time - // and let them cleared for their own message when each get visible. - _endTreatmentRinsebackInit .reasonText = vTreatmentAdjustmentRinseback.text(); - _endTreatmentRinseback .reasonText = vTreatmentAdjustmentRinseback.text(); + if ( vTreatmentAdjustmentRinseback.adjustment_Accepted ) { + _rinsebackCompleteDialog.notificationText ="" + _rinsebackCompleteDialog.close() + } + else { + _rinsebackCompleteDialog.notificationText = vTreatmentAdjustmentRinseback.text() + } + } } }