Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateContent.qml =================================================================== diff -u -r93b7d7da5dea9e0392e139b59117eb0315d6c343 -re49c956894f999f6539b0c404dd1c9b18a76bb4b --- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateContent.qml (.../PreTreatmentCreateContent.qml) (revision 93b7d7da5dea9e0392e139b59117eb0315d6c343) +++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateContent.qml (.../PreTreatmentCreateContent.qml) (revision e49c956894f999f6539b0c404dd1c9b18a76bb4b) @@ -244,8 +244,8 @@ horizontalAlignment : Text.AlignRight font.pixelSize : Fonts.fontPixelValueControl color : Colors.offWhite - visible : _pretreatmentPatientIDEntry.textInput.text.length === 0 && - ! _pretreatmentPatientIDEntry.textInput.activeFocus + visible : _pretreatmentPatientIDEntry.textInput.text.length === 0 && + ! _pretreatmentPatientIDEntry.textInput.activeFocus } } } @@ -277,10 +277,10 @@ contentItem : ValueAdjuster { id: _bloodFlowRateControl editable : _root.editingEnabled - minimum : vTreatmentRanges.bloodFlowRateMin - maximum : vTreatmentRanges.bloodFlowRateMax + minimum : vInstitutionalRecord.bloodFlowRateMin + maximum : vInstitutionalRecord.bloodFlowRateMax step : vTreatmentRanges.bloodFlowRateRes - defaultValue : vTreatmentRanges.bloodFlowRateDef + defaultValue : vInstitutionalRecord.bloodFlowRateDef value : vTreatmentCreate.bloodFlowRate isActive : vTreatmentCreate.bloodFlowRateSet onDidActiveChange: function(vState) { vTreatmentCreate.bloodFlowRateSet = vState } @@ -326,10 +326,10 @@ contentItem : ValueAdjuster { id: _dialysateFlowRateControl editable : _root.editingEnabled - minimum : vTreatmentRanges.dialysateFlowRateMin - maximum : vTreatmentRanges.dialysateFlowRateMax + minimum : vInstitutionalRecord.dialysateFlowRateMin + maximum : vInstitutionalRecord.dialysateFlowRateMax step : vTreatmentRanges.dialysateFlowRateRes - defaultValue : vTreatmentRanges.dialysateFlowRateDef + defaultValue : vInstitutionalRecord.dialysateFlowRateDef value : vTreatmentCreate.dialysateFlowRate isActive : vTreatmentCreate.dialysateFlowRateSet onDidActiveChange: function(vState) { vTreatmentCreate.dialysateFlowRateSet = vState } @@ -369,10 +369,10 @@ contentItem : ValueAdjuster { id: _durationControl editable : _root.editingEnabled - minimum : vTreatmentRanges.treatmentDurationMin - maximum : vTreatmentRanges.treatmentDurationMax + minimum : vInstitutionalRecord.treatmentDurationMin + maximum : vInstitutionalRecord.treatmentDurationMax step : vTreatmentRanges.treatmentDurationRes - defaultValue : vTreatmentRanges.treatmentDurationDef + defaultValue : vInstitutionalRecord.treatmentDurationDef value : vTreatmentCreate.treatmentDuration isActive : vTreatmentCreate.treatmentDurationSet onDidActiveChange: function(vState) { vTreatmentCreate.treatmentDurationSet = vState } @@ -416,10 +416,10 @@ contentItem : ValueAdjuster { id: _heparinBolusVolumeControl editable : _root.editingEnabled - minimum : vTreatmentRanges.heparinBolusVolumeMin - maximum : vTreatmentRanges.heparinBolusVolumeMax + minimum : vInstitutionalRecord.heparinBolusVolumeMin + maximum : vInstitutionalRecord.heparinBolusVolumeMax step : vTreatmentRanges.heparinBolusVolumeRes - defaultValue : vTreatmentRanges.heparinBolusVolumeDef + defaultValue : vInstitutionalRecord.heparinBolusVolumeDef value : vTreatmentCreate.heparinBolusVolume decimal : Variables.heparinPrecision canOff : true @@ -471,10 +471,10 @@ contentItem : ValueAdjuster { id: _heparinDispensingRateControl editable : _root.editingEnabled - minimum : vTreatmentRanges.heparinDispensingRateMin - maximum : vTreatmentRanges.heparinDispensingRateMax + minimum : vInstitutionalRecord.heparinDispensingRateMin + maximum : vInstitutionalRecord.heparinDispensingRateMax step : vTreatmentRanges.heparinDispensingRateRes - defaultValue : vTreatmentRanges.heparinDispensingRateDef + defaultValue : vInstitutionalRecord.heparinDispensingRateDef value : vTreatmentCreate.heparinDispensingRate decimal : Variables.heparinPrecision canOff : true @@ -510,10 +510,10 @@ contentItem : ValueAdjuster { id: _dialysateTemperatureControl editable : _root.editingEnabled - minimum : vTreatmentRanges.dialysateTempMin - maximum : vTreatmentRanges.dialysateTempMax + minimum : vInstitutionalRecord.dialysateTempMin + maximum : vInstitutionalRecord.dialysateTempMax step : vTreatmentRanges.dialysateTempRes - defaultValue : vTreatmentRanges.dialysateTempDef + defaultValue : vInstitutionalRecord.dialysateTempDef value : vTreatmentCreate.dialysateTemp decimal : Variables.dialysateTempPrecision isActive : vTreatmentCreate.dialysateTempSet @@ -533,7 +533,7 @@ contentItem : ValueAdjuster { id: _heparinStopTimeControl editable : _root.editingEnabled - minimum : vTreatmentRanges.heparinStopTimeMin + minimum : vInstitutionalRecord.heparinStopTimeMin maximum : _durationControl.value step : _durationControl.step defaultValue : _durationControl.value @@ -550,16 +550,16 @@ } LabelUnitContainer { id: _salineBolusVolume - text : qsTr("Saline Bolus Volume") + text : qsTr("Fluid Bolus Volume") unitText : Variables.unitTextFluid valid : ! vTreatmentCreate.salineBolusVolumeRejectReason contentItem : ValueAdjuster { id: _salineBolusVolumeControl editable : _root.editingEnabled - minimum : vTreatmentRanges.salineBolusVolumeMin - maximum : vTreatmentRanges.salineBolusVolumeMax + minimum : vInstitutionalRecord.fluidBolusVolumeMin + maximum : vInstitutionalRecord.fluidBolusVolumeMax step : vTreatmentRanges.salineBolusVolumeRes - defaultValue : vTreatmentRanges.salineBolusVolumeDef + defaultValue : vInstitutionalRecord.fluidBolusVolumeDef value : vTreatmentCreate.salineBolusVolume isActive : vTreatmentCreate.salineBolusVolumeSet onDidActiveChange: function(vState) { vTreatmentCreate.salineBolusVolumeSet = vState } @@ -571,3 +571,4 @@ } } } +