Index: sources/storage/TreatmentLog.h
===================================================================
diff -u -r13d6a4fae2f910ab6e289ac9280258a94f734405 -r1c18f738693756ca1f0342c2cc158e32bc28f90b
--- sources/storage/TreatmentLog.h	(.../TreatmentLog.h)	(revision 13d6a4fae2f910ab6e289ac9280258a94f734405)
+++ sources/storage/TreatmentLog.h	(.../TreatmentLog.h)	(revision 1c18f738693756ca1f0342c2cc158e32bc28f90b)
@@ -31,6 +31,11 @@
 
 namespace Storage {
 
+
+/*!
+ * \brief The TreatmentLog class
+ * This class is the controller which converts/saves/exports model to be used in the UI/TreatmentLog
+ */
 class TreatmentLog : public QObject
 {
     Q_OBJECT
@@ -55,6 +60,13 @@
     QString _unitTextDispencingRate         = tr("mL/hr"    );
     QString _unitTextBloodPressure          = tr("mmHg"     );
 
+
+    enum Role {
+        eValue,
+        eTitle,
+        eUnit
+    };
+
     enum TreatmentLogIndex {
         eDeviceID                           ,
         eBloodFlowRate                      ,
@@ -75,7 +87,8 @@
         eHeparinDispenseRate                ,
         eHeparinStop                        ,
         eHeparinDeliveredVolume             ,
-        eTreatmentDateTime                  ,
+        eTreatmentStartDateTime             ,
+        eTreatmentEndDateTime               ,
         eWaterSampleTestResult              ,
         eDialysateVolumeUsed                ,
         eTargetUFVolume                     ,
@@ -88,7 +101,6 @@
         eAverageDialysateTemp               ,
         eAverageArterialPressure            ,
         eAverageVenousPressure              ,
-        eEndTreatmentEarlyAlarm             ,
 
         eTreatmentLogIndexCount
     };
@@ -113,7 +125,8 @@
         tr("Heparin Dispense Rate"          ),
         tr("Heparin Stop"                   ),
         tr("Heparin Delivered Volume"       ),
-        tr("Treatment DateTime"             ),
+        tr("Treatment Start DateTime"       ),
+        tr("Treatment End DateTime"         ),
         tr("Water Sample Test Result"       ),
         tr("Dialysate Volume Used"          ),
         tr("Target UF Volume"               ),
@@ -126,7 +139,6 @@
         tr("Average Dialysate Temp"         ),
         tr("Average Arterial Pressure"      ),
         tr("Average Venous Pressure"        ),
-        tr("End Treatment Early Alarm"      ),
     };
 
     const QStringList _units {
@@ -151,6 +163,7 @@
         _unitTextFluid                      ,
         ""                                  ,
         ""                                  ,
+        ""                                  ,
         _unitTextVolume                     ,
         _unitTextVolume                     ,
         _unitTextVolume                     ,
@@ -162,9 +175,21 @@
         _unitTextTemperature                ,
         _unitTextBloodPressure              ,
         _unitTextBloodPressure              ,
-        ""                                  ,
     };
 
+    QString title(quint8 vIndex) const {
+        if (vIndex < _titles.count()) return _titles[vIndex];
+        return "";
+    }
+    QString value(quint8 vIndex) const {
+        if (vIndex < _values.count()) return _values[vIndex];
+        return "";
+    }
+    QString unit(quint8 vIndex) const {
+        if (vIndex < _units.count()) return _units[vIndex];
+        return "";
+    }
+
     // Lists
     QStringList _values;
     QList<TreatmentLogAvrgeData> _treatmentLogAvrgeData;