Index: sources/gui/qml/pages/settings/SettingsDGCleaning.qml
===================================================================
diff -u -r5e1966a8b22d556e9c0c08533f84c6894127b248 -r1399994928085bd96ea57ce2970ed1723ee19ef2
--- sources/gui/qml/pages/settings/SettingsDGCleaning.qml	(.../SettingsDGCleaning.qml)	(revision 5e1966a8b22d556e9c0c08533f84c6894127b248)
+++ sources/gui/qml/pages/settings/SettingsDGCleaning.qml	(.../SettingsDGCleaning.qml)	(revision 1399994928085bd96ea57ce2970ed1723ee19ef2)
@@ -22,124 +22,58 @@
 //  Qml imports
 import "qrc:/globals"
 import "qrc:/components"
+import "qrc:/compounds"
 
 /*!
- * \brief   SettingsDG provides user options to manually initiate the
- *              - Water Flush
- *              - Heat Disinfection
- *              - Chemical Disinfection \n
- *          or schedule the
- *              - Water Flush
- *              - Heat Disinfection     \n
- *          on daily cycle at certain time of the day
+ * \brief   SettingsDG provides user options to manually initiate the DG Cleaning
+ *          and give the last DG CLeanaing Status
  */
 SettingsBase { id: _root
-    readonly property bool enableScheduling: false  // TODO : phase 1 doesn't have this feature (disinfection schedule)
 
-    QtObject { id: _settingsDG
-        property string status: ""
-        function doConfirm(vWaterFlushScheduleTimeHour          ,
-                           vWaterFlushScheduleTimeMinute        ,
-                           vWaterFlushScheduleCycle             ,
-                           vHeatDisinfectionScheduleTimeHour    ,
-                           vHeatDisinfectionScheduleTimeMinute  ,
-                           vHeatDisinfectionScheduleCycle       ) {
-            console.debug(vWaterFlushScheduleTimeHour           , ":"  ,
-                          vWaterFlushScheduleTimeMinute         , " - ",
-                          vWaterFlushScheduleCycle              , " | ",
-                          vHeatDisinfectionScheduleTimeHour     , ":"  ,
-                          vHeatDisinfectionScheduleTimeMinute   , " - ",
-                          vHeatDisinfectionScheduleCycle        )
-        }
-    }
+    confirmVisible  : false
+    TouchGrid {
+        anchors.horizontalCenter: parent.horizontalCenter
 
-    labelWidth  : 200
-    entryWidth  : 100
-
-    property int            titleIndent : 25
-
-    readonly property bool  isValid     :
-        _waterFlushScheduleTime         .isValid &&
-        _waterFlushScheduleCycle        .isValid &&
-        _heatDisinfectionScheduleTime   .isValid &&
-        _heatDisinfectionScheduleCycle  .isValid
-
-    confirmVisible  : false // phase 1 // true
-    confirmEnabled  : _root.enableScheduling
-    firstFocusInput : _waterFlushScheduleTime
-    notificationText: _settingsDG.status
-    onConfirmClicked: {
-        _settingsDG.doConfirm(
-                    _waterFlushScheduleTime         .hour   ,
-                    _waterFlushScheduleTime         .minute ,
-                    _waterFlushScheduleCycle        .text   ,
-                    _heatDisinfectionScheduleTime   .hour   ,
-                    _heatDisinfectionScheduleTime   .minute ,
-                    _heatDisinfectionScheduleCycle  .text   )
+        colCount    : 1
+        colSpacing  : 0
+        rowCount    : 6
+        rowSpacing  : 0
+        itemHeight  : 50
+        itemWidth   : 800
+        touchable   : false
+        itemsHasLine: [
+            0, // title
+            1,1,1,1,1,
+        ]
+        itemsValueLeftMargin: 500
+        itemsValue  : [
+            ""                                          ,
+            vAdjustmentVersions     .hdVerDevice        ,
+            vAdjustmentVersions     .hdVerFPGA          ,
+            vAdjustmentVersions     .hdSerial           ,
+            vAdjustmentVersions     .dgVerDevice        ,
+            vAdjustmentVersions     .dgVerFPGA          ,
+            vAdjustmentVersions     .dgSerial           ,
+        ]
+        itemsText   : [
+            "Cleaning Last Status"                           , // title
+            qsTr("Last Basic Flush Complete"                ),
+            qsTr("Last Chemical Disinfect Start"            ),
+            qsTr("Last Chemical Disinfect Complete"         ),
+            qsTr("Last Chemical Disinfect Flush Complete"   ),
+            qsTr("Last Heat Disinfect Complete"             ),
+        ]
     }
 
     onVisibleChanged: {
         if ( ! visible ) _root.notificationText = ""
     }
 
-    Row { id: _container
-        visible: false // phase 1 // true
-        spacing: 25
-        y : Qt.inputMethod.visible && _keyboard.visible ? topMarginContent : ( (_root.height - _container.height) / 2 )
-        Behavior on y { NumberAnimation { duration: Variables.keybardAnimationDuration } }
-        anchors.horizontalCenter: parent.horizontalCenter
-
-        Column {
-            spacing         : 25
-            leftPadding     :  titleIndent
-            Label {
-                leftPadding : -titleIndent
-                text        : qsTr("Water Flush")
-            }
-            Line { x        : -titleIndent; width     : 500 }
-            TimeEntry { id  : _waterFlushScheduleTime
-                hour        : "02" // TODO: Settings Manufacturing
-                minute      : "00" // TODO: Settings Manufacturing
-                labelWidth  : _root.labelWidth
-                nextInput   : _waterFlushScheduleCycle
-            }
-            TextEntry { id  : _waterFlushScheduleCycle
-                nextInput   : _heatDisinfectionScheduleTime.firstInput
-                text        : "1" // TODO: Settings Manufacturing
-                label.text  :  qsTr("Cycle (Days)")
-                label.width : _root.labelWidth
-                validator   : IntValidator { bottom: 0;  top : 7 } // TODO: Settings Manufacturing
-            }
-        }
-
-        Column {
-            spacing         : 25
-            leftPadding     :  titleIndent
-            Label {
-                leftPadding : -titleIndent
-                text        : qsTr("Heat Disinfection")
-            }
-            Line { x        : -titleIndent;  width    : 500 }
-            TimeEntry { id  : _heatDisinfectionScheduleTime
-                hour        : "02" // TODO: Settings Manufacturing
-                minute      : "00" // TODO: Settings Manufacturing
-                labelWidth  : _root.labelWidth
-                nextInput   : _heatDisinfectionScheduleCycle
-            }
-            TextEntry { id  : _heatDisinfectionScheduleCycle
-                text        : "21" // TODO: Settings Manufacturing
-                label.text  : qsTr("Cycle (Days)")
-                label.width : _root.labelWidth
-                validator   : IntValidator { bottom: 0;  top : 60 } // TODO: Settings Manufacturing
-            }
-        }
-    }
-
-    Footer {
+    Footer { id: _footer
         anchors.bottomMargin: Variables.mainMenuHeight + Variables.notificationHeight + Variables.minVGap
         childrenWidth: parent.width / 3
         children: [
-            TouchRect { text.text: qsTr("DG Cleaning")
+            TouchRect { text.text: qsTr("Proceed to Cleaning Mode")
                         onClicked: { vDisinfectAdjustDisinfect      .doDisinfectInitiate    () }
             }
         ]