Tue, 03 Mar 2020 20:38:37 +0100
Removed starter_enable checkbox
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 Tue Mar 03 20:23:19 2020 +0100 +++ b/www/js/prod_edit.js Tue Mar 03 20:38:37 2020 +0100 @@ -527,7 +527,6 @@ $('#wa_acid_name').val(dataRecord.wa_acid_name); $('#wa_acid_perc').val(dataRecord.wa_acid_perc); $('#wa_base_name').val(dataRecord.wa_base_name); - $('#starter_enable').val(dataRecord.starter_enable); $('#starter_type').val(dataRecord.starter_type); $('#starter_sg').val(dataRecord.starter_sg); $('#starter_viability').val(dataRecord.starter_viability); @@ -2459,7 +2458,6 @@ if (maybe_starter != dataRecord.starter_enable) { dataRecord.starter_enable = maybe_starter; - $('#starter_enable').val(maybe_starter); } if (dataRecord.starter_enable) { @@ -3627,7 +3625,6 @@ $('#sparge_source').jqxDropDownList({ disabled: true }); $('#sparge_acid_type').jqxDropDownList({ disabled: true }); $('#sparge_acid_perc').jqxNumberInput({ spinButtons: false, readOnly: true, width: false }); - $('#starter_enable').jqxCheckBox({ disabled: true }); $('#starter_type').jqxDropDownList({ disabled: true }); $('#starter_try').jqxButton({ disabled: true }); $('#starter_sg').jqxNumberInput({ spinButtons: false, readOnly: true, width: 90 }); @@ -3740,16 +3737,6 @@ calcEfficiencyBeforeBoil(); calcEfficiencyAfterBoil(); - $('#starter_enable').on('checked', function(event) { - dataRecord.starter_enable = 1; - showStarter(); - calcYeast(); - }); - $('#starter_enable').on('unchecked', function(event) { - dataRecord.starter_enable = 0; - showStarter(); - calcYeast(); - }); $('#starter_try').click(function() { $('#prop1_volume').val(0); $('#prop2_volume').val(0); @@ -5452,7 +5439,6 @@ $('#prop' + i + '_growf').jqxNumberInput(Show2dec); $('#prop' + i + '_growf').hide(); } - $('#starter_enable').jqxCheckBox({ theme: theme, height: 23 }); $('#starter_type').jqxTooltip({ content: 'starter_type' }); $('#starter_type').jqxDropDownList({ theme: theme,
--- a/www/prod_edit.php Tue Mar 03 20:23:19 2020 +0100 +++ b/www/prod_edit.php Tue Mar 03 20:38:37 2020 +0100 @@ -261,7 +261,7 @@ <tr> <td style="vertical-align: top; float: right; padding: 3px;">Verwacht eind SG:</td> <td style="padding: 3px;"><div id="est_fg2"></div></td> - <td align="center" colspan="7" rowspan="5"> + <td align="center" colspan="5" rowspan="5"> <div id="propagator"> <table style="width: 100%;"> <caption>Giststarter stappen</caption> @@ -337,18 +337,16 @@ <td style="padding: 3px;"><div id="plato_cells"></div></td> </tr> <tr> - <td style="vertical-align: top; float: right; padding: 3px;">Maak een starter:</td> - <td style="padding: 3px;"><div id="starter_enable"></div></td> + <td style="vertical-align: top; float: right; padding: 3px;">Gist conditie %:</td> + <td style="padding: 3px;"><div id="starter_viability"></div></td> <td style="vertical-align: top; float: right; padding: 3px;">Starter type:</td> <td style="padding: 3px;"><div id="starter_type"></div></td> <td style="vertical-align: top; float: right; padding: 3px;">Starter SG:</td> <td style="padding: 3px;"><div id="starter_sg"></div></td> - <td style="vertical-align: top; float: right; padding: 3px;">Gist conditie %:</td> - <td style="padding: 3px;"><div id="starter_viability"></div></td> <td style="vertical-align: top; padding: 3px;"><input type="button" id="starter_try" value="Probeer" /></td> </tr> - <tr><td colspan="9"> </td></tr> - <tr><td align="center" colspan="9"><div id="yeastGrid"></div></td></tr> + <tr><td colspan="7"> </td></tr> + <tr><td align="center" colspan="7"><div id="yeastGrid"></div></td></tr> </table> </div> </div> <!-- tab gisten -->