Index: denali.pro.user
===================================================================
diff -u -r5605f930ab5cd1a62b96347f4b4300ef30a830ee -rad9c5d96d9288d685a0ff4e41e087258b5a4c91f
--- denali.pro.user	(.../denali.pro.user)	(revision 5605f930ab5cd1a62b96347f4b4300ef30a830ee)
+++ denali.pro.user	(.../denali.pro.user)	(revision ad9c5d96d9288d685a0ff4e41e087258b5a4c91f)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.10.0, 2022-04-04T15:58:35. -->
+<!-- Written by QtCreator 4.10.0, 2022-04-05T20:19:31. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>
Index: sources/cloudsync/CloudSyncController.cpp
===================================================================
diff -u -rdf0329c47627ceb1fe460cda2ae3ff8c9c851106 -rad9c5d96d9288d685a0ff4e41e087258b5a4c91f
--- sources/cloudsync/CloudSyncController.cpp	(.../CloudSyncController.cpp)	(revision df0329c47627ceb1fe460cda2ae3ff8c9c851106)
+++ sources/cloudsync/CloudSyncController.cpp	(.../CloudSyncController.cpp)	(revision ad9c5d96d9288d685a0ff4e41e087258b5a4c91f)
@@ -587,15 +587,15 @@
 /*!
  * \brief   CloudSyncController::onTreatmentLogSave
  * \details The slot being called when the TreatmentLogController notifies the CloudSyncController, about the treatment log being successfully saved.
- * \param   vPatientID  - Patient ID
  * \param   vDeviceID   - Device ID
+ * \param   vPatientID  - Patient ID
  * \param   vFileName   - The complete Treatment log path and file name.
  */
-void CloudSyncController::onTreatmentLogSave(const QString &vPatientID, const QString &vDeviceID, const QString &vFileName)
+void CloudSyncController::onTreatmentLogSave(const QString &/*vDeviceID*/, const QString &/*vPatientID*/, const QString &vFileName)
 {
-    QStringList data { vPatientID, vDeviceID, vFileName };
-    _uiHistory      [eMessageID_TxReport] = data;
-    sendUIHistory   (eMessageID_TxReport);
+    QVariantList data { /*vDeviceID, vPatientID,*/ vFileName };
+    saveUIHistory(eMessageID_TxReport, data );
+    sendUIHistory(eMessageID_TxReport       );
 }
 
 /*!
@@ -617,7 +617,7 @@
     case eMessageID_ResetFactory     :  ok = sendResetFactory   (          ); break;
     case eMessageID_DeviceState      :  ok = sendDeviceState    (          ); break;
 
-    case eMessageID_TxReport         :                                        break;
+    case eMessageID_TxReport         :  /*  No Req/Rsp, it is event based  */ break; // This message doesn't have the response since there is no request. UI will send when the data ready by HD.
 
     }
     return ok;
Index: sources/cloudsync/CloudSyncController.h
===================================================================
diff -u -r3561f79af1a92356eea01d5d0c3297c69d2ecdf2 -rad9c5d96d9288d685a0ff4e41e087258b5a4c91f
--- sources/cloudsync/CloudSyncController.h	(.../CloudSyncController.h)	(revision 3561f79af1a92356eea01d5d0c3297c69d2ecdf2)
+++ sources/cloudsync/CloudSyncController.h	(.../CloudSyncController.h)	(revision ad9c5d96d9288d685a0ff4e41e087258b5a4c91f)
@@ -178,9 +178,7 @@
 private slots:
     void  onWatchFileChange (const QString &vFile);
     void  onActionReceive   (GuiActionType vAction, const QVariantList &vData);
-    void  onTreatmentLogSave(const QString &vPatientID ,
-                            const QString &vDeviceID  ,
-                            const QString &vFileName  );
+    void  onTreatmentLogSave(const QString &vDeviceID  , const QString &vPatientID , const QString &vFileName  );
     void  onInitComplete    ();
 
 signals:
@@ -243,6 +241,5 @@
 
     bool sendCredentialsSave    (const Message &vMessage); // eMessageID_SaveCredentials
     bool sendCredentialsSend    (); // eMessageID_SendCredentials
-    bool sendTxReport           (); // eMessageID_TxReport
 
 };
Index: sources/storage/TreatmentLog.h
===================================================================
diff -u -r5605f930ab5cd1a62b96347f4b4300ef30a830ee -rad9c5d96d9288d685a0ff4e41e087258b5a4c91f
--- sources/storage/TreatmentLog.h	(.../TreatmentLog.h)	(revision 5605f930ab5cd1a62b96347f4b4300ef30a830ee)
+++ sources/storage/TreatmentLog.h	(.../TreatmentLog.h)	(revision ad9c5d96d9288d685a0ff4e41e087258b5a4c91f)
@@ -254,8 +254,8 @@
     void    doExport    ();
 
 signals:
-    void    didTreatmentLogSave( const QString &vPatientID ,
-                                 const QString &vDeviceID  ,
+    void    didTreatmentLogSave( const QString &vDeviceID  ,
+                                 const QString &vPatientID ,
                                  const QString &vFileName  );
 };
 
Index: sources/view/settings/VDateTime.cpp
===================================================================
diff -u -r5605f930ab5cd1a62b96347f4b4300ef30a830ee -rad9c5d96d9288d685a0ff4e41e087258b5a4c91f
--- sources/view/settings/VDateTime.cpp	(.../VDateTime.cpp)	(revision 5605f930ab5cd1a62b96347f4b4300ef30a830ee)
+++ sources/view/settings/VDateTime.cpp	(.../VDateTime.cpp)	(revision ad9c5d96d9288d685a0ff4e41e087258b5a4c91f)
@@ -196,13 +196,12 @@
     switch (vStatus) {
     case SUCCEED:
         return mSucceed;
-        break;
+
     case FAILED:
         return mFailed.arg(vReason);
-        break;
+
     default:
         return mNotSet;
-        break;
     }
 }