# HG changeset patch # User Michiel Broek # Date 1571419445 -7200 # Node ID 3cccf4392a25d14300eaac8880df45065d678825 # Parent 35675eadc6553affc0d9110af85f70ef89f26d82 Code cleanup and manual compress. diff -r 35675eadc655 -r 3cccf4392a25 www/js/profile_fermentation.js --- a/www/js/profile_fermentation.js Fri Oct 18 16:21:54 2019 +0200 +++ b/www/js/profile_fermentation.js Fri Oct 18 19:24:05 2019 +0200 @@ -22,336 +22,335 @@ function createDelElements() { - $('#eventWindow').jqxWindow({ - theme: theme, - position: { x: 490, y: 210 }, - width: 300, - height: 175, - resizable: false, - isModal: true, - modalOpacity: 0.4, - okButton: $('#delOk'), - cancelButton: $('#delCancel'), - initContent: function () { - $('#delOk').jqxButton({ template: "danger", width: '65px', theme: theme }); - $('#delCancel').jqxButton({ template: "success", width: '65px', theme: theme }); - $('#delCancel').focus(); - } - }); - $('#eventWindow').jqxWindow('hide'); + $('#eventWindow').jqxWindow({ + theme: theme, + position: { x: 490, y: 210 }, + width: 300, + height: 175, + resizable: false, + isModal: true, + modalOpacity: 0.4, + okButton: $('#delOk'), + cancelButton: $('#delCancel'), + initContent: function() { + $('#delOk').jqxButton({ template: 'danger', width: '65px', theme: theme }); + $('#delCancel').jqxButton({ template: 'success', width: '65px', theme: theme }); + $('#delCancel').focus(); + } + }); + $('#eventWindow').jqxWindow('hide'); } -$(document).ready(function () { +$(document).ready(function() { - // tooltips - $("#name").jqxTooltip({ content: 'De naam voor dit vergisting profiel.' }); - $("#inittemp_lo").jqxTooltip({ content: 'De minimale begin temperatuur van dit profiel.' }); - $("#inittemp_hi").jqxTooltip({ content: 'De maximale begin temperatuur van dit profiel.' }); + // tooltips + $('#name').jqxTooltip({ content: 'De naam voor dit vergisting profiel.' }); + $('#inittemp_lo').jqxTooltip({ content: 'De minimale begin temperatuur van dit profiel.' }); + $('#inittemp_hi').jqxTooltip({ content: 'De maximale begin temperatuur van dit profiel.' }); - var dataRecord = {}, - url = 'includes/db_profile_fermentation.php', - // prepare the data - source = { - datatype: "json", - cache: false, - datafields: [ - { name: 'record', type: 'number' }, - { name: 'uuid', type: 'string' }, - { name: 'name', type: 'string' }, - { name: 'inittemp_lo', type: 'float' }, - { name: 'inittemp_hi', type: 'float' }, - { name: 'fridgemode', type: 'int' }, - { name: 'totalsteps', type: 'int' }, - { name: 'duration', type: 'int' }, - { name: 'steps', type: 'array' } - ], - id: 'record', - url: url, - deleterow: function (rowid, commit) { - // synchronize with the server - send delete command - var data = "delete=true&" + $.param({ record: rowid }); - $.ajax({ - dataType: 'json', - url: url, - cache: false, - data: data, - type: "POST", - success: function (data, status, xhr) { - commit(true); - location.reload( true ); - }, - error: function (jqXHR, textStatus, errorThrown) { - commit(false); - } - }); - }, - addrow: function (rowid, rowdata, position, commit) { - var data = "insert=true&" + $.param(rowdata); - $.ajax({ - dataType: 'json', - url: url, - cache: false, - data: data, - type: "POST", - success: function (data, status, xhr) { - commit(true); - location.reload( true ); - }, - error: function(jqXHR, textStatus, errorThrown) { - commit(false); - } - }); - }, - updaterow: function (rowid, rowdata, commit) { - var data = "update=true&" + $.param(rowdata); - $.ajax({ - dataType: 'json', - url: url, - cache: false, - data: data, - type: "POST", - success: function (data, status, xhr) { - commit(true); - location.reload( true ); - }, - error: function(jqXHR, textStatus, errorThrown) { - commit(false); - } - }); - } - }, - dataAdapter = new $.jqx.dataAdapter(source), - editrow = -1, + var dataRecord = {}, + url = 'includes/db_profile_fermentation.php', + source = { + datatype: 'json', + cache: false, + datafields: [ + { name: 'record', type: 'number' }, + { name: 'uuid', type: 'string' }, + { name: 'name', type: 'string' }, + { name: 'inittemp_lo', type: 'float' }, + { name: 'inittemp_hi', type: 'float' }, + { name: 'fridgemode', type: 'int' }, + { name: 'totalsteps', type: 'int' }, + { name: 'duration', type: 'int' }, + { name: 'steps', type: 'array' } + ], + id: 'record', + url: url, + deleterow: function(rowid, commit) { + var data = 'delete=true&' + $.param({ record: rowid }); + $.ajax({ + dataType: 'json', + url: url, + cache: false, + data: data, + type: 'POST', + success: function(data, status, xhr) { + commit(true); + location.reload(true); + }, + error: function(jqXHR, textStatus, errorThrown) { + commit(false); + } + }); + }, + addrow: function(rowid, rowdata, position, commit) { + var data = 'insert=true&' + $.param(rowdata); + $.ajax({ + dataType: 'json', + url: url, + cache: false, + data: data, + type: 'POST', + success: function(data, status, xhr) { + commit(true); + location.reload(true); + }, + error: function(jqXHR, textStatus, errorThrown) { + commit(false); + } + }); + }, + updaterow: function(rowid, rowdata, commit) { + var data = 'update=true&' + $.param(rowdata); + $.ajax({ + dataType: 'json', + url: url, + cache: false, + data: data, + type: 'POST', + success: function(data, status, xhr) { + commit(true); + location.reload(true); + }, + error: function(jqXHR, textStatus, errorThrown) { + commit(false); + } + }); + } + }, + dataAdapter = new $.jqx.dataAdapter(source), + editrow = -1, - // Inline steps editor - editsteps = function (data) { - var generaterow = function () { - var row = {}; - row["name"] = "Stap 1"; - row['steptime'] = 12; - row['resttime'] = 24; - row['target_lo'] = 22.0; - row['target_hi'] = 23.0; - row['fridgemode'] = 0; - return row; - }, - stepSource = { - localdata: data.steps, - datatype: "local", - datafields: [ - { name: 'name', type: 'string' }, - { name: 'steptime', type: 'float' }, - { name: 'resttime', type: 'float' }, - { name: 'target_lo', type: 'float' }, - { name: 'target_hi', type: 'float' }, - { name: 'fridgemode', type: 'int' } - ], - addrow: function (rowid, rowdata, position, commit) { - commit(true); - }, - deleterow: function (rowid, commit) { - commit(true); - } - }, - stepAdapter = new $.jqx.dataAdapter(stepSource); - $("#grid").jqxGrid({ - width: 800, - height: 330, - source: stepAdapter, - theme: theme, - selectionmode: 'singlerow', - editmode: 'selectedcell', - editable: true, - showtoolbar: true, - rendertoolbar: function (toolbar) { - var container = $("
"); - toolbar.append(container); - container.append(''); - container.append(''); - $("#addrowbutton").jqxButton({ template: "primary", theme: theme, width: 150 }); - $("#deleterowbutton").jqxButton({ template: "danger", theme: theme, width: 150 }); - // create new row. - $("#addrowbutton").on('click', function () { - var datarow = generaterow(); - $("#grid").jqxGrid('addrow', null, datarow); - }); - // delete row. - $("#deleterowbutton").on('click', function () { - var selectedrowindex = $("#grid").jqxGrid('getselectedrowindex'), - rowscount = $("#grid").jqxGrid('getdatainformation').rowscount, - id; - if (selectedrowindex >= 0 && selectedrowindex < rowscount) { - id = $("#grid").jqxGrid('getrowid', selectedrowindex); - $("#grid").jqxGrid('deleterow', id); - } - }); - }, - columns: [ - { text: 'Stap naam', datafield: 'name' }, - { text: 'Min. °C', datafield: 'target_lo', width: 100, align: 'right', cellsalign: 'right', cellsformat: 'f1', - validation: function (cell, value) { - if (value < 0 || value > 40) { - return { result: false, message: "De temperatuur moet tussen 0 en 40 zijn." }; - } - return true; - } - }, - { text: 'Max. °C', datafield: 'target_hi', width: 100, align: 'right', cellsalign: 'right', cellsformat: 'f1', - validation: function (cell, value) { - if (value < 0 || value > 40) { - return { result: false, message: "De temperatuur moet tussen 0 en 40 zijn." }; - } - return true; - } - }, - { text: 'Koelkast', datafield: 'fridgemode', columntype: 'checkbox', width: 80 }, - { text: 'Stap tijd', datafield: 'steptime', width: 80, align: 'right', cellsalign: 'right', - validation: function (cell, value) { - if (value < 0 || value > 14400) { - return { result: false, message: "De tijd moet tussen 0 en 14400 zijn." }; - } - return true; - } - }, - { text: 'Rust tijd', datafield: 'resttime', width: 80, align: 'right', cellsalign: 'right', - validation: function (cell, value) { - if (value < 0 || value > 14400) { - return { result: false, message: "De tijd moet tussen 0 en 14400 zijn." }; - } - return true; - } - } - ] - }); - }; + // Inline steps editor + editsteps = function(data) { + var generaterow = function() { + var row = {}; + row['name'] = 'Stap 1'; + row['steptime'] = 12; + row['resttime'] = 24; + row['target_lo'] = 22.0; + row['target_hi'] = 23.0; + row['fridgemode'] = 0; + return row; + }; + var stepSource = { + localdata: data.steps, + datatype: 'local', + datafields: [ + { name: 'name', type: 'string' }, + { name: 'steptime', type: 'float' }, + { name: 'resttime', type: 'float' }, + { name: 'target_lo', type: 'float' }, + { name: 'target_hi', type: 'float' }, + { name: 'fridgemode', type: 'int' } + ], + addrow: function(rowid, rowdata, position, commit) { + commit(true); + }, + deleterow: function(rowid, commit) { + commit(true); + } + }, + stepAdapter = new $.jqx.dataAdapter(stepSource); + $('#grid').jqxGrid({ + width: 800, + height: 330, + source: stepAdapter, + theme: theme, + selectionmode: 'singlerow', + editmode: 'selectedcell', + editable: true, + showtoolbar: true, + rendertoolbar: function(toolbar) { + var container = $('
'); + toolbar.append(container); + container.append(''); + container.append(''); + $('#addrowbutton').jqxButton({ template: 'primary', theme: theme, width: 150 }); + $('#deleterowbutton').jqxButton({ template: 'danger', theme: theme, width: 150 }); + // create new row. + $('#addrowbutton').on('click', function() { + var datarow = generaterow(); + $('#grid').jqxGrid('addrow', null, datarow); + }); + // delete row. + $('#deleterowbutton').on('click', function() { + var selectedrowindex = $('#grid').jqxGrid('getselectedrowindex'), + rowscount = $('#grid').jqxGrid('getdatainformation').rowscount, + id; + if (selectedrowindex >= 0 && selectedrowindex < rowscount) { + id = $('#grid').jqxGrid('getrowid', selectedrowindex); + $('#grid').jqxGrid('deleterow', id); + } + }); + }, + columns: [ + { text: 'Stap naam', datafield: 'name' }, + { text: 'Min. °C', datafield: 'target_lo', width: 100, align: 'right', cellsalign: 'right', cellsformat: 'f1', + validation: function(cell, value) { + if (value < 0 || value > 50) { + return { result: false, message: 'De temperatuur moet tussen 0 en 50 zijn.' }; + } + return true; + } + }, + { text: 'Max. °C', datafield: 'target_hi', width: 100, align: 'right', cellsalign: 'right', cellsformat: 'f1', + validation: function(cell, value) { + if (value < 0 || value > 50) { + return { result: false, message: 'De temperatuur moet tussen 0 en 50 zijn.' }; + } + return true; + } + }, + { text: 'Koelkast', datafield: 'fridgemode', columntype: 'checkbox', width: 80 }, + { text: 'Stap tijd', datafield: 'steptime', width: 80, align: 'right', cellsalign: 'right', + validation: function(cell, value) { + if (value < 0 || value > 14400) { + return { result: false, message: 'De tijd moet tussen 0 en 14400 zijn.' }; + } + return true; + } + }, + { text: 'Rust tijd', datafield: 'resttime', width: 80, align: 'right', cellsalign: 'right', + validation: function(cell, value) { + if (value < 0 || value > 14400) { + return { result: false, message: 'De tijd moet tussen 0 en 14400 zijn.' }; + } + return true; + } + } + ] + }); + }; - // initialize the input fields. - $("#name").jqxInput({ theme: theme, width: 640, height: 23 }); - $("#inittemp_lo").jqxNumberInput( Spin1dec ); - $("#inittemp_lo").jqxNumberInput({ max: 40 }); - $("#inittemp_hi").jqxNumberInput( Spin1dec ); - $("#inittemp_hi").jqxNumberInput({ max: 40 }); - $("#fridgemode").jqxCheckBox({ theme: theme, height: 23, enableContainerClick: false }); + // initialize the input fields. + $('#name').jqxInput({ theme: theme, width: 640, height: 23 }); + $('#inittemp_lo').jqxNumberInput(Spin1dec); + $('#inittemp_lo').jqxNumberInput({ max: 40 }); + $('#inittemp_hi').jqxNumberInput(Spin1dec); + $('#inittemp_hi').jqxNumberInput({ max: 40 }); + $('#fridgemode').jqxCheckBox({ theme: theme, height: 23, enableContainerClick: false }); - // initialize jqxGrid - $("#jqxgrid").jqxGrid({ - width: 1280, - height: 630, - source: dataAdapter, - theme: theme, - showstatusbar: true, - renderstatusbar: function (statusbar) { - var addButton, container = $("
"); - addButton = $("
Nieuw
"); - container.append(addButton); - statusbar.append(container); - addButton.jqxButton({ theme: theme, width: 90, height: 20 }); - // add new row. - addButton.click(function (event) { - editrow = -1; - $("#name").val('Nieuw vergist profiel'); - dataRecord.uuid = ''; - $("#inittemp_lo").val(20.0); - $("#inittemp_hi").val(20.0); - $("#fridgemode").val(0); - dataRecord.totalsteps = 0; - dataRecord.duration = 0; - editsteps(''); - $("#popupWindow").jqxWindow('open'); - }); - }, - filterable: false, - columns: [ - { text: 'Vergisting profiel', datafield: 'name' }, - { text: 'Min. start °C', datafield: 'inittemp_lo', width: 150, align: 'right', cellsalign: 'right', cellsformat: 'f1' }, - { text: 'Max. start °C', datafield: 'inittemp_hi', width: 150, align: 'right', cellsalign: 'right', cellsformat: 'f1' }, - { text: 'Stappen', datafield: 'totalsteps', width: 80, align: 'right', cellsalign: 'right' }, - { text: 'Tijdsduur', datafield: 'duration', width: 150, align: 'right', - cellsrenderer: function (row, columnfield, value, defaulthtml, column) { - var show, days, hours; - if (value < 24) { - show = value + ' uur'; - } else { - days = Math.floor(value / 24); - hours = value % 24; - if (days == 1) - show = days + ' dag, ' + hours + ' uur'; - else - show = days + ' dagen, ' + hours + ' uur'; - } - return "" + show + ""; - } - }, - { text: '', datafield: 'Edit', width: 100, align: 'center', columntype: 'button', cellsrenderer: - function () { - return "Wijzig"; - }, buttonclick: function (row) { - editrow = row; - // get the clicked row's data and initialize the input fields. - dataRecord = $("#jqxgrid").jqxGrid('getrowdata', editrow); - $("#name").val(dataRecord.name); - $("#inittemp_lo").val(parseFloat(dataRecord.inittemp_lo)); - $("#inittemp_hi").val(parseFloat(dataRecord.inittemp_hi)); - $("#fridgemode").val(parseFloat(dataRecord.fridgemode)); - editsteps(dataRecord); - // show the popup window. - $("#popupWindow").jqxWindow('open'); - } - } - ] - }); - // initialize the popup window and buttons. - $("#popupWindow").jqxWindow({ - width: 1050, - height: 550, - position: { x: 110, y: 30 }, - resizable: false, - theme: theme, - isModal: true, - autoOpen: false, - cancelButton: $("#Cancel"), - modalOpacity: 0.40 - }); - $("#popupWindow").on('open', function () { - $("#name").jqxInput('selectAll'); - }); - $("#Delete").jqxButton({ template: "danger", width: '90px', theme: theme }); - $("#Delete").click(function () { - if (editrow >= 0) { - // Open a popup to confirm this action. - $('#eventWindow').jqxWindow('open'); - $("#delOk").click(function () { - var rowID = $('#jqxgrid').jqxGrid('getrowid', editrow); - $("#jqxgrid").jqxGrid('deleterow', rowID); - }); - } - $("#popupWindow").jqxWindow('hide'); - }); - $("#Cancel").jqxButton({ template: "primary", width: '90px', theme: theme }); - $("#Save").jqxButton({ template: "success", width: '90px', theme: theme }); - // update the edited row when the user clicks the 'Save' button. - $("#Save").click(function () { - var row, rowID = -1, steprows = $('#grid').jqxGrid('getrows'); - if (editrow >= 0) { - rowID = $('#jqxgrid').jqxGrid('getrowid', editrow); - } - row = { - record: rowID, - uuid: dataRecord.uuid, - name: $("#name").val(), - inittemp_lo: parseFloat($("#inittemp_lo").jqxNumberInput('decimal')), - inittemp_hi: parseFloat($("#inittemp_hi").jqxNumberInput('decimal')), - fridgemode: $("#fridgemode").val(), - steps: steprows - }; - if (editrow >= 0) { - $('#jqxgrid').jqxGrid('updaterow', rowID, row); - } else { - $('#jqxgrid').jqxGrid('addrow', null, row); - } - $("#popupWindow").jqxWindow('hide'); - }); - createDelElements(); + // initialize jqxGrid + $('#jqxgrid').jqxGrid({ + width: 1280, + height: 630, + source: dataAdapter, + theme: theme, + showstatusbar: true, + renderstatusbar: function(statusbar) { + var addButton, container = $('
'); + addButton = $('
Nieuw
'); + container.append(addButton); + statusbar.append(container); + addButton.jqxButton({ theme: theme, width: 90, height: 20 }); + // add new row. + addButton.click(function(event) { + editrow = -1; + $('#name').val('Nieuw vergist profiel'); + dataRecord.uuid = ''; + $('#inittemp_lo').val(20.0); + $('#inittemp_hi').val(20.0); + $('#fridgemode').val(0); + dataRecord.totalsteps = 0; + dataRecord.duration = 0; + editsteps(''); + $('#popupWindow').jqxWindow('open'); + }); + }, + filterable: false, + columns: [ + { text: 'Vergisting profiel', datafield: 'name' }, + { text: 'Min. start °C', datafield: 'inittemp_lo', width: 150, align: 'right', cellsalign: 'right', cellsformat: 'f1' }, + { text: 'Max. start °C', datafield: 'inittemp_hi', width: 150, align: 'right', cellsalign: 'right', cellsformat: 'f1' }, + { text: 'Stappen', datafield: 'totalsteps', width: 80, align: 'right', cellsalign: 'right' }, + { text: 'Tijdsduur', datafield: 'duration', width: 150, align: 'right', + cellsrenderer: function(row, columnfield, value, defaulthtml, column) { + var show, days, hours; + if (value < 24) { + show = value + ' uur'; + } else { + days = Math.floor(value / 24); + hours = value % 24; + if (days == 1) + show = days + ' dag, ' + hours + ' uur'; + else + show = days + ' dagen, ' + hours + ' uur'; + } + return '' + show + ''; + } + }, + { text: '', datafield: 'Edit', width: 100, align: 'center', columntype: 'button', cellsrenderer: + function() { + return 'Wijzig'; + }, buttonclick: function(row) { + editrow = row; + // get the clicked row's data and initialize the input fields. + dataRecord = $('#jqxgrid').jqxGrid('getrowdata', editrow); + $('#name').val(dataRecord.name); + $('#inittemp_lo').val(parseFloat(dataRecord.inittemp_lo)); + $('#inittemp_hi').val(parseFloat(dataRecord.inittemp_hi)); + $('#fridgemode').val(parseFloat(dataRecord.fridgemode)); + editsteps(dataRecord); + // show the popup window. + $('#popupWindow').jqxWindow('open'); + } + } + ] + }); + // initialize the popup window and buttons. + $('#popupWindow').jqxWindow({ + width: 1050, + height: 550, + position: { x: 110, y: 30 }, + resizable: false, + theme: theme, + isModal: true, + autoOpen: false, + cancelButton: $('#Cancel'), + modalOpacity: 0.40 + }); + $('#popupWindow').on('open', function() { + $('#name').jqxInput('selectAll'); + }); + $('#Delete').jqxButton({ template: 'danger', width: '90px', theme: theme }); + $('#Delete').click(function() { + if (editrow >= 0) { + // Open a popup to confirm this action. + $('#eventWindow').jqxWindow('open'); + $('#delOk').click(function() { + var rowID = $('#jqxgrid').jqxGrid('getrowid', editrow); + $('#jqxgrid').jqxGrid('deleterow', rowID); + }); + } + $('#popupWindow').jqxWindow('hide'); + }); + $('#Cancel').jqxButton({ template: 'primary', width: '90px', theme: theme }); + $('#Save').jqxButton({ template: 'success', width: '90px', theme: theme }); + // update the edited row when the user clicks the 'Save' button. + $('#Save').click(function() { + var row, rowID = -1, steprows = $('#grid').jqxGrid('getrows'); + if (editrow >= 0) { + rowID = $('#jqxgrid').jqxGrid('getrowid', editrow); + } + row = { + record: rowID, + uuid: dataRecord.uuid, + name: $('#name').val(), + inittemp_lo: parseFloat($('#inittemp_lo').jqxNumberInput('decimal')), + inittemp_hi: parseFloat($('#inittemp_hi').jqxNumberInput('decimal')), + fridgemode: $('#fridgemode').val(), + steps: steprows + }; + if (editrow >= 0) { + $('#jqxgrid').jqxGrid('updaterow', rowID, row); + } else { + $('#jqxgrid').jqxGrid('addrow', null, row); + } + $('#popupWindow').jqxWindow('hide'); + }); + createDelElements(); }); diff -r 35675eadc655 -r 3cccf4392a25 www/js/profile_mash.js --- a/www/js/profile_mash.js Fri Oct 18 16:21:54 2019 +0200 +++ b/www/js/profile_mash.js Fri Oct 18 19:24:05 2019 +0200 @@ -22,341 +22,341 @@ function createDelElements() { - $('#eventWindow').jqxWindow({ - theme: theme, - position: { x: 490, y: 210 }, - width: 300, - height: 175, - resizable: false, - isModal: true, - modalOpacity: 0.4, - okButton: $('#delOk'), - cancelButton: $('#delCancel'), - initContent: function () { - $('#delOk').jqxButton({ template: "danger", width: '65px', theme: theme }); - $('#delCancel').jqxButton({ template: "success", width: '65px', theme: theme }); - $('#delCancel').focus(); - } - }); - $('#eventWindow').jqxWindow('hide'); + $('#eventWindow').jqxWindow({ + theme: theme, + position: { x: 490, y: 210 }, + width: 300, + height: 175, + resizable: false, + isModal: true, + modalOpacity: 0.4, + okButton: $('#delOk'), + cancelButton: $('#delCancel'), + initContent: function() { + $('#delOk').jqxButton({ template: 'danger', width: '65px', theme: theme }); + $('#delCancel').jqxButton({ template: 'success', width: '65px', theme: theme }); + $('#delCancel').focus(); + } + }); + $('#eventWindow').jqxWindow('hide'); } -$(document).ready(function () { +$(document).ready(function() { - // tooltips - $("#name").jqxTooltip({ content: 'De naam voor dit maisch profiel.' }); - $("#notes").jqxTooltip({ content: 'De uitgebreide opmerkingen over dit maisch profiel.' }); + // tooltips + $('#name').jqxTooltip({ content: 'De naam voor dit maisch profiel.' }); + $('#notes').jqxTooltip({ content: 'De uitgebreide opmerkingen over dit maisch profiel.' }); - var steprow = 0, - stepData = {}, - dataRecord = {}, - url = 'includes/db_profile_mash.php', - source = { - datatype: 'json', - cache: false, - datafields: [ - { name: 'record', type: 'number' }, - { name: 'name', type: 'string' }, - { name: 'notes', type: 'string' }, - { name: 'steps', type: 'array' } - ], - id: 'record', - url: url, - deleterow: function (rowid, commit) { - // synchronize with the server - send delete command - var data = "delete=true&" + $.param({ record: rowid }); - $.ajax({ - dataType: 'json', - url: url, - cache: false, - data: data, - type: 'POST', - success: function (data, status, xhr) { - commit(true); - console.log('mash deleterow ' + rowid + ' success'); - location.reload( true ); - }, - error: function (jqXHR, textStatus, errorThrown) { - commit(false); - console.log('mash deleterow ' + textStatus); - } - }); - }, - addrow: function (rowid, rowdata, position, commit) { - var data = "insert=true&" + $.param(rowdata); - $.ajax({ - dataType: 'json', - url: url, - cache: false, - data: data, - type: "POST", - success: function (data, status, xhr) { - commit(true); - console.log('mash addrow ' + rowid + ' success'); - location.reload( true ); - }, - error: function(jqXHR, textStatus, errorThrown) { - commit(false); - console.log('mash addrow ' + textStatus); - } - }); - }, - updaterow: function (rowid, rowdata, commit) { - var data = "update=true&" + $.param(rowdata); - $.ajax({ - dataType: 'json', - url: url, - cache: false, - data: data, - type: "POST", - success: function (data, status, xhr) { - commit(true); - console.log('mash updaterow ' + rowid + ' success'); - location.reload( true ); - }, - error: function(jqXHR, textStatus, errorThrown) { - commit(false); - console.log('mash updaterow ' + textStatus); - } - }); - } - }, - dataAdapter = new $.jqx.dataAdapter(source), - editrow = -1, + var steprow = 0, + stepData = {}, + dataRecord = {}, + url = 'includes/db_profile_mash.php', + source = { + datatype: 'json', + cache: false, + datafields: [ + { name: 'record', type: 'number' }, + { name: 'name', type: 'string' }, + { name: 'notes', type: 'string' }, + { name: 'steps', type: 'array' } + ], + id: 'record', + url: url, + deleterow: function(rowid, commit) { + var data = 'delete=true&' + $.param({ record: rowid }); + $.ajax({ + dataType: 'json', + url: url, + cache: false, + data: data, + type: 'POST', + success: function(data, status, xhr) { + commit(true); + console.log('mash deleterow ' + rowid + ' success'); + location.reload(true); + }, + error: function(jqXHR, textStatus, errorThrown) { + commit(false); + console.log('mash deleterow ' + textStatus); + } + }); + }, + addrow: function(rowid, rowdata, position, commit) { + var data = 'insert=true&' + $.param(rowdata); + $.ajax({ + dataType: 'json', + url: url, + cache: false, + data: data, + type: 'POST', + success: function(data, status, xhr) { + commit(true); + console.log('mash addrow ' + rowid + ' success'); + location.reload(true); + }, + error: function(jqXHR, textStatus, errorThrown) { + commit(false); + console.log('mash addrow ' + textStatus); + } + }); + }, + updaterow: function(rowid, rowdata, commit) { + var data = 'update=true&' + $.param(rowdata); + $.ajax({ + dataType: 'json', + url: url, + cache: false, + data: data, + type: 'POST', + success: function(data, status, xhr) { + commit(true); + console.log('mash updaterow ' + rowid + ' success'); + location.reload(true); + }, + error: function(jqXHR, textStatus, errorThrown) { + commit(false); + console.log('mash updaterow ' + textStatus); + } + }); + } + }, + dataAdapter = new $.jqx.dataAdapter(source), + editrow = -1, - // Inline steps editor - editsteps = function (data) { - var generaterow = function () { - var row = {}; - row['step_name'] = "Stap 1"; - row['step_type'] = 0; - row['step_temp'] = 62.0; - row['step_time'] = 20.0; - row['ramp_time'] = 1.0; - row['end_temp'] = 62.0; - return row; - }, - stepSource = { - localdata: data.steps, - datatype: "local", - datafields: [ - { name: 'step_name', type: 'string' }, - { name: 'step_type', type: 'int' }, - { name: 'step_temp', type: 'float' }, - { name: 'step_time', type: 'float' }, - { name: 'ramp_time', type: 'float' }, - { name: 'end_temp', type: 'float' } - ], - addrow: function (rowid, rowdata, position, commit) { - commit(true); - }, - deleterow: function (rowid, commit) { - commit(true); - } - }, - stepAdapter = new $.jqx.dataAdapter(stepSource); + // Inline steps editor + editsteps = function(data) { + var generaterow = function() { + var row = {}; + row['step_name'] = 'Stap 1'; + row['step_type'] = 0; + row['step_temp'] = 62.0; + row['step_time'] = 20.0; + row['ramp_time'] = 1.0; + row['end_temp'] = 62.0; + return row; + }; + var stepSource = { + localdata: data.steps, + datatype: 'local', + datafields: [ + { name: 'step_name', type: 'string' }, + { name: 'step_type', type: 'int' }, + { name: 'step_temp', type: 'float' }, + { name: 'step_time', type: 'float' }, + { name: 'ramp_time', type: 'float' }, + { name: 'end_temp', type: 'float' } + ], + addrow: function(rowid, rowdata, position, commit) { + commit(true); + }, + deleterow: function(rowid, commit) { + commit(true); + } + }, + stepAdapter = new $.jqx.dataAdapter(stepSource); - $("#grid").jqxGrid({ - width: 1020, - height: 330, - source: stepAdapter, - theme: theme, - selectionmode: 'singlerow', - showtoolbar: true, - rendertoolbar: function (toolbar) { - var container = $("
"); - toolbar.append(container); - container.append(''); - container.append(''); - $("#addrowbutton").jqxButton({ template: "primary", theme: theme, width: 150 }); - $("#deleterowbutton").jqxButton({ template: "danger", theme: theme, width: 150 }); - // create new row. - $("#addrowbutton").on('click', function () { - var datarow = generaterow(); - $("#grid").jqxGrid('addrow', null, datarow); - }); - // delete row. - $("#deleterowbutton").on('click', function () { - var rowscount, id, selectedrowindex = $("#grid").jqxGrid('getselectedrowindex'); - rowscount = $("#grid").jqxGrid('getdatainformation').rowscount; - if (selectedrowindex >= 0 && selectedrowindex < rowscount) { - id = $("#grid").jqxGrid('getrowid', selectedrowindex); - $("#grid").jqxGrid('deleterow', id); - } - }); - }, - columns: [ - { text: 'Stap naam', datafield: 'step_name' }, - { text: 'Stap type', datafield: 'step_type', width: 150, - cellsrenderer: function (index, datafield, value, defaultvalue, column, rowdata) { - return "
" + MashStepTypeData[value].nl + "
"; - } - }, - { text: 'Begin °C', datafield: 'step_temp', width: 100, align: 'right', cellsalign: 'right', cellsformat: 'f1' }, - { text: 'Eind °C', datafield: 'end_temp', width: 100, align: 'right', cellsalign: 'right', cellsformat: 'f1' }, - { text: 'Rust min.', datafield: 'step_time', width: 90, align: 'right', cellsalign: 'right' }, - { text: 'Stap min.', datafield: 'ramp_time', width: 90, align: 'right', cellsalign: 'right' }, - { text: '', datafield: 'Edit', columntype: 'button', width: 100, align: 'center', - cellsrenderer: function () { - return "Wijzig"; - }, buttonclick: function (row) { - steprow = row; - stepData = $("#grid").jqxGrid('getrowdata', steprow); - $("#m_step_name").val(stepData.step_name); - $("#m_step_type").val(stepData.step_type); - $("#m_step_temp").val(stepData.step_temp); - $("#m_end_temp").val(stepData.end_temp); - $("#m_step_time").val(stepData.step_time); - $("#m_ramp_time").val(stepData.ramp_time); - // show the popup window. - $("#popupStep").jqxWindow('open'); - } - } - ] - }); - }; + $('#grid').jqxGrid({ + width: 1020, + height: 330, + source: stepAdapter, + theme: theme, + selectionmode: 'singlerow', + showtoolbar: true, + rendertoolbar: function(toolbar) { + var container = $('
'); + toolbar.append(container); + container.append(''); + container.append(''); + $('#addrowbutton').jqxButton({ template: 'primary', theme: theme, width: 150 }); + $('#deleterowbutton').jqxButton({ template: 'danger', theme: theme, width: 150 }); + // create new row. + $('#addrowbutton').on('click', function() { + var datarow = generaterow(); + $('#grid').jqxGrid('addrow', null, datarow); + }); + // delete row. + $('#deleterowbutton').on('click', function() { + var rowscount, id, selectedrowindex = $('#grid').jqxGrid('getselectedrowindex'); + rowscount = $('#grid').jqxGrid('getdatainformation').rowscount; + if (selectedrowindex >= 0 && selectedrowindex < rowscount) { + id = $('#grid').jqxGrid('getrowid', selectedrowindex); + $('#grid').jqxGrid('deleterow', id); + } + }); + }, + columns: [ + { text: 'Stap naam', datafield: 'step_name' }, + { text: 'Stap type', datafield: 'step_type', width: 150, + cellsrenderer: function(index, datafield, value, defaultvalue, column, rowdata) { + return '
' + MashStepTypeData[value].nl + '
'; + } + }, + { text: 'Begin °C', datafield: 'step_temp', width: 100, align: 'right', cellsalign: 'right', cellsformat: 'f1' }, + { text: 'Eind °C', datafield: 'end_temp', width: 100, align: 'right', cellsalign: 'right', cellsformat: 'f1' }, + { text: 'Rust min.', datafield: 'step_time', width: 90, align: 'right', cellsalign: 'right' }, + { text: 'Stap min.', datafield: 'ramp_time', width: 90, align: 'right', cellsalign: 'right' }, + { text: '', datafield: 'Edit', columntype: 'button', width: 100, align: 'center', + cellsrenderer: function() { + return 'Wijzig'; + }, buttonclick: function(row) { + steprow = row; + stepData = $('#grid').jqxGrid('getrowdata', steprow); + $('#m_step_name').val(stepData.step_name); + $('#m_step_type').val(stepData.step_type); + $('#m_step_temp').val(stepData.step_temp); + $('#m_end_temp').val(stepData.end_temp); + $('#m_step_time').val(stepData.step_time); + $('#m_ramp_time').val(stepData.ramp_time); + // show the popup window. + $('#popupStep').jqxWindow('open'); + } + } + ] + }); + }; - // Initialize the input fields. - $("#m_step_name").jqxInput({ theme: theme, width: 320, height: 23 }); - $("#m_step_type").jqxDropDownList({ - theme: theme, - source: MashStepTypeAdapter, - valueMember: 'id', - displayMember: 'nl', - width: 180, - height: 23, - autoDropDownHeight: true - }); - $("#m_step_temp").jqxNumberInput( Spin1dec ); - $("#m_step_temp").jqxNumberInput({ Min: 30, Max: 80 }); - $("#m_end_temp").jqxNumberInput( Spin1dec ); - $("#m_end_temp").jqxNumberInput({ Min: 30, Max: 80 }); - $("#m_step_time").jqxNumberInput( PosInt ); - $("#m_step_time").jqxNumberInput({ Min: 1, Max: 120 }); - $("#m_ramp_time").jqxNumberInput( PosInt ); - $("#m_ramp_time").jqxNumberInput({ Min: 1, Max: 30 }); + // Initialize the input fields. + $('#m_step_name').jqxInput({ theme: theme, width: 320, height: 23 }); + $('#m_step_type').jqxDropDownList({ + theme: theme, + source: MashStepTypeAdapter, + valueMember: 'id', + displayMember: 'nl', + width: 180, + height: 23, + autoDropDownHeight: true + }); + $('#m_step_temp').jqxNumberInput(Spin1dec); + $('#m_step_temp').jqxNumberInput({ Min: 30, Max: 80 }); + $('#m_end_temp').jqxNumberInput(Spin1dec); + $('#m_end_temp').jqxNumberInput({ Min: 30, Max: 80 }); + $('#m_step_time').jqxNumberInput(PosInt); + $('#m_step_time').jqxNumberInput({ Min: 1, Max: 120 }); + $('#m_ramp_time').jqxNumberInput(PosInt); + $('#m_ramp_time').jqxNumberInput({ Min: 1, Max: 30 }); - // initialize the input fields. - $("#name").jqxInput({ theme: theme, width: 480, height: 23 }); - $("#notes").jqxInput({ theme: theme, width: 800, height: 100 }); - // initialize jqxGrid - $("#jqxgrid").jqxGrid({ - width: 1280, - height: 630, - source: dataAdapter, - theme: theme, - showstatusbar: true, - renderstatusbar: function (statusbar) { - var addButton, container = $("
"); - addButton = $("
Add
"); - container.append(addButton); - statusbar.append(container); - addButton.jqxButton({ theme: theme, width: 90, height: 20 }); - // add new row. - addButton.click(function (event) { - editrow = -1; - $("#name").val('Nieuw maisch schema'); - $("#notes").val(''); - editsteps(''); - $("#popupWindow").jqxWindow('open'); - }); - }, - filterable: true, - filtermode: 'excel', - columns: [ - { text: 'Maish schema', datafield: 'name', width: 250 }, - { text: 'Opmerkingen', datafield: 'notes' }, - { text: '', datafield: 'Edit', width: 100, align: 'center', columntype: 'button', - cellsrenderer: function () { - return "Wijzig"; - }, buttonclick: function (row) { - editrow = row; - // get the clicked row's data and initialize the input fields. - dataRecord = $("#jqxgrid").jqxGrid('getrowdata', editrow); - $("#name").val(dataRecord.name); - $("#notes").val(dataRecord.notes); - editsteps(dataRecord); - // show the popup window. - $("#popupWindow").jqxWindow('open'); - } - } - ] - }); - // initialize the popup window and buttons. - $("#popupWindow").jqxWindow({ - width: 1050, - height: 580, - position: { x: 110, y: 30 }, - resizable: false, - theme: theme, - isModal: true, - autoOpen: false, - cancelButton: $("#Cancel"), - modalOpacity: 0.40 - }); - $("#popupWindow").on('open', function () { - $("#name").jqxInput('selectAll'); - }); - $("#popupStep").jqxWindow({ - width: 800, - height: 300, - position: { x: 230, y: 100 }, - resizable: false, - theme: theme, - isModal: true, - autoOpen: false, - cancelButton: $("#Ready"), - modalOpacity: 0.40 - }); + // initialize the input fields. + $('#name').jqxInput({ theme: theme, width: 480, height: 23 }); + $('#notes').jqxInput({ theme: theme, width: 800, height: 100 }); + // initialize jqxGrid + $('#jqxgrid').jqxGrid({ + width: 1280, + height: 630, + source: dataAdapter, + theme: theme, + showstatusbar: true, + renderstatusbar: function(statusbar) { + var addButton, container = $('
'); + addButton = $('
Add
'); + container.append(addButton); + statusbar.append(container); + addButton.jqxButton({ theme: theme, width: 90, height: 20 }); + // add new row. + addButton.click(function(event) { + editrow = -1; + $('#name').val('Nieuw maisch schema'); + $('#notes').val(''); + editsteps(''); + $('#popupWindow').jqxWindow('open'); + }); + }, + filterable: true, + filtermode: 'excel', + columns: [ + { text: 'Maish schema', datafield: 'name', width: 250 }, + { text: 'Opmerkingen', datafield: 'notes' }, + { text: '', datafield: 'Edit', width: 100, align: 'center', columntype: 'button', + cellsrenderer: function() { + return 'Wijzig'; + }, buttonclick: function(row) { + editrow = row; + // get the clicked row's data and initialize the input fields. + dataRecord = $('#jqxgrid').jqxGrid('getrowdata', editrow); + $('#name').val(dataRecord.name); + $('#notes').val(dataRecord.notes); + editsteps(dataRecord); + // show the popup window. + $('#popupWindow').jqxWindow('open'); + } + } + ] + }); + // initialize the popup window and buttons. + $('#popupWindow').jqxWindow({ + width: 1050, + height: 580, + position: { x: 110, y: 30 }, + resizable: false, + theme: theme, + isModal: true, + autoOpen: false, + cancelButton: $('#Cancel'), + modalOpacity: 0.40 + }); + $('#popupWindow').on('open', function() { + $('#name').jqxInput('selectAll'); + }); + $('#popupStep').jqxWindow({ + width: 800, + height: 300, + position: { x: 230, y: 100 }, + resizable: false, + theme: theme, + isModal: true, + autoOpen: false, + cancelButton: $('#Ready'), + modalOpacity: 0.40 + }); - // step detail popup update values. - $("#Ready").jqxButton({ template: "success", width: '90px', theme: theme }); - $("#Ready").click(function () { - $("#grid").jqxGrid('setcellvalue', steprow, 'step_name', $("#m_step_name").val()); - $("#grid").jqxGrid('setcellvalue', steprow, 'step_type', $("#m_step_type").val()); - $("#grid").jqxGrid('setcellvalue', steprow, 'step_temp', $("#m_step_temp").val()); - $("#grid").jqxGrid('setcellvalue', steprow, 'end_temp', $("#m_end_temp").val()); - $("#grid").jqxGrid('setcellvalue', steprow, 'step_time', $("#m_step_time").val()); - $("#grid").jqxGrid('setcellvalue', steprow, 'ramp_time', $("#m_ramp_time").val()); - $('#grid').jqxGrid('sortby', 'step_temp', 'asc'); - }); + // step detail popup update values. + $('#Ready').jqxButton({ template: 'success', width: '90px', theme: theme }); + $('#Ready').click(function() { + $('#grid').jqxGrid('setcellvalue', steprow, 'step_name', $('#m_step_name').val()); + $('#grid').jqxGrid('setcellvalue', steprow, 'step_type', $('#m_step_type').val()); + $('#grid').jqxGrid('setcellvalue', steprow, 'step_temp', $('#m_step_temp').val()); + $('#grid').jqxGrid('setcellvalue', steprow, 'end_temp', $('#m_end_temp').val()); + $('#grid').jqxGrid('setcellvalue', steprow, 'step_time', $('#m_step_time').val()); + $('#grid').jqxGrid('setcellvalue', steprow, 'ramp_time', $('#m_ramp_time').val()); + $('#grid').jqxGrid('sortby', 'step_temp', 'asc'); + }); - // mash profile popup. - $("#Delete").jqxButton({ template: "danger", width: '90px', theme: theme }); - $("#Delete").click(function () { - if (editrow >= 0) { - // Open a popup to confirm this action. - $('#eventWindow').jqxWindow('open'); - $("#delOk").click(function () { - var rowID = $('#jqxgrid').jqxGrid('getrowid', editrow); - $("#jqxgrid").jqxGrid('deleterow', rowID); - }); - } - $("#popupWindow").jqxWindow('hide'); - }); - $("#Cancel").jqxButton({ template: "primary", width: '90px', theme: theme }); - $("#Save").jqxButton({ template: "success", width: '90px', theme: theme }); - $("#Save").click(function () { - var steprows = $('#grid').jqxGrid('getrows'), - rowID = -1, - row; - if (editrow >= 0) { - rowID = $('#jqxgrid').jqxGrid('getrowid', editrow); - } - row = { - record: rowID, - name: $("#name").val(), - notes: $("#notes").val(), - steps: steprows - }; - if (editrow >= 0) { - $('#jqxgrid').jqxGrid('updaterow', rowID, row); - } else { - $('#jqxgrid').jqxGrid('addrow', null, row); - } - $("#popupWindow").jqxWindow('hide'); - }); - createDelElements(); + // mash profile popup. + $('#Delete').jqxButton({ template: 'danger', width: '90px', theme: theme }); + $('#Delete').click(function() { + if (editrow >= 0) { + // Open a popup to confirm this action. + $('#eventWindow').jqxWindow('open'); + $('#delOk').click(function() { + var rowID = $('#jqxgrid').jqxGrid('getrowid', editrow); + $('#jqxgrid').jqxGrid('deleterow', rowID); + }); + } + $('#popupWindow').jqxWindow('hide'); + }); + $('#Cancel').jqxButton({ template: 'primary', width: '90px', theme: theme }); + $('#Save').jqxButton({ template: 'success', width: '90px', theme: theme }); + $('#Save').click(function() { + var steprows = $('#grid').jqxGrid('getrows'), + rowID = -1, + row; + if (editrow >= 0) { + rowID = $('#jqxgrid').jqxGrid('getrowid', editrow); + } + row = { + record: rowID, + name: $('#name').val(), + notes: $('#notes').val(), + steps: steprows + }; + if (editrow >= 0) { + $('#jqxgrid').jqxGrid('updaterow', rowID, row); + } else { + $('#jqxgrid').jqxGrid('addrow', null, row); + } + $('#popupWindow').jqxWindow('hide'); + }); + createDelElements(); }); 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) { + } + }); + }); });