Index: sources/storage/TreatmentLog.cpp
===================================================================
diff -u -rdc8969f6c7bbdb46d2de22622e58e457ceb37df4 -r1eedad37ea1cad5c9aa41ac082614d082f525a7f
--- sources/storage/TreatmentLog.cpp	(.../TreatmentLog.cpp)	(revision dc8969f6c7bbdb46d2de22622e58e457ceb37df4)
+++ sources/storage/TreatmentLog.cpp	(.../TreatmentLog.cpp)	(revision 1eedad37ea1cad5c9aa41ac082614d082f525a7f)
@@ -222,29 +222,22 @@
 {
     // Formatted values
     QString mStrText = "%1";
-    // DEBUG: qDebug() << _Settings.groups();
-    // SRSUI910 : PRS178 : Clinical - Data - Order
 
-
-    // TODO LDT-2500 or LDT-2506
-//    QString mTreatmentDurationFmt       = QTime            (0, 0).addSecs(int(vData.mTreatmentDuration          )).toString(_timeFormat);
-//    QString mActualTreatmentDurationFmt = QTime            (0, 0).addSecs(int(vData.mActualTreatmentDuration    )).toString(_timeFormat);
     QString mTreatmentDuration          = QString::number(vData.mTreatmentDuration         / 60 ); // Converted seconds to minutes.
     QString mActualTreatmentDuration    = QString::number(vData.mTreatmentDurationActual   / 60 ); // Converted seconds to minutes.
     QString mTreatmentStartDateTime     = Format::fromEpoch(              vData.mTreatmentStartEpoch       ,      _datetimeFormat);
     QString mTreatmentEndDateTime       = Format::fromEpoch(              vData.mTreatmentEndEpoch         ,      _datetimeFormat);
 
-//    // TODO : The settings needs modification not only to define the category and groups in a common header but also the settings itself needs some mods.
-//    // - the category shall become as part of the group
-//    // - the structure of the settings should become horizontal which vertical now.
+    // TODO : The settings needs modification not only to define the category and groups in a common header but also the settings itself needs some mods.
+    // - the category shall become as part of the group
+    // - the structure of the settings should become horizontal which vertical now.
     QString mCategory                   = Storage::Settings_Category_DataList;
     QString mAcidConcentrateType        = _Settings.key(mCategory, "Acid Concentrate Options"          , vData.mAcidConcentrateType        );
     QString mBicarbonateConcentrateType = _Settings.key(mCategory, "Bicarbonate Concentrate Options"   , vData.mBicarbonateCartridgeSize   );
     QString mDialyzerType               = _Settings.key(mCategory, "Dialyzer Type Options"             , vData.mDialyzerType               );
     QString mHeparinType                = _Settings.key(mCategory, "Heparin Type Options"              , vData.mHeparinType                );
-    QString mWaterSampleTestResult      = _Settings.key(mCategory, "Water Sample Result"               , vData.mWaterSampleTestResult      );
-    bool isHeparinOff               = vData.mHeparinBolusVolume  == 0;
-    bool isHeparinDispensingRateOff = vData.mHeparinDispenseRate == 0;
+    bool isHeparinOff                   = vData.mHeparinBolusVolume  == 0;
+    bool isHeparinDispensingRateOff     = vData.mHeparinDispenseRate == 0;
 
     // init/fill/clear the _values
     clearModel();
@@ -267,21 +260,20 @@
     _values[eDialyzerType               ] = mDialyzerType                                            ;
     _values[eTreatmentStartDateTime     ] = mTreatmentStartDateTime                                  ;
     _values[eTreatmentEndDateTime       ] = mTreatmentEndDateTime                                    ;
-    _values[eWaterSampleTestResult      ] = mWaterSampleTestResult                                   ;
+    _values[eWaterSampleTestResult      ] = mStrText.arg(vData.mWaterSampleTestResult               );
     _values[eDialysateVolumeUsed        ] = mStrText.arg(vData.mDialysateVolumeUsed         ,FLOAT3 );
     _values[eOriginUFVolume             ] = mStrText.arg(vData.mUFVolume                    ,FLOAT3 );
     _values[eTargetUFVolume             ] = mStrText.arg(vData.mUFVolumeTarget              ,FLOAT3 );
     _values[eActualUFVolume             ] = mStrText.arg(vData.mUFVolumeActual              ,FLOAT3 );
     _values[eOriginUFRate               ] = mStrText.arg(vData.mUFRate                      ,FLOAT3 );
     _values[eTargetUFRate               ] = mStrText.arg(vData.mUFRateTarget                ,FLOAT3 );
     _values[eActualUFRate               ] = mStrText.arg(vData.mUFRateActual                ,FLOAT3 );
-    _values[eSalineBolusVolume          ] = mStrText.arg(vData.mFluidBolusVolume                    );
+    _values[eFluidBolusVolume           ] = mStrText.arg(vData.mFluidBolusVolume                    );
     _values[eHeparinBolusVolume         ] = mStrText.arg(vData.mHeparinBolusVolume          ,FLOAT3 );
 
     _values[eHeparinType                ] = isHeparinOff                ? tr("NONE") : mHeparinType                                             ;
-    _values[eHeparinConcentration       ] = isHeparinOff                ? tr("NONE") : mStrText.arg(vData.mHeparinType                          );
     _values[eHeparinDispenseRate        ] = isHeparinDispensingRateOff  ? tr("OFF" ) : mStrText.arg(vData.mHeparinDispenseRate          ,FLOAT3 );
-    _values[eHeparinStop                ] = isHeparinDispensingRateOff  ? tr("OFF" ) : mStrText.arg(vData.mHeparinDeliveryDuration              );
+    _values[eHeparinDeliveryDuration    ] = isHeparinDispensingRateOff  ? tr("OFF" ) : mStrText.arg(vData.mHeparinDeliveryDuration              );
     _values[eHeparinDeliveredVolume     ] = isHeparinOff                ? tr("OFF" ) : mStrText.arg(vData.mHeparinDeliveredVolume       ,FLOAT3 );
 
     emit didTxCodeReceive("");
@@ -291,7 +283,7 @@
  * \brief TreatmentLog::append
  * \param vData - the received data to be kept in the list to be appended at the end of the Treatment Log
  */
-void TreatmentLog::append(const TreatmentLogAvrgeData &vData) { _treatmentLogAvrgeData.append(vData); qDebug("TreatmentLogAvrgeData");}
+void TreatmentLog::append(const TreatmentLogAvrgeData &vData) { _treatmentLogAvrgeData.append(vData); }
 void TreatmentLog::append(const TreatmentLogAlarmData &vData) { _treatmentLogAlarmData.append(vData); }
 void TreatmentLog::append(const TreatmentLogEventData &vData) { _treatmentLogEventData.append(vData); }
 
@@ -390,12 +382,11 @@
     ADDTOLOG( eDialysateTemperature             );
     ADDTOLOG( eDialyzerType                     );
     ADDTOLOG( eHeparinType                      );
-    ADDTOLOG( eHeparinConcentration             );
     ADDTOLOG( eHeparinBolusVolume               );
     ADDTOLOG( eHeparinDispenseRate              );
-    ADDTOLOG( eHeparinStop                      );
+    ADDTOLOG( eHeparinDeliveryDuration          );
 
-    ADDTITLE("Treatment Report"                   );
+    ADDTITLE("Treatment Report"                 );
     ADDTOLOG( eTreatmentStartDateTime           );
     ADDTOLOG( eTreatmentEndDateTime             );
     ADDTOLOG( eActualTreatmentDuration          );
@@ -407,7 +398,7 @@
     ADDTOLOG( eOriginUFRate                     );
     ADDTOLOG( eTargetUFRate                     );
     ADDTOLOG( eActualUFRate                     );
-    ADDTOLOG( eSalineBolusVolume                );
+    ADDTOLOG( eFluidBolusVolume                 );
     ADDTOLOG( eHeparinDeliveredVolume           );
     ADDTOLOG( eWaterSampleTestResult            );