Mercurial > bms / file comparison

comparison: www/js/prod_edit.js

www/js/prod_edit.js

changeset 460
046ff5fdc96c
parent 458
47b592993dd5
child 462
c91175610f8a
equal deleted inserted replaced
459:53fafe474742 460:046ff5fdc96c
1762 dataRecord.sparge_acid_amount = Acid / 1000; 1762 dataRecord.sparge_acid_amount = Acid / 1000;
1763 $("#sparge_acid_amount").val(Acid); 1763 $("#sparge_acid_amount").val(Acid);
1764 } 1764 }
1765 1765
1766 function calcFermentation(){ 1766 function calcFermentation(){
1767 if(dataRecord.brew_fermenter_sg<1.020)return; 1767 if(dataRecord.brew_fermenter_sg<1.020)return;
1768 var obrix=sg_to_brix(dataRecord.brew_fermenter_sg); 1768 var obrix=sg_to_brix(dataRecord.brew_fermenter_sg);
1769 if ((dataRecord.primary_end_sg>0.990)&&(dataRecord.primary_end_sg<dataRecord.brew_fermenter_sg)){ 1769 if ((dataRecord.primary_end_sg>0.990)&&(dataRecord.primary_end_sg<dataRecord.brew_fermenter_sg)){
1770 var primary_svg=Round(100*(dataRecord.brew_fermenter_sg-dataRecord.primary_end_sg)/(dataRecord.brew_fermenter_sg-1),1); 1770 var primary_svg=Round(100*(dataRecord.brew_fermenter_sg-dataRecord.primary_end_sg)/(dataRecord.brew_fermenter_sg-1),1);
1771 $("#primary_svg").val(primary_svg); 1771 $("#primary_svg").val(primary_svg);
1772 if((dataRecord.fg>0.990)&&(dataRecord.fg<dataRecord.brew_fermenter_sg)){ 1772 if((dataRecord.secondary_end_sg>0.990)&&(dataRecord.secondary_end_sg<dataRecord.brew_fermenter_sg)){
1773 var final_svg=Round(100*(dataRecord.brew_fermenter_sg-dataRecord.fg)/(dataRecord.brew_fermenter_sg-1),1); 1773 var secondary_svg=Round(100*(dataRecord.brew_fermenter_sg-dataRecord.secondary_end_sg)/(dataRecord.brew_fermenter_sg-1),1);
1774 $("#final_svg").val(final_svg); 1774 $("#secondary_svg").val(secondary_svg);
1775 var ABV=Round(abvol(dataRecord.brew_fermenter_sg,dataRecord.fg),2); 1775 if((dataRecord.fg>0.990)&&(dataRecord.fg<dataRecord.brew_fermenter_sg)){
1776 $("#final_abv").val(ABV);}}} 1776 var final_svg=Round(100*(dataRecord.brew_fermenter_sg-dataRecord.fg)/(dataRecord.brew_fermenter_sg-1),1);
1777 $("#final_svg").val(final_svg);
1778 var ABV=Round(abvol(dataRecord.brew_fermenter_sg,dataRecord.fg),2);
1779 $("#final_abv").val(ABV);
1780 }
1781 }
1782 }
1783 }
1777 1784
1778 function ResCO2(CO2, T) { 1785 function ResCO2(CO2, T) {
1779 //var resco2 = 0.000849151 * T * T - 0.0587512 * T + 1.71137; // brouwhulp 1786 //var resco2 = 0.000849151 * T * T - 0.0587512 * T + 1.71137; // brouwhulp
1780 var F = T * 1.8 + 32; 1787 var F = T * 1.8 + 32;
1781 var resco2 = 3.0378 - 0.050062 * F + 0.00026555 * F * F; // most of the rest 1788 var resco2 = 3.0378 - 0.050062 * F + 0.00026555 * F * F; // most of the rest
2051 $("#primary_end_brix").jqxNumberInput({ spinButtons: false, readOnly: true, width: 90 }); 2058 $("#primary_end_brix").jqxNumberInput({ spinButtons: false, readOnly: true, width: 90 });
2052 $("#primary_end_date").jqxDateTimeInput({ disabled: true }); 2059 $("#primary_end_date").jqxDateTimeInput({ disabled: true });
2053 } 2060 }
2054 if (dataRecord.stage >= 6) { // Packaged 2061 if (dataRecord.stage >= 6) { // Packaged
2055 $("#secondary_temp").jqxNumberInput({ spinButtons: false, readOnly: true, width: 90 }); 2062 $("#secondary_temp").jqxNumberInput({ spinButtons: false, readOnly: true, width: 90 });
2063 $("#secondary_end_sg").jqxNumberInput({ spinButtons: false, readOnly: true, width: 90 });
2056 $("#secondary_end_date").jqxDateTimeInput({ disabled: true }); 2064 $("#secondary_end_date").jqxDateTimeInput({ disabled: true });
2057 $("#tertiary_temp").jqxNumberInput({ spinButtons: false, readOnly: true, width: 90 }); 2065 $("#tertiary_temp").jqxNumberInput({ spinButtons: false, readOnly: true, width: 90 });
2058 $("#fg").jqxNumberInput({ spinButtons: false, readOnly: true, width: 90 }); 2066 $("#fg").jqxNumberInput({ spinButtons: false, readOnly: true, width: 90 });
2059 $("#final_brix").jqxNumberInput({ spinButtons: false, readOnly: true, width: 90 }); 2067 $("#final_brix").jqxNumberInput({ spinButtons: false, readOnly: true, width: 90 });
2060 $("#package_date").jqxDateTimeInput({ disabled: true }); 2068 $("#package_date").jqxDateTimeInput({ disabled: true });
2526 //console.log("OBrix:"+OBrix+" FBrix:"+FBrix+" FG:"+FG); 2534 //console.log("OBrix:"+OBrix+" FBrix:"+FBrix+" FG:"+FG);
2527 if(FBrix>0.05){$("#primary_end_sg").val(FG);dataRecord.primary_end_sg=FG;} 2535 if(FBrix>0.05){$("#primary_end_sg").val(FG);dataRecord.primary_end_sg=FG;}
2528 calcFermentation(); 2536 calcFermentation();
2529 } 2537 }
2530 }); 2538 });
2539 $("#secondary_end_sg").on('change',function (event){dataRecord.secondary_end_sg=parseFloat(event.args.value);calcFermentation();});
2540 $("#secondary_end_brix").on('change', function (event) {
2541 if(dataRecord.brew_fermenter_sg>=1.020){
2542 OBrix=sg_to_brix(dataRecord.brew_fermenter_sg);
2543 FBrix=parseFloat(event.args.value);
2544 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);
2545 //console.log("OBrix:"+OBrix+" FBrix:"+FBrix+" FG:"+FG);
2546 if(FBrix>0.05){$("#secondary_end_sg").val(FG);dataRecord.secondary_end_sg=FG;}
2547 calcFermentation();
2548 }
2549 });
2531 $("#final_brix").on('change',function (event){ 2550 $("#final_brix").on('change',function (event){
2532 if(dataRecord.brew_fermenter_sg>=1.020){ 2551 if(dataRecord.brew_fermenter_sg>=1.020){
2533 OBrix=sg_to_brix(dataRecord.brew_fermenter_sg); 2552 OBrix=sg_to_brix(dataRecord.brew_fermenter_sg);
2534 FBrix=parseFloat(event.args.value); 2553 FBrix=parseFloat(event.args.value);
2535 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); 2554 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);
2737 primary_max_temp: parseFloat($("#primary_max_temp").jqxNumberInput('decimal')), 2756 primary_max_temp: parseFloat($("#primary_max_temp").jqxNumberInput('decimal')),
2738 primary_end_temp: parseFloat($("#primary_end_temp").jqxNumberInput('decimal')), 2757 primary_end_temp: parseFloat($("#primary_end_temp").jqxNumberInput('decimal')),
2739 primary_end_sg: parseFloat($("#primary_end_sg").jqxNumberInput('decimal')), 2758 primary_end_sg: parseFloat($("#primary_end_sg").jqxNumberInput('decimal')),
2740 primary_end_date: $("#primary_end_date").val(), 2759 primary_end_date: $("#primary_end_date").val(),
2741 secondary_temp: parseFloat($("#secondary_temp").jqxNumberInput('decimal')), 2760 secondary_temp: parseFloat($("#secondary_temp").jqxNumberInput('decimal')),
2761 secondary_end_sg: parseFloat($("#secondary_end_sg").jqxNumberInput('decimal')),
2742 secondary_end_date: $("#secondary_end_date").val(), 2762 secondary_end_date: $("#secondary_end_date").val(),
2743 tertiary_temp: parseFloat($("#tertiary_temp").jqxNumberInput('decimal')), 2763 tertiary_temp: parseFloat($("#tertiary_temp").jqxNumberInput('decimal')),
2744 package_date: $("#package_date").val(), 2764 package_date: $("#package_date").val(),
2745 package_volume: parseFloat($("#package_volume").jqxNumberInput('decimal')), 2765 package_volume: parseFloat($("#package_volume").jqxNumberInput('decimal')),
2746 package_infuse_amount: parseFloat($("#package_infuse_amount").jqxNumberInput('decimal')), 2766 package_infuse_amount: parseFloat($("#package_infuse_amount").jqxNumberInput('decimal')),
2965 { name: 'primary_max_temp', type: 'float' }, 2985 { name: 'primary_max_temp', type: 'float' },
2966 { name: 'primary_end_temp', type: 'float' }, 2986 { name: 'primary_end_temp', type: 'float' },
2967 { name: 'primary_end_sg', type: 'float' }, 2987 { name: 'primary_end_sg', type: 'float' },
2968 { name: 'primary_end_date', type: 'string' }, 2988 { name: 'primary_end_date', type: 'string' },
2969 { name: 'secondary_temp', type: 'float' }, 2989 { name: 'secondary_temp', type: 'float' },
2990 { name: 'secondary_end_sg', type: 'float' },
2970 { name: 'secondary_end_date', type: 'string' }, 2991 { name: 'secondary_end_date', type: 'string' },
2971 { name: 'tertiary_temp', type: 'float' }, 2992 { name: 'tertiary_temp', type: 'float' },
2972 { name: 'package_date', type: 'string' }, 2993 { name: 'package_date', type: 'string' },
2973 { name: 'package_volume', type: 'float' }, 2994 { name: 'package_volume', type: 'float' },
2974 { name: 'package_infuse_amount', type: 'float' }, 2995 { name: 'package_infuse_amount', type: 'float' },
3176 $("#primary_max_temp").val(dataRecord.primary_max_temp); 3197 $("#primary_max_temp").val(dataRecord.primary_max_temp);
3177 $("#primary_end_temp").val(dataRecord.primary_end_temp); 3198 $("#primary_end_temp").val(dataRecord.primary_end_temp);
3178 $("#primary_end_sg").val(dataRecord.primary_end_sg); 3199 $("#primary_end_sg").val(dataRecord.primary_end_sg);
3179 $("#primary_end_date").val(dataRecord.primary_end_date); 3200 $("#primary_end_date").val(dataRecord.primary_end_date);
3180 $("#secondary_temp").val(dataRecord.secondary_temp); 3201 $("#secondary_temp").val(dataRecord.secondary_temp);
3202 $("#secondary_end_sg").val(dataRecord.secondary_end_sg);
3181 $("#secondary_end_date").val(dataRecord.secondary_end_date); 3203 $("#secondary_end_date").val(dataRecord.secondary_end_date);
3182 $("#tertiary_temp").val(dataRecord.tertiary_temp); 3204 $("#tertiary_temp").val(dataRecord.tertiary_temp);
3183 $("#package_date").val(dataRecord.package_date); 3205 $("#package_date").val(dataRecord.package_date);
3184 $("#package_volume").val(dataRecord.package_volume); 3206 $("#package_volume").val(dataRecord.package_volume);
3185 $("#package_infuse_amount").val(dataRecord.package_infuse_amount); 3207 $("#package_infuse_amount").val(dataRecord.package_infuse_amount);
5772 $("#primary_svg").jqxNumberInput( Show1dec ); 5794 $("#primary_svg").jqxNumberInput( Show1dec );
5773 $("#primary_end_date").jqxTooltip({ content: 'De eind datum van de hoofdvergisting en eventueel overhevelen.' }); 5795 $("#primary_end_date").jqxTooltip({ content: 'De eind datum van de hoofdvergisting en eventueel overhevelen.' });
5774 $("#primary_end_date").jqxDateTimeInput( Dateopts ); 5796 $("#primary_end_date").jqxDateTimeInput( Dateopts );
5775 $('#primary_end_date').on('close', function (event) { calcStage(); }); 5797 $('#primary_end_date').on('close', function (event) { calcStage(); });
5776 $("#secondary_temp").jqxNumberInput( YeastT ); 5798 $("#secondary_temp").jqxNumberInput( YeastT );
5799 $("#secondary_end_sg").jqxTooltip({ content: 'Het gemeten SG aan het eind van de navergisting.' });
5800 $("#secondary_end_sg").jqxNumberInput( SGopts );
5801 $("#secondary_end_brix").jqxTooltip({ content: 'Hulpfinctie: de afgelezen &deg;Brix RI waarde met een refractometer.' });
5802 $("#secondary_end_brix").jqxNumberInput( Spin1dec );
5803 $("#secondary_svg").jqxTooltip({ content: 'De schijnbare vergisting graad behaald na de nagisting.' });
5804 $("#secondary_svg").jqxNumberInput( Show1dec );
5777 $("#secondary_end_date").jqxTooltip({ content: 'De eind datum van de navergisting en het begin van het lageren.' }); 5805 $("#secondary_end_date").jqxTooltip({ content: 'De eind datum van de navergisting en het begin van het lageren.' });
5778 $("#secondary_end_date").jqxDateTimeInput( Dateopts ); 5806 $("#secondary_end_date").jqxDateTimeInput( Dateopts );
5779 $('#secondary_end_date').on('close', function (event) { calcStage(); }); 5807 $('#secondary_end_date').on('close', function (event) { calcStage(); });
5780 $("#tertiary_temp").jqxNumberInput( YeastT ); 5808 $("#tertiary_temp").jqxNumberInput( YeastT );
5781 $("#fg").jqxNumberInput( Spin3dec ); 5809 $("#fg").jqxNumberInput( Spin3dec );

Mercurial Repository: bms

mercurial