Sat, 06 Aug 2022 20:40:26 +0200
The fermentation tab is now a viewer.
www/js/prod_edit.js | file | annotate | diff | comparison | revisions | |
www/prod_edit.php | file | annotate | diff | comparison | revisions |
--- a/www/js/prod_edit.js Sat Aug 06 20:23:33 2022 +0200 +++ b/www/js/prod_edit.js Sat Aug 06 20:40:26 2022 +0200 @@ -1148,6 +1148,7 @@ calcViability(); calcYeast(); kookTijd(); + calcFermentation(); $('#FLog').jqxButton({ disabled: (dataRecord.log_fermentation) ? false : true}); $('#ILog').jqxButton({ disabled: (dataRecord.log_ispindel) ? false : true}); $('#CLog').jqxButton({ disabled: (dataRecord.log_co2pressure) ? false : true}); @@ -3315,7 +3316,6 @@ $('#primary_max_temp').jqxTooltip({ content: 'De hoogst bereikte piek temperatuur tijdens de hoofgvergisting.' }); $('#primary_end_temp').jqxTooltip({ content: 'De eind temperatuur van de hoofdvergisting.' }); $('#primary_end_sg').jqxTooltip({ content: 'Het gemeten SG aan het eind van de hoofdvergisting.' }); - $('#primary_end_brix,#secondary_end_brix,#final_brix').jqxTooltip({ content: 'Hulpfinctie: de afgelezen °Brix RI waarde met een refractometer.' }); $('#primary_svg').jqxTooltip({ content: 'De schijnbare vergisting graad behaald na de hoofdgisting.' }); $('#primary_end_date').jqxTooltip({ content: 'De eind datum van de hoofdvergisting en eventueel overhevelen.' }); $('#secondary_end_sg').jqxTooltip({ content: 'Het gemeten SG aan het eind van de navergisting.' }); @@ -3323,12 +3323,12 @@ $('#secondary_end_date').jqxTooltip({ content: 'De eind datum van de navergisting en het begin van het lageren.' }); $('#est_fg3').jqxTooltip({ content: 'Het verwachte eind SG. Dit wordt automatisch berekend.' }); - $('#primary_end_sg,#secondary_end_sg').jqxNumberInput(SGopts); + $('#primary_end_sg,#secondary_end_sg').jqxNumberInput(Show3dec); $('#primary_end_date,#secondary_end_date').jqxDateTimeInput(Dateopts); - $('#primary_start_temp,#primary_max_temp,#primary_end_temp,#secondary_temp,#tertiary_temp').jqxNumberInput(YeastT); - $('#fg').jqxNumberInput(Spin3dec); + $('#primary_end_date,#secondary_end_date').jqxDateTimeInput({ disabled: true }); + $('#primary_start_temp,#primary_max_temp,#primary_end_temp,#secondary_temp,#tertiary_temp').jqxNumberInput(Show1dec); + $('#fg').jqxNumberInput(Show3dec); $('#brew_fermenter_sg2,#est_fg3').jqxNumberInput(Show3dec); - $('#primary_end_brix,#secondary_end_brix,#final_brix').jqxNumberInput(Spin1dec); $('#final_abv').jqxNumberInput(Show2dec); $('#primary_svg,#secondary_svg,#final_svg').jqxNumberInput(Show1dec); $('#FLog').jqxButton({ template: 'info', width: '150px', theme: theme });
--- a/www/prod_edit.php Sat Aug 06 20:23:33 2022 +0200 +++ b/www/prod_edit.php Sat Aug 06 20:40:26 2022 +0200 @@ -713,9 +713,7 @@ </tr> <tr> <td style="vertical-align: top; float: right; padding: 3px;">Eind hoofdvergisting SG:</td> - <td align="left" style="vertical-align: top;"><div id="primary_end_sg"></div></td> - <td style="vertical-align: top; float: right; padding: 3px;">Afgelezen °Brix RI:</td> - <td align="left" style="vertical-align: top;"><div id="primary_end_brix"></div></td> + <td align="left" colspan="3" style="vertical-align: top;"><div id="primary_end_sg"></div></td> </tr> <tr> <td style="vertical-align: top; float: right; padding: 3px;">Eind hoofdvergisting/overhevelen:</td> @@ -735,9 +733,7 @@ </tr> <tr> <td style="vertical-align: top; float: right; padding: 3px;">Eind nagisting SG:</td> - <td align="left" style="vertical-align: top;"><div id="secondary_end_sg"></div></td> - <td style="vertical-align: top; float: right; padding: 3px;">Afgelezen °Brix RI:</td> - <td align="left" style="vertical-align: top;"><div id="secondary_end_brix"></div></td> + <td align="left" colspan="3" style="vertical-align: top;"><div id="secondary_end_sg"></div></td> </tr> <tr> <td style="vertical-align: top; float: right; padding: 3px;">Eind nagisting/start lageren:</td> @@ -761,9 +757,7 @@ </tr> <tr> <td style="vertical-align: top; float: right; padding: 3px;">Het behaalde eind SG:</td> - <td align="left" style="vertical-align: top;"><div id="fg"></div></td> - <td style="vertical-align: top; float: right; padding: 3px;">Afgelezen °Brix RI:</td> - <td align="left" style="vertical-align: top;"><div id="final_brix"></div></td> + <td align="left" colspan="3" style="vertical-align: top;"><div id="fg"></div></td> </tr> <tr> <td style="vertical-align: top; float: right; padding: 3px;">Alcoholgehalte voor hergisting vol.%:</td>