bms: comparison www/js/prod_edit.js

comparison: www/js/prod_edit.js

www/js/prod_edit.js

changeset 756: b702c25661e7
parent 755: 509510586665
child 757: d13be50c0049

equal deleted inserted replaced

-:509510586665
+:b702c25661e7
 // Inline fermentables editor
 var editFermentable = function(data) {
 var fermentableSource = {
 localdata: data.fermentables,
-datatype: 'local',
-cache: false,
-async: true,
 datafields: [
 { name: 'f_name', type: 'string' },
 { name: 'f_origin', type: 'string' },
 { name: 'f_supplier', type: 'string' },
 { name: 'f_amount', type: 'float' },
 { text: 'Maxinbatch', datafield: 'f_max_in_batch', hidden: true },
 { text: 'Opbrengst', 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: 'Voorraad Kg', datafield: 'f_inventory', width: 120, align: 'right',
 cellsrenderer: function(row, columnfield, value, defaulthtml, columnproperties, rowdata) {
-var color = '#ffffff';
+var color = (value < rowdata.f_amount) ? '#ff4040':'#ffffff';
 if (block_fermentable(dataRecord.inventory_reduced, rowdata.f_added) == false) {
-if (value < rowdata.f_amount)
-color = '#ff4040';
 return '<span style="margin: 4px; margin-top: 6px; float: right; color: ' + color + ';">' + fermentableAdapter.formatNumber(value, 'f3') + '</span>';
 } else {
 return '<span></span>';
 }
 }
 },
 { text: 'Procent', datafield: 'f_percentage', width: 90, align: 'right',
 cellsrenderer: function(row, columnfield, value, defaulthtml, columnproperties, rowdata) {
 if (rowdata.f_added >= 4)
 return '<span></span>';
-var color = '#ffffff';
+var color = (value > rowdata.f_max_in_batch) ? '#ff4040':'#ffffff';
-if (value > rowdata.f_max_in_batch)
-color = '#ff4040';
 return '<span style="margin: 4px; margin-top: 6px; float: right; color: ' + color + ';">' + fermentableAdapter.formatNumber(value, 'p1') + '</span>';
 }
 },
 { text: '100%', datafield: 'f_adjust_to_total_100', width: 70, align: 'center', cellsalign: 'center',
 cellsrenderer: function(index, datafield, value, defaultvalue, column, rowdata) {
 // Inline hops editor
 var editHop = function(data) {
 var hopSource = {
 localdata: data.hops,
-datatype: 'local',
-cache: false,
-async: true,
 datafields: [
 { name: 'h_name', type: 'string' },
 { name: 'h_origin', type: 'string' },
 { name: 'h_amount', type: 'float' },
 { name: 'h_cost', type: 'float' },
 }
 },
 { text: 'Voorraad', datafield: 'h_inventory', width: 110, align: 'right',
 cellsrenderer: function(index, datafield, value, defaultvalue, column, rowdata) {
 if (block_hop(dataRecord.inventory_reduced, rowdata.h_useat) == false) {
-var amount, color = '#ffffff';
+var amount = dataAdapter.formatNumber(value, 'f1') + ' kg',
-if (value < rowdata.h_amount)
+color = (value < rowdata.h_amount) ? '#ff4040':'#ffffff';
-color = '#ff4040';
-amount = dataAdapter.formatNumber(value, 'f1') + ' kg';
 if (value < 1)
 amount = dataAdapter.formatNumber(value * 1000, 'f1') + ' gr';
 return '<span style="margin: 4px; margin-top: 6px; float: right; color: ' + color + ';">' + amount + '</span>';
 } else {
 return '<span></span>';
 // Inline miscs editor
 var editMisc = function(data) {
 var miscSource = {
 localdata: data.miscs,
-datatype: 'local',
-cache: false,
-async: false,
 datafields: [
 { name: 'm_name', type: 'string' },
 { name: 'm_amount', type: 'float' },
 { name: 'm_cost', type: 'float' },
 { name: 'm_type', type: 'int' },
 return '<span style="margin: 4px; margin-top: 6px; float: right;">' + dataAdapter.formatNumber(value * 1000, 'f2') + ' ' + vstr + '</span>';
 }
 },
 { text: 'Voorraad', datafield: 'm_inventory', width: 110, align: 'right',
 cellsrenderer: function(index, datafield, value, defaultvalue, column, rowdata) {
-var vstr, color, amount;
 if (block_misc(dataRecord.inventory_reduced, rowdata.m_use_use) == false) {
-vstr = rowdata.m_amount_is_weight ? 'gr' : 'ml';
+var vstr = rowdata.m_amount_is_weight ? 'gr' : 'ml',
-color = '#ffffff';
+color = (value < rowdata.m_amount) ? '#ff4040':'#ffffff',
-if (value < rowdata.m_amount)
-color = '#ff4040';
 amount = dataAdapter.formatNumber(value * 1000, 'f2') + ' ' + vstr;
 return '<span style="margin: 4px; margin-top: 6px; float: right; color: ' + color + ';">' + amount + '</span>';
 } else {
 return '<span></span>';
 }
 // Inline yeasts editor
 var editYeast = function(data) {
 var yeastSource = {
 localdata: data.yeasts,
-datatype: 'local',
-cache: false,
-async: false,
 datafields: [
 { name: 'y_name', type: 'string' },
 { name: 'y_laboratory', type: 'string' },
 { name: 'y_product_id', type: 'string' },
 { name: 'y_amount', type: 'float' },
 },
 { text: 'Min. &deg;C', width: 70, align: 'right', cellsalign: 'right', datafield: 'y_min_temperature' },
 { text: 'Max. &deg;C', width: 70, align: 'right', cellsalign: 'right', datafield: 'y_max_temperature' },
 { text: 'Tol. %', width: 60, align: 'right', cellsalign: 'right', datafield: 'y_tolerance',
 cellsrenderer: function(index, datafield, value, defaultvalue, column, rowdata) {
-var amount = '', color = '#ffffff';
+var amount = '', color = (dataRecord.est_abv > value) ? '#ff4040':'#ffffff';
 if (value > 0) {
 amount = dataAdapter.formatNumber(value, 'f1');
-if (dataRecord.est_abv > value)
-color = '#ff4040';
 }
 return '<span style="margin: 4px; margin-top: 6px; float: right; color: ' + color + ';">' + amount + '</span>';
 }
 },
 { text: 'Attn. %', width: 70, align: 'right', cellsalign: 'right', datafield: 'y_attenuation', cellsformat: 'f1' },
 // inline mash editor
 var editMash = function(data) {
 var mashSource = {
 localdata: data.mashs,
-datatype: 'local',
-cache: false,
-async: false,
 datafields: [
 { name: 'step_name', type: 'string' },
 { name: 'step_type', type: 'int' },
 { name: 'step_volume', type: 'float' },
 { name: 'step_infuse_amount', type: 'float' },
 }
 function calcViability() {
 var vpm = 1.00;
 var max = 100;
-var rowscount = $('#yeastGrid').jqxGrid('getdatainformation').rowscount;
+var rowscount = dataRecord.yeasts.length;
 if (rowscount) {
 for (i = 0; i < rowscount; i++) {
-row = $('#yeastGrid').jqxGrid('getrowdata', i);
+row = dataRecord.yeasts[i];
 if (row.y_use == 0) {
 if (row.y_form == 0) { // Liquid
 vpm = 0.80;
 max = 97;
 if (row.y_laboratory == 'White Labs') { // PurePitch
 }
 function calcPercentages() {
 console.log('calcPercentages()');
-var tw = 0, rowdata, percentage, rowscount = $('#fermentableGrid').jqxGrid('getdatainformation').rowscount;
+var tw = 0, rowdata, percentage, rowscount = dataRecord.fermentables.length;
 if (rowscount > 1) {
 for (i = 0; i < rowscount; i++) {
-rowdata = $('#fermentableGrid').jqxGrid('getrowdata', i);
+rowdata = dataRecord.fermentables[i];
 if (rowdata.f_added < 4)
 tw += Round(rowdata.f_amount, 3);
 }
 tw = Round(tw, 3);
 pcara = 0;
 mashkg = 0;
 ok_fermentables = 1;    // All is in stock.
 ok_yeasts = 1;
-if ((rows = $('#mashGrid').jqxGrid('getrows'))) {
+if (dataRecord.mashs.length) {
-for (i = 0; i < rows.length; i++) {
+for (i = 0; i < dataRecord.mashs.length; i++) {
-row = rows[i];
+row = dataRecord.mashs[i];
-if (row.step_type == 0) // Infusion
+if (parseFloat(row.step_type) == 0) // Infusion
 mvol += parseFloat(row.step_infuse_amount);
 if (row.step_temp <= 75) { // Ignore mashout
 timem = row.step_time + row.ramp_time;
 mashtime += timem;
 mashtemp += timem * row.step_temp;
 }
 if (mashtime > 5)
 mashtime -= 5; //Correct last ramp > 75
 mashtemp = Round(mashtemp / mashtime, 2);
 } else {
-console.log("calcFermentables() mashGrid not loaded");
+console.log("calcFermentables() no mash steps");
 }
-if (!(rows = $('#fermentableGrid').jqxGrid('getrows'))) {
+if (! dataRecord.fermentables.length) {
-console.log("calcFermentables() fermentableGrid not loaded");
+console.log("calcFermentables() no fermentables");
 return; // grid not yet loaded.
 }
-for (i = 0; i < rows.length; i++) {
+for (i = 0; i < dataRecord.fermentables.length; i++) {
-row = rows[i];
+row = dataRecord.fermentables[i];
 if (row.f_adjust_to_total_100)
 my_100 = true;
 if (row.f_type == 1 && row.f_added < 4) // Sugar
 psugar += row.f_percentage;
 if (row.f_graintype == 2 && row.f_added < 4)    // Crystal
 calcStage();
 // Calculate estimated svg.
 svg = 0; // default.
 initcells = 0;
-rows = $('#yeastGrid').jqxGrid('getrows');
+for (i = 0; i < dataRecord.yeasts.length; i++) {
-for (i = 0; i < rows.length; i++) {
+row = dataRecord.yeasts[i];
-row = rows[i];
 if (row.y_use == 0) {   // Primary
 if (parseFloat(row.y_attenuation) > svg)
 svg = parseFloat(row.y_attenuation);    // Take the highest if multiple yeasts.
 if (row.y_form == 0)
 initcells += (parseFloat(row.y_cells) / 1000000000) * parseFloat(row.y_amount) * (dataRecord.starter_viability / 100);
 var h, m, infused = 0, mashtime = 0, mashvol = 0, vol, i, j, n, a, b, row, temp;
 var lasttemp = 18.0;
 var graintemp = 18.0;
 var tuntemp = 18.0;
-if ((rows = $('#mashGrid').jqxGrid('getrows')) && (mashkg > 0)) {
+if (dataRecord.mashs.length && (mashkg > 0)) {
 console.log('calcMash()');
-for (i = 0; i < rows.length; i++) {
+for (i = 0; i < dataRecord.mashs.length; i++) {
-row = $('#mashGrid').jqxGrid('getrowdata', i);
+row = dataRecord.mashs[i];
 if (row.step_type == 0) { // Infusion
 if (i == 0) {
 // First mash step, temperature from the mashtun and malt.
 n = 20; // tun is preheated.
 tuntemp = row.step_temp;
 temp = 99;
 }
 tuntemp += (temp - tuntemp) / 2;
 row.step_infuse_temp = Round(temp, 6);
 }
-console.log('init infuse temp: ' + row.step_infuse_temp);
+//console.log('init infuse temp: ' + row.step_infuse_temp);
 } else {
 // Calculate amount of infusion water.
 row.step_infuse_amount = infusionVol(infused, mashkg, row.step_infuse_temp, row.step_temp, lasttemp);
-//console.log('vol: ' + row.step_infuse_amount + ' temp: ' + row.step_infuse_temp);
+console.log('vol: ' + row.step_infuse_amount + ' temp: ' + row.step_infuse_temp);
 }
 infused += row.step_infuse_amount;
 } else if (row.step_type == 1) { // Temperature
 if (i > 0)
 row.step_infuse_amount = 0;
 function calcFermentablesFromOG(OG) {
 console.log('calcFermentablesFromOG(' + OG + ')');
 var amount, row, d, i, sug, tot = 0, totmass = 0, rowscount, efficiency = parseFloat($('#efficiency').jqxNumberInput('decimal'));
 sug = sg_to_plato(OG) * parseFloat($('#batch_size').jqxNumberInput('decimal')) * OG / 100;      //total amount of sugars in kg
-rowscount = $('#fermentableGrid').jqxGrid('getdatainformation').rowscount;
+rowscount = dataRecord.fermentables.length;
 for (i = 0; i < rowscount; i++) {
-row = $('#fermentableGrid').jqxGrid('getrowdata', i);
+row = dataRecord.fermentables[i];
 if (row.f_added < 4) {
 d = row.f_percentage / 100 * (row.f_yield / 100) * (1 - row.f_moisture / 100);
 if (row.f_added == 0)   // Mash
 d = efficiency / 100 * d;
 tot += d;
 if (tot)
 totmass = Round(sug / tot, 3);
 if (totmass) {
 for (i = 0; i < rowscount; i++) {
-row = $('#fermentableGrid').jqxGrid('getrowdata', i);
+row = dataRecord.fermentables[i];
 if (row.f_added < 4) {
 amount = Math.round(row.f_percentage * 10 * totmass) / 1000;
+dataRecord.fermentables[i].f_amount = amount;
 $('#fermentableGrid').jqxGrid('setcellvalue', i, 'f_amount', amount);
 }
 }
 }
 };
 $('#yeast_cells').val(initcells);
 if (!(rows = $('#yeastGrid').jqxGrid('getrows'))) {
 return; // grid not yet loaded.
 }
-rowscount = $('#yeastGrid').jqxGrid('getdatainformation').rowscount;
+rowscount = dataRecord.yeasts.length;
 if (rowscount == 0)
 return; // no yeast in recipe
 $('.primary_dry').hide();
 $('.primary_liquid').hide();
 var maybe_starter = 0;
 var pitchrate = 0.75;    // Yeast pitch rate default
 for (i = 0; i < rowscount; i++) {
-row = $('#yeastGrid').jqxGrid('getrowdata', i);
+row = dataRecord.yeasts[i];
 if (row.y_use == 0) { // primary
 if (row.y_form == 1) {
 // Dry yeast
 $('.primary_dry').show();
 console.log('dry yeast: ' + row.y_gr_hl_lo + '@' + row.y_sg_lo + '  ' + row.y_gr_hl_hi + '@' + row.y_sg_hi);
 // dataRecord.starter_viability
 var yeast_grams = Round(volume * multiplier * (100 / dataRecord.starter_viability), 2);
 $('#yeast_grams').val(yeast_grams);
 var yeast_gr_hl = Round(yeast_grams / (volume * 0.01), 2);
 $('#yeast_gr_hl').val(yeast_gr_hl);
-console.log('need ' + yeast_grams + ' grams, gr/hl: ' + yeast_gr_hl);
+//console.log('need ' + yeast_grams + ' grams, gr/hl: ' + yeast_gr_hl);
-//     obj.initgram = Round(obj.volume * multiplier_yeast_needed  * (100 / obj.yeastviability), 2);
 } else {
 // Liquid yeast
 $('.primary_liquid').show();
 // pitchrate see https://www.brewersfriend.com/yeast-pitch-rate-and-starter-calculator/
 needed = Round(dataRecord.yeast_pitchrate * volume * plato, 1);
 $('#need_cells').val(needed);
 use_cells = initcells;
 if (needed <= initcells)
 maybe_starter = 0;
-console.log('calcYeast() pitchrate:' + dataRecord.yeast_pitchrate + ' start:' + initcells + ' needed:' + needed + ' volume:' + volume + ' maybe_starter:' + maybe_starter);
+//console.log('calcYeast() pitchrate:' + dataRecord.yeast_pitchrate + ' start:' + initcells + ' needed:' + needed + ' volume:' + volume + ' maybe_starter:' + maybe_starter);
 if (maybe_starter != dataRecord.starter_enable) {
 dataRecord.starter_enable = maybe_starter;
 showStarter();
 }
 $('#plato_cells').val(parseFloat(use_cells / (volume * plato)));
 };
 function adjustHops(factor) {
-console.log('adjustHops(' + factor + ')');
+//console.log('adjustHops(' + factor + ')');
-var row, i, amount, rowscount = $('#hopGrid').jqxGrid('getdatainformation').rowscount;
+var row, i, amount, rowscount = dataRecord.hops.length;
 if (rowscount == 0)
 return;
 for (i = 0; i < rowscount; i++) {
-row = $('#hopGrid').jqxGrid('getrowdata', i);
+row = dataRecord.hops[i];
 amount = row.h_amount * factor;
+dataRecord.hops[i].h_amount = amount;
 $('#hopGrid').jqxGrid('setcellvalue', i, 'h_amount', amount);
 }
 };
 function whirlpoolHops() {
-var row, i, time, rowscount;
+var row, i, time, rowscount = dataRecord.hops.length;
-if (!(rowscount = $('#hopGrid').jqxGrid('getdatainformation').rowscount))
-return;
 if (rowscount == 0)
 return;
 for (i = 0; i < rowscount; i++) {
-row = $('#hopGrid').jqxGrid('getrowdata', i);
+row = dataRecord.hops[i];
 if (row.h_useat == 4) {
 time = parseFloat(dataRecord.brew_whirlpool9) + parseFloat(dataRecord.brew_whirlpool7) + parseFloat(dataRecord.brew_whirlpool6);
+dataRecord.hops[i].h_time = time;
 $('#hopGrid').jqxGrid('setcellvalue', i, 'h_time', time);
 }
 }
 };
 function calcMiscs() {
 ok_miscs = 1;
-var row, i, rowscount = $('#miscGrid').jqxGrid('getdatainformation').rowscount;
+var row, i, rowscount = dataRecord.miscs.length;
 if (rowscount == 0)
 return;
 for (i = 0; i < rowscount; i++) {
-row = $('#miscGrid').jqxGrid('getrowdata', i);
+row = dataRecord.miscs[i];
 if ((((dataRecord.inventory_reduced <= 2) && (row.m_use_use <= 2)) ||  // Starter, Mash, Boil
 ((dataRecord.inventory_reduced <= 3) && (row.m_use_use == 3)) ||  // Primary
 ((dataRecord.inventory_reduced <= 5) && (row.m_use_use == 4)) ||  // Secondary, Teriary
 ((dataRecord.inventory_reduced <= 6) && (row.m_use_use == 5))) && // Bottle
 (row.m_inventory < row.m_amount)) {
 calcSupplies();
 };
 function adjustMiscs(factor) {
-console.log('adjustMiscs(' + factor + ')');
+//console.log('adjustMiscs(' + factor + ')');
-var row, i, amount, rowscount = $('#miscGrid').jqxGrid('getdatainformation').rowscount;
+var row, i, amount, rowscount = dataRecord.miscs.length;
 if (rowscount == 0)
 return;
 for (i = 0; i < rowscount; i++) {
-row = $('#miscGrid').jqxGrid('getrowdata', i);
+row = dataRecord.miscs[i];
 amount = row.m_amount * factor;
+dataRecord.miscs[i].m_amount = amount;
 $('#miscGrid').jqxGrid('setcellvalue', i, 'm_amount', amount);
 switch (row.m_name) {
 case 'CaCl2':
 $('#wa_cacl2').val(row.m_amount * 1000);
 break;
 }
 };
 function adjustYeasts(factor) {
-console.log('adjustYeasts(' + factor + ')');
+//console.log('adjustYeasts(' + factor + ')');
-var row, i, amount, rowscount = $('#yeastGrid').jqxGrid('getdatainformation').rowscount;
+var row, i, amount, rowscount = dataRecord.yeasts.length;
 if (rowscount == 0)
 return;
 for (i = 0; i < rowscount; i++) {
-row = $('#yeastGrid').jqxGrid('getrowdata', i);
+row = dataRecord.yeasts[i];
 if (! dataRecord.starter_enable) { // Only adjust without a starter
 amount = row.y_amount * factor;
+dataRecord.yeasts[i].y_amount = amount;
 $('#yeastGrid').jqxGrid('setcellvalue', i, 'y_amount', amount);
 }
 }
 calcYeast();
 };
 function adjustWaters(factor) {
-console.log('adjustWaters(' + factor + ')');
+//console.log('adjustWaters(' + factor + ')');
-var amount, row, i, rowscount = $('#mashGrid').jqxGrid('getdatainformation').rowscount;
+var amount, row, i, rowscount = dataRecord.mashs.length;
 if (rowscount == 0)
 return;
 mash_infuse = 0;
 for (i = 0; i < rowscount; i++) {
-row = $('#mashGrid').jqxGrid('getrowdata', i);
+row = dataRecord.mashs[i];
 if (row.step_type == 0) { // Infusion
 amount = Round(parseFloat(row.step_infuse_amount) * factor, 1);
+dataRecord.mashs[i].step_infuse_amount = amount;
 $('#mashGrid').jqxGrid('setcellvalue', i, 'step_infuse_amount', amount);
 mash_infuse += amount;
 }
 }
 if (dataRecord.w2_amount == 0) {
 else
 $('#brew_mash_efficiency').val(0);
 };
 function calcEfficiencyBeforeBoil() {
-var m = 0, rows = {}, i, row, tot, result = 0;
+var m = 0, i, row, tot, result = 0;
-if (!(rows = $('#fermentableGrid').jqxGrid('getrows'))) {
+if (!($('#fermentableGrid').jqxGrid('getrows')))
-return; // grid not yet loaded.
+return; // no grid loaded yet
-}
+if (dataRecord.fermentables.length == 0)
-for (i = 0; i < rows.length; i++) {
+return; // no fermentables
-row = rows[i];
+for (i = 0; i < dataRecord.fermentables.length; i++) {
+row = dataRecord.fermentables[i];
 if (row.f_added == 0) { // Mash
 m += row.f_amount * (row.f_yield / 100) * (1 - row.f_moisture / 100);
 }
 }
 tot = sg_to_plato(dataRecord.brew_preboil_sg) * (dataRecord.brew_preboil_volume / 1.04) * dataRecord.brew_preboil_sg * 10 / 1000;
 }
 function calcEfficiencyAfterBoil() {
 var m = 0, // Sugars added at mash
 b = 0,     // Sugars added at boil
-rows = {}, i, row, tot, result = 0;
+i, row, tot, result = 0;
-if (!(rows = $('#fermentableGrid').jqxGrid('getrows'))) {
+if (!($('#fermentableGrid').jqxGrid('getrows'))) {
 return; // grid not yet loaded.
 }
-for (i = 0; i < rows.length; i++) {
+for (i = 0; i < dataRecord.fermentables.length; i++) {
-row = rows[i];
+row = dataRecord.fermentables[i];
 if (row.f_added == 0) { // Mash
 m += row.f_amount * (row.f_yield / 100) * (1 - row.f_moisture / 100);
 } else if (row.f_added == 1) { // Boil
 b += row.f_amount * (row.f_yield / 100) * (1 - row.f_moisture / 100);
 }
 return C1;
 }
 function ProtonDeficit(pHZ) {
-var rows, i, C1, x, Result = ZRA(pHZ) * parseFloat($('#wg_amount').jqxNumberInput('decimal'));
+var i, C1, x, Result = ZRA(pHZ) * parseFloat($('#wg_amount').jqxNumberInput('decimal'));
 // proton deficit for the grist
-if ((rows = $('#fermentableGrid').jqxGrid('getrows'))) {
+if (( $('#fermentableGrid').jqxGrid('getrows'))) {
-for (i = 0; i < rows.length; i++) {
+for (i = 0; i < dataRecord.fermentables.length; i++) {
-row = rows[i];
+row = dataRecord.fermentables[i];
 if (row.f_added == 0 && row.f_graintype != 6) { // Added == Mash && graintype != No Malt
 C1 = BufferCapacity(row.f_di_ph, row.f_acid_to_ph_57, row.f_color, row.f_graintype);
 x = C1 * (pHZ - row.f_di_ph);   // AcidRequired(ZpH)
 Result += x * row.f_amount;
 }