comparison: www/js/rec_edit.js
www/js/rec_edit.js
- changeset 372
- 1365b5e47130
- parent 359
- 98354ef399cd
- child 373
- ee16d9b844d8
equal
deleted
inserted
replaced
| 371:023ca640b5af | 372:1365b5e47130 |
|---|---|
| 167 var vol = 0; // Volume sugars after boil | 167 var vol = 0; // Volume sugars after boil |
| 168 var addedS = 0; // Added sugars after boil | 168 var addedS = 0; // Added sugars after boil |
| 169 var addedmass = 0; // Added mass after boil | 169 var addedmass = 0; // Added mass after boil |
| 170 var mvol = 0; // mash volume | 170 var mvol = 0; // mash volume |
| 171 var colort = 0; // Colors srm * vol totals | 171 var colort = 0; // Colors srm * vol totals |
| 172 var colorh = 0; // Colors ebc * vol * kt | |
| 172 var my_100 = false; | 173 var my_100 = false; |
| 173 var mashtime = 0; // Total mash time | 174 var mashtime = 0; // Total mash time |
| 174 var mashtemp = 0; // Average mash temperature | 175 var mashtemp = 0; // Average mash temperature |
| 176 var bv = 0.925; // Bierverlies rendement | |
| 177 var sr = 0.95; // Mash en spoel rendement | |
| 175 | 178 |
| 176 if ((rows = $('#mashGrid').jqxGrid('getrows'))) { | 179 if ((rows = $('#mashGrid').jqxGrid('getrows'))) { |
| 177 for (var i = 0; i < rows.length; i++) { | 180 for (var i = 0; i < rows.length; i++) { |
| 178 var row = rows[i]; | 181 var row = rows[i]; |
| 179 if (row.step_type == 0) // Infusion | 182 if (row.step_type == 0) // Infusion |
| 216 addedS += row.f_amount * x; | 219 addedS += row.f_amount * x; |
| 217 addedmass += row.f_amount; | 220 addedmass += row.f_amount; |
| 218 vol += (x * sugardensity + (1 - x) * 1) * row.f_amount; | 221 vol += (x * sugardensity + (1 - x) * 1) * row.f_amount; |
| 219 } | 222 } |
| 220 colort += row.f_amount * ebc_to_srm(row.f_color); | 223 colort += row.f_amount * ebc_to_srm(row.f_color); |
| 224 colorh += row.f_amount * row.f_color * get_kt(row.f_color); | |
| 221 } | 225 } |
| 222 to_100 = my_100; | 226 to_100 = my_100; |
| 223 if (to_100) { | 227 if (to_100) { |
| 224 $("#wf_amount").jqxNumberInput({ width: 90, readOnly: true, spinButtons: false }); | 228 $("#wf_amount").jqxNumberInput({ width: 90, readOnly: true, spinButtons: false }); |
| 225 } else { | 229 } else { |
| 233 | 237 |
| 234 // Estimate SG in kettle before boil | 238 // Estimate SG in kettle before boil |
| 235 preboil_sg = estimate_sg(sugarsm, parseFloat(dataRecord.boil_size)); | 239 preboil_sg = estimate_sg(sugarsm, parseFloat(dataRecord.boil_size)); |
| 236 | 240 |
| 237 // Color of the wort | 241 // Color of the wort |
| 238 var cw = colort / parseFloat(dataRecord.batch_size) * 8.34436; | 242 if (dataRecord.color_method == 3) { // Hans Halberstadt |
| 239 var color = kw_to_ebc(dataRecord.color_method, cw); | 243 var color = Math.round((4.46 * bv * sr) / parseFloat(dataRecord.batch_size) * colorh); |
| 244 } else { | |
| 245 var cw = colort / parseFloat(dataRecord.batch_size) * 8.34436; | |
| 246 var color = kw_to_ebc(dataRecord.color_method, cw); | |
| 247 } | |
| 240 dataRecord.est_color = color; | 248 dataRecord.est_color = color; |
| 241 $('#est_color').val(color); | 249 $('#est_color').val(color); |
| 242 $('#est_color2').val(color); | 250 $('#est_color2').val(color); |
| 243 var scolor = ebc_to_color(color); | 251 var scolor = ebc_to_color(color); |
| 244 document.getElementById("bcolor").style.background= scolor; | 252 document.getElementById("bcolor").style.background= scolor; |
