Index: sources/storage/TreatmentLog.cpp
===================================================================
diff -u -r0c983aea7de7480e86739469f5a64ad18b244634 -r0f1aa395dfb46e006bdec10d0bb99f2ed27739bf
--- sources/storage/TreatmentLog.cpp	(.../TreatmentLog.cpp)	(revision 0c983aea7de7480e86739469f5a64ad18b244634)
+++ sources/storage/TreatmentLog.cpp	(.../TreatmentLog.cpp)	(revision 0f1aa395dfb46e006bdec10d0bb99f2ed27739bf)
@@ -23,6 +23,9 @@
 #include "Logger.h"
 #include "MSettings.h"
 
+#include "GuiGlobals.h"
+#include "MAlarmStatusData.h"
+
 using namespace Storage;
 
 #define NONE   "N/A"
@@ -88,8 +91,10 @@
     _values.clear();
     for (int i = 0; i < eTreatmentLogIndexCount; i++) _values << "";
 
+    _deviceID                             = mStrText.arg(vData.mDeviceID                            );
+
     _values[ePatientID                  ] = vPatientID.trimmed()                                     ;
-    _values[eDeviceID                   ] = mStrText.arg(vData.mDeviceID                            );
+//    _values[eDeviceID                   ] = mStrText.arg(vData.mDeviceID                            ); // removed during our meeting with Sean and Jahnavi 04/11/2022@16:00.
     _values[eBloodFlowRate              ] = mStrText.arg(vData.mBloodFlowRate                       );
     _values[eDialysateFlowRate          ] = mStrText.arg(vData.mDialysateFlowRate                   );
     _values[eTreatmentDuration          ] = mTreatmentDuration                                       ;
@@ -119,11 +124,11 @@
     _values[eTargetUFRate               ] = mStrText.arg(vData.mTargetUFRate                ,FLOAT3 );
     _values[eActualUFRate               ] = mStrText.arg(vData.mActualUFRate                ,FLOAT3 );
     _values[eSalineBolusVolume          ] = mStrText.arg(vData.mSalineBolusVolume                   );
-    _values[eAverageBloodFlow           ] = mStrText.arg(vData.mAverageBloodFlow            ,FLOAT3 );
-    _values[eAverageDialysateFlow       ] = mStrText.arg(vData.mAverageDialysateFlow        ,FLOAT3 );
-    _values[eAverageDialysateTemp       ] = mStrText.arg(vData.mAverageDialysateTemp        ,FLOAT3 );
-    _values[eAverageArterialPressure    ] = mStrText.arg(vData.mAverageArterialPressure     ,FLOAT3 );
-    _values[eAverageVenousPressure      ] = mStrText.arg(vData.mAverageVenousPressure       ,FLOAT3 );
+//    _values[eAverageBloodFlow           ] = mStrText.arg(vData.mAverageBloodFlow            ,FLOAT3 );  // removed during our meeting with Sean and Jahnavi 04/11/2022@16:00.
+//    _values[eAverageDialysateFlow       ] = mStrText.arg(vData.mAverageDialysateFlow        ,FLOAT3 );  // removed during our meeting with Sean and Jahnavi 04/11/2022@16:00.
+//    _values[eAverageDialysateTemp       ] = mStrText.arg(vData.mAverageDialysateTemp        ,FLOAT3 );  // removed during our meeting with Sean and Jahnavi 04/11/2022@16:00.
+//    _values[eAverageArterialPressure    ] = mStrText.arg(vData.mAverageArterialPressure     ,FLOAT3 );  // removed during our meeting with Sean and Jahnavi 04/11/2022@16:00.
+//    _values[eAverageVenousPressure      ] = mStrText.arg(vData.mAverageVenousPressure       ,FLOAT3 );  // removed during our meeting with Sean and Jahnavi 04/11/2022@16:00.
 }
 
 /*!
@@ -212,9 +217,9 @@
 
     ADDTITLE("Title");
     ADDTOLOG( ePatientID                        );
-    ADDTOLOG( eDeviceID                         );
+//    ADDTOLOG( eDeviceID                         ); PRS 180: will be used only for the name not in the content.
 
-    ADDTITLE("Treatment Prescription"           );
+    ADDTITLE("Treatment Parameters"             );
     ADDTOLOG( eTreatmentDuration                );
     ADDTOLOG( eBloodFlowRate                    );
     ADDTOLOG( eDialysateFlowRate                );
@@ -232,35 +237,35 @@
     ADDTOLOG( eHeparinDispenseRate              );
     ADDTOLOG( eHeparinStop                      );
 
-    ADDTITLE("Treatment Parameters"             );
+    ADDTITLE("Treatment Time"                   );
     ADDTOLOG( eTreatmentStartDateTime           );
     ADDTOLOG( eTreatmentEndDateTime             );
     ADDTOLOG( eActualTreatmentDuration          );
 
-    ADDTITLE("Post-Treatment Data"              );
+    ADDTITLE("Device Treatment Data"            );
     ADDTOLOG( eDialysateVolumeUsed              );
     ADDTOLOG( eOriginUFVolume                   );
     ADDTOLOG( eTargetUFVolume                   );
     ADDTOLOG( eActualUFVolume                   );
+    ADDTOLOG( eOriginUFRate                     );
+    ADDTOLOG( eTargetUFRate                     );
+    ADDTOLOG( eActualUFRate                     );
     ADDTOLOG( eSalineBolusVolume                );
     ADDTOLOG( eHeparinDeliveredVolume           );
 
     ADDTITLE("Extra"                            );
     ADDTOLOG( eWaterSampleTestResult            );
-    ADDTOLOG( eOriginUFRate                     );
-    ADDTOLOG( eTargetUFRate                     );
-    ADDTOLOG( eActualUFRate                     );
-    ADDTOLOG( eAverageBloodFlow                 );
-    ADDTOLOG( eAverageDialysateFlow             );
-    ADDTOLOG( eAverageDialysateTemp             );
-    ADDTOLOG( eAverageArterialPressure          );
-    ADDTOLOG( eAverageVenousPressure            );
+//    ADDTOLOG( eAverageBloodFlow                 ); // removed during our meeting with Sean and Jahnavi 04/11/2022@16:00.
+//    ADDTOLOG( eAverageDialysateFlow             ); // removed during our meeting with Sean and Jahnavi 04/11/2022@16:00.
+//    ADDTOLOG( eAverageArterialPressure          ); // removed during our meeting with Sean and Jahnavi 04/11/2022@16:00.
+//    ADDTOLOG( eAverageVenousPressure            ); // removed during our meeting with Sean and Jahnavi 04/11/2022@16:00.
+//    ADDTOLOG( eAverageDialysateTemp             ); // removed during our meeting with Sean and Jahnavi 04/11/2022@16:00.
 
     ADDTITLE("Treatment Data"                   );
     for ( const TreatmentLogAvrgeData &item : _treatmentLogAvrgeData ) {
         QString line;
         line += csv.arg(item.mTimeStamp         );
-        line += csv.arg(NONE                    );
+//        line += csv.arg(NONE                    ); // removed during our meeting with Sean and Jahnavi 04/11/2022@16:00.
         line += csv.arg(item.mBloodFlowRate     );
         line += csv.arg(item.mDialysateFlowRate );
         line += csv.arg(item.mUFRate            ,FLOAT3 );
@@ -275,10 +280,11 @@
     ADDTITLE("Treatment Alarms"                 );
     for ( const TreatmentLogAlarmData &item : _treatmentLogAlarmData ) {
         QString line;
+        // TODO : QString alarmText = Model::MAlarmStatus::toText(static_cast<Gui::GuiAlarmID>(item.mAlarmID));
         line += csv.arg(item.mTimeStamp         );
-        line += csv.arg(item.mAlarmID           );
-        line += csv.arg(item.mParam1            );
-        line += end.arg(item.mParam2            );
+        line += csv.arg(item.mAlarmID           ); // may need to change, during our discussion with Sean and I 04/11/2022. to alarmText
+        line += csv.arg(item.mParam1            ); // may need to remove, during our discussion with Sean and I 04/11/2022.
+        line += end.arg(item.mParam2            ); // may need to remove, during our discussion with Sean and I 04/11/2022.
         ADDALINE(line);
     }
 
@@ -298,7 +304,7 @@
     _lastTxInfo.mDateTime.replace(":", "" ); // remove  time separator
     _lastTxInfo.mDateTime.replace(" ", "_"); // replace spaces
 
-    _lastTxInfo.mDeviceID   = _values[eDeviceID];
+    _lastTxInfo.mDeviceID   = _deviceID;
     _lastTxInfo.mPatientID  = _values[ePatientID];
     _lastTxInfo.mFileName   = QString("%1%2_%3.log")
             .arg(_treatmentLogPath)