Tue, 29 Oct 2019 10:44:08 +0100
Better way to show splitted batches. Added flameout calculations to the php scripts.
--- a/www/includes/formulas.php Mon Oct 28 20:52:17 2019 +0100 +++ b/www/includes/formulas.php Tue Oct 29 10:44:08 2019 +0100 @@ -235,11 +235,19 @@ } $whirlibus = 0; - if ($useat == 4) { // Any whirlpool - if ($whirlpool9) + if ($useat == 3 || $useat == 4) { // Flameout or any whirlpool + if ($whirlpool9) { $whirlibus += ($mass * ($alpha / 100) * 20) / $volume * $whirlpool9 / 50; - if ($whirlpool7) + } else { + if ($useat == 3) // Flameout hops are 2 minutes in this range. + $whirlibus += ($mass * ($alpha / 100) * 20) / $volume * (2 / 50); + } + if ($whirlpool7) { $whirlibus += ($mass * ($alpha / 100) * 6) / $volume * $whirlpool7 / 50; + } else { + if ($useat == 3) // Flameout hops are 4 minutes in this range. + $whirlibus += ($mass * ($alpha / 100) * 6) / $volume * (4 / 50); + } if ($whirlpool6) $whirlibus += ($mass * ($alpha / 100) * 2) / $volume * $whirlpool6 / 50; }
--- a/www/js/prod_edit.js Mon Oct 28 20:52:17 2019 +0100 +++ b/www/js/prod_edit.js Tue Oct 29 10:44:08 2019 +0100 @@ -536,9 +536,10 @@ $('#prop4_type').val(dataRecord.prop4_type); $('#prop4_volume').val(dataRecord.prop4_volume); $('#divide_type').val(SplitData[dataRecord.divide_type].nl); + $('#divide_batch').val((dataRecord.divide_part + 1) + ' / ' + (dataRecord.divide_parts + 1)); // hidden divide_size // hidden divide_factor - $('#divide_parts').val(dataRecord.divide_parts); + // hidden divide_parts // hidden divide_part editFermentable(dataRecord); editHop(dataRecord); @@ -4475,8 +4476,8 @@ calcStage(); } }); - $('#divide_parts').jqxTooltip({ content: 'Het aantal extra gesplitste brouw producten.' }); - $('#divide_parts').jqxNumberInput(Show0dec); + $('#divide_batch').jqxTooltip({ content: 'Het aantal extra gesplitste batches.' }); + $('#divide_batch').jqxInput({ theme: theme, width: 120, height: 23 }); $('#divide_type').jqxTooltip({ content: 'Het splitsing moment in het productie proces.' }); $('#divide_type').jqxInput({ theme: theme, width: 120, height: 23 });
--- a/www/prod_edit.php Mon Oct 28 20:52:17 2019 +0100 +++ b/www/prod_edit.php Tue Oct 29 10:44:08 2019 +0100 @@ -37,10 +37,10 @@ <td align="left" style="vertical-align: top; padding: 3px;"><input id="stage" readonly /></td> </tr> <tr id='divide_row'> - <td style="vertical-align: top; float: right; padding: 3px;">Splits aantal:</td> - <td align="left"><div id="divide_parts"></div></td> - <td style="vertical-align: top; float: right; padding: 3px;">Splits moment:</td> + <td style="vertical-align: top; float: right; padding: 3px;">Splits product:</td> <td align="left" style="vertical-align: top; padding: 3px;"><input id="divide_type" readonly /></td> + <td style="vertical-align: top; float: right; padding: 3px;">Gesplitst product:</td> + <td align="left" style="vertical-align: top; padding: 3px;"><input id="divide_batch" readonly /></td> <td style="vertical-align: top; float: right; padding: 3px;">Splits focus:</td> <td align="left"><div id="d3"></div></td> </tr>