Index: sources/view/VTreatmentCreate.h
===================================================================
diff -u -rfd7107924547c4cdd23283b25446a10752cb53d2 -r80250cfdbe58a3df17950d342212f155d52d3971
--- sources/view/VTreatmentCreate.h	(.../VTreatmentCreate.h)	(revision fd7107924547c4cdd23283b25446a10752cb53d2)
+++ sources/view/VTreatmentCreate.h	(.../VTreatmentCreate.h)	(revision 80250cfdbe58a3df17950d342212f155d52d3971)
@@ -106,10 +106,9 @@
     const quint32 salineBolusVolume_Max                      = 300  ; // PRS 350
     const quint32 salineBolusVolume_Res                      = 100  ; // PRS 350
 
+    const quint32 heparinType_Res                            = 1    ; // PRS ???
     const quint32 acidConcentrate_Res                        = 1    ; // PRS 35
-
     const quint32 bicarbonateConcentrate_Res                 = 1    ; // PRS 351
-
     const quint32 dialyzerType_Res                           = 1    ; // PRS 352
 
     // Celsius
@@ -164,15 +163,18 @@
     enum BICARBONATE_ENUM {
         eBicarbUnset= 9999,
         eBicarb01   =  0,
-
     };
 
     enum DIALYZER_ENUM {
      eDialyzerUnset = 9999,
      eDialyzer01    =  0,
      eDialyzer02        ,
      eDialyzer03        ,
+    };
 
+    enum HEPARIN_ENUM {
+     eHeparinUnset = 9999,
+     eHeparin01    =  0,
     };
 
 protected:
@@ -184,6 +186,7 @@
     TREATMENT_PARAMETER(quint32, heparinStopTime,                           heparinStopTime_Def,              heparinStopTime_Min,              heparinStopTime_Max,              heparinStopTime_Res)
     TREATMENT_PARAMETER(quint32, salineBolusVolume,                       salineBolusVolume_Def,            salineBolusVolume_Min,            salineBolusVolume_Max,            salineBolusVolume_Res)
 
+    TREATMENT_PARAMETER(quint32, heparinType,                                     eHeparinUnset,                       eHeparin01,                       eHeparin01,                  heparinType_Res)
     TREATMENT_PARAMETER(quint32, acidConcentrate,                                    eAcidUnset,                          eAcid01,                          eAcid03,              acidConcentrate_Res)
     TREATMENT_PARAMETER(quint32, bicarbonateConcentrate,                           eBicarbUnset,                        eBicarb01,                        eBicarb01,       bicarbonateConcentrate_Res)
     TREATMENT_PARAMETER(quint32, dialyzerType,                                   eDialyzerUnset,                      eDialyzer01,                      eDialyzer03,                 dialyzerType_Res)
@@ -197,21 +200,14 @@
     TREATMENT_PARAMETER(quint32, rinsebackFlowRate,                       rinsebackFlowRate_Def,            rinsebackFlowRate_Min,            rinsebackFlowRate_Max,            rinsebackFlowRate_Res)
 
 protected:
+    PROPERTY(QString    , patientID                     , "")
+    PROPERTY(QStringList, heparinTypeOptions            , {})
+    PROPERTY(QStringList, acidConcentrateOptions        , {})
+    PROPERTY(QStringList, bicarbonateConcentrateOptions , {})
+    PROPERTY(QStringList, dialyzerTypeOptions           , {})
+    PROPERTY(bool       , continueEnabled               , false)
 
-    PROPERTY(QStringList, acidConcentrateOptions        , QStringList() << "08-1251-1"
-                                                                        << "08-2251-0"
-                                                                        << "08-3251-9")
-    PROPERTY(QStringList, bicarbonateConcentrateOptions , QStringList() << "Fresenius Centrisol Liquid")
-    PROPERTY(QStringList, dialyzerTypeOptions           , QStringList() << "BBraun Diacap Pro 13H"
-                                                                        << "BBraun Diacap Pro 16H"
-                                                                        << "BBraun Diacap Pro 19H"
-                                                                        << "Fresenius Optiflux F160NRe"
-                                                                        << "Fresenius Optiflux F180NRe")
-
-    PROPERTY(bool, continueEnabled, false)  
-
     AdjustParametersValidationRequestData treatmentData; // OK
-    AdjustParametersConfirmRequestData  confirmTreatmentRequest;
 
     bool          validate(const AdjustParametersValidationRequestData &vData);
     void          setTreatmentData();
@@ -230,13 +226,15 @@
 
 private slots:
     bool onActionReceive(AdjustParametersValidationResponseData data);
+    void onSettingsDone();
 
 public slots:
     void doResetCreateTreatment();
     void doValidation();
     void doConfirm();
     void doCancel();
     void doUserModifiedParameters();
+
     QStringList doGetPrescriptionParameterNames();
     QStringList doGetPrescriptionParameterValues();
     QStringList doGetOperatingParameterNames();