# HG changeset patch # User Michiel Broek # Date 1553543245 -3600 # Node ID 2987e5bb830d6cfa80ef95ddfaabb0c68ea75e17 # Parent f0ca77097236b730627c42f3a83d8fee50af02b6 Fix for adding mash steps. diff -r f0ca77097236 -r 2987e5bb830d www/js/prod_edit.js --- a/www/js/prod_edit.js Wed Mar 13 21:31:04 2019 +0100 +++ b/www/js/prod_edit.js Mon Mar 25 20:47:25 2019 +0100 @@ -3850,17 +3850,6 @@ // inline mash editor var editMash = function (data) { - var generaterow = function () { - var row = {}; - row["step_name"] = "Stap 1"; - row["step_type"] = "Infusion"; - row["step_infuse_amount"] = 15; - row["step_temp"] = 62.0; - row['step_time'] = 20.0; - row['ramp_time'] = 1.0; - row['end_temp'] = 62.0; - return row; - } var mashSource = { localdata: data.mashs, datatype: "local", @@ -3908,8 +3897,20 @@ container.append(''); $("#saddrowbutton").jqxButton({ template: "primary", theme: theme, height: 27, width: 150, disabled: (dataRecord.stage > 3) }); $("#saddrowbutton").on('click', function () { - var datarow = generaterow(); - var commit = $("#mashGrid").jqxGrid('addrow', null, datarow); + var rowscount = $("#mashGrid").jqxGrid('getdatainformation').rowscount; + var row = {}; + row["step_name"] = "Stap " + (rowscount + 1); + if (rowscount > 0) { + row["step_type"] = 1; + } else { + row["step_type"] = 0; + row["step_infuse_amount"] = 15; + } + row["step_temp"] = 62.0; + row['step_time'] = 20.0; + row['ramp_time'] = 1.0; + row['end_temp'] = 62.0; + var commit = $("#mashGrid").jqxGrid('addrow', null, row); }); // delete selected step. $("#sdeleterowbutton").jqxButton({ template: "danger", theme: theme, height: 27, width: 150, disabled: (dataRecord.stage > 3) });