Index: sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentAdditional.qml =================================================================== diff -u -r8a5dbf556a66524fbe4b60ac1573182a0bd27617 -r668190d460e7919f0eb4aa449ade53122bcd68d1 --- sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentAdditional.qml (.../EndTreatmentAdditional.qml) (revision 8a5dbf556a66524fbe4b60ac1573182a0bd27617) +++ sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentAdditional.qml (.../EndTreatmentAdditional.qml) (revision 668190d460e7919f0eb4aa449ade53122bcd68d1) @@ -30,8 +30,9 @@ title.text: qsTr("Additional Rinseback") - hasTimeout : vTreatmentRinseback.timeoutTotal - timeoutValue: vTreatmentRinseback.timeoutCountDown * 60 + // DEN-10163 + // hasTimeout : vTreatmentRinseback.timeoutTotal + // timeoutValue: vTreatmentRinseback.timeoutCountDown * 60 ProgressCircle { id: _circle diameter: 335 Index: sources/model/hd/data/treatment/MTreatmentRinsebackData.cpp =================================================================== diff -u -re4a0e2fc4c7ae0cbce0d670772276bf7f5ff3845 -r668190d460e7919f0eb4aa449ade53122bcd68d1 --- sources/model/hd/data/treatment/MTreatmentRinsebackData.cpp (.../MTreatmentRinsebackData.cpp) (revision e4a0e2fc4c7ae0cbce0d670772276bf7f5ff3845) +++ sources/model/hd/data/treatment/MTreatmentRinsebackData.cpp (.../MTreatmentRinsebackData.cpp) (revision 668190d460e7919f0eb4aa449ade53122bcd68d1) @@ -51,11 +51,11 @@ */ MTreatmentRinseback::Data MTreatmentRinseback::data() const { Data data; - data.mTarget = _data.mTarget .value; - data.mCurrent = _data.mCurrent .value; - data.mRate = _data.mRate .value; - data.mTimeoutTotal = _data.mTimeoutTotal .value; - data.mTimeoutCountDown = _data.mTimeoutCountDown.value; - data.mTimeoutCountDown = _data.mSafetyVolume .value; + data.mTarget = _data.mTarget .value; + data.mCurrent = _data.mCurrent .value; + data.mRate = _data.mRate .value; + data.mTimeoutTotal = _data.mTimeoutTotal .value; + data.mTimeoutCountDown = _data.mTimeoutCountDown.value; + data.mSafetyVolume = _data.mSafetyVolume .value; return data; }