# HG changeset patch # User Michiel Broek # Date 1713983766 -7200 # Node ID 66b7a1135452629e82be07c1b603fc4e9b7ee2d3 # Parent 344470c6bb1cafe08b79acc6326f2ce2b33fe6dd Finished save fermenter uit edit. diff -r 344470c6bb1c -r 66b7a1135452 www/js/set_fermenters.js --- a/www/js/set_fermenters.js Wed Apr 24 16:46:45 2024 +0200 +++ b/www/js/set_fermenters.js Wed Apr 24 20:36:06 2024 +0200 @@ -141,6 +141,33 @@ dropDownWidth: 480, autoDropDownHeight: true }); + $('#air_address').on('select', function (event) { + var args = event.args; + if (args) { + if ((args.index > 0) && (args.type != 'none')) { + dataRecord.air_idx = 0; + $('#air_idx').val(0); + } + } + }); + $('#beer_address').on('select', function (event) { + var args = event.args; + if (args) { + if ((args.index > 0) && (args.type != 'none')) { + dataRecord.beer_idx = 0; + $('#beer_idx').val(0); + } + } + }); + $('#chiller_address').on('select', function (event) { + var args = event.args; + if (args) { + if ((args.index > 0) && (args.type != 'none')) { + dataRecord.chiller_idx = 0; + $('#chiller_idx').val(0); + } + } + }); $('#air_idx,#beer_idx,#chiller_idx,#heater_idx,#cooler_idx,#fan_idx,#light_idx,#door_idx,#psu_idx').jqxNumberInput(Spin0dec); $('#heater_address,#cooler_address,#fan_address,#light_address').jqxDropDownList({ theme: theme, @@ -151,6 +178,51 @@ dropDownWidth: 480, autoDropDownHeight: true }); + $('#heater_address').on('select', function (event) { + var args = event.args; + if (args) { + if ((args.index > 0) && (args.type != 'none')) { + dataRecord.heater_idx = dataRecord.heater_state = dataRecord.heater_delay = 0; + $('#heater_idx').val(0); + $('#heater_state').val(0); + $('#heater_delay').val(0); + } + } + }); + $('#cooler_address').on('select', function (event) { + var args = event.args; + if (args) { + if ((args.index > 0) && (args.type != 'none')) { + dataRecord.cooler_idx = dataRecord.cooler_state = dataRecord.cooler_delay = 0; + $('#cooler_idx').val(0); + $('#cooler_state').val(0); + $('#cooler_delay').val(0); + } + } + }); + $('#fan_address').on('select', function (event) { + var args = event.args; + if (args) { + if ((args.index > 0) && (args.type != 'none')) { + dataRecord.fan_idx = dataRecord.fan_state = dataRecord.fan_delay = 0; + $('#fan_idx').val(0); + $('#fan_state').val(0); + $('#fan_delay').val(0); + } + } + }); + $('#light_address').on('select', function (event) { + var args = event.args; + if (args) { + if ((args.index > 0) && (args.type != 'none')) { + dataRecord.light_idx = dataRecord.light_state = dataRecord.light_delay = 0; + $('#light_idx').val(0); + $('#light_state').val(0); + $('#light_delay').val(0); + } + } + }); + $('#heater_state,#cooler_state,#fan_state,#light_state').jqxNumberInput(Perc0); $('#heater_delay,#cooler_delay,#fan_delay,#light_delay').jqxNumberInput(Spin0dec); $('#pidh_p,#pidh_i,#pidh_d,#pidc_p,#pidc_i,#pidc_d').jqxNumberInput(Spin3dec); @@ -165,6 +237,24 @@ dropDownWidth: 480, autoDropDownHeight: true }); + $('#door_address').on('select', function (event) { + var args = event.args; + if (args) { + if ((args.index > 0) && (args.type != 'none')) { + dataRecord.door_idx = 0; + $('#door_idx').val(0); + } + } + }); + $('#psu_address').on('select', function (event) { + var args = event.args; + if (args) { + if ((args.index > 0) && (args.type != 'none')) { + dataRecord.psu_idx = 0; + $('#psu_idx').val(0); + } + } + }); $('#door_state,#psu_state').jqxNumberInput(Show0dec); // initialize jqxGrid @@ -323,18 +413,94 @@ var data, row = { uuid: dataRecord.uuid, -// type: $('#dev_type').val(), -// direction: $('#dev_direction').val(), -// value: parseInt($('#dev_value').jqxNumberInput('decimal')), -// offset: parseInt($('#dev_offset').jqxNumberInput('decimal')), -// present: $('#dev_present').val(), -// address: $('#dev_address').val(), -// subdevice: parseInt($('#dev_subdevice').jqxNumberInput('decimal')), -// gpiopin: parseInt($('#dev_gpiopin').jqxNumberInput('val')), -// description: $('#dev_description').val(), -// comment: $('#dev_comment').val() + alias: dataRecord.alias, + mode: dataRecord.mode, + stage: dataRecord.stage, + pidh_p: parseFloat($('#pidh_p').jqxNumberInput('decimal')), + pidh_i: parseFloat($('#pidh_i').jqxNumberInput('decimal')), + pidh_d: parseFloat($('#pidh_d').jqxNumberInput('decimal')), + pidh_imax: parseFloat($('#pidh_imax').jqxNumberInput('decimal')), + pidh_idle: parseFloat($('#pidh_idle').jqxNumberInput('decimal')), + pidc_p: parseFloat($('#pidc_p').jqxNumberInput('decimal')), + pidc_i: parseFloat($('#pidc_i').jqxNumberInput('decimal')), + pidc_d: parseFloat($('#pidc_d').jqxNumberInput('decimal')), + pidc_imax: parseFloat($('#pidc_imax').jqxNumberInput('decimal')), + pidc_idle: parseFloat($('#pidc_idle').jqxNumberInput('decimal')) }; data = 'update=true&' + $.param(row); + if ($('#air_address').val() != '') { + var row = { + air_address: $('#air_address').val(), + air_idx: parseInt($('#air_idx').jqxNumberInput('decimal')) + }; + data += '&' + $.param(row); + } + if ($('#beer_address').val() != '') { + var row = { + beer_address: $('#beer_address').val(), + beer_address2: $('#beer_address2').val(), + beer_idx: parseInt($('#beer_idx').jqxNumberInput('decimal')) + }; + data += '&' + $.param(row); + } + if ($('#chiller_address').val() != '') { + var row = { + chiller_address: $('#chiller_address').val(), + chiller_idx: parseInt($('#chiller_idx').jqxNumberInput('decimal')) + }; + data += '&' + $.param(row); + } + if ($('#heater_address').val() != '') { + var row = { + heater_address: $('#heater_address').val(), + heater_idx: parseInt($('#heater_idx').jqxNumberInput('decimal')), + heater_state: parseInt($('#heater_state').jqxNumberInput('decimal')), + heater_delay: parseInt($('#heater_delay').jqxNumberInput('decimal')) + }; + data += '&' + $.param(row); + } + if ($('#cooler_address').val() != '') { + var row = { + cooler_address: $('#cooler_address').val(), + cooler_idx: parseInt($('#cooler_idx').jqxNumberInput('decimal')), + cooler_state: parseInt($('#cooler_state').jqxNumberInput('decimal')), + cooler_delay: parseInt($('#cooler_delay').jqxNumberInput('decimal')) + }; + data += '&' + $.param(row); + } + if ($('#fan_address').val() != '') { + var row = { + fan_address: $('#fan_address').val(), + fan_idx: parseInt($('#fan_idx').jqxNumberInput('decimal')), + fan_state: parseInt($('#fan_state').jqxNumberInput('decimal')), + fan_delay: parseInt($('#fan_delay').jqxNumberInput('decimal')) + }; + data += '&' + $.param(row); + } + if ($('#light_address').val() != '') { + var row = { + light_address: $('#light_address').val(), + light_idx: parseInt($('#light_idx').jqxNumberInput('decimal')), + light_state: parseInt($('#light_state').jqxNumberInput('decimal')), + light_delay: parseInt($('#light_delay').jqxNumberInput('decimal')) + }; + data += '&' + $.param(row); + } + if ($('#door_address').val() != '') { + var row = { + door_address: $('#door_address').val(), + door_idx: parseInt($('#door_idx').jqxNumberInput('decimal')) + }; + data += '&' + $.param(row); + } + if ($('#psu_address').val() != '') { + var row = { + psu_address: $('#psu_address').val(), + psu_idx: parseInt($('#psu_idx').jqxNumberInput('decimal')) + }; + data += '&' + $.param(row); + } + console.log(data); $.ajax({ dataType: 'json', diff -r 344470c6bb1c -r 66b7a1135452 www/set_fermenters.php --- a/www/set_fermenters.php Wed Apr 24 16:46:45 2024 +0200 +++ b/www/set_fermenters.php Wed Apr 24 20:36:06 2024 +0200 @@ -23,9 +23,9 @@ - Code: + Beer Code: - Beer: + Beer Name: Stage: @@ -44,8 +44,7 @@ Index:
Alternate: -
- +
Chiller sensor: