comparison: www/js/prod_edit.js
www/js/prod_edit.js
- changeset 373
- ee16d9b844d8
- parent 372
- 1365b5e47130
- child 375
- 7f5455806f20
equal
deleted
inserted
replaced
| 372:1365b5e47130 | 373:ee16d9b844d8 |
|---|---|
| 140 var addedS = 0; // Added sugars after boil | 140 var addedS = 0; // Added sugars after boil |
| 141 var addedmass = 0; // Added mass after boil | 141 var addedmass = 0; // Added mass after boil |
| 142 var mvol = 0; // mash volume | 142 var mvol = 0; // mash volume |
| 143 var colort = 0; // Colors srm * vol totals | 143 var colort = 0; // Colors srm * vol totals |
| 144 var colorh = 0; // Colors ebc * vol * kt | 144 var colorh = 0; // Colors ebc * vol * kt |
| 145 var colorn = 0; // Colors ebc * pt * pct | |
| 145 var my_100 = false; | 146 var my_100 = false; |
| 146 var mashtime = 0; // Total mash time | 147 var mashtime = 0; // Total mash time |
| 147 var mashtemp = 0; // Average mash temperature | 148 var mashtemp = 0; // Average mash temperature |
| 148 var bv = 0.925; // Bierverlies rendement | 149 var bv = 0.925; // Bierverlies rendement |
| 149 var sr = 0.95; // Mash en spoel rendement | 150 var sr = 0.95; // Mash en spoel rendement |
| 192 addedmass += row.f_amount; | 193 addedmass += row.f_amount; |
| 193 vol += (x * sugardensity + (1 - x) * 1) * row.f_amount; | 194 vol += (x * sugardensity + (1 - x) * 1) * row.f_amount; |
| 194 } | 195 } |
| 195 colort += row.f_amount * ebc_to_srm(row.f_color); | 196 colort += row.f_amount * ebc_to_srm(row.f_color); |
| 196 colorh += row.f_amount * row.f_color * get_kt(row.f_color); | 197 colorh += row.f_amount * row.f_color * get_kt(row.f_color); |
| 198 colorn += (row.f_percentage / 100) * row.f_color; // For 8.6 Pt wort. | |
| 197 // Check supplies. | 199 // Check supplies. |
| 198 if ((((dataRecord.inventory_reduced <= 2) && (row.f_added <= 1)) || // Mash or boil | 200 if ((((dataRecord.inventory_reduced <= 2) && (row.f_added <= 1)) || // Mash or boil |
| 199 ((dataRecord.inventory_reduced <= 3) && (row.f_added == 2)) || // Primary | 201 ((dataRecord.inventory_reduced <= 3) && (row.f_added == 2)) || // Primary |
| 200 ((dataRecord.inventory_reduced <= 5) && (row.f_added == 3)) || // Secondary or Tertiary | 202 ((dataRecord.inventory_reduced <= 5) && (row.f_added == 3)) || // Secondary or Tertiary |
| 201 ((dataRecord.inventory_reduced <= 6) && (row.f_added == 4))) && row.f_inventory < row.f_amount) { | 203 ((dataRecord.inventory_reduced <= 6) && (row.f_added == 4))) && row.f_inventory < row.f_amount) { |
| 258 if ((dataRecord.brew_fermenter_volume * ogx + addedmass) > 0) { | 260 if ((dataRecord.brew_fermenter_volume * ogx + addedmass) > 0) { |
| 259 var pt = 100 * sug / (dataRecord.brew_fermenter_volume * ogx + addedmass + top); | 261 var pt = 100 * sug / (dataRecord.brew_fermenter_volume * ogx + addedmass + top); |
| 260 dataRecord.brew_fermenter_sg = Math.round(plato_to_sg(pt) * 10000) / 10000; | 262 dataRecord.brew_fermenter_sg = Math.round(plato_to_sg(pt) * 10000) / 10000; |
| 261 $("#brew_fermenter_sg").val(dataRecord.brew_fermenter_sg); | 263 $("#brew_fermenter_sg").val(dataRecord.brew_fermenter_sg); |
| 262 // color | 264 // color |
| 263 if (dataRecord.color_method == 3) { | 265 if (dataRecord.color_method == 4) { |
| 266 dataRecord.brew_fermenter_color = Math.round(((pt / 8.6) * colorn) + (dataRecord.boil_time / 60)); | |
| 267 } else if (dataRecord.color_method == 3) { | |
| 264 dataRecord.brew_fermenter_color = Math.round((4.46 * bv * sr) / (aboil_volume + top) * colorh); | 268 dataRecord.brew_fermenter_color = Math.round((4.46 * bv * sr) / (aboil_volume + top) * colorh); |
| 265 } else { | 269 } else { |
| 266 var cw = colort / (aboil_volume + top) * 8.34436; | 270 var cw = colort / (aboil_volume + top) * 8.34436; |
| 267 dataRecord.brew_fermenter_color = kw_to_ebc(dataRecord.color_method, cw); | 271 dataRecord.brew_fermenter_color = kw_to_ebc(dataRecord.color_method, cw); |
| 268 } | 272 } |
| 278 $("#brew_fermenter_color").val(0); | 282 $("#brew_fermenter_color").val(0); |
| 279 $("#bcolorf").hide(); | 283 $("#bcolorf").hide(); |
| 280 } | 284 } |
| 281 | 285 |
| 282 // Color of the wort | 286 // Color of the wort |
| 283 if (dataRecord.color_method == 3) { // Hans Halberstadt | 287 if (dataRecord.color_method == 4) { |
| 288 var color = Math.round(((sg_to_plato(dataRecord.est_og) / 8.6) * colorn) + (dataRecord.boil_time / 60)); | |
| 289 } else if (dataRecord.color_method == 3) { // Hans Halberstadt | |
| 284 var color = Math.round((4.46 * bv * sr) / parseFloat(dataRecord.batch_size) * colorh); | 290 var color = Math.round((4.46 * bv * sr) / parseFloat(dataRecord.batch_size) * colorh); |
| 285 } else { | 291 } else { |
| 286 var cw = colort / parseFloat(dataRecord.batch_size) * 8.34436; | 292 var cw = colort / parseFloat(dataRecord.batch_size) * 8.34436; |
| 287 var color = kw_to_ebc(dataRecord.color_method, cw); | 293 var color = kw_to_ebc(dataRecord.color_method, cw); |
| 288 } | 294 } |
