Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreatePatientPrescription.qml
===================================================================
diff -u -r52d17dab2211c2e4d9160c55c316ad7a40ce4d6c -r1a46e7e1fd9da0fcfa8359a194610c55adfff04f
--- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreatePatientPrescription.qml	(.../PreTreatmentCreatePatientPrescription.qml)	(revision 52d17dab2211c2e4d9160c55c316ad7a40ce4d6c)
+++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreatePatientPrescription.qml	(.../PreTreatmentCreatePatientPrescription.qml)	(revision 1a46e7e1fd9da0fcfa8359a194610c55adfff04f)
@@ -18,27 +18,51 @@
     spacing      : Variables.defaultMargin * 3
 
     function setPresetParameters () {
-        vTreatmentCreate.sodium         = vTreatmentRanges.dialysateSodiumDef
-        vTreatmentCreate.bicarbonate    = vTreatmentRanges.dialysateBicarbonateDef
+        vTreatmentCreate.sodiumSet                          = true
+        vTreatmentCreate.bicarbonateSet                     = true
+        vTreatmentCreate.fluidBolusVolumeSet                = true
+        vTreatmentCreate.primeDiscardVolumeSet              = true
+        vTreatmentCreate.rinsebackVolumeSet                 = true
+        vTreatmentCreate.bloodPressureMeasureIntervalSet    = true
+        vTreatmentCreate.hepatitusBStatusSet                = true
+
+        vTreatmentCreate.sodium                         = vTreatmentRanges.dialysateSodiumDef
+        vTreatmentCreate.bicarbonate                    = vTreatmentRanges.dialysateBicarbonateDef
+        vTreatmentCreate.fluidBolusVolume               = vTreatmentRanges.salineBolusVolumeDef
+        vTreatmentCreate.primeDiscardVolume             = vTreatmentRanges.primeDiscardVolumeDef
+        vTreatmentCreate.rinsebackVolume                = vTreatmentRanges.rinsebackVolumeDef
+        vTreatmentCreate.bloodPressureMeasureInterval   = vTreatmentRanges.bloodPressureMeasureInterval[vTreatmentRanges.vitalsInterval]
+        vTreatmentCreate.hepatitusBStatus               = 0
     }
 
     function refreshAll () {
-
-        _sodium        .refresh()
-        _bicarbonate   .refresh()
+        _sodium                         .refresh()
+        _bicarbonate                    .refresh()
+        _fluidBolusVolume               .refresh()
+        _primeDiscardVolume             .refresh()
+        _primeRinsebackVolume           .refresh()
+        _bpMeasurementIntervalControl   .refresh()
+        _hepatitusStatusControl         .refresh()
     }
 
     function clear () {
-
-        _sodium        .clear()
-        _bicarbonate   .clear()
-        clearErrors()
-        canEdit (true)
+        _sodium                         .clear()
+        _bicarbonate                    .clear()
+        _fluidBolusVolume               .clear()
+        _primeDiscardVolume             .clear()
+        _primeRinsebackVolume           .clear()
+        _bpMeasurementIntervalControl   .clear()
+        _hepatitusStatusControl   .     clear()
     }
 
     function ready () {
-        return  _sodium        .isActive    && _sodium          .valid  &&
-                _bicarbonate   .isActive    && _bicarbonate     .valid
+        return  _sodium                         .isActive    && _sodium                 .valid  &&
+                _bicarbonate                    .isActive    && _bicarbonate            .valid  &&
+                _fluidBolusVolume               .isActive    && _fluidBolusVolume       .valid  &&
+                _primeDiscardVolume             .isActive    && _primeDiscardVolume     .valid  &&
+                _primeRinsebackVolume           .isActive    && _primeRinsebackVolume   .valid  &&
+                _bpMeasurementIntervalControl   .isActive    && _bpMeasurementInterval  .valid  &&
+                _hepatitusStatusControl         .isActive    && _hepatitusStatus        .valid
     }
 
     Column {  id: _leftColumn
@@ -56,8 +80,8 @@
             step            : vTreatmentRanges.dialysateSodiumRes
             defaultValue    : vTreatmentRanges.dialysateSodiumDef
             value           : vTreatmentCreate.sodium
-            isActive        : true      // PRS-215
-
+            isActive        : vTreatmentCreate.sodiumSet
+            onDidActiveChange   : function(vState) {  vTreatmentCreate.sodiumSet = vState }
             onDidChange         : function(vValue) {
                 if ( ! _sodium.valid ) { vTreatmentCreate.sodiumRejectReason = Variables.noRejectReason }
                 vTreatmentCreate.sodium = vValue
@@ -76,21 +100,124 @@
             step            : vTreatmentRanges.dialysateBicarbonateRes
             defaultValue    : vTreatmentRanges.dialysateBicarbonateDef
             value           : vTreatmentCreate.bicarbonate
-            isActive        : true      // PRS-215
-
+            isActive        : vTreatmentCreate.bicarbonateSet
+            onDidActiveChange   : function(vState) {  vTreatmentCreate.bicarbonateSet = vState }
             onDidChange         : function(vValue) {
                 if ( ! _sodium.valid ) { vTreatmentCreate.bicarbonateRejectReason = Variables.noRejectReason }
                 vTreatmentCreate.bicarbonate = vValue
             }
         }
 
+        LabelUnitValueAdjuster { id: _fluidBolusVolume
+            text            : qsTr("Fluid Bolus Volume")
+            unitText        : Variables.unitTextFluid
+            valid           : ! vTreatmentCreate.fluidBolusVolumeRejectReason
+            width           : _root.cellWidth
+            height          : _root.cellHeight
+            editable        : _root.editingEnabled
+            minimum         : vTreatmentRanges.salineBolusVolumeMin
+            maximum         : vTreatmentRanges.salineBolusVolumeMax
+            step            : vTreatmentRanges.salineBolusVolumeRes
+            defaultValue    : vTreatmentRanges.salineBolusVolumeDef
+            value           : vTreatmentCreate.fluidBolusVolume
+            isActive        : vTreatmentCreate.fluidBolusVolumeSet
+            onDidActiveChange   : function(vState) {  vTreatmentCreate.fluidBolusVolumeSet = vState }
+            onDidChange     : function(vValue) {
+                if ( ! _fluidBolusVolume.valid ) { vTreatmentCreate.fluidBolusVolumeRejectReason = Variables.noRejectReason }
+                vTreatmentCreate.fluidBolusVolume = vValue
+            }
+        }
 
+        LabelUnitValueAdjuster { id: _primeDiscardVolume
+            text            : qsTr("Prime Discard Volume")
+            unitText        : Variables.unitTextFluid
+            valid           : ! vTreatmentCreate.primeDiscardVolumeRejectReason
+            width           : _root.cellWidth
+            height          : _root.cellHeight
+            editable        : _root.editingEnabled
+            minimum         : vTreatmentRanges.primeDiscardVolumeMin
+            maximum         : vTreatmentRanges.primeDiscardVolumeMax
+            step            : vTreatmentRanges.primeDiscardVolumeRes
+            defaultValue    : vTreatmentRanges.primeDiscardVolumeDef
+            value           : vTreatmentCreate.primeDiscardVolume
+            isActive        : vTreatmentCreate.primeDiscardVolumeSet
+            onDidActiveChange   : function(vState) {  vTreatmentCreate.primeDiscardVolumeSet = vState }
+            onDidChange     : function(vValue) {
+                if ( ! _primeDiscardVolume.valid ) { vTreatmentCreate.primeDiscardVolumeRejectReason = Variables.noRejectReason }
+                vTreatmentCreate.primeDiscardVolume = vValue
+            }
+        }
 
-
+        LabelUnitValueAdjuster { id: _primeRinsebackVolume
+            text            : qsTr("Prime Rinseback Volume")
+            unitText        : Variables.unitTextFluid
+            valid           : ! vTreatmentCreate.rinsebackVolumeRejectReason
+            width           : _root.cellWidth
+            height          : _root.cellHeight
+            editable        : _root.editingEnabled
+            minimum         : vTreatmentRanges.rinsebackVolumeMin
+            maximum         : vTreatmentRanges.rinsebackVolumeMax
+            step            : vTreatmentRanges.rinsebackVolumeRes
+            defaultValue    : vTreatmentRanges.rinsebackVolumeDef
+            value           : vTreatmentCreate.rinsebackVolume
+            isActive        : vTreatmentCreate.rinsebackVolumeSet
+            onDidActiveChange   : function(vState) {  vTreatmentCreate.rinsebackVolumeSet = vState }
+            onDidChange     : function(vValue) {
+                if ( ! _primeRinsebackVolume.valid ) { vTreatmentCreate.rinsebackVolumeRejectReason = Variables.noRejectReason }
+                vTreatmentCreate.rinsebackVolume = vValue
+            }
+        }
     }
 
     Column { id: _rightColumn
         spacing : _root.columnSpacing
 
+        LabelUnitContainer { id: _bpMeasurementInterval
+            text        : qsTr("Vitals Interval")
+            unitText    : Variables.unitTextDuration
+            valid       : ! vTreatmentCreate.bloodPressureMeasureIntervalRejectReason
+
+            contentItem : ValueAdjusterCustom { id: _bpMeasurementIntervalControl
+                editable        : _root.editingEnabled
+                isActive        : vTreatmentCreate.bloodPressureMeasureIntervalSet
+                defaultValue    : vTreatmentRanges.vitalsInterval
+                value           : vTreatmentRanges.bloodPressureMeasureInterval.indexOf(vTreatmentCreate.bloodPressureMeasureInterval.toString())
+                model           : vTreatmentRanges.bloodPressureMeasureInterval
+                canOff          : true
+
+                onDidActiveChange: function(vState) {  vTreatmentCreate.bloodPressureMeasureIntervalSet = vState }
+
+                onDidChange     : function(vValue) {
+                    if ( ! _bpMeasurementInterval.valid ) {
+                        vTreatmentCreate.bloodPressureMeasureIntervalRejectReason = Variables.noRejectReason
+                    }
+
+                    vTreatmentCreate.bloodPressureMeasureInterval       = vTreatmentRanges.bloodPressureMeasureInterval[vValue]
+                }
+            }
+        }
+
+        LabelUnitContainer { id: _hepatitusStatus
+            text        : qsTr("Hepatitus Status")
+            valid       : ! vTreatmentCreate.hepatitusBStatusRejectReason
+
+            contentItem : ValueAdjusterCustom { id: _hepatitusStatusControl
+                editable        : _root.editingEnabled
+                isActive        : vTreatmentCreate.hepatitusBStatusSet
+                value           : vTreatmentCreate.hepatitusBStatus
+                defaultValue    : vTreatmentCreate.hepatitusBStatus
+                model           : vTreatmentRanges.hepatitisStatus
+
+                onDidActiveChange: function(vState) {  vTreatmentCreate.hepatitusBStatusSet = vState }
+
+                onDidChange     : function(vValue) {
+                    if ( ! _hepatitusStatus.valid ) {
+                        vTreatmentCreate.hepatitusBStatusRejectReason = Variables.noRejectReason
+                    }
+
+                    vTreatmentCreate.hepatitusBStatus       = vValue
+                }
+            }
+        }
     }
 }