diff -r 14e349ff2a10 -r a8aabb63fbcc www/js/rec_edit.js --- a/www/js/rec_edit.js Tue Jan 29 21:52:08 2019 +0100 +++ b/www/js/rec_edit.js Wed Jan 30 16:40:23 2019 +0100 @@ -1420,7 +1420,8 @@ { name: 'f_percentage', type: 'float' }, { name: 'f_di_ph', type: 'float' }, { name: 'f_acid_to_ph_57', type: 'float' }, - { name: 'f_stock', type: 'float' }, + { name: 'f_inventory', type: 'float' }, + { name: 'f_avail', type: 'int' } ], addrow: function (rowid, rowdata, position, commit) { commit(true); @@ -1450,6 +1451,7 @@ $("#faddrowbutton").jqxDropDownList({ placeHolder: "Kies mout:", theme: theme, + template: "primary", source: fermentablelist, displayMember: "name", width: 150, @@ -1501,6 +1503,7 @@ } row["f_di_ph"] = datarecord.di_ph; row["f_acid_to_ph_57"] = datarecord.acid_to_ph_57; + row["f_inventory"] = datarecord.inventory; var commit = $("#fermentableGrid").jqxGrid('addrow', null, row); } }); @@ -1512,7 +1515,7 @@ }); // delete selected fermentable. - $("#fdeleterowbutton").jqxButton({ theme: theme, height: 27, width: 150 }); + $("#fdeleterowbutton").jqxButton({ template: "danger", theme: theme, height: 27, width: 150 }); $("#fdeleterowbutton").on('click', function () { var selectedrowindex = $("#fermentableGrid").jqxGrid('getselectedrowindex'); var rowscount = $("#fermentableGrid").jqxGrid('getdatainformation').rowscount; @@ -1577,7 +1580,7 @@ }, { text: 'Opbrengst', editable: false, datafield: 'f_yield', width: 90, align: 'right', cellsalign: 'right', cellsformat: 'p1' }, { text: 'Gewicht Kg', datafield: 'f_amount', width: 120, align: 'right', cellsalign: 'right', cellsformat: 'f3' }, - { text: 'Voorr. Kg', datafield: 'f_stock', width: 120, align: 'right', cellsalign: 'right', cellsformat: 'f3' }, + { text: 'Voorr. Kg', datafield: 'f_inventory', width: 120, align: 'right', cellsalign: 'right', cellsformat: 'f3' }, { text: 'Percent', datafield: 'f_percentage', width: 90, align: 'right', cellsalign: 'right', cellsformat: 'p1' }, { text: '100%', align: 'center', datafield: 'f_adjust_to_total_100', columntype: 'checkbox', width: 70 }, { text: 'Wijzig', datafield: 'Edit', columntype: 'button', width: 100, align: 'center', cellsrenderer: function () { @@ -2501,17 +2504,61 @@ }); $("#FermentableReady").jqxButton({ template: "success", width: '90px', theme: theme }); $("#FermentableReady").click(function () { - $("#fermentableGrid").jqxGrid('setcellvalue', fermentableRow, 'f_name', $("#wf_name").val()); - - // $("#fermentableGrid").jqxGrid('sortby', 'f_amount', 'desc'); + $("#fermentableGrid").jqxGrid('sortby', 'f_amount', 'desc'); // Recalc percentages - // calcFermentables(); - // calcSVG(); - // calcABV(); - // calcIBUs(); + calcFermentables(); + calcSVG(); + calcABV(); + calcIBUs(); // Waters: yes there is impact. }); $("#wf_name").jqxInput({ theme: theme, width: 320, height: 23 }); + $("#wf_instock").jqxCheckBox({ theme: theme, height: 23 }); + $("#wf_instock").on('change', function (event) { + fermentableinstock = event.args.checked; + fermentablelist.dataBind(); + }); + $("#wf_select").jqxDropDownList({ + placeHolder: "Kies mout:", + theme: theme, + source: fermentablelist, + displayMember: "name", + width: 150, + height: 23, + dropDownWidth: 500, + dropDownHeight: 500, + renderer: function (index, label, value) { + var datarecord = fermentablelist.records[index]; + return datarecord.supplier+ " / " + datarecord.name + " (" + datarecord.color + " EBC)"; + } + }); + $("#wf_select").on('select', function (event) { + if (event.args) { + var index = event.args.index; + var datarecord = fermentablelist.records[index]; + var rowdata = $("#fermentableGrid").jqxGrid('getrowdata', fermentableRow); + $("#wf_name").val(datarecord.name); + rowdata.f_name = datarecord.name; + rowdata.f_origin = datarecord.origin; + rowdata.f_supplier = datarecord.supplier; + rowdata.f_type = datarecord.type; + rowdata.f_cost = datarecord.cost; + rowdata.f_yield = datarecord.yield; + rowdata.f_color = datarecord.color; + rowdata.f_coarse_fine_diff = datarecord.coarse_fine_diff; + rowdata.f_moisture = datarecord.moisture; + rowdata.f_diastatic_power = datarecord.diastatic_power; + rowdata.f_protein = datarecord.protein; + rowdata.f_max_in_batch = datarecord.max_in_batch; + rowdata.f_graintype = datarecord.graintype; + rowdata.f_dissolved_protein = datarecord.dissolved_protein; + rowdata.f_recommend_mash = datarecord.recommend_mash; + rowdata.f_add_after_boil = datarecord.add_after_boil; + rowdata.f_di_ph = datarecord.di_ph; + rowdata.f_acid_to_ph_57 = datarecord.acid_to_ph_57; + rowdata.f_inventory = datarecord.inventory; + } + }); $("#wf_amount").jqxNumberInput( Spin3dec5 ); $('#wf_amount').on('change', function (event) { console.log("amount changed: "+event.args.value);