Index: sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustTreatmentLog.cpp
===================================================================
diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -re8d73dd5ebca400248f59bf4c3940ff50dee696a
--- sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustTreatmentLog.cpp	(.../VPostTreatmentAdjustTreatmentLog.cpp)	(revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1)
+++ sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustTreatmentLog.cpp	(.../VPostTreatmentAdjustTreatmentLog.cpp)	(revision e8d73dd5ebca400248f59bf4c3940ff50dee696a)
@@ -37,8 +37,8 @@
     ACTION_VIEW_CONNECTION(TreatmentLogAlarmData);
     ACTION_VIEW_CONNECTION(TreatmentLogEventData);
 
-    connect(&_TreatmentLog  , &TreatmentLog::isIdleNotified,
-                              [=](bool vIdle) { isIdle(vIdle); } );
+//    connect(&_TreatmentLog  , &TreatmentLog::didTxCodeReceive,
+//                              [=](const QString &vTxCode) { txCode( vTxCode ); } );
 
     connect(&_TreatmentLog  , &TreatmentLog::didTxCodeReceive,
                               [=](const QString &vTxCode) { txCode( vTxCode ); } );
@@ -53,7 +53,7 @@
  */
 void View::VPostTreatmentAdjustmentTreatmentLog::doRequest() {
     _TreatmentLog.clearModel();
-    parametersText        ( {} );
+//    parametersText        ( {} );
 
     AdjustTreatmentLogRequestData data;
     emit didAdjustment(data);
@@ -79,59 +79,71 @@
 
     // init the TreatmentLog model
     _TreatmentLog.initModel     ( vData, _patientID.trimmed(), heparinBolusVolumeOff(), heparinDispensingRateOff());
-    if ( vData.mAccepted ) {
-        //TODO  Commented out for now
-        // It is needed to display NONE for the heparin items if the heparin set to off on Create Treatment Parameters screen.
-        // The problem is the data comes from the _TreatmentLog model
-        // But if that model changes to have the NONE values, then the CloudSync or Cloud may reject the TxLog.
-        // When the Cloud is updated we can as well update the entire flow.
-        // For now it will only updates the display/Gui value.
-        // Look for the https://diality.atlassian.net/browse/DEN-15911
-        // to know were to update for full model the view update.
-        // When the model updated the valueGui() can be removed and valuesLog() can be used.
-        parametersText          ( _TreatmentLog.values() );
-    } else {
-        parametersText          ( {} );
-    }
 
     // raw values
-    bloodFlowRate               ( vData.mBloodFlowRate              );
-    dialysateFlowRate           ( vData.mDialysateFlowRate          );
-    treatmentDuration           ( vData.mTreatmentDuration          );
-    actualTreatmentDuration     ( vData.mActualTreatmentDuration    );
-    acidConcentrateType         ( vData.mAcidConcentrateType        );
-    bicarbonateConcentrateType  ( vData.mBicarbonateConcentrateType );
-    potassiumConcentration      ( vData.mPotassiumConcentration     );
-    calciumConcentration        ( vData.mCalciumConcentration       );
-    bicarbonateConcentration    ( vData.mBicarbonateConcentration   );
-    sodiumConcentration         ( vData.mSodiumConcentration        );
-    dialysateTemperature        ( vData.mDialysateTemperature       );
-    dialyzerType                ( vData.mDialyzerType               );
-    treatmentStartEpoch         ( vData.mTreatmentStartEpoch        );
-    treatmentEndEpoch           ( vData.mTreatmentEndEpoch          );
-    averageBloodFlow            ( vData.mAverageBloodFlow           );
-    averageDialysateFlow        ( vData.mAverageDialysateFlow       );
-    dialysateVolumeUsed         ( vData.mDialysateVolumeUsed        );
-    averageDialysateTemp        ( vData.mAverageDialysateTemp       );
-    originUFVolume              ( vData.mOriginUFVolume             );
-    targetUFVolume              ( vData.mTargetUFVolume             );
-    actualUFVolume              ( vData.mActualUFVolume             );
-    originUFRate                ( vData.mOriginUFRate               );
-    targetUFRate                ( vData.mTargetUFRate               );
-    actualUFRate                ( vData.mActualUFRate               );
-    salineBolusVolume           ( vData.mSalineBolusVolume          );
-    heparinBolusVolume          ( vData.mHeparinBolusVolume         );
-    heparinDispenseRate         ( vData.mHeparinDispenseRate        );
-    heparinStop                 ( vData.mHeparinStop                );
-    heparinDeliveredVolume      ( vData.mHeparinDeliveredVolume     );
-    averageArterialPressure     ( vData.mAverageArterialPressure    );
-    averageVenousPressure       ( vData.mAverageVenousPressure      );
-    deviceID                    ( vData.mDeviceID                   );
-    waterSampleTestResult       ( vData.mWaterSampleTestResult      );
+    bloodFlowRate                     ( vData.mBloodFlowRate                        );
+    bloodFlowRateActual               ( vData.mBloodFlowRateActual                  );
+    dialysateFlowRate                 ( vData.mDialysateFlowRate                    );
+    dialysateFlowRateActual           ( vData.mDialysateFlowRateActual              );
+    treatmentDuration                 ( vData.mTreatmentDuration                    );
+    treatmentDurationActual           ( vData.mTreatmentDurationActual              );
+    acidConcentrateType               ( vData.mAcidConcentrateType                  );
+    acidConcentrateTypeActual         ( vData.mAcidConcentrateTypeActual            );
+    bicarbonateCartridgeSize          ( vData.mBicarbonateCartridgeSize             );
+    bicarbonateCartridgeSizeActual    ( vData.mBicarbonateCartridgeSizeActual       );
+    potassiumConcentration            ( vData.mPotassiumConcentration               );
+    potassiumConcentrationActual      ( vData.mPotassiumConcentrationActual         );
+    calciumConcentration              ( vData.mCalciumConcentration                 );
+    calciumConcentrationActual        ( vData.mCalciumConcentrationActual           );
+    bicarbonateConcentration          ( vData.mBicarbonateConcentration             );
+    bicarbonateConcentrationActual    ( vData.mBicarbonateConcentrationActual       );
+    sodiumConcentration               ( vData.mSodiumConcentration                  );
+    sodiumConcentrationActual         ( vData.mSodiumConcentrationActual            );
+    vitalsInterval                    ( vData.mVitalsInterval                       );
+    vitalsIntervalActual              ( vData.mVitalsIntervalActual                 );
+    dialyzerType                      ( vData.mDialyzerType                         );
+    treatmentStartEpoch               ( vData.mTreatmentStartEpoch                  );
+    treatmentEndEpoch                 ( vData.mTreatmentEndEpoch                    );
+    fluidBolusVolume                  ( vData.mFluidBolusVolume                     );
+    fluidBolusVolumeActual            ( vData.mFluidBolusVolumeActual               );
+    heparinType                       ( vData.mHeparinType                          );
+    heparinDeliveryDuration           ( vData.mHeparinDeliveryDuration              );
+    heparinDeliveryDurationActual     ( vData.mHeparinDeliveryDurationActual        );
+    treatmentModality                 ( vData.mTreatmentModality                    );
+    treatmentModalityActual           ( vData.mTreatmentModalityActual              );
+    hDFOperatingMode                  ( vData.mHDFOperatingMode                     );
+    hDFOperatingModeActual            ( vData.mHDFOperatingModeActual               );
+    hepatitisStatus                   ( vData.mHepatitisStatus                      );
+    dialysateTemperature              ( vData.mDialysateTemperature                 );
+    dialysateTemperatureActual        ( vData.mDialysateTemperatureActual           );
+    dialysateVolumeUsed               ( vData.mDialysateVolumeUsed                  );
+    heparinBolusVolume                ( vData.mHeparinBolusVolume                   );
+    heparinBolusVolumeActual          ( vData.mHeparinBolusVolumeActual             );
+    heparinDispenseRate               ( vData.mHeparinDispenseRate                  );
+    heparinDispenseRateActual         ( vData.mHeparinDispenseRateActual            );
+    heparinDeliveredVolume            ( vData.mHeparinDeliveredVolume               );
+    averageArterialPressure           ( vData.mAverageArterialPressure              );
+    averageVenousPressure             ( vData.mAverageVenousPressure                );
+    uFVolume                          ( vData.mUFVolume                             );
+    uFVolumeActual                    ( vData.mUFVolumeActual                       );
+    uFVolumeTarget                    ( vData.mUFVolumeTarget                       );
+    uFRate                            ( vData.mUFRate                               );
+    uFRateActual                      ( vData.mUFRateActual                         );
+    uFRateTarget                      ( vData.mUFRateTarget                         );
+    substitutionVolume                ( vData.mSubstitutionVolume                   );
+    substitutionVolumeActual          ( vData.mSubstitutionVolumeActual             );
+    substitutionVolumeTarget          ( vData.mSubstitutionVolumeTarget             );
+    substitutionRate                  ( vData.mSubstitutionRate                     );
+    substitutionRateActual            ( vData.mSubstitutionRateActual               );
+    substitutionRateTarget            ( vData.mSubstitutionRateTarget               );
+    isoUfVolume                       ( vData.mIsoUfVolume                          );
+    isoUfVolumeActual                 ( vData.mIsoUfVolumeActual                    );
+    isoUfVolumeTarget                 ( vData.mIsoUfVolumeTarget                    );
+    isoUfRate                         ( vData.mIsoUfRate                            );
+    isoUfRateActual                   ( vData.mIsoUfRateActual                      );
+    isoUfRateTarget                   ( vData.mIsoUfRateTarget                      );
+    waterSampleTestResult             ( vData.mWaterSampleTestResult                );
 
-    heparinType                 ( vData.mHeparinType                );
-    heparinConcentration        ( vData.mHeparinConcentration       );
-
     if (adjustment_Accepted())
         _TreatmentLog.doSave();