Index: sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustTreatmentLogResponse.cpp
===================================================================
diff -u -r2216ac6ac7f77437a7c29ac8b4043be01bc4609e -r1c18f738693756ca1f0342c2cc158e32bc28f90b
--- sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustTreatmentLogResponse.cpp	(.../MPostTreatmentAdjustTreatmentLogResponse.cpp)	(revision 2216ac6ac7f77437a7c29ac8b4043be01bc4609e)
+++ sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustTreatmentLogResponse.cpp	(.../MPostTreatmentAdjustTreatmentLogResponse.cpp)	(revision 1c18f738693756ca1f0342c2cc158e32bc28f90b)
@@ -20,6 +20,7 @@
     return {
         _data.mAccepted                     .value,
         _data.mReason                       .value,
+
         _data.mBloodFlowRate                .value,
         _data.mDialysateFlowRate            .value,
         _data.mTreatmentDuration            .value,
@@ -32,7 +33,8 @@
         _data.mSodiumConcentration          .value,
         _data.mDialysateTemperature         .value,
         _data.mDialyzerType                 .value,
-        _data.mTreatmentDateTime            .value,
+        _data.mTreatmentStartEpoch          .value,
+        _data.mTreatmentEndEpoch            .value,
         _data.mAverageBloodFlow             .value,
         _data.mAverageDialysateFlow         .value,
         _data.mDialysateVolumeUsed          .value,
@@ -42,21 +44,24 @@
         _data.mTargetUFRate                 .value,
         _data.mActualUFRate                 .value,
         _data.mSalineBolusVolume            .value,
-        _data.mHeparinType                  .value,
-        _data.mHeparinConcentration         .value,
         _data.mHeparinBolusVolume           .value,
         _data.mHeparinDispenseRate          .value,
         _data.mHeparinStop                  .value,
         _data.mHeparinDeliveredVolume       .value,
         _data.mAverageArterialPressure      .value,
         _data.mAverageVenousPressure        .value,
-        _data.mEndTreatmentEarlyAlarm       .value,
         _data.mDeviceID                     .value,
         _data.mWaterSampleTestResult        .value,
+
+        _data.mHeparinType                  .value,
+        _data.mHeparinConcentration         .value,
     };
 }
 
 bool MAdjustTreatmentLogResponse::fromByteArray(const QByteArray &vByteArray, int *vIndex) {
+    _data.mHeparinType          .value  =    0;
+    _data.mHeparinConcentration .value  = 1000;
+
     int index = 0; // message data start position
     if (GetValue(vByteArray, index, _data.mAccepted                     ))
     if (GetValue(vByteArray, index, _data.mReason                       ))
@@ -72,7 +77,8 @@
     if (GetValue(vByteArray, index, _data.mSodiumConcentration          ))
     if (GetValue(vByteArray, index, _data.mDialysateTemperature         ))
     if (GetValue(vByteArray, index, _data.mDialyzerType                 ))
-    if (GetValue(vByteArray, index, _data.mTreatmentDateTime            ))
+    if (GetValue(vByteArray, index, _data.mTreatmentStartEpoch          ))
+    if (GetValue(vByteArray, index, _data.mTreatmentEndEpoch            ))
     if (GetValue(vByteArray, index, _data.mAverageBloodFlow             ))
     if (GetValue(vByteArray, index, _data.mAverageDialysateFlow         ))
     if (GetValue(vByteArray, index, _data.mDialysateVolumeUsed          ))
@@ -82,15 +88,12 @@
     if (GetValue(vByteArray, index, _data.mTargetUFRate                 ))
     if (GetValue(vByteArray, index, _data.mActualUFRate                 ))
     if (GetValue(vByteArray, index, _data.mSalineBolusVolume            ))
-    if (GetValue(vByteArray, index, _data.mHeparinType                  ))
-    if (GetValue(vByteArray, index, _data.mHeparinConcentration         ))
     if (GetValue(vByteArray, index, _data.mHeparinBolusVolume           ))
     if (GetValue(vByteArray, index, _data.mHeparinDispenseRate          ))
     if (GetValue(vByteArray, index, _data.mHeparinStop                  ))
     if (GetValue(vByteArray, index, _data.mHeparinDeliveredVolume       ))
     if (GetValue(vByteArray, index, _data.mAverageArterialPressure      ))
     if (GetValue(vByteArray, index, _data.mAverageVenousPressure        ))
-    if (GetValue(vByteArray, index, _data.mEndTreatmentEarlyAlarm       ))
     if (GetValue(vByteArray, index, _data.mDeviceID                     ))
     if (GetValue(vByteArray, index, _data.mWaterSampleTestResult        ))
          return true ;
@@ -127,8 +130,6 @@
     else { if(vIndex) *vIndex = index; return false; }
     else { if(vIndex) *vIndex = index; return false; }
     else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
-    else { if(vIndex) *vIndex = index; return false; }
 }
 
 /*!
@@ -140,6 +141,7 @@
     Data data;
     data.mAccepted                      = _data.mAccepted                   .value;
     data.mReason                        = _data.mReason                     .value;
+
     data.mBloodFlowRate                 = _data.mBloodFlowRate              .value;
     data.mDialysateFlowRate             = _data.mDialysateFlowRate          .value;
     data.mTreatmentDuration             = _data.mTreatmentDuration          .value;
@@ -152,7 +154,8 @@
     data.mSodiumConcentration           = _data.mSodiumConcentration        .value;
     data.mDialysateTemperature          = _data.mDialysateTemperature       .value;
     data.mDialyzerType                  = _data.mDialyzerType               .value;
-    data.mTreatmentDateTime             = _data.mTreatmentDateTime          .value;
+    data.mTreatmentStartEpoch           = _data.mTreatmentStartEpoch        .value;
+    data.mTreatmentEndEpoch             = _data.mTreatmentEndEpoch          .value;
     data.mAverageBloodFlow              = _data.mAverageBloodFlow           .value;
     data.mAverageDialysateFlow          = _data.mAverageDialysateFlow       .value;
     data.mDialysateVolumeUsed           = _data.mDialysateVolumeUsed        .value;
@@ -162,16 +165,17 @@
     data.mTargetUFRate                  = _data.mTargetUFRate               .value;
     data.mActualUFRate                  = _data.mActualUFRate               .value;
     data.mSalineBolusVolume             = _data.mSalineBolusVolume          .value;
-    data.mHeparinType                   = _data.mHeparinType                .value;
-    data.mHeparinConcentration          = _data.mHeparinConcentration       .value;
     data.mHeparinBolusVolume            = _data.mHeparinBolusVolume         .value;
     data.mHeparinDispenseRate           = _data.mHeparinDispenseRate        .value;
     data.mHeparinStop                   = _data.mHeparinStop                .value;
     data.mHeparinDeliveredVolume        = _data.mHeparinDeliveredVolume     .value;
     data.mAverageArterialPressure       = _data.mAverageArterialPressure    .value;
     data.mAverageVenousPressure         = _data.mAverageVenousPressure      .value;
-    data.mEndTreatmentEarlyAlarm        = _data.mEndTreatmentEarlyAlarm     .value;
     data.mDeviceID                      = _data.mDeviceID                   .value;
     data.mWaterSampleTestResult         = _data.mWaterSampleTestResult      .value;
+
+    data.mHeparinType                   = _data.mHeparinType                .value;
+    data.mHeparinConcentration          = _data.mHeparinConcentration       .value;
+
     return data;
 }