Index: sources/view/VTreatmentCreate.cpp
===================================================================
diff -u -r56381aae237db191956aff493907cd1f0801216b -r4a7dd11138d2321f1ab8d324b3bd25f02eaefe84
--- sources/view/VTreatmentCreate.cpp	(.../VTreatmentCreate.cpp)	(revision 56381aae237db191956aff493907cd1f0801216b)
+++ sources/view/VTreatmentCreate.cpp	(.../VTreatmentCreate.cpp)	(revision 4a7dd11138d2321f1ab8d324b3bd25f02eaefe84)
@@ -42,28 +42,30 @@
 
     AdjustParametersValidationRequestData data;
 
-    data.mTreatmentModality             = _treatmentModality            ;
-    data.mHDFTreatmentMode              = _hdfTreatmentMode             ;
-    data.mBloodFlowRate                 = _bloodFlowRate                ;
-    data.mDialysateFlowRate             = _dialysateFlowRate            ;
-    data.mTreatmentDuration             = _treatmentDuration            ;
-    data.mHeparinDeliveryDuration       = _heparinDeliveryDuration      ;
-    data.mHeparinType                   = _heparinType                  ;
-    data.mDryBicarbCartSize             = _dryBicarbCartSize            ;
-    data.mSodium                        = _sodium                       ;
-    data.mBicarbonate                   = _bicarbonate                  ;
-    data.mDialyzerType                  = _dialyzerType                 ;
-    data.mFluidBolusVolume              = _fluidBolusVolume             ;
-    data.mBloodPressureMeasureInterval  = _bloodPressureMeasureInterval ;
-    data.mPrimeDiscardVolume            = _primeDiscardVolume           ;
-    data.mRinsebackVolume               = _rinsebackVolume              ;
-    data.mHepatitusBStatus              = _hepatitusBStatus             ;
-    data.mSubstitutionFluidVolume       = _substitutionFluidVolume      ;
-    data.mHeparinBolusVolume            = _heparinBolusVolume           ;
-    data.mHeparinDispensingRate         = _heparinDispensingRate        ;
-    data.mDialysateTemp                 = _dialysateTemp                ;
-//    data.mPotassium                     = _potassium                    ;
-//    data.mCalcium                       = _calcium                      ;
+    data.mTreatmentModality                 = _treatmentModality                ;
+    data.mHDFTreatmentMode                  = _hdfTreatmentMode                 ;
+    data.mBloodFlowRate                     = _bloodFlowRate                    ;
+    data.mDialysateFlowRate                 = _dialysateFlowRate                ;
+    data.mTreatmentDuration                 = _treatmentDuration                ;
+    data.mHeparinDeliveryDuration           = _heparinDeliveryDuration          ;
+    data.mHeparinType                       = _heparinType                      ;
+    data.mDryBicarbCartSize                 = _dryBicarbCartSize                ;
+    data.mSodium                            = _sodium                           ;
+    data.mBicarbonate                       = _bicarbonate                      ;
+    data.mDialyzerType                      = _dialyzerType                     ;
+    data.mFluidBolusVolume                  = _fluidBolusVolume                 ;
+    data.mBloodPressureMeasureInterval      = _bloodPressureMeasureInterval     ;
+    data.mPrimeDiscardVolume                = _primeDiscardVolume               ;
+    data.mRinsebackVolume                   = _rinsebackVolume                  ;
+    data.mHepatitusBStatus                  = _hepatitusBStatus                 ;
+    data.mSubstitutionFluidVolume           = _substitutionFluidVolume          ;
+    data.mHeparinBolusVolume                = _heparinBolusVolume               ;
+    data.mHeparinDispensingRate             = _heparinDispensingRate            ;
+    data.mDialysateTemp                     = _dialysateTemp                    ;
+    data.mAcidConcentrateConversionFactor   = _acidConcentrateConversionFactor  ;
+    data.mUFVolume                          = _ultrafiltrationVolume            ;
+    data.mUFPreWeight                       = _ufPreWeight                      ;
+    data.mUFEstimatedTargetWeight           = _ufEstimatedTargetWeight          ;
 
     parametersConfirmed(false);
     parametersValidated(false);
@@ -117,28 +119,30 @@
  */
 void VTreatmentCreate::onActionReceive(const AdjustParametersValidationResponseData &data) {
     if (! data.mAccepted) {
-        treatmentModalityRejectReason               (data.mTreatmentModalityRejectionReason             );
-        hDFTreatmentModeRejectReason                (data.mHDFTreatmentModeRejectionReason              );
-        bloodFlowRateRejectReason                   (data.mBloodFlowRateRejectionReason                 );
-        dialysateFlowRateRejectReason               (data.mDialysateFlowRateRejectionReason             );
-        treatmentDurationRejectReason               (data.mTreatmentDurationRejectionReason             );
-        heparinDeliveryDurationRejectReason         (data.mHeparinDeliveryDurationRejectionReason       );
-        heparinTypeRejectReason                     (data.mHeparinTypeRejectionReason                   );
-        dryBicarbCartSizeRejectReason               (data.mDryBicarbCartSizeRejectionReason             );
-        sodiumRejectReason                          (data.mSodiumRejectionReason                        );
-        bicarbonateRejectReason                     (data.mBicarbonateRejectionReason                   );
-        dialyzerTypeRejectReason                    (data.mDialyzerTypeRejectionReason                  );
-        fluidBolusVolumeRejectReason                (data.mFluidBolusVolumeRejectionReason              );
-        bloodPressureMeasureIntervalRejectReason    (data.mBloodPressureMeasureIntervalRejectionReason  );
-        primeDiscardVolumeRejectReason              (data.mPrimeDiscardVolumeRejectionReason            );
-        rinsebackVolumeRejectReason                 (data.mRinsebackVolumeRejectionReason               );
-        hepatitusBStatusRejectReason                (data.mHepatitusBStatusRejectionReason              );
-        substitutionFluidVolumeRejectReason         (data.mSubstitutionFluidVolumeRejectionReason       );
-        heparinBolusVolumeRejectReason              (data.mHeparinBolusVolumeRejectionReason            );
-        heparinDispensingRateRejectReason           (data.mHeparinDispensingRateRejectionReason         );
-        dialysateTempRejectReason                   (data.mDialysateTempRejectionReason                 );
-        potassiumRejectReason                       (data.mPotassiumRejectionReason                     );
-        calciumRejectReason                         (data.mCalciumRejectionReason                       );
+        treatmentModalityRejectReason                   (data.mTreatmentModalityRejectionReason                 );
+        hDFTreatmentModeRejectReason                    (data.mHDFTreatmentModeRejectionReason                  );
+        bloodFlowRateRejectReason                       (data.mBloodFlowRateRejectionReason                     );
+        dialysateFlowRateRejectReason                   (data.mDialysateFlowRateRejectionReason                 );
+        treatmentDurationRejectReason                   (data.mTreatmentDurationRejectionReason                 );
+        heparinDeliveryDurationRejectReason             (data.mHeparinDeliveryDurationRejectionReason           );
+        heparinTypeRejectReason                         (data.mHeparinTypeRejectionReason                       );
+        dryBicarbCartSizeRejectReason                   (data.mDryBicarbCartSizeRejectionReason                 );
+        sodiumRejectReason                              (data.mSodiumRejectionReason                            );
+        bicarbonateRejectReason                         (data.mBicarbonateRejectionReason                       );
+        dialyzerTypeRejectReason                        (data.mDialyzerTypeRejectionReason                      );
+        fluidBolusVolumeRejectReason                    (data.mFluidBolusVolumeRejectionReason                  );
+        bloodPressureMeasureIntervalRejectReason        (data.mBloodPressureMeasureIntervalRejectionReason      );
+        primeDiscardVolumeRejectReason                  (data.mPrimeDiscardVolumeRejectionReason                );
+        rinsebackVolumeRejectReason                     (data.mRinsebackVolumeRejectionReason                   );
+        hepatitusBStatusRejectReason                    (data.mHepatitusBStatusRejectionReason                  );
+        substitutionFluidVolumeRejectReason             (data.mSubstitutionFluidVolumeRejectionReason           );
+        heparinBolusVolumeRejectReason                  (data.mHeparinBolusVolumeRejectionReason                );
+        heparinDispensingRateRejectReason               (data.mHeparinDispensingRateRejectionReason             );
+        dialysateTempRejectReason                       (data.mDialysateTempRejectionReason                     );
+        acidConcentrateConversionFactorRejectionReason  (data.mAcidConcentrateConversionFactorRejectionReason   );
+        ufVolumeRejectionReason                         (data.mUFVolumeRejectionReason                          );
+        ufPreWeightRejectionReason                      (data.mUFPreWeightRejectionReason                       );
+        ufEstimatedTargetWeightRejectionReason          (data.mUFEstimatedTargetWeightRejectionReason           );
 
         parametersValidated(false);
     }