Index: sources/gui/qml/pages/settings/SettingsDeviceRegistration.qml =================================================================== diff -u -r380136967ba230affe91f614a9805319688eb05b -r015a7cea7842d589a11325a989436be342b801ef --- sources/gui/qml/pages/settings/SettingsDeviceRegistration.qml (.../SettingsDeviceRegistration.qml) (revision 380136967ba230affe91f614a9805319688eb05b) +++ sources/gui/qml/pages/settings/SettingsDeviceRegistration.qml (.../SettingsDeviceRegistration.qml) (revision 015a7cea7842d589a11325a989436be342b801ef) @@ -121,9 +121,9 @@ y : _root.topMargin anchors.right : parent.right anchors.rightMargin : _root.rightMargin - - completeText : qsTr("Registration complete") - stepNames : [ + completeVisible : vCloudSync.isReady + completeText : qsTr("Registration complete") + stepNames : [ qsTr("Cloud Service is running" ), qsTr("Registering the device" ) ] @@ -132,15 +132,29 @@ TouchRect { id : _scanButton anchors.bottom : parent.bottom anchors.bottomMargin : Variables.mainMenuHeight * 2 + Variables.minVGap * 2 - anchors.horizontalCenter: parent.horizontalCenter + anchors.horizontalCenter: parent.horizontalCenter text.text : qsTr("START") width : 350 isDefault : true enabled : true // ! device device registered onClicked : { - vAdjustmentVersions .doAdjustment() + let mHasNetworkConnection = (_ipAddress_eth0.isValid || _ipAddress_wlan0.isValid) + if ( ! mHasNetworkConnection) { _root.notificationText = qsTr("No Network Connection"); return } + + let mHasSerials = ( _serial_HD != "" && _serial_DG != "") + if ( ! mHasSerials ) { _root.notificationText = qsTr("No device Serial" ); return } + + vCloudSync .doRegister () } // start device registration } + // Connections { target: vCloudSync + // function onselfTestConsumables_primeEntered ( vValue ) {/* _preTreatmentConsumablesSelfTest.checkList.setItem( 0, vValue )*/ } + // function onSelfTestConsumables_biCarbPumpEntered ( vValue ) { _preTreatmentConsumablesSelfTest.checkList.setItem( 0, vValue )} + // function onSelfTestConsumables_biCarbPumpEntered ( vValue ) { _preTreatmentConsumablesSelfTest.checkList.setItem( 0, vValue )} + // function onSelfTestConsumables_biCarbPumpEntered ( vValue ) { _preTreatmentConsumablesSelfTest.checkList.setItem( 0, vValue )} + // function onSelfTestConsumables_acidPumpEntered ( vValue ) { _preTreatmentConsumablesSelfTest.checkList.setItem( 1, vValue )} + // } + notificationText: "" }