Index: sources/storage/TreatmentLog.cpp
===================================================================
diff -u -rea37bc16ab57586729e332c2a9df3299f91012ca -rc16cfee6212ad1ba9f788c41d4a4c916daa43c9c
--- sources/storage/TreatmentLog.cpp	(.../TreatmentLog.cpp)	(revision ea37bc16ab57586729e332c2a9df3299f91012ca)
+++ sources/storage/TreatmentLog.cpp	(.../TreatmentLog.cpp)	(revision c16cfee6212ad1ba9f788c41d4a4c916daa43c9c)
@@ -226,32 +226,33 @@
     // SRSUI910 : PRS178 : Clinical - Data - Order
 
     bool isHeparinOff = vHeparinBolusVolumeOff && vHeparinDispensingRateOff;
+    Q_UNUSED(isHeparinOff);
 
     // 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.mActualTreatmentDuration   / 60 ); // Converted seconds to minutes.
-    QString mTreatmentStartDateTime     = Format::fromEpoch(              vData.mTreatmentStartEpoch       ,      _datetimeFormat);
-    QString mTreatmentEndDateTime       = Format::fromEpoch(              vData.mTreatmentEndEpoch         ,      _datetimeFormat);
+//    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.
-    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      );
+//    // 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      );
 
 
     // init/fill/clear the _values
     clearModel();
 
     // TODO in treatment log story  LDT-2500 or LDT-2506
     _values[ePatientID                  ] = vPatientID.trimmed()                                     ;
-//    _values[eBloodFlowRate              ] = mStrText.arg(vData.mBloodFlowRate                       );
+    _values[eBloodFlowRate              ] = mStrText.arg(vData.mBloodFlowRate                       );
 //    _values[eDialysateFlowRate          ] = mStrText.arg(vData.mDialysateFlowRate                   );
 //    _values[eTreatmentDuration          ] = mTreatmentDuration                                       ;
 //    _values[eActualTreatmentDuration    ] = mActualTreatmentDuration                                 ;
@@ -275,12 +276,12 @@
 //    _values[eActualUFRate               ] = mStrText.arg(vData.mActualUFRate                ,FLOAT3 );
 //    _values[eSalineBolusVolume          ] = mStrText.arg(vData.mSalineBolusVolume                   );
 
-    _values[eHeparinType                ] = isHeparinOff                ? tr("NONE") : mHeparinType                                             ;
-//    _values[eHeparinConcentration       ] = isHeparinOff                ? tr("NONE") : mStrText.arg(vData.mHeparinConcentration                );
-    _values[eHeparinBolusVolume         ] = vHeparinBolusVolumeOff      ? tr("OFF" ) : mStrText.arg(vData.mHeparinBolusVolume          ,FLOAT3 );
-    _values[eHeparinDispenseRate        ] = vHeparinDispensingRateOff   ? tr("OFF" ) : mStrText.arg(vData.mHeparinDispenseRate         ,FLOAT3 );
-//    _values[eHeparinStop                ] = vHeparinDispensingRateOff   ? tr("OFF" ) : mStrText.arg(vData.mHeparinStop                         );
-    _values[eHeparinDeliveredVolume     ] = isHeparinOff                ? tr("OFF" ) : mStrText.arg(vData.mHeparinDeliveredVolume      ,FLOAT3 );
+//    _values[eHeparinType                ] = isHeparinOff                ? tr("NONE") : mHeparinType                                             ;
+////    _values[eHeparinConcentration       ] = isHeparinOff                ? tr("NONE") : mStrText.arg(vData.mHeparinConcentration                );
+//    _values[eHeparinBolusVolume         ] = vHeparinBolusVolumeOff      ? tr("OFF" ) : mStrText.arg(vData.mHeparinBolusVolume          ,FLOAT3 );
+//    _values[eHeparinDispenseRate        ] = vHeparinDispensingRateOff   ? tr("OFF" ) : mStrText.arg(vData.mHeparinDispenseRate         ,FLOAT3 );
+////    _values[eHeparinStop                ] = vHeparinDispensingRateOff   ? tr("OFF" ) : mStrText.arg(vData.mHeparinStop                         );
+//    _values[eHeparinDeliveredVolume     ] = isHeparinOff                ? tr("OFF" ) : mStrText.arg(vData.mHeparinDeliveredVolume      ,FLOAT3 );
 
     emit didTxCodeReceive("");
 }