Index: sources/view/VTreatmentCreate.h
===================================================================
diff -u -rc8de9dc4cb679628ac9c0c9551bc43ad3c415d4a -r7cc15ae5968205b241a08ca4646f283b8bf97b03
--- sources/view/VTreatmentCreate.h	(.../VTreatmentCreate.h)	(revision c8de9dc4cb679628ac9c0c9551bc43ad3c415d4a)
+++ sources/view/VTreatmentCreate.h	(.../VTreatmentCreate.h)	(revision 7cc15ae5968205b241a08ca4646f283b8bf97b03)
@@ -1,5 +1,4 @@
-#ifndef VCREATETREATMENT_H
-#define VCREATETREATMENT_H
+#pragma once
 
 // Qt
 #include <QObject>
@@ -157,29 +156,27 @@
     const quint32 rinsebackFlowRate_Res                      =   25 ; // PRS 359
 
     enum ACID_ENUM {
-     eAcid01 = 0,
-     eAcid02,
-     eAcid03,
-
-     eAcidUnset = 9999,
+        eAcidUnset  = 9999,
+        eAcid01     =  0,
+        eAcid02         ,
+        eAcid03         ,
     };
 
     enum BICARBONATE_ENUM {
-     eBicarb01 = 0,
+        eBicarbUnset= 9999,
+        eBicarb01   =  0,
 
-     eBicarbUnset = 9999,
     };
 
     enum DIALYZER_ENUM {
-     eDialyzer01 = 0,
-     eDialyzer02,
-     eDialyzer03,
-
      eDialyzerUnset = 9999,
+     eDialyzer01    =  0,
+     eDialyzer02        ,
+     eDialyzer03        ,
+
     };
 
 protected:
-
     TREATMENT_PARAMETER(quint32, bloodFlowRate,                               bloodFlowRate_Def,                bloodFlowRate_Min,                bloodFlowRate_Max,                bloodFlowRate_Res)
     TREATMENT_PARAMETER(quint32, dialysateFlowRate,                       dialysateFlowRate_Def,            dialysateFlowRate_Min,            dialysateFlowRate_Max,            dialysateFlowRate_Res)
     TREATMENT_PARAMETER(quint32, duration,                                         duration_Def,                     duration_Min,                     duration_Max,                     duration_Res)
@@ -202,92 +199,47 @@
 
 protected:
 
-    PROPERTY(QStringList, acidConcentrateOptions, QStringList() << "08-1251-1" << "08-2251-0" << "08-3251-9")
-    PROPERTY(QStringList, bicarbonateConcentrateOptions, QStringList() << "Dimesol - BC-201")
-    PROPERTY(QStringList, dialyzerTypeOptions, QStringList() << "Nipro Elisio-H 17"
-                                                              << "Nipro Elisio-H 19"
-                                                              << "Fresenius Optiflux F160NRe"
-                                                              << "Fresenius Optiflux F180NRe")
+    PROPERTY(QStringList, acidConcentrateOptions        , QStringList() << "08-1251-1"
+                                                                        << "08-2251-0"
+                                                                        << "08-3251-9")
+    PROPERTY(QStringList, bicarbonateConcentrateOptions , QStringList() << "Dimesol - BC-201")
+    PROPERTY(QStringList, dialyzerTypeOptions           , QStringList() << "Nipro Elisio-H 17"
+                                                                        << "Nipro Elisio-H 19"
+                                                                        << "Fresenius Optiflux F160NRe"
+                                                                        << "Fresenius Optiflux F180NRe")
 
     PROPERTY(bool, continueEnabled, false)  
-    PROPERTY(bool, saveTreatmentProfile, false)
 
-    AdjustParametersValidationRequestData treatmentData;
+    AdjustParametersValidationRequestData treatmentData; // OK
+    AdjustParametersConfirmRequestData  confirmTreatmentRequest;
+
     bool          validate(const AdjustParametersValidationRequestData &vData);
-    QString       saveNewTreatment(const QJsonObject &obj, const QString &dir = Treatment_Profiles_Dir);
-    QString       getParameterRangesDataCSV();
-    bool          saveTreatmentRangesCSV(const QString &filename);
-    QJsonObject   loadTreatmentParameterRanges(const QString &path = Treatment_Parameter_Ranges_Path_JSON);
-    QStringList   jsonArrayToStringList(const QJsonArray &arr);
-    bool          indexInItems(quint32 idx, const QStringList &items);
     void          setTreatmentData();
 
 private:
-
-    enum UIRejectReasons {
-        OUT_OF_RANGE,
-        LOW_HIGH_INCOMPATIBLE
-    };
-
-    enum Page {
-        None,
-        CreateTreatment,
-        ConfirmTreatment,
-        Priming,
-        BeginTreatment
-    };
-
-    QHash<UIRejectReasons, const char *> uiRejections {
-        { OUT_OF_RANGE,  "The selected value is out of range." },
-        { LOW_HIGH_INCOMPATIBLE,  "The low and high selections are incompatible." },
-
-    };
-
-    Page pageToShow = None;
-
     QString enumToString(GuiRequestReasons vEnum);
-    AdjustInitTreatmentRequestData initTreatmentRequest;
-    AdjustParametersConfirmRequestData confirmTreatmentRequest;
-    void goToNextPage(bool forward);
 
-
-private slots:
-    void onFinishedSaveNewTreatment(bool result);
-
 signals:
-    void showCreate();
-    void showConfirm();
-    void showPrime();
-    void showBegin();
-    void pop();
-    void showTreatmentStart();
-    void requestValidateParameters(const AdjustParametersValidationRequestData &data);
-    void requestConfirm(const AdjustParametersConfirmRequestData &data);
-    void requestSelectParameters(const AdjustInitTreatmentRequestData &data);
+    void didAdjustment(const AdjustParametersValidationRequestData &data);
+    void didAdjustment(const AdjustParametersConfirmRequestData    &data);
+
     void resetCreateTreatment();
     void fwValidationFailed(QString reason);
     void fwValidationSuccess();
     void scrollToParameter(QString parameter);
-    void requestConcurrentSave(QString, QString, bool);
 
+private slots:
+    bool onActionReceive(AdjustParametersValidationResponseData data);
+
 public slots:
     void doResetCreateTreatment();
-    void doFinishedCreate();
-    void doFinishedConfirm();
-    void doFinishedPrime();
-    void doStartTreatment();
-    bool doActionReceive(AdjustParametersValidationResponseData data);
-    void doActionReceive(const AdjustInitTreatmentResponseData &messageData);
+    void doValidation();
+    void doConfirm();
+    void doCancel();
     void doUserModifiedParameters();
     QStringList doGetPrescriptionParameterNames();
     QStringList doGetPrescriptionParameterValues();
     QStringList doGetOperatingParameterNames();
     QStringList doGetOperatingParameterValues();
-    void doSelectParameters();
-    void doCancelConfirmParameters();
-    void doCancelSelectingParameters();
-    void doRequestPop();
 };
 }
-
-#endif // VCREATETREATMENT_H