Index: sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustTreatmentLog.cpp
===================================================================
diff -u -re125bd5cf13750eaf241d518b9c846139afaa81c -r2216ac6ac7f77437a7c29ac8b4043be01bc4609e
--- sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustTreatmentLog.cpp	(.../VPostTreatmentAdjustTreatmentLog.cpp)	(revision e125bd5cf13750eaf241d518b9c846139afaa81c)
+++ sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustTreatmentLog.cpp	(.../VPostTreatmentAdjustTreatmentLog.cpp)	(revision 2216ac6ac7f77437a7c29ac8b4043be01bc4609e)
@@ -14,20 +14,38 @@
  */
 #include "VPostTreatmentAdjustTreatmentLog.h"
 
+// Qt
+#include <QtConcurrent/QtConcurrent>
+#include <QFuture>
+
 // Project
 #include "GuiController.h"
+#include "FileHandler.h"
 
+using namespace Storage;
+
 VIEW_DEF_CLASS_ADJUSTMENT(VPostTreatmentAdjustmentTreatmentLog)
 
 /*! \brief   Connection Initializer
     \details All the class signal/slot connections are defined here.
 */
 void View::VPostTreatmentAdjustmentTreatmentLog::initConnections() {
-    ADJUST_VIEW_CONNECTION(AdjustTreatmentLogRequestData);
+    ADJUST_VIEW_CONNECTION(AdjustTreatmentLogRequestData );
     ACTION_VIEW_CONNECTION(AdjustTreatmentLogResponseData);
+    connect(&_TreatmentLog  , &TreatmentLog::isIdleNotified,
+            this            , [=](bool vIdle){isIdle(vIdle);});
 }
 
 /*!
+ * \brief   View::VPostTreatmentAdjustmentTreatmentLog::doRequest
+ * \details the invocable slot to send user's treatment log request
+ */
+void View::VPostTreatmentAdjustmentTreatmentLog::doRequest() {
+    AdjustTreatmentLogRequestData data;
+    emit didAdjustment(data);
+}
+
+/*!
  * \brief   VPostTreatmentAdjustmentUltrafiltrationInit::onActionReceive
  * \details received response model data handler
  * \param   vData - model data
@@ -37,43 +55,8 @@
     adjustment_Accepted         ( vData.mAccepted                   );
     adjustment_Reason           ( vData.mReason                     );
 
-    // Formatted values
-    QStringList mParametersText;
-    QString mStr = "%1";
-    mParametersText += mStr.arg(vData.mBloodFlowRate                        );
-    mParametersText += mStr.arg(vData.mDialysateFlowRate                    );
-    mParametersText += mStr.arg(vData.mTreatmentDuration                    );
-    mParametersText += mStr.arg(vData.mActualTreatmentDuration              );
-    mParametersText += mStr.arg(vData.mAcidConcentrateType                  );
-    mParametersText += mStr.arg(vData.mBicarbonateConcentrateType           );
-    mParametersText += mStr.arg(vData.mPotassiumConcentration               );
-    mParametersText += mStr.arg(vData.mCalciumConcentration                 );
-    mParametersText += mStr.arg(vData.mBicarbonateConcentration             );
-    mParametersText += mStr.arg(vData.mSodiumConcentration                  );
-    mParametersText += mStr.arg(vData.mDialysateTemperature         ,0,'f',3);
-    mParametersText += mStr.arg(vData.mDialyzerType                         );
-    mParametersText += mStr.arg(vData.mTreatmentDateTime                    );
-    mParametersText += mStr.arg(vData.mAverageBloodFlow             ,0,'f',3);
-    mParametersText += mStr.arg(vData.mAverageDialysateFlow         ,0,'f',3);
-    mParametersText += mStr.arg(vData.mDialysateVolumeUsed          ,0,'f',3);
-    mParametersText += mStr.arg(vData.mAverageDialysateTemp         ,0,'f',3);
-    mParametersText += mStr.arg(vData.mTargetUFVolume               ,0,'f',3);
-    mParametersText += mStr.arg(vData.mActualUFVolume               ,0,'f',3);
-    mParametersText += mStr.arg(vData.mTargetUFRate                 ,0,'f',3);
-    mParametersText += mStr.arg(vData.mActualUFRate                 ,0,'f',3);
-    mParametersText += mStr.arg(vData.mSalineBolusVolume                    );
-    mParametersText += mStr.arg(vData.mHeparinType                          );
-    mParametersText += mStr.arg(vData.mHeparinConcentration                 );
-    mParametersText += mStr.arg(vData.mHeparinBolusVolume           ,0,'f',3);
-    mParametersText += mStr.arg(vData.mHeparinDispenseRate          ,0,'f',3);
-    mParametersText += mStr.arg(vData.mHeparinPreStop                       );
-    mParametersText += mStr.arg(vData.mHeparinDeliveredVolume       ,0,'f',3);
-    mParametersText += mStr.arg(vData.mAverageArterialPressure      ,0,'f',3);
-    mParametersText += mStr.arg(vData.mAverageVenousPressure        ,0,'f',3);
-    mParametersText += mStr.arg(vData.mEndTreatmentEarlyAlarm               );
-    mParametersText += mStr.arg(vData.mDeviceID                             );
-    mParametersText += mStr.arg(vData.mWaterSampleTestResult                );
-    parametersText( mParametersText );
+    _TreatmentLog.initModel(vData);
+    parametersText              ( _TreatmentLog.values() );
 
     // raw values
     bloodFlowRate               ( vData.mBloodFlowRate              );
@@ -102,26 +85,22 @@
     heparinConcentration        ( vData.mHeparinConcentration       );
     heparinBolusVolume          ( vData.mHeparinBolusVolume         );
     heparinDispenseRate         ( vData.mHeparinDispenseRate        );
-    heparinPreStop              ( vData.mHeparinPreStop             );
+    heparinStop                 ( vData.mHeparinStop                );
     heparinDeliveredVolume      ( vData.mHeparinDeliveredVolume     );
     averageArterialPressure     ( vData.mAverageArterialPressure    );
     averageVenousPressure       ( vData.mAverageVenousPressure      );
     endTreatmentEarlyAlarm      ( vData.mEndTreatmentEarlyAlarm     );
     deviceID                    ( vData.mDeviceID                   );
     waterSampleTestResult       ( vData.mWaterSampleTestResult      );
 
+    if (adjustment_Accepted())
+        _TreatmentLog.doSave();
 
-
     // *** has to be the last to let the information to be set and then emit the signal ***
     // *** otherwise will use the Previous values before being set.                     ***
     adjustment                  ( true );
 }
 
-/*!
- * \brief   View::VPostTreatmentAdjustmentTreatmentLog::doConfirm
- * \details the invocable slot to send user's Disposables Removal confirm
- */
-void View::VPostTreatmentAdjustmentTreatmentLog::doRequest() {
-    AdjustTreatmentLogRequestData data;
-    emit didAdjustment(data);
+void View::VPostTreatmentAdjustmentTreatmentLog::doExport() {
+    _TreatmentLog.doExport();
 }