diff -r 92d6bc8a4cdd -r f433193f7bb6 www/js/inv_waters.js --- a/www/js/inv_waters.js Fri Nov 16 16:20:17 2018 +0100 +++ b/www/js/inv_waters.js Sat Nov 17 15:58:13 2018 +0100 @@ -56,7 +56,6 @@ $("#magnesium").jqxTooltip({ content: 'Magnesium (Mg).' }); $("#ph").jqxTooltip({ content: 'De zuurgraad (pH).' }); $("#total_alkalinity").jqxTooltip({ content: 'Totale alkaliniteit.' }); - $("#default_water").jqxTooltip({ content: 'Is dit het standaard water voor de meeste bieren.' }); $("#inventory").jqxTooltip({ content: 'Voorraad in liters.' }); $("#cost").jqxTooltip({ content: 'Kostprijs per liter. 5 cijfers achter de comma zodat het kraanwater er ook in kan.' }); // prepare the data @@ -76,7 +75,6 @@ { name: 'ph', type: 'float' }, { name: 'notes', type: 'string' }, { name: 'total_alkalinity', type: 'float' }, - { name: 'default_water', type: 'bool' }, { name: 'inventory', type: 'float' }, { name: 'cost', type: 'float' } ], @@ -144,7 +142,6 @@ $("#notes").jqxInput({ theme: theme, width: 640, height: 100 }); $("#total_alkalinity").jqxNumberInput({ inputMode: 'simple', spinMode: 'simple', theme: theme, width: 70, height: 23, min: 0, decimalDigits: 1, spinButtons: true }); - $("#default_water").jqxCheckBox({ theme: theme, width: 120, height: 23 }); $("#inventory").jqxNumberInput({ inputMode: 'simple', spinMode: 'simple', theme: theme, width: 70, height: 23, min: 0, decimalDigits: 1, spinButtons: true }); $("#cost").jqxNumberInput({inputMode: 'simple', spinMode: 'simple', theme: theme, width: 110, height: 23, min: 0, decimalDigits: 5, spinButtons: true }); var dataAdapter = new $.jqx.dataAdapter(source); @@ -178,7 +175,6 @@ $("#ph").val(''); $("#notes").val(''); $("#total_alkalinity").val(''); - $("#default_water").val(''); $("#inventory").val(''); $("#cost").val(''); $("#popupWindow").jqxWindow('open'); @@ -189,7 +185,6 @@ columns: [ { text: 'Water leverancier', datafield: 'name', width: 225 }, { text: 'Opmerkingen', datafield: 'notes' }, - { text: 'Standaard', datafield: 'default_water', columntype: 'checkbox', width: 80 }, { text: 'Onbeperkt', datafield: 'unlimited_stock', columntype: 'checkbox', width: 80 }, { text: 'Liters', datafield: 'inventory', width: 70, align: 'right', cellsalign: 'right', cellsformat: 'f1' }, { text: 'Wijzig', datafield: 'Edit', width: 120, align: 'center', columntype: 'button', cellsrenderer: function () { @@ -211,7 +206,6 @@ $("#ph").val(dataRecord.ph); $("#notes").val(dataRecord.notes); $("#total_alkalinity").val(dataRecord.total_alkalinity); - $("#default_water").val(dataRecord.default_water); $("#inventory").val(dataRecord.inventory); $("#cost").val(dataRecord.cost); // show the popup window. @@ -258,7 +252,6 @@ ph: parseFloat($("#ph").jqxNumberInput('decimal')), notes: $("#notes").val(), total_alkalinity: parseFloat($("#total_alkalinity").jqxNumberInput('decimal')), - default_water: $("#default_water").val(), inventory: parseFloat($("#inventory").jqxNumberInput('decimal')), cost: parseFloat($("#cost").jqxNumberInput('decimal')) }; @@ -279,7 +272,6 @@ ph: parseFloat($("#ph").jqxNumberInput('decimal')), notes: $("#notes").val(), total_alkalinity: parseFloat($("#total_alkalinity").jqxNumberInput('decimal')), - default_water: $("#default_water").val(), inventory: parseFloat($("#inventory").jqxNumberInput('decimal')), cost: parseFloat($("#cost").jqxNumberInput('decimal')) };