# HG changeset patch # User Michiel Broek # Date 1667144763 -3600 # Node ID 60bb365fb48db25fad14f3c2095dc4e1eba8fa8d # Parent ba607babc468eaa747df024e5ade7e1fef9f280c Removed use of obsolete product equipment fields and added the equipment chiller fields. Changed tab 2 of the product view to show the chiller method. diff -r ba607babc468 -r 60bb365fb48d www/includes/db_product.php --- a/www/includes/db_product.php Sat Oct 22 15:27:50 2022 +0200 +++ b/www/includes/db_product.php Sun Oct 30 16:46:03 2022 +0100 @@ -533,27 +533,6 @@ } echo json_encode($response); -} else if (isset($_POST['splitit'])) { - /* - * Update split batch details - */ - $sql = "UPDATE `products` SET "; - $sql .= "divide_type='" . $_POST['divide_type']; - $sql .= "', divide_size='" . $_POST['divide_size']; - $sql .= "', divide_parts='" . $_POST['divide_parts']; - $sql .= "' WHERE record='" . $_POST['record'] . "';"; - syslog(LOG_NOTICE, $sql); - - $result = mysqli_query($connect, $sql); - if (! $result) { - syslog(LOG_NOTICE, "db_product: result: ".mysqli_error($connect)); - $response['error'] = true; - $response['msg'] = "SQL update fout: ".mysqli_error($connect); - } else { - syslog(LOG_NOTICE, "db_product: updated (divide) record ".$_POST['record']); - } - echo json_encode($response); - } else if (isset($_POST['delete'])) { /* * DELETE command. @@ -723,11 +702,10 @@ $brew .= ',"eq_trub_chiller_loss":' . floatval($row['eq_trub_chiller_loss']); $brew .= ',"eq_evap_rate":' . floatval($row['eq_evap_rate']); $brew .= ',"eq_boil_time":' . floatval($row['eq_boil_time']); - $brew .= ',"eq_calc_boil_volume":' . $row['eq_calc_boil_volume']; - $brew .= ',"eq_calc_boil_volume":' . floatval($row['eq_calc_boil_volume']); + $brew .= ',"xeq_calc_boil_volume":' . floatval($row['eq_calc_boil_volume']); $brew .= ',"eq_top_up_kettle":' . floatval($row['eq_top_up_kettle']); - $brew .= ',"eq_lauter_volume":' . floatval($row['eq_lauter_volume']); - $brew .= ',"eq_lauter_height":' . floatval($row['eq_lauter_height']); + $brew .= ',"xeq_lauter_volume":' . floatval($row['eq_lauter_volume']); + $brew .= ',"xeq_lauter_height":' . floatval($row['eq_lauter_height']); $brew .= ',"eq_lauter_deadspace":' . floatval($row['eq_lauter_deadspace']); $brew .= ',"eq_kettle_volume":' . floatval($row['eq_kettle_volume']); $brew .= ',"eq_kettle_height":' . floatval($row['eq_kettle_height']); @@ -735,6 +713,11 @@ $brew .= ',"eq_mash_max":' . floatval($row['eq_mash_max']); $brew .= ',"eq_efficiency":' . floatval($row['eq_efficiency']); $brew .= ',"eq_top_up_water":' . floatval($row['eq_top_up_water']); + $brew .= ',"eq_chiller_type":' . $row['eq_chiller_type']; + $brew .= ',"eq_chiller_to79":' . floatval($row['eq_chiller_to79']); + $brew .= ',"eq_chiller_volume":' . floatval($row['eq_chiller_volume']); + $brew .= ',"eq_chiller_lpm":' . floatval($row['eq_chiller_lpm']); + $brew .= ',"eq_chiller_loss":' . floatval($row['eq_chiller_loss']); $brew .= ',"brew_date_start":"' . $row['brew_date_start']; $brew .= '","brew_mash_ph":' . floatval($row['brew_mash_ph']); $brew .= ',"brew_mash_sg":' . floatval($row['brew_mash_sg']); diff -r ba607babc468 -r 60bb365fb48d www/js/global.js --- a/www/js/global.js Sat Oct 22 15:27:50 2022 +0200 +++ b/www/js/global.js Sun Oct 30 16:46:03 2022 +0100 @@ -365,10 +365,10 @@ CoolingTypeData = [ { id: 0, en: '-', nl: '-' }, - { id: 1, en: 'Emersion chiller', nl: 'Dompelkoeler' }, + { id: 1, en: 'Immersion chiller', nl: 'Dompelkoeler' }, { id: 2, en: 'Counterflow chiller', nl: 'Tegenstroomkoeler' }, { id: 3, en: 'Au bain marie', nl: 'Au bain marie' }, - { id: 4, en: 'Natural', nl: 'Laten afkoelen' } + { id: 4, en: 'No-chill', nl: 'Laten afkoelen' } ], CoolingTypeSource = { localdata: CoolingTypeData, diff -r ba607babc468 -r 60bb365fb48d www/js/prod_view.js --- a/www/js/prod_view.js Sat Oct 22 15:27:50 2022 +0200 +++ b/www/js/prod_view.js Sun Oct 30 16:46:03 2022 +0100 @@ -161,17 +161,22 @@ { name: 'eq_trub_chiller_loss', type: 'float' }, { name: 'eq_evap_rate', type: 'float' }, { name: 'eq_boil_time', type: 'float' }, - { name: 'eq_calc_boil_volume', type: 'int' }, + { name: 'xeq_calc_boil_volume', type: 'int' }, { name: 'eq_top_up_kettle', type: 'float' }, { name: 'eq_notes', type: 'string' }, - { name: 'eq_lauter_volume', type: 'float' }, - { name: 'eq_lauter_height', type: 'float' }, + { name: 'xeq_lauter_volume', type: 'float' }, + { name: 'xeq_lauter_height', type: 'float' }, { name: 'eq_lauter_deadspace', type: 'float' }, { name: 'eq_kettle_volume', type: 'float' }, { name: 'eq_kettle_height', type: 'float' }, { name: 'eq_mash_volume', type: 'float' }, { name: 'eq_mash_max', type: 'float' }, { name: 'eq_efficiency', type: 'float' }, + { name: 'eq_chiller_type', type: 'int' }, + { name: 'eq_chiller_to79', type: 'float' }, + { name: 'eq_chiller_volume', type: 'float' }, + { name: 'eq_chiller_lpm', type: 'float' }, + { name: 'eq_chiller_loss', type: 'float' }, { name: 'brew_date_start', type: 'string' }, { name: 'brew_mash_ph', type: 'float' }, { name: 'brew_mash_sg', type: 'float' }, @@ -373,12 +378,18 @@ $('#eq_evap_rate').val(dataRecord.eq_evap_rate); $('#eq_boil_time').val(dataRecord.eq_boil_time); $('#eq_top_up_kettle').val(dataRecord.eq_top_up_kettle); - $('#eq_lauter_volume').val(dataRecord.eq_lauter_volume); +// $('#eq_lauter_volume').val(dataRecord.eq_lauter_volume); $('#eq_lauter_deadspace').val(dataRecord.eq_lauter_deadspace); $('#eq_kettle_volume').val(dataRecord.eq_kettle_volume); $('#eq_mash_volume').val(dataRecord.eq_mash_volume); $('#eq_mash_max').val(dataRecord.eq_mash_max); $('#eq_efficiency').val(dataRecord.eq_efficiency); + $('#eq_chiller_type').val(CoolingTypeData[dataRecord.eq_chiller_type].nl); + $('#eq_chiller_to79').val(dataRecord.eq_chiller_to79); + $('#eq_chiller_volume').val(dataRecord.eq_chiller_volume); + $('#eq_chiller_lpm').val(dataRecord.eq_chiller_lpm); + $('#eq_chiller_loss').val(dataRecord.eq_chiller_loss); + $('#eq_fermenter_volume').val((dataRecord.eq_batch_size / 1.04) - dataRecord.eq_trub_chiller_loss - dataRecord.eq_chiller_loss ); // Brewdate $('#brew_date_start').val(dataRecord.brew_date_start); $('#brew_mash_ph').val(dataRecord.brew_mash_ph); @@ -2908,19 +2919,22 @@ $('#eq_boil_time').jqxTooltip({ content: 'Normale kooktijd in minuten, 0 voor no-boil recepten.' }); $('#eq_top_up_kettle').jqxTooltip({ content: 'Extra water toevoegen tijdens de kook.' }); $('#eq_notes').jqxTooltip({ content: 'Opmerkingen over deze apparatuur.' }); - $('#eq_lauter_volume').jqxTooltip({ content: 'Filterkuip volume.' }); $('#eq_lauter_deadspace').jqxTooltip({ content: 'Filterkuip verlies in liters.' }); $('#eq_kettle_volume').jqxTooltip({ content: 'Kook ketel volume in liters.' }); $('#eq_mash_volume').jqxTooltip({ content: 'Maisch water voor de eerste stap.' }); $('#eq_mash_max').jqxTooltip({ content: 'De maximale moutstort in Kg.' }); $('#eq_efficiency').jqxTooltip({ content: 'Gemiddeld brouwzaal rendement.' }); + $('#eq_fermenter_volume').jqxNumberInput(Show1dec); $('#eq_name').jqxInput({ theme: theme, width: 250, height: 23 }); $('#eq_evap_rate').jqxNumberInput(Show2dec); $('#eq_boil_time').jqxNumberInput(Show0dec); $('#eq_notes').jqxInput({ theme: theme, width: 960, height: 200 }); $('#eq_boil_size,#eq_batch_size,#eq_tun_volume,#eq_top_up_water,#eq_trub_chiller_loss,#eq_top_up_kettle').jqxNumberInput(Show1dec); - $('#eq_lauter_volume,#eq_lauter_deadspace,#eq_kettle_volume,#eq_mash_volume,#eq_mash_max,#eq_efficiency').jqxNumberInput(Show1dec); + $('#eq_lauter_deadspace,#eq_kettle_volume,#eq_mash_volume,#eq_mash_max,#eq_efficiency').jqxNumberInput(Show1dec); + $('#eq_chiller_type').jqxInput({ theme: theme, width: 180, height: 23 }); + $('#eq_chiller_to79').jqxNumberInput(Show0dec); + $('#eq_chiller_volume,#eq_chiller_lpm,#eq_chiller_loss').jqxNumberInput(Show2dec); // Tab 3, Fermentables $('#est_color2').jqxTooltip({ content: 'De kleur in EBC. Dit wordt automatisch berekend.' }); diff -r ba607babc468 -r 60bb365fb48d www/prod_view.php --- a/www/prod_view.php Sat Oct 22 15:27:50 2022 +0200 +++ b/www/prod_view.php Sun Oct 30 16:46:03 2022 +0100 @@ -124,65 +124,75 @@ - + - + - + + - + + + - - - + + + + + - - - + + + + + - - - - - - - - - + + + + + - - - - - - - - + + + + + + - - - + + + + - - + + + + + + + + + +
Installatie naam:
Opmerkingen:
MaischenKokenKokenKoelen
Maischkuip volume L:
Kookketel volume L:
Wort koeler type:
Maischwater L:
Kook volume L:
Trub verlies kookketel L:
Minuten koelen tot 79°C:
Maximum moutstort Kg:
Verdamping per uur L:
Kook volume L:
Dompelkoeler L:
FilterenKooktijd in minuten:
Filter volume L:
Extra water bij koken L:
FilterenVerdamping per uur L:
Overbrengen verlies L:
Filterkuip verlies L:
KoelenVolume eind koken L:
Filterkuip dode ruimte L:
Kooktijd in minuten:
Overbrengen liter/minuut:
Trub verlies kookketel L:
 Brouwzaalrendement %:
Extra water bij koken L:
Overbrengen
Extra water in gistvat:
 Volume eind koken L:
Extra water in gistvat L:
Volume naar gistvat L: