comparison: www/js/prod_edit.js
www/js/prod_edit.js
- changeset 655
- f4e00869f39f
- parent 651
- 6e89cb158153
- child 658
- 945d5eba869a
equal
deleted
inserted
replaced
| 654:0aef416dbceb | 655:f4e00869f39f |
|---|---|
| 1958 $('#est_abv').val(dataRecord.est_abv); | 1958 $('#est_abv').val(dataRecord.est_abv); |
| 1959 $('#est_abv2').val(dataRecord.est_abv); | 1959 $('#est_abv2').val(dataRecord.est_abv); |
| 1960 | 1960 |
| 1961 // Calculate the final svg if available use the real value. | 1961 // Calculate the final svg if available use the real value. |
| 1962 if ((dataRecord.stage >= 6) && (dataRecord.fg > 0.990) && (dataRecord.fg < dataRecord.brew_fermenter_sg)) { | 1962 if ((dataRecord.stage >= 6) && (dataRecord.fg > 0.990) && (dataRecord.fg < dataRecord.brew_fermenter_sg)) { |
| 1963 svg = 100 * (dataRecord.brew_fermenter_sg - dataRecord.fg) / (dataRecord.brew_fermenter_sg - 1); | 1963 svg = calc_svg(dataRecord.brew_fermenter_sg, dataRecord.fg); |
| 1964 org = dataRecord.brew_fermenter_sg; | 1964 org = dataRecord.brew_fermenter_sg; |
| 1965 fig = dataRecord.fg; | 1965 fig = dataRecord.fg; |
| 1966 } | 1966 } |
| 1967 | 1967 |
| 1968 $('#yeast_cells').val(initcells); | 1968 $('#yeast_cells').val(initcells); |
| 3388 function calcFermentation() { | 3388 function calcFermentation() { |
| 3389 var primary_svg, secondary_svg, final_svg, ABV; | 3389 var primary_svg, secondary_svg, final_svg, ABV; |
| 3390 if (dataRecord.brew_fermenter_sg < 1.020) | 3390 if (dataRecord.brew_fermenter_sg < 1.020) |
| 3391 return; | 3391 return; |
| 3392 if ((dataRecord.primary_end_sg > 0.990) && (dataRecord.primary_end_sg < dataRecord.brew_fermenter_sg)) { | 3392 if ((dataRecord.primary_end_sg > 0.990) && (dataRecord.primary_end_sg < dataRecord.brew_fermenter_sg)) { |
| 3393 primary_svg = Round(100 * (dataRecord.brew_fermenter_sg - dataRecord.primary_end_sg) / (dataRecord.brew_fermenter_sg - 1), 1); | 3393 primary_svg = Round(calc_svg(dataRecord.brew_fermenter_sg, dataRecord.primary_end_sg), 1); |
| 3394 $('#primary_svg').val(primary_svg); | 3394 $('#primary_svg').val(primary_svg); |
| 3395 if ((dataRecord.secondary_end_sg > 0.990) && (dataRecord.secondary_end_sg < dataRecord.brew_fermenter_sg)) { | 3395 if ((dataRecord.secondary_end_sg > 0.990) && (dataRecord.secondary_end_sg < dataRecord.brew_fermenter_sg)) { |
| 3396 secondary_svg = Round(100 * (dataRecord.brew_fermenter_sg - dataRecord.secondary_end_sg) / (dataRecord.brew_fermenter_sg - 1), 1); | 3396 secondary_svg = Round(calc_svg(dataRecord.brew_fermenter_sg, dataRecord.secondary_end_sg), 1); |
| 3397 $('#secondary_svg').val(secondary_svg); | 3397 $('#secondary_svg').val(secondary_svg); |
| 3398 if ((dataRecord.fg > 0.990) && (dataRecord.fg < dataRecord.brew_fermenter_sg)) { | 3398 if ((dataRecord.fg > 0.990) && (dataRecord.fg < dataRecord.brew_fermenter_sg)) { |
| 3399 final_svg = Round(100 * (dataRecord.brew_fermenter_sg - dataRecord.fg) / (dataRecord.brew_fermenter_sg - 1), 1); | 3399 final_svg = Round(calc_svg(dataRecord.brew_fermenter_sg, dataRecord.fg), 1); |
| 3400 $('#final_svg').val(final_svg); | 3400 $('#final_svg').val(final_svg); |
| 3401 ABV = Round(abvol(dataRecord.brew_fermenter_sg, dataRecord.fg), 2); | 3401 ABV = Round(abvol(dataRecord.brew_fermenter_sg, dataRecord.fg), 2); |
| 3402 $('#final_abv').val(ABV); | 3402 $('#final_abv').val(ABV); |
| 3403 } | 3403 } |
| 3404 } | 3404 } |
