comparison: www/js/prod_edit.js
www/js/prod_edit.js
- changeset 439
- b72478cd2c18
- parent 438
- 61436d428454
- child 445
- bcba4f17703f
equal
deleted
inserted
replaced
| 438:61436d428454 | 439:b72478cd2c18 |
|---|---|
| 287 var sug = sg_to_plato(ogx) * dataRecord.brew_fermenter_volume * ogx / 100; //kg of sugar in | 287 var sug = sg_to_plato(ogx) * dataRecord.brew_fermenter_volume * ogx / 100; //kg of sugar in |
| 288 sug += addedS; //kg | 288 sug += addedS; //kg |
| 289 | 289 |
| 290 if ((dataRecord.brew_fermenter_volume * ogx + addedmass) > 0) { | 290 if ((dataRecord.brew_fermenter_volume * ogx + addedmass) > 0) { |
| 291 var pt = 100 * sug / (dataRecord.brew_fermenter_volume * ogx + addedmass + top); | 291 var pt = 100 * sug / (dataRecord.brew_fermenter_volume * ogx + addedmass + top); |
| 292 dataRecord.brew_fermenter_sg = Math.round(plato_to_sg(pt) * 10000) / 10000; | 292 dataRecord.brew_fermenter_sg = Round(plato_to_sg(pt),4); |
| 293 $("#brew_fermenter_sg").val(dataRecord.brew_fermenter_sg); | 293 $("#brew_fermenter_sg").val(dataRecord.brew_fermenter_sg); |
| 294 // color | 294 // color |
| 295 if (dataRecord.color_method == 4) { | 295 if (dataRecord.color_method == 4) { |
| 296 dataRecord.brew_fermenter_color = Math.round(((pt / 8.6) * colorn) + (dataRecord.boil_time / 60)); | 296 dataRecord.brew_fermenter_color = Math.round(((pt / 8.6) * colorn) + (dataRecord.boil_time / 60)); |
| 297 } else if (dataRecord.color_method == 3) { | 297 } else if (dataRecord.color_method == 3) { |
| 1759 Acid = Math.round(Acid * 100) / 100; | 1759 Acid = Math.round(Acid * 100) / 100; |
| 1760 dataRecord.sparge_acid_amount = Acid / 1000; | 1760 dataRecord.sparge_acid_amount = Acid / 1000; |
| 1761 $("#sparge_acid_amount").val(Acid); | 1761 $("#sparge_acid_amount").val(Acid); |
| 1762 } | 1762 } |
| 1763 | 1763 |
| 1764 function calcFermentation() { | 1764 function calcFermentation(){ |
| 1765 if (dataRecord.brew_fermenter_sg < 1.020) | 1765 if(dataRecord.brew_fermenter_sg<1.020)return; |
| 1766 return; | 1766 var obrix=sg_to_brix(dataRecord.brew_fermenter_sg); |
| 1767 var obrix = sg_to_brix(dataRecord.brew_fermenter_sg); | 1767 if ((dataRecord.primary_end_sg>0.990)&&(dataRecord.primary_end_sg<dataRecord.brew_fermenter_sg)){ |
| 1768 console.log("calcFermentation() og:"+dataRecord.brew_fermenter_sg+" brix:"+obrix); | 1768 var primary_svg=Round(100*(dataRecord.brew_fermenter_sg-dataRecord.primary_end_sg)/(dataRecord.brew_fermenter_sg-1),1); |
| 1769 if ((dataRecord.primary_end_sg > 0.990) && (dataRecord.primary_end_sg < dataRecord.brew_fermenter_sg)) { | 1769 $("#primary_svg").val(primary_svg); |
| 1770 var primary_svg = 100 * (dataRecord.brew_fermenter_sg - dataRecord.primary_end_sg) / (dataRecord.brew_fermenter_sg - 1); | 1770 if((dataRecord.fg>0.990)&&(dataRecord.fg<dataRecord.brew_fermenter_sg)){ |
| 1771 //console.log("primary svg: "+primary_svg); | 1771 var final_svg=Round(100*(dataRecord.brew_fermenter_sg-dataRecord.fg)/(dataRecord.brew_fermenter_sg-1),1); |
| 1772 $("#primary_svg").val(primary_svg); | 1772 $("#final_svg").val(final_svg); |
| 1773 if ((dataRecord.fg > 0.990) && (dataRecord.fg < dataRecord.brew_fermenter_sg)) { | 1773 var ABV=Round(abvol(dataRecord.brew_fermenter_sg,dataRecord.fg),2); |
| 1774 var final_svg = 100 * (dataRecord.brew_fermenter_sg - dataRecord.fg) / (dataRecord.brew_fermenter_sg - 1); | 1774 $("#final_abv").val(ABV);}}} |
| 1775 $("#final_svg").val(final_svg); | |
| 1776 var ABV = abvol(dataRecord.brew_fermenter_sg, dataRecord.fg); | |
| 1777 $("#final_abv").val(ABV); | |
| 1778 } | |
| 1779 } | |
| 1780 } | |
| 1781 | 1775 |
| 1782 function ResCO2(CO2, T) { | 1776 function ResCO2(CO2, T) { |
| 1783 //var resco2 = 0.000849151 * T * T - 0.0587512 * T + 1.71137; // brouwhulp | 1777 //var resco2 = 0.000849151 * T * T - 0.0587512 * T + 1.71137; // brouwhulp |
| 1784 var F = T * 1.8 + 32; | 1778 var F = T * 1.8 + 32; |
| 1785 var resco2 = 3.0378 - 0.050062 * F + 0.00026555 * F * F; // most of the rest | 1779 var resco2 = 3.0378 - 0.050062 * F + 0.00026555 * F * F; // most of the rest |
| 2502 $('#keg_carbonation_temp').on('change', function (event) { | 2496 $('#keg_carbonation_temp').on('change', function (event) { |
| 2503 dataRecord.keg_carbonation_temp = parseFloat(event.args.value); | 2497 dataRecord.keg_carbonation_temp = parseFloat(event.args.value); |
| 2504 calcCarbonation(); | 2498 calcCarbonation(); |
| 2505 }); | 2499 }); |
| 2506 | 2500 |
| 2507 $("#brew_fermenter_extrawater").on('change', function (event) { | 2501 $("#brew_fermenter_extrawater").on('change',function (event){ |
| 2508 dataRecord.brew_fermenter_extrawater = parseFloat(event.args.value); | 2502 dataRecord.brew_fermenter_extrawater=parseFloat(event.args.value);calcFermentables();calcIBUs();calcYeast(); |
| 2509 calcFermentables(); | |
| 2510 calcIBUs(); | |
| 2511 calcYeast(); | |
| 2512 }); | 2503 }); |
| 2513 $("#brew_fermenter_tcloss").on('change', function (event) { | 2504 $("#brew_fermenter_tcloss").on('change',function (event){ |
| 2514 dataRecord.brew_fermenter_tcloss = parseFloat(event.args.value); | 2505 dataRecord.brew_fermenter_tcloss=parseFloat(event.args.value);calcFermentables();calcIBUs();calcYeast(); |
| 2515 calcFermentables(); | |
| 2516 calcIBUs(); | |
| 2517 calcYeast(); | |
| 2518 }); | 2506 }); |
| 2519 $("#primary_end_sg").on('change', function (event) { | 2507 $("#primary_end_sg").on('change',function (event){dataRecord.primary_end_sg=parseFloat(event.args.value);calcFermentation();}); |
| 2520 dataRecord.primary_end_sg = parseFloat(event.args.value); | 2508 $("#primary_end_brix").on('change', function (event) { |
| 2521 calcFermentation(); | 2509 if(dataRecord.brew_fermenter_sg>=1.020){ |
| 2510 OBrix=sg_to_brix(dataRecord.brew_fermenter_sg); | |
| 2511 FBrix=parseFloat(event.args.value); | |
| 2512 var FG=Round(1.0031-0.002318474*OBrix-0.000007775*(OBrix*OBrix)-0.000000034*Math.pow(OBrix,3)+0.00574*(FBrix)+0.00003344*(FBrix*FBrix)+0.000000086*Math.pow(FBrix,3),4); | |
| 2513 //console.log("OBrix:"+OBrix+" FBrix:"+FBrix+" FG:"+FG); | |
| 2514 if(FBrix>0.05){$("#primary_end_sg").val(FG);dataRecord.primary_end_sg=FG;} | |
| 2515 calcFermentation(); | |
| 2516 } | |
| 2522 }); | 2517 }); |
| 2523 $("#primary_end_brix").on('change', function (event) { | 2518 $("#final_brix").on('change',function (event){ |
| 2524 // Brix reading from refractometer RI | 2519 if(dataRecord.brew_fermenter_sg>=1.020){ |
| 2525 if (dataRecord.brew_fermenter_sg >= 1.020) { | 2520 OBrix=sg_to_brix(dataRecord.brew_fermenter_sg); |
| 2526 OBrix = sg_to_brix(dataRecord.brew_fermenter_sg); | 2521 FBrix=parseFloat(event.args.value); |
| 2527 FBrix = parseFloat(event.args.value); | 2522 var FG=Round(1.0031-0.002318474*OBrix-0.000007775*(OBrix*OBrix)-0.000000034*Math.pow(OBrix,3)+0.00574*(FBrix)+0.00003344*(FBrix*FBrix)+0.000000086*Math.pow(FBrix,3),4); |
| 2528 // http://seanterrill.com/2011/04/07/refractometer-fg-results/ | 2523 // Ook brouwhulp SGFerm() maar is niet in gebruik. |
| 2529 // var FG = 1.0000 - 0.0044993 * OBrix + 0.0117741 * FBrix + | 2524 //var FG=((1.001843-0.002318474*OBrix-0.000007775*(OBrix*OBrix)-0.000000034*Math.pow(OBrix,3)+0.00574*(FBrix)+0.00003344*(FBrix*FBrix)+0.000000086*Math.pow(FBrix,3))+(1.313454)*0.001); |
| 2530 // 0.000275806 * (OBrix * OBrix) - 0.00127169 * (FBrix * FBrix) - | 2525 //console.log("OBrix:"+OBrix+" FBrix:"+FBrix+" FG:"+FG); |
| 2531 // 0.00000727999 * Math.pow(OBrix, 3) + 0.0000632929 * Math.pow(FBrix, 3); | 2526 if(FBrix>0.05){$("#fg").val(FG);dataRecord.fg=FG;} |
| 2532 // var FG = 1.0000 - 0.00085683 * OBrix + 0.0034941 * FBrix; | |
| 2533 // Brouwhulp | |
| 2534 var FG = 1.0031 - 0.002318474 * OBrix - 0.000007775 * (OBrix * OBrix) - | |
| 2535 0.000000034 * Math.pow(OBrix, 3) + 0.00574 * (FBrix) + | |
| 2536 0.00003344 * (FBrix * FBrix) + 0.000000086 * Math.pow(FBrix, 3); | |
| 2537 // var FG = ((1.001843 - 0.002318474 * OBrix - 0.000007775 * (OBrix * OBrix) | |
| 2538 // - 0.000000034 * Math.pow(OBrix, 3) + 0.00574 * (FBrix) | |
| 2539 // + 0.00003344 * (FBrix * FBrix) + 0.000000086 * Math.pow(FBrix, 3)) | |
| 2540 // + (1.313454) * 0.001); | |
| 2541 console.log("OBrix:"+OBrix+" FBrix:"+FBrix+" FG:"+FG); | |
| 2542 if (FBrix > 0.05) { | |
| 2543 $("#primary_end_sg").val(FG); | |
| 2544 dataRecord.primary_end_sg = FG; | |
| 2545 } | |
| 2546 calcFermentation(); | 2527 calcFermentation(); |
| 2547 } | 2528 } |
| 2548 }); | 2529 }); |
| 2549 $("#final_brix").on('change', function (event) { | 2530 $("#fg").on('change',function (event){dataRecord.fg=parseFloat(event.args.value);calcFermentation();}); |
| 2550 // Brix reading from refractometer RI | 2531 $("#BLog").jqxButton({disabled:(dataRecord.log_brew)?false:true}); |
| 2551 if (dataRecord.brew_fermenter_sg >= 1.020) { | 2532 $("#FLog").jqxButton({disabled:(dataRecord.log_fermentation)?false:true}); |
| 2552 OBrix = sg_to_brix(dataRecord.brew_fermenter_sg); | |
| 2553 FBrix = parseFloat(event.args.value); | |
| 2554 // http://seanterrill.com/2011/04/07/refractometer-fg-results/ | |
| 2555 // var FG = 1.0000 - 0.0044993 * OBrix + 0.0117741 * FBrix + | |
| 2556 // 0.000275806 * (OBrix * OBrix) - 0.00127169 * (FBrix * FBrix) - | |
| 2557 // 0.00000727999 * Math.pow(OBrix, 3) + 0.0000632929 * Math.pow(FBrix, 3); | |
| 2558 // Brouwhulp BrixToFG() | |
| 2559 var FG = 1.0031 - 0.002318474 * OBrix - 0.000007775 * (OBrix * OBrix) - | |
| 2560 0.000000034 * Math.pow(OBrix, 3) + 0.00574 * (FBrix) + | |
| 2561 0.00003344 * (FBrix * FBrix) + 0.000000086 * Math.pow(FBrix, 3); | |
| 2562 // Ook brouwhulp SGFerm() maar is niet in gebruik. | |
| 2563 // var FG = ((1.001843 - 0.002318474 * OBrix - 0.000007775 * (OBrix * OBrix) | |
| 2564 // - 0.000000034 * Math.pow(OBrix, 3) + 0.00574 * (FBrix) | |
| 2565 // + 0.00003344 * (FBrix * FBrix) + 0.000000086 * Math.pow(FBrix, 3)) | |
| 2566 // + (1.313454) * 0.001); | |
| 2567 console.log("OBrix:"+OBrix+" FBrix:"+FBrix+" FG:"+FG); | |
| 2568 if (FBrix > 0.05) { | |
| 2569 $("#fg").val(FG); | |
| 2570 dataRecord.fg = FG; | |
| 2571 } | |
| 2572 calcFermentation(); | |
| 2573 } | |
| 2574 }); | |
| 2575 $("#BLog").jqxButton({ disabled: (dataRecord.log_brew) ? false:true }); | |
| 2576 $("#FLog").jqxButton({ disabled: (dataRecord.log_fermentation) ? false:true }); | |
| 2577 }; | 2533 }; |
| 2578 | 2534 |
| 2579 $("#styleSelect").jqxDropDownList({ | 2535 $("#styleSelect").jqxDropDownList({ |
| 2580 placeHolder: "Kies bierstijl:", | 2536 placeHolder: "Kies bierstijl:", |
| 2581 theme: theme, | 2537 theme: theme, |
