bms: comparison www/js/prod_edit.js

comparison: www/js/prod_edit.js

www/js/prod_edit.js

changeset 760: fce78f57a44d
parent 759: 89bcab49284a
child 764: e95744b6b31d

equal deleted inserted replaced

-:89bcab49284a
+:fce78f57a44d
 k_what = 0;
 hop_flavour = 0,
 hop_aroma = 0,
 mash_infuse = 0,
-last_base = '',
 last_acid = '',
 MMCa = 40.048,
 MMMg = 24.305,
 MMNa = 22.98976928,
 $('#wb_magnesium').val(dataRecord.wb_magnesium);
 $('#wb_total_alkalinity').val(dataRecord.wb_total_alkalinity);
 $('#wb_ph').val(dataRecord.wb_ph);
 $('#wa_acid_name').val(dataRecord.wa_acid_name);
 $('#wa_acid_perc').val(dataRecord.wa_acid_perc);
-$('#wa_base_name').val(dataRecord.wa_base_name);
+//   $('#wa_base_name').val(dataRecord.wa_base_name);
 $('#starter_type').val(dataRecord.starter_type);
 $('#starter_sg').val(dataRecord.starter_sg);
 $('#starter_viability').val(dataRecord.starter_viability);
 $('#yeast_prod_date').val(dataRecord.yeast_prod_date);
 $('#yeast_pitchrate').val(dataRecord.yeast_pitchrate);
 case 'Zwavelzuur':
 $('#wa_acid_name').val(3);
 $('#wa_acid').val(row.m_amount * 1000);
 $('#wa_acid_perc').val(AcidTypeData[3].AcidPrc);
 last_acid = 'Zwavelzuur';
-break;
-case 'Na2CO3':
-$('#wa_base_name').val(0);
-$('#wa_base').val(row.m_amount * 1000);
-last_base = 'Na2CO3';
-break;
-case 'Ca(OH)2':
-$('#wa_base_name').val(1);
-$('#wa_base').val(row.m_amount * 1000);
-last_base = 'Ca(OH)2';
 break;
 }
 }
 return data;
 },
 case 'Zoutzuur':
 case 'Fosforzuur':
 case 'Zwavelzuur':
 $('#wa_acid').val(row.m_amount * 1000);
 break;
-case 'Na2CO3':
-case 'Ca(OH)2':
-$('#wa_base').val(row.m_amount * 1000);
-break;
 }
 }
 };
 function adjustYeasts(factor) {
 ph = 0,
 RA = 0,
 frac = 0,
 TpH = 0,
 protonDeficit = 0,
-AT, BT,
+AT, /*BT,*/
 r1d, r2d, f1d, f2d, f3d,
 deltapH, deltapd, pd, n,
 Res;
 if (dataRecord.w1_name == '') {
 if (parseFloat(dataRecord.wa_acid_perc) == 0) {
 dataRecord.wa_acid_perc = AcidTypeData[AT].AcidPrc;
 $('#wa_acid_perc').val(AcidTypeData[AT].AcidPrc);
 }
-if (dataRecord.wa_base_name < 0 || dataRecord.wa_base_name > 3) {
-$('#wa_base_name').val(0);
-dataRecord.wa_base_name = 0;
-}
-if (last_base == '')
-last_base = BaseTypeData[dataRecord.wa_base_name].nl;
 AT = dataRecord.wa_acid_name;
-BT = dataRecord.wa_base_name;
 /* Note that the next calculations do not correct the pH change by the added salts.
 This pH change is at most 0.1 pH and is a minor difference in Acid amount. */
 if (dataRecord.calc_acid) {
 $('.c_mashph').show();
 TpH = parseFloat(dataRecord.mash_ph);
 protonDeficit = ProtonDeficit(TpH);
 //console.log('calc_acid tgt: ' + TpH + ' protonDeficit: ' + protonDeficit);
 if (protonDeficit > 0) { // Add acid
-$('#wa_base').val(0);
-dataRecord.wa_base = 0;
-setWaterAgent(last_base, 0);
 frac = CalcFrac(TpH, AcidTypeData[AT].pK1, AcidTypeData[AT].pK2, AcidTypeData[AT].pK3);
 Acid = protonDeficit / frac;
 Acid *= AcidTypeData[AT].MolWt; // mg
 Acidmg = Acid;
 Acid = Acid / AcidTypeData[AT].AcidSG; // ml
 $('#wa_acid').val(Acid);
 setWaterAgent(AcidTypeData[AT].nl, Acid);
 bicarbonate = bicarbonate - protonDeficit * frac / liters;
 total_alkalinity = bicarbonate * 50 / 61;
-} else if (protonDeficit < 0) { //Add base
-$('#wa_acid').val(0);
-dataRecord.wa_acid = 0;
-setWaterAgent(last_acid, 0);
-r1d = Math.pow(10, (TpH - 6.35));
-r2d = Math.pow(10, (TpH - 10.33));
-f1d = 1 / (1 + r1d + r1d * r2d);
-f2d = f1d * r1d;
-f3d = f2d * r2d;
-switch (BT) {
-//     case 0:
-//      RA = -protonDeficit / (f1d - f3d); // Sodiumbicarbonate, mmol totaal
-//      RA = RA * MMNaHCO3 / 1000; //gram
-//      $('#wa_base').val(Round(RA, 2));
-//      setWaterAgent('NaHCO3', Round(RA, 2));
-//      if (liters > 0) {
-//       // Na
-//       RA = (parseFloat($('#wa_nacl').jqxNumberInput('decimal')) * MMNa / MMNaCl * 1000 +
-//             parseFloat($('#wa_base').jqxNumberInput('decimal')) * MMNa / MMNaHCO3 * 1000) / liters;
-//       sodium = wg_sodium + RA;
-//       // HCO3
-//       RA = (parseFloat($('#wa_base').jqxNumberInput('decimal')) * MMHCO3 / MMNaHCO3 * 1000) / liters;
-//       bicarbonate = wg_bicarbonate + RA;
-//       total_alkalinity = bicarbonate * 50 / 61;
-//      }
-//      break;
-case 0:
-RA = -protonDeficit / (2 * f1d + f2d); // Sodiumcarbonate, mmol totaal
-RA = RA * MMNa2CO3 / 1000; //gram
-$('#wa_base').val(Round(RA, 2));
-setWaterAgent('Na2CO3', Round(RA, 2));
-if (liters > 0) {
-RA = (parseFloat($('#wa_nacl').jqxNumberInput('decimal')) * MMNa / MMNaCl * 1000+
-parseFloat($('#wa_base').jqxNumberInput('decimal')) * 2 * MMNa / MMNa2CO3 * 1000) / liters;
-sodium = wg_sodium + RA;
-// HCO3
-RA = (parseFloat($('#wa_base').jqxNumberInput('decimal')) * MMHCO3 / MMNa2CO3 * 1000) / liters;
-bicarbonate = wg_bicarbonate + RA;
-total_alkalinity = bicarbonate * 50 / 61;
-}
-break;
-//     case 2:
-//      RA = -protonDeficit * (f1d - f3d); // Calciumcarbonate, mmol totaal
-//      RA = RA * MMCaCO3 / 1000; //gram
-//      //but only 1/3 is effective, so add 3 times as much
-//      RA = 3 * RA;
-//      $('#wa_base').val(Round(RA, 2));
-//      setWaterAgent('CaCO3', Round(RA, 2));
-//      if (liters > 0) {
-//       //Bicarbonate
-//       RA = (parseFloat($('#wa_base').jqxNumberInput('decimal')) / 3 * MMHCO3 / MMCaCO3 * 1000) / liters;
-//       bicarbonate = wg_bicarbonate + RA;
-//       total_alkalinity = bicarbonate * 50 / 61;
-//       //Ca precipitates out as Ca10(PO4)6(OH)2
-//       RA = (parseFloat($('#wa_cacl2').jqxNumberInput('decimal')) * MMCa / MMCaCl2 * 1000 +
-//             parseFloat($('#wa_caso4').jqxNumberInput('decimal')) * MMCa / MMCaSO4 * 1000 +
-//             parseFloat($('#wa_base').jqxNumberInput('decimal')) * MMCa / MMCaCO3 * 1000) / liters;
-//       calcium = wg_calcium + RA;
-//      }
-//      break;
-case 1:
-RA = -protonDeficit / 19.3; // Calciumhydroxide
-$('#wa_base').val(Round(RA, 2));
-setWaterAgent('Ca(OH)2', Round(RA, 2));
-if (liters > 0) {
-// Bicarbonate
-RA = -protonDeficit / liters;
-total_alkalinity = wg_total_alkalinity + RA;
-bicarbonate = total_alkalinity * 61 / 50;
-// Calcium
-RA = (parseFloat($('#wa_cacl2').jqxNumberInput('decimal')) * MMCa / MMCaCl2 * 1000 +
-parseFloat($('#wa_caso4').jqxNumberInput('decimal')) * MMCa / MMCaSO4 * 1000 +
-parseFloat($('#wa_base').jqxNumberInput('decimal')) * MMCa / MMCaOH2 * 1000) / liters;
-calcium = wg_calcium + RA;
-}
-break;
-}
 }
 ph = TpH;
 $('#wb_ph').val(Round(ph, 2));
 $('#est_mash_ph').val(Round(ph, 2));
 } else {
 /* Manual calculate pH */
 $('.c_mashph').hide();
 console.log('calc_acid no');
-if (parseFloat($('#wa_base').jqxNumberInput('decimal')) > 0 && liters > 0) {
-/* First add the base salts */
-switch (BT) {
-//     case 0:  // Sodiumbicarbonate, Na
-//      RA = (parseFloat($('#wa_nacl').jqxNumberInput('decimal')) * MMNa / MMNaCl * 1000 +
-//            parseFloat($('#wa_base').jqxNumberInput('decimal')) * MMNa / MMNaHCO3 * 1000) / liters;
-//      sodium = wg_sodium + RA;
-//      // HCO3
-//      RA = (parseFloat($('#wa_base').jqxNumberInput('decimal')) * MMHCO3 / MMNaHCO3 * 1000) / liters;
-//      bicarbonate = wg_bicarbonate + RA;
-//      total_alkalinity = bicarbonate * 50 / 61;
-//      break;
-case 0: // Sodiumcarbonate
-RA = (parseFloat($('#wa_nacl').jqxNumberInput('decimal')) * MMNa / MMNaCl * 1000 +
-parseFloat($('#wa_base').jqxNumberInput('decimal')) * 2 * MMNa / MMNa2CO3 * 1000) / liters;
-sodium = wg_sodium + RA;
-// HCO3
-RA = (parseFloat($('#wa_base').jqxNumberInput('decimal')) * MMHCO3 / MMNa2CO3 * 1000) / liters;
-bicarbonate = wg_bicarbonate + RA;
-total_alkalinity = bicarbonate * 50 / 61;
-break;
-//     case 2: // Calciumcarbonate: Bicarbonate
-//      RA = (parseFloat($('#wa_base').jqxNumberInput('decimal')) / 3 * MMHCO3 * 1000 / MMCaCO3) / liters;
-//      bicarbonate = wg_bicarbonate + RA;
-//      total_alkalinity = bicarbonate * 50 / 61;
-//      // Ca
-//      RA = (parseFloat($('#wa_cacl2').jqxNumberInput('decimal')) * MMCa * 1000 / MMCaCl2 +
-//            parseFloat($('#wa_caso4').jqxNumberInput('decimal')) * MMCa * 1000 / MMCaSO4 +
-//            parseFloat($('#wa_base').jqxNumberInput('decimal')) * MMCa * 1000/ MMCaCO3) / liters;
-//      calcium = wg_calcium + RA;
-//      break;
-}
-}
 pHa = Round(ph, 3); // Adjusted water pH
 // Then calculate the new pH with added acids and malts
 console.log('Mash pH: ' + pHa);
 Acid  = AcidTypeData[AT].AcidSG * (parseFloat(dataRecord.wa_acid_perc) / 100); // ml
 Acid *= parseFloat($('#wa_acid').jqxNumberInput('decimal'));
 $('#wa_mgcl2').jqxNumberInput(spinstate);
 $('#wa_nahco3').jqxNumberInput(spinstate);
 $('#wa_caco3').jqxNumberInput(spinstate);
 $('#mash_ph').jqxNumberInput(spinstate);
 $('#calc_acid').jqxCheckBox(onval);
-$('#wa_base_name').jqxDropDownList(onval);
-$('#wa_base').jqxNumberInput(spinstate);
 $('#wa_acid_name').jqxDropDownList(onval);
 $('#wa_acid').jqxNumberInput(spinstate);
 $('#wa_acid_perc').jqxNumberInput(spinsmall);
 $('#sparge_temp').jqxNumberInput(spinstate);
 $('#sparge_volume').jqxNumberInput(spinstate);
 if (event.args) {
 setWaterAgent('CaCO3', 0);
 setWaterAgent('CaCO3', event.args.value);
 calcWater();
 }
-});
-$('#wa_base_name').on('select', function(event) {
-if (event.args) {
-var index = event.args.index;
-console.log('wa_base_name ' + index);
-setWaterAgent(last_base, 0);
-last_base = BaseTypeData[index].nl;
-setWaterAgent(last_base, parseFloat($('#wa_base').jqxNumberInput('decimal')));
-dataRecord.wa_base_name = index;
-calcWater();
-}
-});
-$('#wa_base').on('change', function(event) {
-var name = BaseTypeData[$('#wa_base_name').val()].nl;
-setWaterAgent(name, parseFloat(event.args.value));
-calcWater();
 });
 $('#wa_acid_name').on('select', function(event) {
 if (event.args) {
 var index = event.args.index;
 console.log('wa_acid_name ' + index + ' last_acid: ' + last_acid);
 wb_magnesium: parseFloat($('#wb_magnesium').jqxNumberInput('decimal')),
 wb_total_alkalinity: parseFloat($('#wb_total_alkalinity').jqxNumberInput('decimal')),
 wb_ph: parseFloat($('#wb_ph').jqxNumberInput('decimal')),
 wa_acid_name: parseInt($('#wa_acid_name').val()),
 wa_acid_perc: parseFloat($('#wa_acid_perc').jqxNumberInput('decimal')),
-wa_base_name: parseInt($('#wa_base_name').val()),
+wa_base_name: 0,
 starter_enable: dataRecord.starter_enable,
 starter_type: $('#starter_type').val(),
 starter_sg: parseFloat($('#starter_sg').jqxNumberInput('decimal')),
 starter_viability: parseFloat($('#starter_viability').jqxNumberInput('decimal')),
 yeast_prod_date: $('#yeast_prod_date').val(),
 $('#wa_caco3').jqxTooltip({ content: 'Kalk'});
 $('#wa_cacl2,#wa_caso4,#wa_mgso4,#wa_nacl,#wa_mgcl2,#wa_nahco3,#wa_caco3').jqxNumberInput(Spin1dec);
 $('#mash_ph').jqxTooltip({ content: 'Maisch pH tussen 5.2 en 5.6. Gebruik 5.2 voor lichte en 5.5 voor donkere bieren.'});
 $('#mash_ph').jqxNumberInput(SpinpH);
 $('#calc_acid').jqxCheckBox({ theme: theme, width: 120, height: 23 });
-$('#wa_base_name').jqxDropDownList({
+$('#wa_acid').jqxNumberInput(Spin2dec);
-theme: theme,
-source: BaseTypeAdapter,
-valueMember: 'id',
-displayMember: 'nl',
-width: 170,
-height: 23,
-autoDropDownHeight: true
-});
-$('#wa_base,#wa_acid').jqxNumberInput(Spin2dec);
-$('#wa_base').jqxNumberInput({ symbol: ' gr', symbolPosition: 'right' });
 $('#wa_acid_name').jqxDropDownList({
 theme: theme,
 source: AcidTypeAdapter,
 valueMember: 'id',
 displayMember: 'nl',
-width: 170,
+width: 130,
 height: 23,
 autoDropDownHeight: true
 });
 $('#wa_acid').jqxNumberInput({ symbol: ' ml', symbolPosition: 'right' });
 $('#wa_acid_perc,#sparge_acid_perc').jqxNumberInput(Perc0);