Index: sources/view/vtreatmentadjustmentultrafiltrationstate.cpp =================================================================== diff -u -r7d3062c841b788ced31d939dec990afe0de1442d -r0b1e55604d139154b791e1615792921df211ba4d --- sources/view/vtreatmentadjustmentultrafiltrationstate.cpp (.../vtreatmentadjustmentultrafiltrationstate.cpp) (revision 7d3062c841b788ced31d939dec990afe0de1442d) +++ sources/view/vtreatmentadjustmentultrafiltrationstate.cpp (.../vtreatmentadjustmentultrafiltrationstate.cpp) (revision 0b1e55604d139154b791e1615792921df211ba4d) @@ -56,6 +56,8 @@ */ QString View::VTreatmentAdjustmentUltrafiltrationState::text() { + if (adjustment_Accepted()) return ""; + // if there is a reason (passed) it will be used QString mText = VTreatmentAdjustmentResponseBase::text(); // coco begin validated : Manually tested. @@ -64,19 +66,11 @@ if (! mText.isEmpty()) return mText; // coco end // otherwise a general message will be created/passed. - if (! adjustment_Accepted()) { - qDebug() << "VTreatmentAdjustmentUltrafiltrationState::text()" << true; - switch (_data.requestedState) { - case AdjustUltrafiltrationStateRequestData::eRunning: - mText = tr("Unable to Resume Ultrafiltration or already running"); - break; - - case AdjustUltrafiltrationStateRequestData::ePaused: - mText = tr("Unable to Pause Ultrafiltration or already paused"); - break; - } + if (isPaused()) { + mText = tr("Unable to Resume Ultrafiltration or already running"); } else { - qDebug() << "VTreatmentAdjustmentUltrafiltrationState::text()" << false; + mText = tr("Unable to Pause Ultrafiltration or already paused"); + } return mText; }