Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateContent.qml =================================================================== diff -u -r24f141c96bdd5d4043e6ff05ea7ad962f63faabc -rc43d24c50f4344348d36d8ae9273797f4557356a --- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateContent.qml (.../PreTreatmentCreateContent.qml) (revision 24f141c96bdd5d4043e6ff05ea7ad962f63faabc) +++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateContent.qml (.../PreTreatmentCreateContent.qml) (revision c43d24c50f4344348d36d8ae9273797f4557356a) @@ -255,10 +255,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 } @@ -276,10 +276,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 } @@ -297,10 +297,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 } @@ -321,10 +321,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 @@ -344,10 +344,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 @@ -383,7 +383,7 @@ contentItem : ValueAdjuster { id: _heparinStopTimeControl editable : _root.editingEnabled - minimum : vTreatmentRanges.heparinStopTimeMin + minimum : vInstitutionalRecord.heparinStopTimeMin maximum : _durationControl.value step : _durationControl.step defaultValue : _durationControl.value @@ -533,10 +533,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 @@ -549,16 +549,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 }