Index: simulator/plugins/postTreatment/loader.py
===================================================================
diff -u -r967521dff94783ce48b50abc8db6bcd67bb501bf -r80e41aa60d1fe7534b4c082f087f708afb89c38d
--- simulator/plugins/postTreatment/loader.py	(.../loader.py)	(revision 967521dff94783ce48b50abc8db6bcd67bb501bf)
+++ simulator/plugins/postTreatment/loader.py	(.../loader.py)	(revision 80e41aa60d1fe7534b4c082f087f708afb89c38d)
@@ -42,7 +42,8 @@
     leSodiumConcentration: QtWidgets.QLineEdit
     leDialysateTemperature: QtWidgets.QLineEdit
     leDialyzerType: QtWidgets.QLineEdit
-    leTreatmentDateTime: QtWidgets.QLineEdit
+    leTreatmentStartDateTime: QtWidgets.QLineEdit
+    leTreatmentEndDateTime: QtWidgets.QLineEdit
     leAverageBloodFlow: QtWidgets.QLineEdit
     leAverageDialysateFlow: QtWidgets.QLineEdit
     leDialysateVolumeUsed: QtWidgets.QLineEdit
@@ -53,15 +54,12 @@
     leTargetUFRate: QtWidgets.QLineEdit
     leActualUFRate: QtWidgets.QLineEdit
     leSalineBolusVolume: QtWidgets.QLineEdit
-    leHeparinType: QtWidgets.QLineEdit
-    leHeparinConcentration: QtWidgets.QLineEdit
     leHeparinBolusVolume: QtWidgets.QLineEdit
     leHeparinDispenseRate: QtWidgets.QLineEdit
     leHeparinPreStop: QtWidgets.QLineEdit
     leHeparinDeliveredVolume: QtWidgets.QLineEdit
     leAverageArterialPressure: QtWidgets.QLineEdit
     leAverageVenousPressure: QtWidgets.QLineEdit
-    leEndTreatmentEarlyAlarm: QtWidgets.QLineEdit
     leDeviceID: QtWidgets.QLineEdit
     leWaterSampleTestResult: QtWidgets.QLineEdit
 
@@ -112,7 +110,8 @@
         self.leSodiumConcentration = self.find_line_edit('leSodiumConcentration')
         self.leDialysateTemperature = self.find_line_edit('leDialysateTemperature')
         self.leDialyzerType = self.find_line_edit('leDialyzerType')
-        self.leTreatmentDateTime = self.find_line_edit('leTreatmentDateTime')
+        self.leTreatmentStartDateTime = self.find_line_edit('leTreatmentStartDateTime')
+        self.leTreatmentEndDateTime = self.find_line_edit('leTreatmentEndDateTime')
         self.leAverageBloodFlow = self.find_line_edit('leAverageBloodFlow')
         self.leAverageDialysateFlow = self.find_line_edit('leAverageDialysateFlow')
         self.leDialysateVolumeUsed = self.find_line_edit('leDialysateVolumeUsed')
@@ -123,15 +122,12 @@
         self.leTargetUFRate = self.find_line_edit('leTargetUFRate')
         self.leActualUFRate = self.find_line_edit('leActualUFRate')
         self.leSalineBolusVolume = self.find_line_edit('leSalineBolusVolume')
-        self.leHeparinType = self.find_line_edit('leHeparinType')
-        self.leHeparinConcentration = self.find_line_edit('leHeparinConcentration')
         self.leHeparinBolusVolume = self.find_line_edit('leHeparinBolusVolume')
         self.leHeparinDispenseRate = self.find_line_edit('leHeparinDispenseRate')
         self.leHeparinPreStop = self.find_line_edit('leHeparinPreStop')
         self.leHeparinDeliveredVolume = self.find_line_edit('leHeparinDeliveredVolume')
         self.leAverageArterialPressure = self.find_line_edit('leAverageArterialPressure')
         self.leAverageVenousPressure = self.find_line_edit('leAverageVenousPressure')
-        self.leEndTreatmentEarlyAlarm = self.find_line_edit('leEndTreatmentEarlyAlarm')
         self.leDeviceID = self.find_line_edit('leDeviceID')
         self.leWaterSampleTestResult = self.find_line_edit('leWaterSampleTestResult')
 
@@ -243,7 +239,6 @@
         :return: none
         """
         self.interface.hd.cmd_send_post_treatment_log_response(True, 0,
-                                                               # column 1
                                                                int(self.leBloodFlowRate.text()),
                                                                int(self.leDialysateFlowRate.text()),
                                                                int(self.leTreatmentDuration.text()),
@@ -256,26 +251,23 @@
                                                                int(self.leSodiumConcentration.text()),
                                                                float(self.leDialysateTemperature.text()),
                                                                int(self.leDialyzerType.text()),
-                                                               int(self.leTreatmentDateTime.text()),
+                                                               int(self.leTreatmentStartDateTime.text()),
+                                                               int(self.leTreatmentEndDateTime.text()),
                                                                float(self.leAverageBloodFlow.text()),
                                                                float(self.leAverageDialysateFlow.text()),
                                                                float(self.leDialysateVolumeUsed.text()),
                                                                float(self.leAverageDialysateTemp.text()),
-                                                               # column 2
                                                                float(self.leTargetUFVolume.text()),
                                                                float(self.leActualUFVolume.text()),
                                                                float(self.leTargetUFRate.text()),
                                                                float(self.leActualUFRate.text()),
                                                                int(self.leSalineBolusVolume.text()),
-                                                               int(self.leHeparinType.text()),
-                                                               int(self.leHeparinConcentration.text()),
                                                                float(self.leHeparinBolusVolume.text()),
                                                                float(self.leHeparinDispenseRate.text()),
                                                                int(self.leHeparinPreStop.text()),
                                                                float(self.leHeparinDeliveredVolume.text()),
                                                                float(self.leAverageArterialPressure.text()),
                                                                float(self.leAverageVenousPressure.text()),
-                                                               int(self.leEndTreatmentEarlyAlarm.text()),
                                                                int(self.leDeviceID.text()),
                                                                int(self.leWaterSampleTestResult.text())
                                                                )