diff -r 2465dbc90ea4 -r 0fe366d953ab www/js/prod_edit.js --- a/www/js/prod_edit.js Mon Sep 16 17:26:38 2019 +0200 +++ b/www/js/prod_edit.js Wed Sep 18 14:40:34 2019 +0200 @@ -305,6 +305,10 @@ { name: 'prop3_volume', type: 'float' }, { name: 'prop4_type', type: 'int' }, { name: 'prop4_volume', type: 'float' }, + { name: 'divide_type', type: 'int' }, + { name: 'divide_size', type: 'float' }, + { name: 'divide_parts', type: 'int' }, + { name: 'divide_from', type: 'string' }, { name: 'fermentables', type: 'array' }, { name: 'hops', type: 'array' }, { name: 'miscs', type: 'array' }, @@ -530,6 +534,10 @@ $('#prop3_volume').val(dataRecord.prop3_volume); $('#prop4_type').val(dataRecord.prop4_type); $('#prop4_volume').val(dataRecord.prop4_volume); + // hidden divide_type + // hidden divide_size + // hidden divide_parts + // hidden divide_from editFermentable(dataRecord); editHop(dataRecord); editMisc(dataRecord); @@ -4369,6 +4377,10 @@ prop3_volume: parseFloat($('#prop3_volume').jqxNumberInput('decimal')), prop4_type: $('#prop4_type').val(), prop4_volume: parseFloat($('#prop4_volume').jqxNumberInput('decimal')), + divide_type: dataRecord.divide_type, + divide_size: dataRecord.divide_size, + divide_parts: dataRecord.divide_parts, + divide_from: dataRecord.divide_from, fermentables: $('#fermentableGrid').jqxGrid('getrows'), hops: $('#hopGrid').jqxGrid('getrows'), miscs: $('#miscGrid').jqxGrid('getrows'), @@ -4389,7 +4401,8 @@ window.location.href = my_return; else window.location.href = - 'prod_export.php?record=' + my_record + '&return=' + my_return + '&select=' + my_select + '&code=' + dataRecord.code + '&name=' + dataRecord.name; + 'prod_export.php?record=' + my_record + '&return=' + my_return + '&select=' + my_select + '&code=' + dataRecord.code + '&name=' + dataRecord.name + + '&stage=' + dataRecord.stage + '&split=' + dataRecord.divide_type; }, error: function(jqXHR, textStatus, errorThrown) { console.log('saveRecord() ' + textStatus);