Index: sources/storage/TreatmentLog.h
===================================================================
diff -u -raacca8cc53f5e4ff5abb6d7df3d5ad48c915645c -r1eedad37ea1cad5c9aa41ac082614d082f525a7f
--- sources/storage/TreatmentLog.h	(.../TreatmentLog.h)	(revision aacca8cc53f5e4ff5abb6d7df3d5ad48c915645c)
+++ sources/storage/TreatmentLog.h	(.../TreatmentLog.h)	(revision 1eedad37ea1cad5c9aa41ac082614d082f525a7f)
@@ -70,6 +70,7 @@
     QString _unitTextHeparinConcentration   = tr("IU/mL"    );
     QString _unitTextDispensingRate         = tr("mL/hr"    );
     QString _unitTextBloodPressure          = tr("mmHg"     );
+    QString _unitTextWatertSample           = tr("mg/L"     );
 
     struct TxInfo {
         void    clear() {
@@ -103,6 +104,7 @@
 
     enum TreatmentLogIndex {
         ePatientID                          ,
+        eSecondaryPatientID                 ,
         eBloodFlowRate                      ,
         eDialysateFlowRate                  ,
         eTreatmentDuration                  ,
@@ -116,10 +118,9 @@
         eDialysateTemperature               ,
         eDialyzerType                       ,
         eHeparinType                        ,
-        eHeparinConcentration               ,
         eHeparinBolusVolume                 ,
         eHeparinDispenseRate                ,
-        eHeparinStop                        ,
+        eHeparinDeliveryDuration            ,
         eHeparinDeliveredVolume             ,
         eTreatmentStartDateTime             ,
         eTreatmentEndDateTime               ,
@@ -131,12 +132,13 @@
         eOriginUFRate                       ,
         eTargetUFRate                       ,
         eActualUFRate                       ,
-        eSalineBolusVolume                  ,
+        eFluidBolusVolume                   ,
         eTreatmentLogIndexCount             ,
     };
 
     const QStringList _titles {
         tr("Patient ID"                     ), // ePatientID
+        tr("Secondary Patient ID"           ), // eSecondaryPatientID
         tr("Blood Flow Rate"                ), // eBloodFlowRate
         tr("Dialysate Flow Rate"            ), // eDialysateFlowRate
         tr("Treatment Duration"             ), // eTreatmentDuration
@@ -150,10 +152,9 @@
         tr("Dialysate Temperature"          ), // eDialysateTemperature
         tr("Dialyzer Type"                  ), // eDialyzerType
         tr("Heparin Type"                   ), // eHeparinType
-        tr("Heparin Concentration"          ), // eHeparinConcentration
         tr("Heparin Bolus Volume"           ), // eHeparinBolusVolume
         tr("Heparin Dispense Rate"          ), // eHeparinDispenseRate
-        tr("Heparin Stop"                   ), // eHeparinStop
+        tr("Heparin Delivery Duration"      ), // eHeparinDeliveryDuration
         tr("Heparin Delivered Volume"       ), // eHeparinDeliveredVolume
         tr("Treatment Start DateTime"       ), // eTreatmentStartDateTime
         tr("Treatment End DateTime"         ), // eTreatmentEndDateTime
@@ -165,11 +166,12 @@
         tr("Prescribed UF Rate"             ), // eOriginUFRate
         tr("Target UF Rate"                 ), // eTargetUFRate
         tr("Actual UF Rate"                 ), // eActualUFRate
-        tr("Saline Bolus Volume"            ), // eSalineBolusVolume
+        tr("Fluid Bolus Volume"             ), // eFluidBolusVolume
     };
 
     const QStringList _units {
         ""                                  , // ePatientID
+        ""                                  , // eSecondaryPatientID
         _unitTextFlowRate                   , // eBloodFlowRate
         _unitTextFlowRate                   , // eDialysateFlowRate
         _unitTextDurationMin                , // eTreatmentDuration
@@ -182,23 +184,22 @@
         _unitTextConcentration              , // eSodiumConcentration
         _unitTextTemperature                , // eDialysateTemperature
         ""                                  , // eDialyzerType
-        ""                                  , // eHeparinType
-        _unitTextHeparinConcentration       , // eHeparinConcentration
+        _unitTextHeparinConcentration       , // eHeparinType
         _unitTextFluid                      , // eHeparinBolusVolume
         _unitTextDispensingRate             , // eHeparinDispenseRate
-        _unitTextDurationMin                , // eHeparinStop
+        _unitTextDurationMin                , // eHeparinDeliveryDuration
         _unitTextFluid                      , // eHeparinDeliveredVolume
         ""                                  , // eTreatmentStartDateTime
         ""                                  , // eTreatmentEndDateTime
-        ""                                  , // eWaterSampleTestResult
+        _unitTextWatertSample               , // eWaterSampleTestResult
         _unitTextVolume                     , // eDialysateVolumeUsed
         _unitTextVolume                     , // eOriginUFVolume
         _unitTextVolume                     , // eTargetUFVolume
         _unitTextVolume                     , // eActualUFVolume
         _unitTextFlowRate                   , // eOriginUFRate
         _unitTextFlowRate                   , // eTargetUFRate
         _unitTextFlowRate                   , // eActualUFRate
-        _unitTextFluid                      , // eSalineBolusVolume
+        _unitTextFluid                      , // eFluidBolusVolume
     };
 
     QString string(quint8 vIndex , const QStringList &vStringList) const {
@@ -252,7 +253,7 @@
     void timerEvent(QTimerEvent *) override;
 
 public:
-    void initModel(const AdjustTreatmentLogResponseData &vData, const QString &vPatientID, bool vHeparinBolusVolumeOff, bool vHeparinDispensingRateOff);
+    void initModel(const AdjustTreatmentLogResponseData &vData, const QString &vPatientID, const QString &vSecondaryPatientID);
     void clearModel() {
         _values.clear();
         for (int i = 0; i < eTreatmentLogIndexCount; i++) _values << "";