bms: comparison www/js/rec_edit.js

comparison: www/js/rec_edit.js

www/js/rec_edit.js

changeset 559: 10cc2400b5d5
parent 549: 21705ae9dff2
child 561: dc618b8a9552

equal deleted inserted replaced

-:a8e065a9f851
+:10cc2400b5d5
 else
 return 0.5;
 }
-function GetOptClSO4ratio() {
+function GetOptSO4Clratio() {
-var BUGU = GetBUGU();
+if (parseFloat($('#pr_sulfate').jqxNumberInput('decimal')) > 0 && parseFloat($('#pr_chloride').jqxNumberInput('decimal'))) {
-return (-1.2 * BUGU + 1.4);
+return (parseFloat($('#pr_sulfate').jqxNumberInput('decimal')) / parseFloat($('#pr_chloride').jqxNumberInput('decimal')));
+} else {
+var BUGU = GetBUGU();
+return (-1.2 * BUGU + 1.4);
+}
 }
 function setRangeIndicator(ion, rangeCode) {
 { name: 'y_attenuation', type: 'float' },
 { name: 'y_use', type: 'int' },
 { name: 'y_cells', type: 'float' },
 { name: 'y_tolerance', type: 'float' },
 { name: 'y_inventory', type: 'float' },
+{ name: 'y_sta1', type: 'int' },
+{ name: 'y_bacteria', type: 'int' },
+{ name: 'y_harvest_top', type: 'int' },
+{ name: 'y_harvest_time', type: 'int' },
+{ name: 'y_pitch_temperature', type: 'float' },
+{ name: 'y_pofpos', type: 'int' },
+{ name: 'y_zymocide', type: 'int' },
 { name: 'y_avail', type: 'int' }
 ],
 addrow: function(rowid, rowdata, position, commit) {
 //console.log("yeast addrow "+rowid);
 commit(true);
 row['y_attenuation'] = datarecord.attenuation;
 row['y_flocculation'] = datarecord.flocculation;
 row['y_cells'] = datarecord.cells;
 row['y_tolerance'] = datarecord.tolerance;
 row['y_inventory'] = datarecord.inventory;
+row['y_sta1'] = datarecord.sta1;
+row['y_bacteria'] = datarecord.bacteria;
+row['y_harvest_top'] = datarecord.harvest_top;
+row['y_harvest_time'] = datarecord.harvest_time;
+row['y_pitch_temperature'] = datarecord.pitch_temperature;
+row['y_pofpos'] = datarecord.pofpos;
+row['y_zymocide'] = datarecord.zymocide;
 $('#yeastGrid').jqxGrid('addrow', null, row);
 }
 $('#yaddrowbutton').jqxDropDownList('clearSelection');
 });
 $('#yinstockbutton').jqxCheckBox({ theme: theme, height: 27, disabled: (dataRecord.stage > 3) });
 TpH = 0,
 protonDeficit = 0,
 AT, BT, result, pK1, pK2, pK3, MolWt, AcidSG, AcidPrc,
 r1d, r2d, f1d, f2d, f3d,
 deltapH, deltapd, pd, n,
-piCLSO4_low, piCLSO4_high, Res,
+Res,
 wg_calcium, wg_sodium, wg_total_alkalinity, wg_chloride, wg_sulfate, wg_bicarbonate;
 if (dataRecord.w1_name == '') {
 return;
 }
 Acidmg / 1000 * MMCl / (MMCl + 1);
 RA = 1000 * RA / liters;
 chloride = wg_chloride + RA;
 }
-// 2:1 Sulfate to Chroride IPA's, Pale Ales.
+var BUGU = GetBUGU();
-// 1:1 Sulfate to Chloride Balanced
+$('#tgt_bu').val(Round(BUGU, 2));
-// 1:2 Sulfate to Chloride Malty
-// Note, values below are the other way, cl to so4!
-// So: 0.5 is IPA's, Pale Ales.
-//       1 Balanced
-//       2 Malty.
-$('#tgt_bu').val(Math.round(GetBUGU() * 100) / 100);
 // From brouwhulp.
-if (GetBUGU() < 0.32)
+if (BUGU < 0.32)
 $('#wr_bu').html("<span style='vertical-align: top; font-size: 14px; font-style: italic;'>Zeer moutig en zoet</span>");
-else if (GetBUGU() < 0.43)
+else if (BUGU < 0.43)
 $('#wr_bu').html("<span style='vertical-align: top; font-size: 14px; font-style: italic;'>Moutig, zoet</span>");
-else if (GetBUGU() < 0.52)
+else if (BUGU < 0.52)
 $('#wr_bu').html("<span style='vertical-align: top; font-size: 14px; font-style: italic;'>Evenwichtig</span>");
-else if (GetBUGU() < 0.63)
+else if (BUGU < 0.63)
 $('#wr_bu').html("<span style='vertical-align: top; font-size: 14px; font-style: italic;'>Licht hoppig, bitter</span>");
 else
 $('#wr_bu').html("<span style='vertical-align: top; font-size: 14px; font-style: italic;'>Extra hoppig, zeer bitter</span>");
-$('#tgt_cl_so4').val(Math.round(GetOptClSO4ratio() * 10) / 10);
-if (sulfate > 0)
+// Sulfate to Chloride ratio (Palmer).
-RA = chloride / sulfate;
+var OptSO4Clratio = GetOptSO4Clratio();
+$('#tgt_so4_cl').val(Round(OptSO4Clratio, 1));
+if (OptSO4Clratio < 0.4)
+$('#wrt_so4_cl').html("<span style='vertical-align: top; font-size: 14px; font-style: italic;'>Te moutig</span>");
+else if (OptSO4Clratio < 0.6)
+$('#wrt_so4_cl').html("<span style='vertical-align: top; font-size: 14px; font-style: italic;'>Zeer moutig</span>");
+else if (OptSO4Clratio < 0.8)
+$('#wrt_so4_cl').html("<span style='vertical-align: top; font-size: 14px; font-style: italic;'>Moutig</span>");
+else if (OptSO4Clratio < 1.5)
+$('#wrt_so4_cl').html("<span style='vertical-align: top; font-size: 14px; font-style: italic;'>Gebalanceerd</span>");
+else if (OptSO4Clratio < 2.0)
+$('#wrt_so4_cl').html("<span style='vertical-align: top; font-size: 14px; font-style: italic;'>Licht bitter</span>");
+else if (OptSO4Clratio < 4.0)
+$('#wrt_so4_cl').html("<span style='vertical-align: top; font-size: 14px; font-style: italic;'>Bitter</span>");
+else if (OptSO4Clratio < 9.0)
+$('#wrt_so4_cl').html("<span style='vertical-align: top; font-size: 14px; font-style: italic;'>Zeer bitter</span>");
+else
+$('#wrt_so4_cl').html("<span style='vertical-align: top; font-size: 14px; font-style: italic;'>Te bitter</span>");
+if (chloride > 0)
+RA = sulfate / chloride;
 else
 RA = 10;
-$('#got_cl_so4').val(Math.round(RA * 10) / 10);
+$('#got_so4_cl').val(Round(RA, 1));
-piCLSO4_low = 0.8 * GetOptClSO4ratio();
-piCLSO4_high = 1.2 * GetOptClSO4ratio();
 Res = 'normaal';
-if (RA < piCLSO4_low)
+if (RA < (0.8 * OptSO4Clratio))
 Res = 'laag';
-else if (RA > piCLSO4_high)
+else if (RA > (1.2 * OptSO4Clratio))
 Res = 'hoog';
-setRangeIndicator('cl_so4', Res);
+setRangeIndicator('so4_cl', Res);
 $('#wb_calcium').val(Round(calcium, 1));
 $('#wb_magnesium').val(Round(magnesium, 1));
 $('#wb_sodium').val(Round(sodium, 1));
 $('#wb_sulfate').val(Round(sulfate, 1));
 y_attenuation: yeastData.y_attenuation,
 y_use: yeastData.y_use,
 y_cells: yeastData.y_cells,
 y_tolerance: yeastData.y_tolerance,
 y_inventory: yeastData.y_inventory,
+y_sta1: yeastData.y_sta1,
+y_bacteria: yeastData.y_bacteria,
+y_harvest_top: yeastData.y_harvest_top,
+y_harvest_time: yeastData.y_harvest_time,
+y_pitch_temperature: yeastData.y_pitch_temperature,
+y_pofpos: yeastData.y_pofpos,
+y_zymocide: yeastData.y_zymocide,
 y_avail: yeastData.y_avail
 };
 $('#yeastGrid').jqxGrid('updaterow', rowID, row);
 calcFermentables();
 });
 yeastData.y_max_temperature = datarecord.max_temperature;
 yeastData.y_flocculation = datarecord.flocculation;
 yeastData.y_attenuation = datarecord.attenuation;
 yeastData.y_cells = datarecord.cells;
 yeastData.y_inventory = datarecord.inventory;
+yeastData.y_sta1 = datarecord.sta1;
+yeastData,y_bacteria = datarecord.bacteria;
+yeastData.y_harvest_top = datarecord.harvest_top;
+yeastData.y_harvest_time = datarecord.harvest_time;
+yeastData.y_pitch_temperature = datarecord.pitch_temperature;
+yeastData.y_pofpos = datarecord.pofpos;
+yeastData.y_zymocide = datarecord.zymocide;
 if (yeastData.y_form == 0) {
 $('#wy_pmpt_amount').html('Pak(ken):');
-} else if (yeastData.y_form == 1) {
+} else if (yeastData.y_form == 1 || yeastData.y_form == 6) {
 $('#wy_pmpt_amount').html('Gewicht gram:');
 } else {
 $('#wy_pmpt_amount').html('Volume ml:');
 }
 calcFermentables();
 $('#wg_amount').val(mash_infuse);
 });
 // Tab 7, Water
 $('#tgt_bu').jqxNumberInput(Show2wat);
-$('#tgt_cl_so4').jqxNumberInput(Show1wat);
+$('#tgt_so4_cl').jqxNumberInput(Show1wat);
-$('#got_cl_so4').jqxNumberInput(Show1wat);
+$('#got_so4_cl').jqxNumberInput(Show1wat);
 // Water source 1
 $('#w1_name').jqxDropDownList({
 placeHolder: 'Kies hoofd water:',
 theme: theme,
 $('#pr_sulfate').val(datarecord.sulfate);
 $('#pr_chloride').val(datarecord.chloride);
 $('#pr_sodium').val(datarecord.sodium);
 $('#pr_magnesium').val(datarecord.magnesium);
 $('#pr_total_alkalinity').val(datarecord.total_alkalinity);
+calcWater();
 }
 });
 $('#pr_calcium').jqxNumberInput(Show1wat);
 $('#pr_magnesium').jqxNumberInput(Show1wat);
 $('#pr_sodium').jqxNumberInput(Show1wat);