diff -r 35675eadc655 -r 3cccf4392a25 www/js/profile_setup.js --- a/www/js/profile_setup.js Fri Oct 18 16:21:54 2019 +0200 +++ b/www/js/profile_setup.js Fri Oct 18 19:24:05 2019 +0200 @@ -21,147 +21,143 @@ *****************************************************************************/ -$(document).ready(function () { - - var dataRecord = {}, - // dropdownlist datasource from inventory_waters, must load sync - waterUrl = "getwatersources.php", - waterInvSource = { - datatype: "json", - datafields: [ - { name: 'name', type: 'string' }, - ], - url: waterUrl, - async: false - }, - waterlist = new $.jqx.dataAdapter(waterInvSource); - url = "includes/db_setup.php", +$(document).ready(function() { - // Prepare the data - source = { - datatype: "json", - cache: false, - datafields: [ - { name: 'brewery_name', type: 'string' }, - { name: 'factor_mashhop', type: 'number' }, - { name: 'factor_fwh', type: 'number' }, - { name: 'factor_pellet', type: 'number' }, - { name: 'factor_plug', type: 'number' }, - { name: 'factor_wethop', type: 'number' }, - { name: 'factor_cryohop', type: 'number' }, - { name: 'ibu_method', type: 'int' }, - { name: 'color_method', type: 'int' }, - { name: 'brix_correction', type: 'float' }, - { name: 'grain_absorbtion', type: 'float' }, - { name: 'default_water', type: 'string' } - ], - url: url - }, + var dataRecord = {}, + waterInvSource = { + datatype: 'json', + datafields: [{ name: 'name', type: 'string' }], + url: 'getwatersources.php', + async: false + }, + waterlist = new $.jqx.dataAdapter(waterInvSource); + url = 'includes/db_setup.php', + source = { + datatype: 'json', + cache: false, + datafields: [ + { name: 'brewery_name', type: 'string' }, + { name: 'factor_mashhop', type: 'number' }, + { name: 'factor_fwh', type: 'number' }, + { name: 'factor_pellet', type: 'number' }, + { name: 'factor_plug', type: 'number' }, + { name: 'factor_wethop', type: 'number' }, + { name: 'factor_cryohop', type: 'number' }, + { name: 'ibu_method', type: 'int' }, + { name: 'color_method', type: 'int' }, + { name: 'brix_correction', type: 'float' }, + { name: 'grain_absorbtion', type: 'float' }, + { name: 'default_water', type: 'string' } + ], + url: url + }, + dataAdapter = new $.jqx.dataAdapter(source, { + loadComplete: function() { + var records = dataAdapter.records; + dataRecord = records[0]; + $('#brewery_name').val(dataRecord.brewery_name); + $('#factor_mashhop').val(dataRecord.factor_mashhop); + $('#factor_fwh').val(dataRecord.factor_fwh); + $('#factor_pellet').val(dataRecord.factor_pellet); + $('#factor_plug').val(dataRecord.factor_plug); + $('#factor_wethop').val(dataRecord.factor_wethop); + $('#factor_cryohop').val(dataRecord.factor_cryohop); + $('#color_method').val(dataRecord.color_method); + $('#ibu_method').val(dataRecord.ibu_method); + $('#brix_correction').val(dataRecord.brix_correction); + $('#grain_absorbtion').val(dataRecord.grain_absorbtion); + }, + loadError: function(jqXHR, status, error) { + }, + }); - // Load data and select one record. - dataAdapter = new $.jqx.dataAdapter(source, { - loadComplete: function () { - var records = dataAdapter.records; - dataRecord = records[0]; - $("#brewery_name").val(dataRecord.brewery_name); - $("#factor_mashhop").val(dataRecord.factor_mashhop); - $("#factor_fwh").val(dataRecord.factor_fwh); - $("#factor_pellet").val(dataRecord.factor_pellet); - $("#factor_plug").val(dataRecord.factor_plug); - $("#factor_wethop").val(dataRecord.factor_wethop); - $("#factor_cryohop").val(dataRecord.factor_cryohop); - $("#color_method").val(dataRecord.color_method); - $("#ibu_method").val(dataRecord.ibu_method); - $("#brix_correction").val(dataRecord.brix_correction); - $("#grain_absorbtion").val(dataRecord.grain_absorbtion); - }, - loadError: function (jqXHR, status, error) { - }, - }); + dataAdapter.dataBind(); - dataAdapter.dataBind(); - - // Tooltips - $("#brewery_name").jqxTooltip({ content: 'De naam voor deze brouwerij.' }); - $("#factor_mashhop").jqxTooltip({ content: 'Het efficientie percentage voor hop tijdens de maisch.' }); - $("#factor_fwh").jqxTooltip({ content: 'Het efficientie percentage voor First Wort Hop.' }); - $("#factor_pellet").jqxTooltip({ content: 'Het efficientie percentage bij gebruik van hop pellets.' }); - $("#factor_plug").jqxTooltip({ content: 'Het efficientie percentage bij gebruik van hop plugs.' }); - $("#factor_wethop").jqxTooltip({ content: 'Het efficientie percentage bij gebruik van nat geplukte hop.' }); - $("#factor_cryohop").jqxTooltip({ content: 'Het efficientie percentage bij gebruik van Cryo Hop®.' }); - $("#brix_correction").jqxTooltip({ content: 'Omzettingsfactor voor Plato naar Brix' }); - $("#grain_absorbtion").jqxTooltip({ content: 'Absorbtie van water door graan (L/Kg)' }); + // Tooltips + $('#brewery_name').jqxTooltip({ content: 'De naam voor deze brouwerij.' }); + $('#factor_mashhop').jqxTooltip({ content: 'Het efficientie percentage voor hop tijdens de maisch.' }); + $('#factor_fwh').jqxTooltip({ content: 'Het efficientie percentage voor First Wort Hop.' }); + $('#factor_pellet').jqxTooltip({ content: 'Het efficientie percentage bij gebruik van hop pellets.' }); + $('#factor_plug').jqxTooltip({ content: 'Het efficientie percentage bij gebruik van hop plugs.' }); + $('#factor_wethop').jqxTooltip({ content: 'Het efficientie percentage bij gebruik van nat geplukte hop.' }); + $('#factor_cryohop').jqxTooltip({ content: 'Het efficientie percentage bij gebruik van Cryo Hop®.' }); + $('#brix_correction').jqxTooltip({ content: 'Omzettingsfactor voor Plato naar Brix' }); + $('#grain_absorbtion').jqxTooltip({ content: 'Absorbtie van water door graan (L/Kg)' }); - // Editers - $("#brewery_name").jqxInput({ theme: theme, width: 640, height: 23 }); - $("#factor_fwh").jqxNumberInput({ inputMode: 'simple', theme: theme, width: 110, height: 23, min: -50, max: 50, decimalDigits: 0, spinButtons: true, symbol: '%', symbolPosition: 'right' }); - $("#factor_mashhop").jqxNumberInput({ inputMode: 'simple', theme: theme, width: 110, height: 23, min: -50, max: 50, decimalDigits: 0, spinButtons: true, symbol: '%', symbolPosition: 'right' }); - $("#factor_pellet").jqxNumberInput({ inputMode: 'simple', theme: theme, width: 110, height: 23, min: 0, max: 20, decimalDigits: 0, spinButtons: true, symbol: '%', symbolPosition: 'right' }); - $("#factor_plug").jqxNumberInput({ inputMode: 'simple', theme: theme, width: 110, height: 23, min: 0, max: 20, decimalDigits: 0, spinButtons: true, symbol: '%', symbolPosition: 'right' }); - $("#factor_wethop").jqxNumberInput({ inputMode: 'simple', theme: theme, width: 110, height: 23, min: -98, max: -20, decimalDigits: 0, spinButtons: true, symbol: '%', symbolPosition: 'right' }); - $("#factor_cryohop").jqxNumberInput({ inputMode: 'simple', theme: theme, width: 110, height: 23, min: -20, max: 150, decimalDigits: 0, spinButtons: true, symbol: '%', symbolPosition: 'right' }); - $("#brix_correction").jqxNumberInput({ inputMode: 'simple', theme: theme, width: 110, height: 23, min: 1.00, max: 1.05, decimalDigits: 2, spinButtons: true }); - $("#grain_absorbtion").jqxNumberInput({ inputMode: 'simple', theme: theme, width: 110, height: 23, min: 0.5, max: 1.1, decimalDigits: 2, spinButtons: true }); - $("#color_method").jqxDropDownList({ - theme: theme, - source: ColorMethodAdapter, - valueMember: 'id', - displayMember: 'nl', - width: 180, - autoDropDownHeight: true - }); - $("#ibu_method").jqxDropDownList({ - theme: theme, - source: IBUmethodAdapter, - valueMember: 'id', - displayMember: 'nl', - width: 180, - autoDropDownHeight: true - }); - $('#default_water').jqxDropDownList({ - placeHolder: "Kies water:", - theme: theme, - source: waterlist, - valueMember: "name", - displayMember: "name", - width: 250, - dropDownHorizontalAlignment: 'right', - dropDownWidth: 300, - autoDropDownHeight: true - }); - $('#default_water').jqxDropDownList( 'selectItem', dataRecord.default_water ); + // Editers + $('#brewery_name').jqxInput({ theme: theme, width: 640, height: 23 }); + $('#factor_fwh').jqxNumberInput({ inputMode: 'simple', theme: theme, width: 110, height: 23, min: -50, max: 50, + decimalDigits: 0, spinButtons: true, symbol: '%', symbolPosition: 'right' }); + $('#factor_mashhop').jqxNumberInput({ inputMode: 'simple', theme: theme, width: 110, height: 23, min: -50, max: 50, + decimalDigits: 0, spinButtons: true, symbol: '%', symbolPosition: 'right' }); + $('#factor_pellet').jqxNumberInput({ inputMode: 'simple', theme: theme, width: 110, height: 23, min: 0, max: 20, + decimalDigits: 0, spinButtons: true, symbol: '%', symbolPosition: 'right' }); + $('#factor_plug').jqxNumberInput({ inputMode: 'simple', theme: theme, width: 110, height: 23, min: 0, max: 20, + decimalDigits: 0, spinButtons: true, symbol: '%', symbolPosition: 'right' }); + $('#factor_wethop').jqxNumberInput({ inputMode: 'simple', theme: theme, width: 110, height: 23, min: -98, max: -20, + decimalDigits: 0, spinButtons: true, symbol: '%', symbolPosition: 'right' }); + $('#factor_cryohop').jqxNumberInput({ inputMode: 'simple', theme: theme, width: 110, height: 23, min: -20, max: 150, + decimalDigits: 0, spinButtons: true, symbol: '%', symbolPosition: 'right' }); + $('#brix_correction').jqxNumberInput({ inputMode: 'simple', theme: theme, width: 110, height: 23, min: 1.00, max: 1.05, decimalDigits: 2, spinButtons: true }); + $('#grain_absorbtion').jqxNumberInput({ inputMode: 'simple', theme: theme, width: 110, height: 23, min: 0.5, max: 1.1, decimalDigits: 2, spinButtons: true }); + $('#color_method').jqxDropDownList({ + theme: theme, + source: ColorMethodAdapter, + valueMember: 'id', + displayMember: 'nl', + width: 180, + autoDropDownHeight: true + }); + $('#ibu_method').jqxDropDownList({ + theme: theme, + source: IBUmethodAdapter, + valueMember: 'id', + displayMember: 'nl', + width: 180, + autoDropDownHeight: true + }); + $('#default_water').jqxDropDownList({ + placeHolder: 'Kies water:', + theme: theme, + source: waterlist, + valueMember: 'name', + displayMember: 'name', + width: 250, + dropDownHorizontalAlignment: 'right', + dropDownWidth: 300, + autoDropDownHeight: true + }); + $('#default_water').jqxDropDownList('selectItem', dataRecord.default_water); - $("#Save").jqxButton({ template: "success", width: '90px', theme: theme }); - $("#Save").click(function () { - var data, - row = { - record: 1, - brewery_name: $("#brewery_name").val(), - factor_mashhop: $("#factor_mashhop").val(), - factor_fwh: $("#factor_fwh").val(), - factor_pellet: $("#factor_pellet").val(), - factor_plug: $("#factor_plug").val(), - factor_wethop: $("#factor_wethop").val(), - factor_cryohop: $("#factor_cryohop").val(), - color_method: $("#color_method").val(), - ibu_method: $("#ibu_method").val(), - brix_correction: parseFloat($("#brix_correction").jqxNumberInput('decimal')), - grain_absorbtion: parseFloat($("#grain_absorbtion").jqxNumberInput('decimal')), - default_water: $("#default_water").val() - }; - data = "update=true&" + $.param(row); - $.ajax({ - dataType: 'json', - url: url, - cache: false, - data: data, - type: "POST", - success: function (data, status, xhr) { - // update command is executed. - //window.location.href = my_return; - }, - error: function(jqXHR, textStatus, errorThrown) { - } - }); - }); + $('#Save').jqxButton({ template: 'success', width: '90px', theme: theme }); + $('#Save').click(function() { + var data, + row = { + record: 1, + brewery_name: $('#brewery_name').val(), + factor_mashhop: $('#factor_mashhop').val(), + factor_fwh: $('#factor_fwh').val(), + factor_pellet: $('#factor_pellet').val(), + factor_plug: $('#factor_plug').val(), + factor_wethop: $('#factor_wethop').val(), + factor_cryohop: $('#factor_cryohop').val(), + color_method: $('#color_method').val(), + ibu_method: $('#ibu_method').val(), + brix_correction: parseFloat($('#brix_correction').jqxNumberInput('decimal')), + grain_absorbtion: parseFloat($('#grain_absorbtion').jqxNumberInput('decimal')), + default_water: $('#default_water').val() + }; + data = 'update=true&' + $.param(row); + $.ajax({ + dataType: 'json', + url: url, + cache: false, + data: data, + type: 'POST', + success: function(data, status, xhr) { + }, + error: function(jqXHR, textStatus, errorThrown) { + } + }); + }); });