Index: sources/gui/qml/pages/treatment/sections/TreatmentTime.qml =================================================================== diff -u -r5a2f0e2068f2998a9bf7377d39f2eecb0d4ad15a -rdc4a0cbb5eb3a967755f4ba40d8407032723c957 --- sources/gui/qml/pages/treatment/sections/TreatmentTime.qml (.../TreatmentTime.qml) (revision 5a2f0e2068f2998a9bf7377d39f2eecb0d4ad15a) +++ sources/gui/qml/pages/treatment/sections/TreatmentTime.qml (.../TreatmentTime.qml) (revision dc4a0cbb5eb3a967755f4ba40d8407032723c957) @@ -28,28 +28,26 @@ */ Rectangle { id: _root property int minimum : 0 - property int maximum : vTreatmentTime.time_Total - property int progressValue : vTreatmentTime.time_Elapsed - property int timeTextValue : vTreatmentTime.time_Remaining + property int maximum : isIsoTreatment ? vTreatmentIsolatedUF.duration : vTreatmentTime.time_Total + property int progressValue : isIsoTreatment ? vTreatmentIsolatedUF.elapsedTime : vTreatmentTime.time_Elapsed + property int timeTextValue : isIsoTreatment ? vTreatmentIsolatedUF.timeRemaining : vTreatmentTime.time_Remaining - property bool isRunning : vTDTreatmentStates.txDialysis && - !( vTDTreatmentStates.sbWaitPump || vTDTreatmentStates.sbRunning ) + property bool isRunning : ( vTDTreatmentStates.txDialysis || vTDTreatmentStates.txIsolatedUF ) && + !( vTDTreatmentStates.sbWaitPump || vTDTreatmentStates.sbRunning ) property bool isPaused : vTDTreatmentStates.txStop || ! _root.isRunning - property bool isComplete : vTDTreatmentStates.txEnd property bool isHDTreatment : vTreatmentCreate.treatmentModality === 0 property bool isHDFTreatment: vTreatmentCreate.treatmentModality === 1 - property bool isIsoTreatment: vTreatmentCreate.treatmentModality === 2 property string notificationText: isComplete ? qsTr("Treatment Complete") : isPaused ? qsTr("Treatment Paused") : + isIsoTreatment ? qsTr("Isolated UF Time") : isHDTreatment ? qsTr("HD Mode") : isHDFTreatment ? ("%1\n%2").arg(qsTr("HDF Mode")) .arg(vTreatmentRanges.hdfTreatmentModeOptions[vTreatmentCreate.hdfTreatmentMode]) : - isIsoTreatment ? qsTr("Isolated UF Mode") : "" property color notificationColor: isComplete ? Colors.statusComplete : @@ -59,14 +57,12 @@ isIsoTreatment ? Colors.statusTextActive : "" - property bool editEnabled : ! isTreatmentEnd // LEAHI-PRS-376 + property bool editEnabled : ! isTreatmentEnd && ! isIsoTreatment // LEAHI-PRS-376 ** LEAHI-PRS-459 color : "transparent" width : _circle.width height : _circle.height - onIsCompleteChanged: _rinsebackCompleteDialog.isTxCompleted = _root.isComplete - signal clicked() ProgressCircle { id: _circle