Index: sources/view/VTreatmentCreate.h
===================================================================
diff -u -r9cc47cf817b3236812926e3a92373db89932fe72 -r82b22f0f0ae1ff5b0a5c1524c7e91cc8d667b180
--- sources/view/VTreatmentCreate.h	(.../VTreatmentCreate.h)	(revision 9cc47cf817b3236812926e3a92373db89932fe72)
+++ sources/view/VTreatmentCreate.h	(.../VTreatmentCreate.h)	(revision 82b22f0f0ae1ff5b0a5c1524c7e91cc8d667b180)
@@ -79,59 +79,62 @@
     PROPERTY(bool       , heparinDispensingRateOff                      , true)
     PROPERTY(bool       , heparinBolusVolumeOff                         , true)
 
+    VALUESET(quint32    , treatmentModality                             , 0)
     VALUESET(quint32    , hdfTreatmentMode                              , 0)
     VALUESET(quint32    , bloodFlowRate                                 , 0)
     VALUESET(quint32    , dialysateFlowRate                             , 0)
     VALUESET(quint32    , treatmentDuration                             , 0)
-    VALUESET(quint32    , salineBolusVolume                             , 0)
-    VALUESET(quint32    , heparinStopTime                               , 0)
+    VALUESET(quint32    , heparinDeliveryDuration                       , 0)
     VALUESET(quint32    , heparinType                                   , 0)
-    VALUESET(quint32    , acidConcentrate                               , 0)
-    VALUESET(quint32    , bicarbonateConcentrate                        , 0)
+    VALUESET(quint32    , dryBicarbCartSize                             , 0)
+    VALUESET(quint32    , sodium                                        , 0)
+    VALUESET(quint32    , bicarbonate                                   , 0)
     VALUESET(quint32    , dialyzerType                                  , 0)
+    VALUESET(quint32    , fluidBolusVolume                              , 0)
     VALUESET(quint32    , bloodPressureMeasureInterval                  , 0)
-    VALUESET(quint32    , rinsebackFlowRate                             , 0)
     VALUESET(quint32    , rinsebackVolume                               , 0)
-    VALUESET(qint32     , arterialPressureLimitWindow                   , 0)
-    VALUESET(qint32     , venousPressureLimitWindow                     , 0)
-    VALUESET(qint32     , venousPressureLimitAsymtrc                    , 0)
-    VALUESET(qint32     , transmembranePressureLimitWindow              , 0)
-    VALUESET(float      , dialysateTemp                                 , 0)
-    VALUESET(float      , heparinDispensingRate                         , 0)
-    VALUESET(float      , heparinBolusVolume                            , 0)
+    VALUESET(quint32    , hepatitusBStatus                              , 0)
+    VALUESET(quint32    , acidConcentrate                               , 0)
     VALUESET(float      , substitutionFluidVolume                       , 0)
+    VALUESET(float      , heparinBolusVolume                            , 0)
+    VALUESET(float      , heparinDispensingRate                         , 0)
+    VALUESET(float      , dialysateTemp                                 , 0)
+    VALUESET(float      , acidConcentrateConversionFactor               , 0)
+    VALUESET(float      , ufPreWeight                                   , 0)
+    VALUESET(float      , ufEstimatedTargetWeight                       , 0)
+    VALUESET(float      , ultrafiltrationVolume                         , 0)
 
     VALUESET(QString    , patientID                                     ,"")
     VALUESET(bool       , parametersValidated                           , 0)
-    VALUESET(bool       , parametersConfirmed                           , 0)
 
-    VALUESET(qint32     , dryBicabCartridgeSize                         , 0)
-    VALUESET(qint32     , bicarbFinalDialysateComposition               , 0)
-    VALUESET(qint32     , sodiumFinalDialysateComposition               , 0)
-    VALUESET(qint32     , actualRORejectionPercentage                   , 0)
+    VALUESET(qint32     , actualRORejectionPercentage                   , 0)  // TODO comes from FP Update Later
 
-
     PROPERTY(QString    , txCode                                        ,"")
 
-    TRIGGER(quint32     , bloodFlowRateRejectReason                     , 0)
-    TRIGGER(quint32     , dialysateFlowRateRejectReason                 , 0)
-    TRIGGER(quint32     , treatmentDurationRejectReason                 , 0)
-    TRIGGER(quint32     , heparinDispensingRateRejectReason             , 0)
-    TRIGGER(quint32     , heparinBolusVolumeRejectReason                , 0)
-    TRIGGER(quint32     , heparinStopTimeRejectReason                   , 0)
-    TRIGGER(quint32     , salineBolusVolumeRejectReason                 , 0)
-    TRIGGER(quint32     , heparinTypeRejectReason                       , 0)
-    TRIGGER(quint32     , acidConcentrateRejectReason                   , 0)
-    TRIGGER(quint32     , bicarbonateConcentrateRejectReason            , 0)
-    TRIGGER(quint32     , dialyzerTypeRejectReason                      , 0)
-    TRIGGER(quint32     , dialysateTempRejectReason                     , 0)
-    TRIGGER(quint32     , arterialPressureLimitWindowRejectReason       , 0)
-    TRIGGER(quint32     , venousPressureLimitWindowRejectReason         , 0)
-    TRIGGER(quint32     , venousPressureLimitAsymtrcRejectReason        , 0)
-    TRIGGER(quint32     , bloodPressureMeasureIntervalRejectReason      , 0)
-    TRIGGER(quint32     , rinsebackFlowRateRejectReason                 , 0)
-    TRIGGER(quint32     , rinsebackVolumeRejectReason                   , 0)
-    TRIGGER(quint32     , transmembranePressureLimitWindowRejectReason  , 0)
+    TRIGGER(quint32     , treatmentModalityRejectReason                     , 0)
+    TRIGGER(quint32     , hDFTreatmentModeRejectReason                      , 0)
+    TRIGGER(quint32     , bloodFlowRateRejectReason                         , 0)
+    TRIGGER(quint32     , dialysateFlowRateRejectReason                     , 0)
+    TRIGGER(quint32     , treatmentDurationRejectReason                     , 0)
+    TRIGGER(quint32     , heparinDeliveryDurationRejectReason               , 0)
+    TRIGGER(quint32     , heparinTypeRejectReason                           , 0)
+    TRIGGER(quint32     , dryBicarbCartSizeRejectReason                     , 0)
+    TRIGGER(quint32     , sodiumRejectReason                                , 0)
+    TRIGGER(quint32     , bicarbonateRejectReason                           , 0)
+    TRIGGER(quint32     , dialyzerTypeRejectReason                          , 0)
+    TRIGGER(quint32     , fluidBolusVolumeRejectReason                      , 0)
+    TRIGGER(quint32     , bloodPressureMeasureIntervalRejectReason          , 0)
+    TRIGGER(quint32     , rinsebackVolumeRejectReason                       , 0)
+    TRIGGER(quint32     , hepatitusBStatusRejectReason                      , 0)
+    TRIGGER(quint32     , substitutionFluidVolumeRejectReason               , 0)
+    TRIGGER(quint32     , heparinBolusVolumeRejectReason                    , 0)
+    TRIGGER(quint32     , heparinDispensingRateRejectReason                 , 0)
+    TRIGGER(quint32     , dialysateTempRejectReason                         , 0)
+    TRIGGER(quint32     , acidConcentrateConversionFactorRejectionReason    , 0)
+    TRIGGER(quint32     , ufVolumeRejectionReason                           , 0)
+    TRIGGER(quint32     , ufPreWeightRejectionReason                        , 0)
+    TRIGGER(quint32     , ufEstimatedTargetWeightRejectionReason            , 0)
+    TRIGGER(quint32     , acidConcentrateIndexRejectionReason               , 0)
 
     VIEW_DEC_CLASS(VTreatmentCreate)
     VIEW_DEC_SLOT(AdjustParametersValidationResponseData)
@@ -140,7 +143,6 @@
 private:
     QString enumToString(GuiRequestReasons vEnum);
 
-    void generateTxCode();
 
 signals:
     void didAdjustment(const AdjustParametersValidationRequestData &data);
@@ -152,8 +154,7 @@
     void doValidation   ();
     void doConfirm      ();
     void doCancel       ();
+    void generateTxCode();
 
-    QStringList doGetPrescriptionParameterValues();
-    QStringList doGetOperatingParameterValues();
 };
 }