Index: sources/gui/qml/pages/posttreatment/PostTreatmentReview.qml
===================================================================
diff -u -r13d6a4fae2f910ab6e289ac9280258a94f734405 -r5687815256ae070a9a207107088e3f72dd464da0
--- sources/gui/qml/pages/posttreatment/PostTreatmentReview.qml	(.../PostTreatmentReview.qml)	(revision 13d6a4fae2f910ab6e289ac9280258a94f734405)
+++ sources/gui/qml/pages/posttreatment/PostTreatmentReview.qml	(.../PostTreatmentReview.qml)	(revision 5687815256ae070a9a207107088e3f72dd464da0)
@@ -1,15 +1,15 @@
 /*!
  *
- * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved.
+ * Copyright (c) 2021-2024 Diality Inc. - All Rights Reserved.
  * \copyright
  * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
  * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
  *
- * \file    PostTreatmentMainStack.qml
+ * \file    PostTreatmentReview.qml
  * \author  (last)      Behrouz NematiPour
- * \date    (last)      20-Apr-2021
+ * \date    (last)      31-Jul-2024
  * \author  (original)  Behrouz NematiPour
- * \date    (original)  20-Apr-2021
+ * \date    (original)  21-Apr-2021
  *
  */
 
@@ -36,19 +36,58 @@
 
     header.confirmText.text: qsTr("NEXT")
 
-    ExportButton {
+    ExportButton { id: _exportButton
+        isSmall         : true
         anchors.top     : parent.top
         anchors.left    : parent.left
-        exportFunction  : vPostTreatmentAdjustmentTreatmentLog.doExport
-        enabled         : vPostTreatmentAdjustmentTreatmentLog.isIdle && _GuiView.usbReady
+        enabled         : vPostTreatmentAdjustmentTreatmentLog.isIdle && _GuiView.usbIsReady && !_GuiView.exportRunning
+        onClicked       : vPostTreatmentAdjustmentTreatmentLog.doExport()
     }
+    USBButton { id: _usbButton
+        anchors.top     : _exportButton.top
+        anchors.left    : _exportButton.right
+        anchors.leftMargin: Variables.minVGap
+        enabled         : _GuiView.usbIsReady && !_GuiView.exportRunning
+    }
 
     ScrollBar {
         anchors.fill: _flickable
         flickable   : _flickable
         backColor   : Colors.backgroundDialog
     }
 
+    Label { id: _txCode
+        property string empty   : "..."
+        property string txCode  : vPostTreatmentAdjustmentTreatmentLog.txCode
+        Timer { id: _waitTxCodeTimer
+            property int count: 0
+            interval: 1000
+            repeat  : true
+            running : _txCode.visible && ! _txCode.txCode
+            onTriggered: {
+                _txCode.empty = ".".repeat( count ++ )
+                if ( count == 4 ) count = 0
+            }
+        }
+
+        anchors.bottom  : _flickable.top
+        anchors.left    : _flickable.left
+        width           : _flickable.width
+        text            : qsTr("Code: ") + ( txCode ? txCode : empty )
+        font.pixelSize  : Fonts.fontPixelButton
+    }
+
+    QRCode { id: _qrCode
+        // removed for the P1  release, since the code had a big change and cannot be removed entirely
+        // added   for the P1B release
+        visible         : true
+        anchors.bottom  : _flickable.top
+        anchors.right   : _flickable.right
+        anchors.margins : 15
+        qrcode          : vPostTreatmentAdjustmentTreatmentLog.txCode
+        clear           : ! _root.visible
+    }
+
     Flickable { id: _flickable
         clip: true
         anchors {
@@ -63,10 +102,16 @@
         contentHeight: _parametersGrid.height
 
         TouchGrid { id: _parametersGrid
-            height          : rowCount * ( rowSpacing + itemHeight  ) + itemHeight
+            // TODO: fixed only for this list since it has been used other places.
+            // investigate more to move these readonly properties in the TouchGrid component.
+            readonly property int _itemCount: vPostTreatmentAdjustmentTreatmentLog.parametersTitle.length
+            readonly property int _colCount : 2
+            readonly property int _rowCount : Math.ceil( _itemCount / _colCount )
+
+            height          : _rowCount * ( rowSpacing + itemHeight  ) + itemHeight
             width           : parent.width
-            colCount        : 2
-            rowCount        : 17
+            colCount        : _colCount
+            rowCount        : _rowCount
             itemWidth       : 575
             rowSpacing      : 0
             colSpacing      : 50
@@ -76,14 +121,21 @@
             itemsUnit       : vPostTreatmentAdjustmentTreatmentLog.parametersUnit
             itemsValueLeftMargin    : 350 // if decreased may be covered by title
             itemsUnitLeftMargin     : 470 // if increased will be covered by chevron if touchable
-            itemsTouchable  : [
-                0,0,0,0,1,0,0,0,0,0,
-                1,0,0,0,0,0,0,0,0,0,
-                0,0,0,0,0,0,0,0,0,0,
-                0,0,0,0,0,0,0,0,0,0,
-            ]
+            // Note: to make the item touchable
+            // set the touchable: true
+            // and set the index ot the touchable item in the itemsTouchable: [] list to 1
+            // like displayed below.
+            touchable       : false
+            // itemsTouchable  : [
+            //     0,0,0,0,0,0,0,0,0,0,
+            //     0,0,0,0,0,0,0,0,0,0,
+            //     0,0,0,0,0,0,0,0,0,0,
+            //     0,0,0,0,0,0,0,0,0,0,
+            // ]
             onItemClicked: _root.itemClicked(vIndex)
         }
     }
+    reasonText      : vPostTreatmentAdjustmentTreatmentLog.text()
+    informationText : vPostTreatmentAdjustmentTreatmentLog.notification
 }