Index: sources/gui/qml/components/BaseComboBox.qml =================================================================== diff -u -rec53ffe0a1528ace958cfe347875b7bcd25bed57 -r36981dc04fd7c25285975d4ba5ad8c1ddeb16028 --- sources/gui/qml/components/BaseComboBox.qml (.../BaseComboBox.qml) (revision ec53ffe0a1528ace958cfe347875b7bcd25bed57) +++ sources/gui/qml/components/BaseComboBox.qml (.../BaseComboBox.qml) (revision 36981dc04fd7c25285975d4ba5ad8c1ddeb16028) @@ -30,7 +30,6 @@ property int delegateHeight : height property bool canOff : false property bool centerHorizontally: false - property var itemsEnabled : Array(_root.count).fill(true) width : 300 displayText : _root.isActive ? currentText : Variables.emptyEntry @@ -40,8 +39,6 @@ signal clear() - onClear : { currentIndex = 0 } - contentItem: Text { id: _displayText text : canOff && parent.displayText === "0" ? qsTr("OFF") : parent.displayText color : Colors.offWhite @@ -62,11 +59,10 @@ width : _root.delegateWidth height : _root.delegateHeight highlighted : _root.highlightedIndex === index - enabled : _root.itemsEnabled[index] contentItem: Text { text : canOff && modelData === "0" ? qsTr("OFF") : modelData - color : enabled ? Colors.offWhite : Colors.textDisableButton + color : Colors.offWhite font : _root.font verticalAlignment : Text.AlignVCenter horizontalAlignment : centerHorizontally ? Text.AlignHCenter : undefined Index: sources/gui/qml/dialogs/DryDemoDialog.qml =================================================================== diff -u -r20c46d34bd425f14e76ba2aacf7761cccef37753 -r36981dc04fd7c25285975d4ba5ad8c1ddeb16028 --- sources/gui/qml/dialogs/DryDemoDialog.qml (.../DryDemoDialog.qml) (revision 20c46d34bd425f14e76ba2aacf7761cccef37753) +++ sources/gui/qml/dialogs/DryDemoDialog.qml (.../DryDemoDialog.qml) (revision 36981dc04fd7c25285975d4ba5ad8c1ddeb16028) @@ -22,8 +22,9 @@ RINSEBACK , RECIRCULATE , TREATMENT_STOP , - DISINFECTION , + END_TREATMENT , POST_TREATMENT , + DISINFECTION , COUNT } @@ -73,8 +74,10 @@ model[DryDemoDialog.RINSEBACK] = qsTr("Rinseback") model[DryDemoDialog.RECIRCULATE] = qsTr("Recirculate") model[DryDemoDialog.TREATMENT_STOP] = qsTr("Treatment Stop") - model[DryDemoDialog.DISINFECTION] = qsTr("Disinfection") + model[DryDemoDialog.END_TREATMENT] = qsTr("End Treatment") model[DryDemoDialog.POST_TREATMENT] = qsTr("Post-Treatment") + model[DryDemoDialog.DISINFECTION] = qsTr("Disinfection") + itemsText = model } } Index: sources/gui/qml/pages/posttreatment/PostTreatmentDisconnectStack.qml =================================================================== diff -u -r9c0335bc7f5a2b591a9c6241b00ebb9510ea611a -r36981dc04fd7c25285975d4ba5ad8c1ddeb16028 --- sources/gui/qml/pages/posttreatment/PostTreatmentDisconnectStack.qml (.../PostTreatmentDisconnectStack.qml) (revision 9c0335bc7f5a2b591a9c6241b00ebb9510ea611a) +++ sources/gui/qml/pages/posttreatment/PostTreatmentDisconnectStack.qml (.../PostTreatmentDisconnectStack.qml) (revision 36981dc04fd7c25285975d4ba5ad8c1ddeb16028) @@ -61,6 +61,16 @@ return _root.subStepIndex === PostTreatmentDisconnectStack.Step.DrainConsumable } + function continueEnabled() { + switch ( _root.subStepIndex ) { + case PostTreatmentDisconnectStack.Step.DisconnectPatient: + return true + case PostTreatmentDisconnectStack.Step.DrainConsumable: + return ! vTreatmentDryBicartDisconnect.depressurizeInProgress && ! vTreatmentDryBicartDisconnect.drainInProgress + default: + } + } + // ----- Screens definitions PostTreatmentBase { id: _postTreatmentDisconnectPatient; stepIndex: PostTreatmentDisconnectStack.Step.DisconnectPatient; subStepName: qsTr("Disconnect Patient BloodLines"); instructionBased: true} PostTreatmentDrainConsumables { id: _postTreatmentDrainConsumables; stepIndex: PostTreatmentDisconnectStack.Step.DrainConsumable; } Index: sources/gui/qml/pages/posttreatment/PostTreatmentStack.qml =================================================================== diff -u -r490a131c41be4c335a7fbd74ff79b5784fb1726c -r36981dc04fd7c25285975d4ba5ad8c1ddeb16028 --- sources/gui/qml/pages/posttreatment/PostTreatmentStack.qml (.../PostTreatmentStack.qml) (revision 490a131c41be4c335a7fbd74ff79b5784fb1726c) +++ sources/gui/qml/pages/posttreatment/PostTreatmentStack.qml (.../PostTreatmentStack.qml) (revision 36981dc04fd7c25285975d4ba5ad8c1ddeb16028) @@ -123,6 +123,18 @@ } } + function continueEnabled() { + switch ( _root.stackStepIndex ) { + case PostTreatmentStack.Disconnect: + return _postTreatmentDisconnectStack.continueEnabled() + case PostTreatmentStack.Remove: + case PostTreatmentStack.Review: + case PostTreatmentStack.Disinfection: // fallthrough + default: + return true + } + } + StepNavigationTitleBar { id: _titleBar stepIndex : _root.stackStepIndex anchors { @@ -137,6 +149,7 @@ backVisible : _root.backEnabled() width : _root.width stepNames : _root.stepNames + confirmEnabled : _root.continueEnabled() subStepIndex : isDisconnect ? _postTreatmentDisconnectStack.subStepIndex + 1 : 0 Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreatePatientPrescription.qml =================================================================== diff -u -r9c15c403ee00b776def3aaf8bfb32a3f8c6f2792 -r36981dc04fd7c25285975d4ba5ad8c1ddeb16028 --- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreatePatientPrescription.qml (.../PreTreatmentCreatePatientPrescription.qml) (revision 9c15c403ee00b776def3aaf8bfb32a3f8c6f2792) +++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreatePatientPrescription.qml (.../PreTreatmentCreatePatientPrescription.qml) (revision 36981dc04fd7c25285975d4ba5ad8c1ddeb16028) @@ -12,16 +12,14 @@ readonly property int cellWidth : Variables.createRxLabelUnitContainerWidth readonly property int cellHeight : Variables.createRxLabelUnitContainerHeight readonly property bool heparinFeatured : vSettings.heparinSyringePump - property bool isHDFFeatured : vTreatmentCreate.treatmentModality === HeaderBar.Mode_HDF || - vTreatmentCreate.treatmentModality === HeaderBar.Mode_HD_Online_Fluid - property bool isHeparinOn : _heparinRxControl.value === PreTreatmentCreatePatientPrescription.ON + property bool isHDFFeatured : vTreatmentCreate.treatmentModality === HeaderBar.Mode_HDF + property bool isHeparinOn : _heparinRxControl.value === PreTreatmentCreatePatientPrescription.ON property bool editingEnabled : true property int columnSpacing : 15 spacing : Variables.defaultMargin * 3 - enum HeparinEnabled { OFF, ON @@ -65,6 +63,9 @@ vTreatmentCreate.treatmentDuration = vTreatmentRanges.treatmentDurationDef vTreatmentCreate.ultrafiltrationVolume = vTreatmentRanges.ultrafiltrationVolumeDef vTreatmentCreate.dialysateTemp = vTreatmentRanges.dialysateTempDef + vTreatmentCreate.acidConcentrate = 0 + vTreatmentCreate.dryBicarbCartSize = 0 + vTreatmentCreate.dialyzerType = 0 } } @@ -81,6 +82,7 @@ function clear () { vTreatmentCreate.patientID = "" + vTreatmentCreate.secondaryPatientID = "" _hdfTreatmentModeControl .clear() _subFluidVolume .clear() _bloodFlowRate .clear() @@ -113,31 +115,15 @@ LabelUnitContainer { id: _patientID text : qsTr("Patient ID") + showEdit : true + onEditClicked : _patientIdEntry.open() - contentItem : TextEntry { id: _pretreatmentPatientIDEntry - clip : true - textInput.width : parent.width - Variables.defaultMargin * 4 - text : vTreatmentCreate.patientID - anchors.centerIn : parent - textInput.maximumLength : 20 // LEAHI-PRS-236 - textInput.rightPadding : Variables.defaultMargin - textInput.leftPadding : Variables.defaultMargin * 14 - textInput.inputMethodHints : Qt.ImhPreferLowercase - textInput.echoMode : TextInput.Normal - textInput.validator : RegExpValidator { regExp: Variables.regExp_PatientID } - line.visible : false - enabled : _root.editingEnabled - - Text { id: _patientIDPlaceHolderText - text : Variables.emptyEntry - anchors.fill : parent - rightPadding : 125 - horizontalAlignment : Text.AlignRight - font.pixelSize : Fonts.fontPixelValueControl - color : Colors.offWhite - visible : _pretreatmentPatientIDEntry.textInput.text.length === 0 && - ! _pretreatmentPatientIDEntry.textInput.activeFocus - } + contentItem : Text { id: _patientIDText + anchors.centerIn : parent + horizontalAlignment : Text.AlignRight + font.pixelSize : Fonts.fontPixelValueControl + color : Colors.offWhite + text : vTreatmentCreate.patientID !== "" ? vTreatmentCreate.patientID : Variables.emptyEntry } } @@ -155,9 +141,6 @@ currentIndex : vTreatmentCreate.treatmentModality model : vTreatmentRanges.treatmentModalityOptions centerHorizontally : true - itemsEnabled : [ vTreatmentCreate.treatmentModality === HeaderBar.Mode_HD , // Mode_HD - vTreatmentCreate.treatmentModality !== HeaderBar.Mode_HD , // Mode_HDF - vTreatmentCreate.treatmentModality !== HeaderBar.Mode_HD ] // Mode_HD_Online_Fluid onActivated : { if ( ! _treatmentModality.valid ) { vTreatmentCreate.treatmentModalityRejectReason = Variables.noRejectReason } @@ -202,7 +185,7 @@ step : vTreatmentRanges.substitutionVolumeRes defaultValue : vTreatmentRanges.substitutionVolumeDef decimal : Variables.substitutionPrecision - value : vTreatmentCreate.substitutionFluidVolume + value : _root.isHDFFeatured ? vTreatmentCreate.substitutionFluidVolume : 0 isActive : vTreatmentCreate.substitutionFluidVolumeSet onDidActiveChange : function(vState) { vTreatmentCreate.substitutionFluidVolumeSet = vState }