diff -r 685f20ad87ed -r 92a080c1a5d5 www/js/set_global.js --- a/www/js/set_global.js Mon Apr 22 20:58:55 2024 +0200 +++ b/www/js/set_global.js Tue Apr 23 13:06:33 2024 +0200 @@ -23,6 +23,7 @@ $(document).ready(function() { var global = {}, + url = 'getglobal.php', globalSource = { datatype: 'json', cache: false, @@ -36,6 +37,7 @@ { name: 'FW' }, { name: 'server_port', type: 'int' }, { name: 'websocket_port', type: 'int' }, + { name: 'nextunit', type: 'int' }, { name: 'thb_temp_uuid', map: 'THB>temperature>uuid' }, { name: 'temp_uuid', map: 'THB>temperature>uuid' }, { name: 'temp_state', map: 'THB>temperature>state' }, @@ -49,52 +51,49 @@ { name: 'lcd_rows', map: 'LCD>rows', type: 'int' }, { name: 'mqtt_host', map: 'MQTT>host' }, { name: 'mqtt_port', map: 'MQTT>port', type: 'int' }, - { name: 'mqtt_username', map: 'MQTT_username' }, - { name: 'mqtt_password', map: 'MQTT_password' } + { name: 'mqtt_username', map: 'MQTT>username' }, + { name: 'mqtt_password', map: 'MQTT>password' } ], id: 'name', - url: 'getglobal.php' + url: url }, globalData = new $.jqx.dataAdapter(globalSource, { loadComplete: function(records) { global = globalData.records[0]; - updateScreen(); + $('#name').val(global.name); + $('#uuid').val(global.uuid); + $('#node').val(global.node); + $('#os').val(global.os + ' ' + global.os_version); + $('#FW').val(global.FW); + $('#server_port').val(global.server_port); + $('#websocket_port').val(global.websocket_port); + $('#nextunit').val(global.nextunit); + $('#temp_uuid').val(global.temp_uuid); + $('#temp_state').val(global.temp_state); + $('#temp_value').val(global.temp_value / 1000.0); + $('#hum_uuid').val(global.hum_uuid); + $('#hum_state').val(global.hum_state); + $('#hum_value').val(global.hum_value / 1000.0); + $('#temp_hum_idx').val(global.temp_hum_idx); + $('#lcd_address').val(global.lcd_address); + $('#lcd_cols').val(global.lcd_cols); + $('#lcd_rows').val(global.lcd_rows) + $('#mqtt_host').val(global.mqtt_host); + $('#mqtt_port').val(global.mqtt_port); + $('#mqtt_username').val(global.mqtt_username); + $('#mqtt_password').val(global.mqtt_password); } - }), - tzoffset = (new Date()).getTimezoneOffset() * 60000; //offset in milliseconds - - function updateScreen() { - $('#name').val(global.name); - $('#uuid').val(global.uuid); - $('#node').val(global.node); - $('#os').val(global.os + ' ' + global.os_version); - $('#FW').val(global.FW); - $('#server_port').val(global.server_port); - $('#websocket_port').val(global.websocket_port); - $('#temp_uuid').val(global.temp_uuid); - $('#temp_state').val(global.temp_state); - $('#temp_value').val(global.temp_value / 1000.0); - $('#hum_uuid').val(global.hum_uuid); - $('#hum_state').val(global.hum_state); - $('#hum_value').val(global.hum_value / 1000.0); - $('#temp_hum_idx').val(global.temp_hum_idx); - $('#lcd_address').val(global.lcd_address); - $('#lcd_cols').val(global.lcd_cols); - $('#lcd_rows').val(global.lcd_rows) - $('#mqtt_host').val(global.mqtt_host); - $('#mqtt_port').val(global.mqtt_port); - $('#mqtt_username').val(global.mqtt_username); - $('#mqtt_password').val(global.mqtt_password); - } + }); // initialize the input fields. $('#name').jqxInput({ theme: theme, width: 240, height: 23 }); - $('#uuid').jqxInput({ theme: theme, width: 480, height: 23 }); + $('#uuid').jqxInput({ theme: theme, width: 360, height: 23 }); $('#node').jqxInput({ theme: theme, width: 240, height: 23 }); $('#os').jqxInput({ theme: theme, width: 240, height: 23 }); $('#FW').jqxInput({ theme: theme, width: 120, height: 23 }); - $('#server_port').jqxNumberInput(Spin0dec); - $('#websocket_port').jqxNumberInput(Spin0dec); + $('#server_port').jqxNumberInput(Show0dec); + $('#websocket_port').jqxNumberInput(Show0dec); + $('#nextunit').jqxNumberInput(Show0dec); $('#temp_uuid').jqxDropDownList({ theme: theme, source: tempsensorlist, @@ -118,30 +117,53 @@ $('#hum_state').jqxInput({ theme: theme, width: 120, height: 23 }); $('#hum_value').jqxNumberInput(Show1dec); $('#temp_hum_idx').jqxNumberInput(Spin0dec); - $('#lcd_address').jqxNumberInput(Spin0dec); $('#lcd_cols').jqxNumberInput(GPIOInt); $('#lcd_rows').jqxNumberInput(GPIOInt); - $('#mqtt_host').jqxInput({ theme: theme, width: 240, height: 23 }); $('#mqtt_port').jqxNumberInput(Spin0dec); $('#mqtt_username').jqxInput({ theme: theme, width: 240, height: 23 }); - $('#mqtt_password').jqxInput({ theme: theme, width: 240, height: 23 }); + $('#mqtt_password').jqxPasswordInput({ placeHolder: "Enter Password", showPasswordIcon: true, theme: theme, width: 240, height: 23 }); globalData.dataBind(); $('#Save').jqxButton({ template: 'success', width: '90px', theme: theme }); $('#Save').click(function() { - var row, rowID = -1; - if (editrow >= 0) { - rowID = $('#jqxgrid').jqxGrid('getrowid', editrow); - } + var data, row = { - uuid: dataRecord.uuid, - type: $('#type').val() + name: $('#name').val(), + port: parseInt($('#server_port').jqxNumberInput('decimal')), + temp_uuid: $('#temp_uuid').val(), + hum_uuid: $('#hum_uuid').val(), + temp_hum_idx: $('#temp_hum_idx').val(), + lcd_address: parseInt($('#lcd_address').jqxNumberInput('decimal')), + lcd_cols: parseInt($('#lcd_cols').jqxNumberInput('decimal')), + lcd_rows: parseInt($('#lcd_rows').jqxNumberInput('decimal')), + mqtt_host: $('#mqtt_host').val(), + mqtt_port: parseInt($('#mqtt_port').jqxNumberInput('decimal')), + mqtt_user: $('#mqtt_username').val(), + mqtt_pass: $('#mqtt_password').val(), + websocket_port: parseInt($('#websocket_port').jqxNumberInput('decimal')) }; -// $('#jqxgrid').jqxGrid('updaterow', rowID, row); + data = 'update=true&' + $.param(row); + $.ajax({ + dataType: 'json', + url: url, + cache: false, + data: data, + type: 'POST', + success: function(data) { + if (data.error) { + console.log('update: ' + data.msg); + alert('Fout: ' + data.msg); + } else { + console.log('update: success'); + } + }, + error: function(jqXHR, textStatus, errorThrown) { + } + }); }); websocket.onmessage = function(evt) {