comparison: www/js/rec_edit.js
www/js/rec_edit.js
- changeset 373
- ee16d9b844d8
- parent 372
- 1365b5e47130
- child 376
- 1de1623e1760
equal
deleted
inserted
replaced
| 372:1365b5e47130 | 373:ee16d9b844d8 |
|---|---|
| 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 colorh = 0; // Colors ebc * vol * kt |
| 173 var colorn = 0; // Colors ebc * pt * pct | |
| 173 var my_100 = false; | 174 var my_100 = false; |
| 174 var mashtime = 0; // Total mash time | 175 var mashtime = 0; // Total mash time |
| 175 var mashtemp = 0; // Average mash temperature | 176 var mashtemp = 0; // Average mash temperature |
| 176 var bv = 0.925; // Bierverlies rendement | 177 var bv = 0.925; // Bierverlies rendement |
| 177 var sr = 0.95; // Mash en spoel rendement | 178 var sr = 0.95; // Mash en spoel rendement |
| 220 addedmass += row.f_amount; | 221 addedmass += row.f_amount; |
| 221 vol += (x * sugardensity + (1 - x) * 1) * row.f_amount; | 222 vol += (x * sugardensity + (1 - x) * 1) * row.f_amount; |
| 222 } | 223 } |
| 223 colort += row.f_amount * ebc_to_srm(row.f_color); | 224 colort += row.f_amount * ebc_to_srm(row.f_color); |
| 224 colorh += row.f_amount * row.f_color * get_kt(row.f_color); | 225 colorh += row.f_amount * row.f_color * get_kt(row.f_color); |
| 226 colorn += (row.f_percentage / 100) * row.f_color; // For 8.6 Pt wort. | |
| 225 } | 227 } |
| 226 to_100 = my_100; | 228 to_100 = my_100; |
| 227 if (to_100) { | 229 if (to_100) { |
| 228 $("#wf_amount").jqxNumberInput({ width: 90, readOnly: true, spinButtons: false }); | 230 $("#wf_amount").jqxNumberInput({ width: 90, readOnly: true, spinButtons: false }); |
| 229 } else { | 231 } else { |
| 237 | 239 |
| 238 // Estimate SG in kettle before boil | 240 // Estimate SG in kettle before boil |
| 239 preboil_sg = estimate_sg(sugarsm, parseFloat(dataRecord.boil_size)); | 241 preboil_sg = estimate_sg(sugarsm, parseFloat(dataRecord.boil_size)); |
| 240 | 242 |
| 241 // Color of the wort | 243 // Color of the wort |
| 242 if (dataRecord.color_method == 3) { // Hans Halberstadt | 244 if (dataRecord.color_method == 4) { |
| 245 var color = Math.round(((sg_to_plato(dataRecord.est_og) / 8.6) * colorn) + (dataRecord.boil_time / 60)); | |
| 246 } else if (dataRecord.color_method == 3) { // Hans Halberstadt | |
| 243 var color = Math.round((4.46 * bv * sr) / parseFloat(dataRecord.batch_size) * colorh); | 247 var color = Math.round((4.46 * bv * sr) / parseFloat(dataRecord.batch_size) * colorh); |
| 244 } else { | 248 } else { |
| 245 var cw = colort / parseFloat(dataRecord.batch_size) * 8.34436; | 249 var cw = colort / parseFloat(dataRecord.batch_size) * 8.34436; |
| 246 var color = kw_to_ebc(dataRecord.color_method, cw); | 250 var color = kw_to_ebc(dataRecord.color_method, cw); |
| 247 } | 251 } |
