bms: comparison www/js/prod_edit.js

comparison: www/js/prod_edit.js

www/js/prod_edit.js

changeset 538: 41d21817608e
parent 525: 8bbc5730aaa8
child 539: fe9ac6d49c4f

equal deleted inserted replaced

-:7c37a6f85d55
+:41d21817608e
 { name: 'h_amount', type: 'float' },
 { name: 'h_cost', type: 'float' },
 { name: 'h_type', type: 'int' },
 { name: 'h_form', type: 'int' },
 { name: 'h_useat', type: 'int' },
-{ name: 'h_time', type: 'float' },
+{ name: 'h_time', type: 'int' },
 { name: 'h_alpha', type: 'float' },
 { name: 'h_beta', type: 'float' },
 { name: 'h_hsi', type: 'float' },
 { name: 'h_humulene', type: 'float' },
 { name: 'h_caryophyllene', type: 'float' },
 }
 calcIBUs();
 });
 },
 ready: function() {
+whirlpoolHops();
 calcIBUs();
 $('#jqxTabs').jqxTabs('next');
 },
 columns: [
 { text: 'Hop', datafield: 'h_name',
 }
 },
 { text: 'IBU', datafield: 'ibu', width: 80, align: 'right',
 cellsrenderer: function(index, datafield, value, defaultvalue, column, rowdata) {
 var ibu = toIBU(rowdata.h_useat, rowdata.h_form, preboil_sg, parseFloat($('#batch_size').jqxNumberInput('decimal')),
-parseFloat(rowdata.h_amount), parseFloat(rowdata.h_time), parseFloat(rowdata.h_alpha), $('#ibu_method').val());
+parseFloat(rowdata.h_amount), parseFloat(rowdata.h_time), parseFloat(rowdata.h_alpha), $('#ibu_method').val(),
+dataRecord.brew_whirlpool9, dataRecord.brew_whirlpool7, dataRecord.brew_whirlpool6);
 return '<span style="margin: 4px; margin-top: 6px; float: right;">' + dataAdapter.formatNumber(ibu, 'f1') + '</span>';
 }
 },
 { text: 'Gewicht', datafield: 'h_amount', width: 110, align: 'right',
 cellsrenderer: function(index, datafield, value, defaultvalue, column, rowdata) {
 hopRow = row;
 hopData = $('#hopGrid').jqxGrid('getrowdata', hopRow);
 $('#wh_name').val(hopData.h_name);
 $('#wh_amount').val(hopData.h_amount * 1000);
 var ibu = toIBU(hopData.h_useat, hopData.h_form, preboil_sg, parseFloat($('#batch_size').jqxNumberInput('decimal')),
-parseFloat(hopData.h_amount), parseFloat(hopData.h_time), parseFloat(hopData.h_alpha), $('#ibu_method').val());
+parseFloat(hopData.h_amount), parseFloat(hopData.h_time), parseFloat(hopData.h_alpha), $('#ibu_method').val(),
+dataRecord.brew_whirlpool9, dataRecord.brew_whirlpool7, dataRecord.brew_whirlpool6);
 $('#wh_ibu').val(ibu);
 if (hopData.h_useat == 5) // Dry hop
 $('#wh_time').val(hopData.h_time / 1440);
 else
 $('#wh_time').val(hopData.h_time);
 }
 function hopFlavourContribution(bt, vol, use, amount) {
 var result;
+if (use == 4 || use == 5) // Whirlpool or Dry-hop
+return 0;
 if (use == 1) { // First wort
 result = 0.15;          // assume 15% flavourcontribution for fwh
 } else if (bt > 50) {
 result = 0.10;          // assume 10% flavourcontribution as a minimum
 } else {
 }
 function hopAromaContribution(bt, vol, use, amount) {
 var result = 0;
-if (use == 5) {         // Dry hop
+if (use == 5) { // Dry hop
 result = 1.33;
+} else if (use == 4) { // Whirlpool
+if (bt > 30)
+bt = 30; // Max 30 minutes
+result = 0.62 * bt / 30;
 } else if (bt > 20) {
 result = 0;
 } else if (bt > 7.5) {
 result = 10.03 / (4 * Math.sqrt(2 * Math.PI)) * Math.exp(-0.5 * Math.pow((bt - 7.5) / 4, 2));
 } else if (use == 2) {  // Boil
 result = 1;
 } else if (use == 3) {  // Aroma
 result = 1.2;
-} else if (use == 4) {  // Whirlpool
+}
-result = 1.2;
+return (result * amount * 1000) / vol;
-}
-return (result * amount * 1000) / vol;
 }
 function calcIBUs() {
 var total_ibus = 0, ferm_ibus = 0, rows = {}, i, row;
 hop_aroma = hop_flavour = 0;
 }
 ok_hops = 1;
 for (i = 0; i < rows.length; i++) {
 row = rows[i];
 total_ibus += toIBU(row.h_useat, row.h_form, preboil_sg, parseFloat(dataRecord.batch_size),
-parseFloat(row.h_amount), parseFloat(row.h_time), parseFloat(row.h_alpha), dataRecord.ibu_method);
+parseFloat(row.h_amount), parseFloat(row.h_time), parseFloat(row.h_alpha), dataRecord.ibu_method,
+dataRecord.brew_whirlpool9, dataRecord.brew_whirlpool7, dataRecord.brew_whirlpool6);
 ferm_ibus += toIBU(row.h_useat, row.h_form, preboil_sg,
 parseFloat(dataRecord.brew_fermenter_volume) + parseFloat(dataRecord.brew_fermenter_tcloss),
-parseFloat(row.h_amount), parseFloat(row.h_time), parseFloat(row.h_alpha), dataRecord.ibu_method);
+parseFloat(row.h_amount), parseFloat(row.h_time), parseFloat(row.h_alpha), dataRecord.ibu_method,
+dataRecord.brew_whirlpool9, dataRecord.brew_whirlpool7, dataRecord.brew_whirlpool6);
 hop_flavour += hopFlavourContribution(parseFloat(row.h_time), parseFloat(dataRecord.batch_size),
 row.h_useat, parseFloat(row.h_amount));
 hop_aroma += hopAromaContribution(parseFloat(row.h_time), parseFloat(dataRecord.batch_size),
 row.h_useat, parseFloat(row.h_amount));
 if ((((dataRecord.inventory_reduced <= 2) && (row.h_useat <= 4)) ||  // Mash, FW, Boil, Aroma, Whirlpool
 return;
 for (i = 0; i < rowscount; i++) {
 row = $('#hopGrid').jqxGrid('getrowdata', i);
 amount = row.h_amount * factor;
 $('#hopGrid').jqxGrid('setcellvalue', i, 'h_amount', amount);
+}
+};
+function whirlpoolHops() {
+console.log('whirlpoolHops()');
+var row, i, time, rowscount;
+if (!(rowscount =  $('#hopGrid').jqxGrid('getdatainformation').rowscount))
+return;
+if (rowscount == 0)
+return;
+for (i = 0; i < rowscount; i++) {
+row = $('#hopGrid').jqxGrid('getrowdata', i);
+if (row.h_useat == 4) {
+time = parseFloat(dataRecord.brew_whirlpool9) + parseFloat(dataRecord.brew_whirlpool7) + parseFloat(dataRecord.brew_whirlpool6);
+$('#hopGrid').jqxGrid('setcellvalue', i, 'h_time', time);
+}
 }
 };
 function calcMiscs() {
 }
 });
 $('#fg').on('change', function(event) {
 dataRecord.fg = parseFloat(event.args.value);
 calcFermentation();
+});
+$('#brew_whirlpool9').on('valueChanged', function(event) {
+dataRecord.brew_whirlpool9 = event.args.value;
+whirlpoolHops();
+calcIBUs();
+});
+$('#brew_whirlpool7').on('valueChanged', function(event) {
+dataRecord.brew_whirlpool7 = event.args.value;
+whirlpoolHops();
+calcIBUs();
+});
+$('#brew_whirlpool6').on('valueChanged', function(event) {
+dataRecord.brew_whirlpool6 = event.args.value;
+whirlpoolHops();
+calcIBUs();
 });
 $('#BLog').jqxButton({ disabled: (dataRecord.log_brew) ? false : true});
 $('#FLog').jqxButton({ disabled: (dataRecord.log_fermentation) ? false : true});
 }
 $('#wh_amount').jqxNumberInput(Spin1dec);
 $('#wh_amount').on('change', function(event) {
 console.log('amount changed: ' + event.args.value + ' time:' + hopData.h_time + ' alpha:' + hopData.h_alpha);
 var ibu, amount = parseFloat(event.args.value) / 1000;
 ibu = toIBU(hopData.h_useat, hopData.h_form, preboil_sg, parseFloat($('#batch_size').jqxNumberInput('decimal')),
-amount, parseFloat(hopData.h_time), parseFloat(hopData.h_alpha), $('#ibu_method').val()
+amount, parseFloat(hopData.h_time), parseFloat(hopData.h_alpha), $('#ibu_method').val(),
+dataRecord.brew_whirlpool9, dataRecord.brew_whirlpool7, dataRecord.brew_whirlpool6
 );
 hopData.h_amount = amount;
 $('#wh_ibu').val(ibu);
 });
 $('#wh_ibu').jqxNumberInput(Show1dec);
 if (newtime > parseFloat($('#boil_time').jqxNumberInput('decimal'))) {
 newtime = parseFloat($('#boil_time').jqxNumberInput('decimal'));
 $('#wh_time').val(newtime);
 }
 hopData.h_time = newtime;
-} else if (hopData.h_useat == 4) { // Whirlpool
-if (newtime > 120) {
-newtime = 120;
-$('#wh_time').val(newtime);
-}
-hopData.h_time = newtime;
 } else if (hopData.h_useat == 5) { // Dry hop
 if (newtime > 21) {
 newtime = 21;
 $('#wh_time').val(newtime);
 }
 hopData.h_time = newtime * 1440;
 }
 ibu = toIBU(hopData.h_useat, hopData.h_form, preboil_sg, parseFloat($('#batch_size').jqxNumberInput('decimal')),
-parseFloat(hopData.h_amount), parseFloat(hopData.h_time), parseFloat(hopData.h_alpha), $('#ibu_method').val());
+parseFloat(hopData.h_amount), parseFloat(hopData.h_time), parseFloat(hopData.h_alpha), $('#ibu_method').val(),
+dataRecord.brew_whirlpool9, dataRecord.brew_whirlpool7, dataRecord.brew_whirlpool6);
 // console.log("time changed: "+newtime+" final:"+hopData.h_time+" ibu:"+ibu);
 $('#wh_ibu').val(ibu);
 });
 $('#wh_useat').jqxDropDownList({
 theme: theme,
 $('#wh_time').val(hopData.h_time);
 } else if (index == 3) { // Aroma
 hopData.h_time = 0;
 $('#wh_time').jqxNumberInput({ spinButtons: false, readOnly: true, width: 90 });
 $('#wh_time').val(0);
-} else {        // Boil, Whirlpool or Dry hop
+} else if (index == 4) { // Whirlpool
+hopData.h_time = (parseFloat(dataRecord.brew_whirlpool9) + parseFloat(dataRecord.brew_whirlpool7) + parseFloat(dataRecord.brew_whirlpool6));
+$('#wh_time').jqxNumberInput({ spinButtons: false, readOnly: true, width: 90 });
+$('#wh_time').val(hopData.h_time);
+} else {        // Boil, Dry hop
 $('#wh_time').jqxNumberInput({ spinButtons: true, readOnly: false, width: 110 });
 }
 if (index == 5) // Dry hop
 $('#wh_pmpt_time').html('Tijd in dagen');
 else