comparison: www/js/prod_edit.js
www/js/prod_edit.js
- changeset 559
- 10cc2400b5d5
- parent 557
- ee76d0bfcdaf
- child 560
- 850e82c1021d
equal
deleted
inserted
replaced
| 558:a8e065a9f851 | 559:10cc2400b5d5 |
|---|---|
| 2044 } | 2044 } |
| 2045 ok_hops = 1; | 2045 ok_hops = 1; |
| 2046 for (i = 0; i < rows.length; i++) { | 2046 for (i = 0; i < rows.length; i++) { |
| 2047 row = rows[i]; | 2047 row = rows[i]; |
| 2048 total_ibus += toIBU(row.h_useat, row.h_form, preboil_sg, parseFloat(dataRecord.batch_size), | 2048 total_ibus += toIBU(row.h_useat, row.h_form, preboil_sg, parseFloat(dataRecord.batch_size), |
| 2049 parseFloat(row.h_amount), parseFloat(row.h_time), parseFloat(row.h_alpha), dataRecord.ibu_method, | 2049 parseFloat(row.h_amount), parseFloat(row.h_time), parseFloat(row.h_alpha), dataRecord.ibu_method, |
| 2050 dataRecord.brew_whirlpool9, dataRecord.brew_whirlpool7, dataRecord.brew_whirlpool6); | 2050 dataRecord.brew_whirlpool9, dataRecord.brew_whirlpool7, dataRecord.brew_whirlpool6); |
| 2051 ferm_ibus += toIBU(row.h_useat, row.h_form, preboil_sg, | 2051 ferm_ibus += toIBU(row.h_useat, row.h_form, preboil_sg, |
| 2052 parseFloat(dataRecord.brew_fermenter_volume) + parseFloat(dataRecord.brew_fermenter_tcloss), | 2052 parseFloat(dataRecord.brew_fermenter_volume) + parseFloat(dataRecord.brew_fermenter_tcloss), |
| 2053 parseFloat(row.h_amount), parseFloat(row.h_time), parseFloat(row.h_alpha), dataRecord.ibu_method, | 2053 parseFloat(row.h_amount), parseFloat(row.h_time), parseFloat(row.h_alpha), dataRecord.ibu_method, |
| 2054 dataRecord.brew_whirlpool9, dataRecord.brew_whirlpool7, dataRecord.brew_whirlpool6); | 2054 dataRecord.brew_whirlpool9, dataRecord.brew_whirlpool7, dataRecord.brew_whirlpool6); |
| 2055 hop_flavour += hopFlavourContribution(parseFloat(row.h_time), parseFloat(dataRecord.batch_size), | 2055 hop_flavour += hopFlavourContribution(parseFloat(row.h_time), parseFloat(dataRecord.batch_size), row.h_useat, parseFloat(row.h_amount)); |
| 2056 row.h_useat, parseFloat(row.h_amount)); | 2056 hop_aroma += hopAromaContribution(parseFloat(row.h_time), parseFloat(dataRecord.batch_size), row.h_useat, parseFloat(row.h_amount)); |
| 2057 hop_aroma += hopAromaContribution(parseFloat(row.h_time), parseFloat(dataRecord.batch_size), | |
| 2058 row.h_useat, parseFloat(row.h_amount)); | |
| 2059 if ((((dataRecord.inventory_reduced <= 2) && (row.h_useat <= 4)) || // Mash, FW, Boil, Aroma, Whirlpool | 2057 if ((((dataRecord.inventory_reduced <= 2) && (row.h_useat <= 4)) || // Mash, FW, Boil, Aroma, Whirlpool |
| 2060 ((dataRecord.inventory_reduced <= 6) && (row.h_useat == 5))) && // Dry-hop | 2058 ((dataRecord.inventory_reduced <= 6) && (row.h_useat == 5))) && // Dry-hop |
| 2061 (row.h_inventory < row.h_amount)) | 2059 (row.h_inventory < row.h_amount)) |
| 2062 ok_hops = 0; | 2060 ok_hops = 0; |
| 2063 } | 2061 } |
