Mercurial > bms / annotate

www/includes/db_product.php@4c25db9e8102 (annotated)

www/includes/db_product.php

Thu, 10 Jan 2019 20:22:06 +0100

author
Michiel Broek <mbroek@mbse.eu>
date
Thu, 10 Jan 2019 20:22:06 +0100
changeset 185
4c25db9e8102
parent 166
635033a29c48
child 192
7f69b43e6084
permissions
-rw-r--r--

Added configuration settings for MQTT in config.php. Finished screen box sizes for the fermenters monitor. Select beername and code from the current brew products and send it to the fermenter. Added switch commands to the fermenter. Delay data get from the fermenter after sending any command so there is time to process the commands. Turn switches off when the mode changes. Removed 0.2 degrees setpoint diffs for low and high, the fermenter must deal with it. Prevent turning the heater and cooler together on.

111
8c4ba91adf58 Basic screens for brew products.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1 <?php
8c4ba91adf58 Basic screens for brew products.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
2
8c4ba91adf58 Basic screens for brew products.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
3 require($_SERVER['DOCUMENT_ROOT']."/config.php");
8c4ba91adf58 Basic screens for brew products.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
4 require($_SERVER['DOCUMENT_ROOT']."/version.php");
8c4ba91adf58 Basic screens for brew products.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
5
8c4ba91adf58 Basic screens for brew products.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
6 #Connect to the database
8c4ba91adf58 Basic screens for brew products.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
7 $connect = mysqli_connect(DBASE_HOST, DBASE_USER, DBASE_PASS, DBASE_NAME);
8c4ba91adf58 Basic screens for brew products.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
8 if (! $connect) {
8c4ba91adf58 Basic screens for brew products.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
9 die('Connect Error (' . mysqli_connect_errno() . ') ' . mysqli_connect_error());
8c4ba91adf58 Basic screens for brew products.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
10 }
8c4ba91adf58 Basic screens for brew products.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
11 mysqli_set_charset($connect, "utf8" );
8c4ba91adf58 Basic screens for brew products.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
12
115
ad31f4bd4036 Inventory database script added missing fields. Product database script added JOIN with the prod_recipes table.
Michiel Broek <mbroek@mbse.eu>
parents: 114
diff changeset
13 $escapers = array("\\", "/", "\"", "\n", "\r", "\t", "\x08", "\x0c");
ad31f4bd4036 Inventory database script added missing fields. Product database script added JOIN with the prod_recipes table.
Michiel Broek <mbroek@mbse.eu>
parents: 114
diff changeset
14 $replacements = array("\\\\", "\\/", "\\\"", "\\n", "\\r", "\\t", "\\f", "\\b");
151
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
15 $rescapers = array("'");
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
16 $rreplacements = array("\\'");
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
17 $disallowed = array('visibleindex','uniqueid','boundindex','uid','h_weight','m_weight');
111
8c4ba91adf58 Basic screens for brew products.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
18
8c4ba91adf58 Basic screens for brew products.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
19 if (isset($_POST['insert']) || isset($_POST['update'])) {
8c4ba91adf58 Basic screens for brew products.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
20 if (isset($_POST['insert'])) {
151
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
21 $sql = "INSERT INTO `products` SET ";
111
8c4ba91adf58 Basic screens for brew products.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
22 }
8c4ba91adf58 Basic screens for brew products.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
23 if (isset($_POST['update'])) {
151
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
24 $sql = "UPDATE `products` SET ";
111
8c4ba91adf58 Basic screens for brew products.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
25 }
151
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
26
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
27 $stage = $_POST['stage'];
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
28 if ($stage == 'Plan')
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
29 $stageno = 0;
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
30 else if ($stage == 'Wait')
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
31 $stageno = 1;
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
32 else if ($stage == 'Brew')
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
33 $stageno = 2;
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
34 else if ($stage == 'Primary')
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
35 $stageno = 3;
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
36 else if ($stage == 'Secondary')
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
37 $stageno = 4;
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
38 else if ($stage == 'Tertiary')
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
39 $stageno = 5;
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
40 else if ($stage == 'Package')
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
41 $stageno = 6;
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
42 else if ($stage == 'Carbonation')
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
43 $stageno = 7;
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
44 else if ($stage == 'Mature')
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
45 $stageno = 8;
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
46 else if ($stage == 'Taste')
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
47 $stageno = 9;
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
48 else if ($stage == 'Ready')
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
49 $stageno = 10;
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
50 else if ($stage == 'Closed')
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
51 $stageno = 11;
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
52
111
8c4ba91adf58 Basic screens for brew products.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
53 // Basic settings
166
635033a29c48 Fixed new recipes uuid generation and saving missing new fields.
Michiel Broek <mbroek@mbse.eu>
parents: 164
diff changeset
54 if (isset($_POST['uuid'])) {
635033a29c48 Fixed new recipes uuid generation and saving missing new fields.
Michiel Broek <mbroek@mbse.eu>
parents: 164
diff changeset
55 $sql .= "uuid='" . $_POST['uuid'];
635033a29c48 Fixed new recipes uuid generation and saving missing new fields.
Michiel Broek <mbroek@mbse.eu>
parents: 164
diff changeset
56 syslog(LOG_NOTICE, 'Keep uuid ');
635033a29c48 Fixed new recipes uuid generation and saving missing new fields.
Michiel Broek <mbroek@mbse.eu>
parents: 164
diff changeset
57 } else {
635033a29c48 Fixed new recipes uuid generation and saving missing new fields.
Michiel Broek <mbroek@mbse.eu>
parents: 164
diff changeset
58 $uuid = str_replace("\n", "", file_get_contents('/proc/sys/kernel/random/uuid'));
635033a29c48 Fixed new recipes uuid generation and saving missing new fields.
Michiel Broek <mbroek@mbse.eu>
parents: 164
diff changeset
59 $sql .= "uuid='" . $uuid;
635033a29c48 Fixed new recipes uuid generation and saving missing new fields.
Michiel Broek <mbroek@mbse.eu>
parents: 164
diff changeset
60 syslog(LOG_NOTICE, 'New uuid ');
635033a29c48 Fixed new recipes uuid generation and saving missing new fields.
Michiel Broek <mbroek@mbse.eu>
parents: 164
diff changeset
61 }
151
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
62 $sql .= "', name='" . mysqli_real_escape_string($connect, $_POST['name']);
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
63 $sql .= "', code='" . mysqli_real_escape_string($connect, $_POST['code']);
111
8c4ba91adf58 Basic screens for brew products.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
64 $sql .= "', birth='" . $_POST['birth'];
8c4ba91adf58 Basic screens for brew products.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
65 $sql .= "', stage='" . $_POST['stage'];
164
0a5abea575a9 Added the last tab, fermentation to the product editer.
Michiel Broek <mbroek@mbse.eu>
parents: 163
diff changeset
66 $sql .= "', notes='" . mysqli_real_escape_string($connect, $_POST['notes']);
111
8c4ba91adf58 Basic screens for brew products.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
67 ($_POST['log_brew'] == 'true') ? $sql .= "', log_brew='1" : $sql .= "', log_brew='0";
8c4ba91adf58 Basic screens for brew products.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
68 ($_POST['log_fermentation'] == 'true') ? $sql .= "', log_fermentation='1" : $sql .= "', log_fermentation='0";
8c4ba91adf58 Basic screens for brew products.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
69 ($_POST['inventory_reduced'] == 'true') ? $sql .= "', inventory_reduced='1" : $sql .= "', inventory_reduced='0";
151
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
70 ($_POST['locked'] == 'true') ? $sql .= "', locked='1" : $sql .= "', locked='0";
111
8c4ba91adf58 Basic screens for brew products.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
71 // Equipment
8c4ba91adf58 Basic screens for brew products.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
72 $sql .= "', eq_name='" . mysqli_real_escape_string($connect, $_POST['eq_name']);
8c4ba91adf58 Basic screens for brew products.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
73 $sql .= "', eq_boil_size='" . $_POST['eq_boil_size'];
8c4ba91adf58 Basic screens for brew products.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
74 $sql .= "', eq_batch_size='" . $_POST['eq_batch_size'];
8c4ba91adf58 Basic screens for brew products.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
75 $sql .= "', eq_tun_volume='" . $_POST['eq_tun_volume'];
8c4ba91adf58 Basic screens for brew products.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
76 $sql .= "', eq_tun_weight='" . $_POST['eq_tun_weight'];
119
ae5e8d740173 Renamed some fields in prod_main to prevent ambigous names with the join. Delete product also deletes the corresponding recipe. Fixed equipment load and save. Read data from the product main joined with prod_recipes completed. The brewday page is now almost complete, the calculations must be added.
Michiel Broek <mbroek@mbse.eu>
parents: 115
diff changeset
77 $sql .= "', eq_tun_specific_heat='" . $_POST['eq_tun_specific_heat'];
ae5e8d740173 Renamed some fields in prod_main to prevent ambigous names with the join. Delete product also deletes the corresponding recipe. Fixed equipment load and save. Read data from the product main joined with prod_recipes completed. The brewday page is now almost complete, the calculations must be added.
Michiel Broek <mbroek@mbse.eu>
parents: 115
diff changeset
78 $sql .= "', eq_tun_material='" . mysqli_real_escape_string($connect, $_POST['eq_tun_material']);
111
8c4ba91adf58 Basic screens for brew products.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
79 $sql .= "', eq_tun_height='" . $_POST['eq_tun_height'];
8c4ba91adf58 Basic screens for brew products.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
80 $sql .= "', eq_top_up_water='" . $_POST['eq_top_up_water'];
8c4ba91adf58 Basic screens for brew products.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
81 $sql .= "', eq_trub_chiller_loss='" . $_POST['eq_trub_chiller_loss'];
8c4ba91adf58 Basic screens for brew products.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
82 $sql .= "', eq_evap_rate='" . $_POST['eq_evap_rate'];
8c4ba91adf58 Basic screens for brew products.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
83 $sql .= "', eq_boil_time='" . $_POST['eq_boil_time'];
8c4ba91adf58 Basic screens for brew products.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
84 $sql .= "', eq_calc_boil_volume='" . $_POST['eq_calc_boil_volume'];
8c4ba91adf58 Basic screens for brew products.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
85 $sql .= "', eq_top_up_kettle='" . $_POST['eq_top_up_kettle'];
8c4ba91adf58 Basic screens for brew products.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
86 $sql .= "', eq_hop_utilization='" . $_POST['eq_hop_utilization'];
164
0a5abea575a9 Added the last tab, fermentation to the product editer.
Michiel Broek <mbroek@mbse.eu>
parents: 163
diff changeset
87 $sql .= "', eq_notes='" . mysqli_real_escape_string($connect, $_POST['eq_notes']);
111
8c4ba91adf58 Basic screens for brew products.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
88 $sql .= "', eq_lauter_volume='" . $_POST['eq_lauter_volume'];
8c4ba91adf58 Basic screens for brew products.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
89 $sql .= "', eq_lauter_height='" . $_POST['eq_lauter_height'];
8c4ba91adf58 Basic screens for brew products.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
90 $sql .= "', eq_lauter_deadspace='" . $_POST['eq_lauter_deadspace'];
8c4ba91adf58 Basic screens for brew products.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
91 $sql .= "', eq_kettle_volume='" . $_POST['eq_kettle_volume'];
8c4ba91adf58 Basic screens for brew products.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
92 $sql .= "', eq_kettle_height='" . $_POST['eq_kettle_height'];
8c4ba91adf58 Basic screens for brew products.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
93 $sql .= "', eq_mash_volume='" . $_POST['eq_mash_volume'];
149
ff45488d480e Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents: 121
diff changeset
94 $sql .= "', eq_mash_max='" . $_POST['eq_mash_max'];
111
8c4ba91adf58 Basic screens for brew products.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
95 $sql .= "', eq_efficiency='" . $_POST['eq_efficiency'];
164
0a5abea575a9 Added the last tab, fermentation to the product editer.
Michiel Broek <mbroek@mbse.eu>
parents: 163
diff changeset
96 $sql .= "', brew_date_start='" . $_POST['brew_date_start'];
0a5abea575a9 Added the last tab, fermentation to the product editer.
Michiel Broek <mbroek@mbse.eu>
parents: 163
diff changeset
97 $sql .= "', brew_mash_ph='" . $_POST['brew_mash_ph'];
0a5abea575a9 Added the last tab, fermentation to the product editer.
Michiel Broek <mbroek@mbse.eu>
parents: 163
diff changeset
98 $sql .= "', brew_mash_sg='" . $_POST['brew_mash_sg'];
0a5abea575a9 Added the last tab, fermentation to the product editer.
Michiel Broek <mbroek@mbse.eu>
parents: 163
diff changeset
99 $sql .= "', brew_sparge_temperature='" . $_POST['brew_sparge_temperature'];
0a5abea575a9 Added the last tab, fermentation to the product editer.
Michiel Broek <mbroek@mbse.eu>
parents: 163
diff changeset
100 $sql .= "', brew_sparge_volume='" . $_POST['brew_sparge_volume'];
0a5abea575a9 Added the last tab, fermentation to the product editer.
Michiel Broek <mbroek@mbse.eu>
parents: 163
diff changeset
101 $sql .= "', brew_sparge_ph='" . $_POST['brew_sparge_ph'];
0a5abea575a9 Added the last tab, fermentation to the product editer.
Michiel Broek <mbroek@mbse.eu>
parents: 163
diff changeset
102 $sql .= "', brew_preboil_volume='" . $_POST['brew_preboil_volume'];
0a5abea575a9 Added the last tab, fermentation to the product editer.
Michiel Broek <mbroek@mbse.eu>
parents: 163
diff changeset
103 $sql .= "', brew_preboil_sg='" . $_POST['brew_preboil_sg'];
0a5abea575a9 Added the last tab, fermentation to the product editer.
Michiel Broek <mbroek@mbse.eu>
parents: 163
diff changeset
104 $sql .= "', brew_preboil_ph='" . $_POST['brew_preboil_ph'];
0a5abea575a9 Added the last tab, fermentation to the product editer.
Michiel Broek <mbroek@mbse.eu>
parents: 163
diff changeset
105 $sql .= "', brew_aboil_volume='" . $_POST['brew_aboil_volume'];
0a5abea575a9 Added the last tab, fermentation to the product editer.
Michiel Broek <mbroek@mbse.eu>
parents: 163
diff changeset
106 $sql .= "', brew_aboil_sg='" . $_POST['brew_aboil_sg'];
0a5abea575a9 Added the last tab, fermentation to the product editer.
Michiel Broek <mbroek@mbse.eu>
parents: 163
diff changeset
107 $sql .= "', brew_aboil_ph='" . $_POST['brew_aboil_ph'];
0a5abea575a9 Added the last tab, fermentation to the product editer.
Michiel Broek <mbroek@mbse.eu>
parents: 163
diff changeset
108 $sql .= "', brew_aboil_efficiency='" . $_POST['brew_aboil_efficiency'];
0a5abea575a9 Added the last tab, fermentation to the product editer.
Michiel Broek <mbroek@mbse.eu>
parents: 163
diff changeset
109 $sql .= "', brew_cooling_method='" . $_POST['brew_cooling_method'];
0a5abea575a9 Added the last tab, fermentation to the product editer.
Michiel Broek <mbroek@mbse.eu>
parents: 163
diff changeset
110 $sql .= "', brew_cooling_time='" . $_POST['brew_cooling_time'];
0a5abea575a9 Added the last tab, fermentation to the product editer.
Michiel Broek <mbroek@mbse.eu>
parents: 163
diff changeset
111 $sql .= "', brew_cooling_to='" . $_POST['brew_cooling_to'];
0a5abea575a9 Added the last tab, fermentation to the product editer.
Michiel Broek <mbroek@mbse.eu>
parents: 163
diff changeset
112 $sql .= "', brew_whirlpool9='" . $_POST['brew_whirlpool9'];
0a5abea575a9 Added the last tab, fermentation to the product editer.
Michiel Broek <mbroek@mbse.eu>
parents: 163
diff changeset
113 $sql .= "', brew_whirlpool7='" . $_POST['brew_whirlpool7'];
0a5abea575a9 Added the last tab, fermentation to the product editer.
Michiel Broek <mbroek@mbse.eu>
parents: 163
diff changeset
114 $sql .= "', brew_whirlpool6='" . $_POST['brew_whirlpool6'];
0a5abea575a9 Added the last tab, fermentation to the product editer.
Michiel Broek <mbroek@mbse.eu>
parents: 163
diff changeset
115 $sql .= "', brew_whirlpool2='" . $_POST['brew_whirlpool2'];
0a5abea575a9 Added the last tab, fermentation to the product editer.
Michiel Broek <mbroek@mbse.eu>
parents: 163
diff changeset
116 $sql .= "', brew_aeration_time='" . $_POST['brew_aeration_time'];
0a5abea575a9 Added the last tab, fermentation to the product editer.
Michiel Broek <mbroek@mbse.eu>
parents: 163
diff changeset
117 $sql .= "', brew_aeration_speed='" . $_POST['brew_aeration_speed'];
0a5abea575a9 Added the last tab, fermentation to the product editer.
Michiel Broek <mbroek@mbse.eu>
parents: 163
diff changeset
118 $sql .= "', brew_aeration_type='" . $_POST['brew_aeration_type'];
0a5abea575a9 Added the last tab, fermentation to the product editer.
Michiel Broek <mbroek@mbse.eu>
parents: 163
diff changeset
119 $sql .= "', brew_fermenter_volume='" . $_POST['brew_fermenter_volume'];
0a5abea575a9 Added the last tab, fermentation to the product editer.
Michiel Broek <mbroek@mbse.eu>
parents: 163
diff changeset
120 $sql .= "', brew_fermenter_extrawater='" . $_POST['brew_fermenter_extrawater'];
0a5abea575a9 Added the last tab, fermentation to the product editer.
Michiel Broek <mbroek@mbse.eu>
parents: 163
diff changeset
121 $sql .= "', brew_fermenter_sg='" . $_POST['brew_fermenter_sg'];
0a5abea575a9 Added the last tab, fermentation to the product editer.
Michiel Broek <mbroek@mbse.eu>
parents: 163
diff changeset
122 $sql .= "', brew_fermenter_ibu='" . $_POST['brew_fermenter_ibu'];
0a5abea575a9 Added the last tab, fermentation to the product editer.
Michiel Broek <mbroek@mbse.eu>
parents: 163
diff changeset
123 $sql .= "', brew_date_end='" . $_POST['brew_date_end'];
0a5abea575a9 Added the last tab, fermentation to the product editer.
Michiel Broek <mbroek@mbse.eu>
parents: 163
diff changeset
124 ($_POST['brew_log_available'] == 'true') ? $sql .= "', brew_log_available='1" : $sql .= "', brew_log_available='0";
163
4a4cc3497a57 Added the packaging tab contents.
Michiel Broek <mbroek@mbse.eu>
parents: 159
diff changeset
125 $sql .= "', og='" . $_POST['og'];
4a4cc3497a57 Added the packaging tab contents.
Michiel Broek <mbroek@mbse.eu>
parents: 159
diff changeset
126 $sql .= "', fg='" . $_POST['fg'];
164
0a5abea575a9 Added the last tab, fermentation to the product editer.
Michiel Broek <mbroek@mbse.eu>
parents: 163
diff changeset
127 $sql .= "', primary_start_temp='" . $_POST['primary_start_temp'];
0a5abea575a9 Added the last tab, fermentation to the product editer.
Michiel Broek <mbroek@mbse.eu>
parents: 163
diff changeset
128 $sql .= "', primary_max_temp='" . $_POST['primary_max_temp'];
0a5abea575a9 Added the last tab, fermentation to the product editer.
Michiel Broek <mbroek@mbse.eu>
parents: 163
diff changeset
129 $sql .= "', primary_end_temp='" . $_POST['primary_end_temp'];
0a5abea575a9 Added the last tab, fermentation to the product editer.
Michiel Broek <mbroek@mbse.eu>
parents: 163
diff changeset
130 $sql .= "', primary_end_sg='" . $_POST['primary_end_sg'];
0a5abea575a9 Added the last tab, fermentation to the product editer.
Michiel Broek <mbroek@mbse.eu>
parents: 163
diff changeset
131 $sql .= "', primary_end_date='" . $_POST['primary_end_date'];
163
4a4cc3497a57 Added the packaging tab contents.
Michiel Broek <mbroek@mbse.eu>
parents: 159
diff changeset
132 $sql .= "', secondary_temp='" . $_POST['secondary_temp'];
4a4cc3497a57 Added the packaging tab contents.
Michiel Broek <mbroek@mbse.eu>
parents: 159
diff changeset
133 $sql .= "', secondary_end_date='" . $_POST['secondary_end_date'];
4a4cc3497a57 Added the packaging tab contents.
Michiel Broek <mbroek@mbse.eu>
parents: 159
diff changeset
134 $sql .= "', tertiary_temp='" . $_POST['tertiary_temp'];
4a4cc3497a57 Added the packaging tab contents.
Michiel Broek <mbroek@mbse.eu>
parents: 159
diff changeset
135 $sql .= "', package_date='" . $_POST['package_date'];
4a4cc3497a57 Added the packaging tab contents.
Michiel Broek <mbroek@mbse.eu>
parents: 159
diff changeset
136 $sql .= "', bottle_amount='" . $_POST['bottle_amount'];
4a4cc3497a57 Added the packaging tab contents.
Michiel Broek <mbroek@mbse.eu>
parents: 159
diff changeset
137 $sql .= "', bottle_carbonation='" . $_POST['bottle_carbonation'];
4a4cc3497a57 Added the packaging tab contents.
Michiel Broek <mbroek@mbse.eu>
parents: 159
diff changeset
138 $sql .= "', bottle_priming_sugar='" . $_POST['bottle_priming_sugar'];
4a4cc3497a57 Added the packaging tab contents.
Michiel Broek <mbroek@mbse.eu>
parents: 159
diff changeset
139 $sql .= "', bottle_priming_amount='" . $_POST['bottle_priming_amount'];
4a4cc3497a57 Added the packaging tab contents.
Michiel Broek <mbroek@mbse.eu>
parents: 159
diff changeset
140 $sql .= "', bottle_carbonation_temp='" . $_POST['bottle_carbonation_temp'];
4a4cc3497a57 Added the packaging tab contents.
Michiel Broek <mbroek@mbse.eu>
parents: 159
diff changeset
141 $sql .= "', keg_amount='" . $_POST['keg_amount'];
4a4cc3497a57 Added the packaging tab contents.
Michiel Broek <mbroek@mbse.eu>
parents: 159
diff changeset
142 $sql .= "', keg_carbonation='" . $_POST['keg_carbonation'];
4a4cc3497a57 Added the packaging tab contents.
Michiel Broek <mbroek@mbse.eu>
parents: 159
diff changeset
143 $sql .= "', keg_priming_sugar='" . $_POST['keg_priming_sugar'];
4a4cc3497a57 Added the packaging tab contents.
Michiel Broek <mbroek@mbse.eu>
parents: 159
diff changeset
144 $sql .= "', keg_priming_amount='" . $_POST['keg_priming_amount'];
4a4cc3497a57 Added the packaging tab contents.
Michiel Broek <mbroek@mbse.eu>
parents: 159
diff changeset
145 $sql .= "', keg_carbonation_temp='" . $_POST['keg_carbonation_temp'];
4a4cc3497a57 Added the packaging tab contents.
Michiel Broek <mbroek@mbse.eu>
parents: 159
diff changeset
146 ($_POST['keg_forced_carb'] == 'true') ? $sql .= "', keg_forced_carb='1" : $sql .= "', keg_forced_carb='0";
4a4cc3497a57 Added the packaging tab contents.
Michiel Broek <mbroek@mbse.eu>
parents: 159
diff changeset
147 $sql .= "', keg_pressure='" . $_POST['keg_pressure'];
4a4cc3497a57 Added the packaging tab contents.
Michiel Broek <mbroek@mbse.eu>
parents: 159
diff changeset
148 $sql .= "', taste_notes='" . mysqli_real_escape_string($connect, $_POST['taste_notes']);
4a4cc3497a57 Added the packaging tab contents.
Michiel Broek <mbroek@mbse.eu>
parents: 159
diff changeset
149 $sql .= "', taste_rate='" . $_POST['taste_rate'];
4a4cc3497a57 Added the packaging tab contents.
Michiel Broek <mbroek@mbse.eu>
parents: 159
diff changeset
150 $sql .= "', taste_date='" . $_POST['taste_date'];
4a4cc3497a57 Added the packaging tab contents.
Michiel Broek <mbroek@mbse.eu>
parents: 159
diff changeset
151 $sql .= "', taste_color='" . mysqli_real_escape_string($connect, $_POST['taste_color']);
4a4cc3497a57 Added the packaging tab contents.
Michiel Broek <mbroek@mbse.eu>
parents: 159
diff changeset
152 $sql .= "', taste_transparency='" . mysqli_real_escape_string($connect, $_POST['taste_transparency']);
4a4cc3497a57 Added the packaging tab contents.
Michiel Broek <mbroek@mbse.eu>
parents: 159
diff changeset
153 $sql .= "', taste_head='" . mysqli_real_escape_string($connect, $_POST['taste_head']);
4a4cc3497a57 Added the packaging tab contents.
Michiel Broek <mbroek@mbse.eu>
parents: 159
diff changeset
154 $sql .= "', taste_aroma='" . mysqli_real_escape_string($connect, $_POST['taste_aroma']);
4a4cc3497a57 Added the packaging tab contents.
Michiel Broek <mbroek@mbse.eu>
parents: 159
diff changeset
155 $sql .= "', taste_taste='" . mysqli_real_escape_string($connect, $_POST['taste_taste']);
4a4cc3497a57 Added the packaging tab contents.
Michiel Broek <mbroek@mbse.eu>
parents: 159
diff changeset
156 $sql .= "', taste_mouthfeel='" . mysqli_real_escape_string($connect, $_POST['taste_mouthfeel']);
4a4cc3497a57 Added the packaging tab contents.
Michiel Broek <mbroek@mbse.eu>
parents: 159
diff changeset
157 $sql .= "', taste_aftertaste='" . mysqli_real_escape_string($connect, $_POST['taste_aftertaste']);
151
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
158
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
159 /*
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
160 * Recipe part
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
161 */
163
4a4cc3497a57 Added the packaging tab contents.
Michiel Broek <mbroek@mbse.eu>
parents: 159
diff changeset
162 $sql .= "', st_name='" . mysqli_real_escape_string($connect, $_POST['st_name']);
4a4cc3497a57 Added the packaging tab contents.
Michiel Broek <mbroek@mbse.eu>
parents: 159
diff changeset
163 $sql .= "', st_letter='" . mysqli_real_escape_string($connect, $_POST['st_letter']);
4a4cc3497a57 Added the packaging tab contents.
Michiel Broek <mbroek@mbse.eu>
parents: 159
diff changeset
164 $sql .= "', st_guide='" . mysqli_real_escape_string($connect, $_POST['st_guide']);
4a4cc3497a57 Added the packaging tab contents.
Michiel Broek <mbroek@mbse.eu>
parents: 159
diff changeset
165 $sql .= "', st_type='" . mysqli_real_escape_string($connect, $_POST['st_type']);
4a4cc3497a57 Added the packaging tab contents.
Michiel Broek <mbroek@mbse.eu>
parents: 159
diff changeset
166 $sql .= "', st_category='" . mysqli_real_escape_string($connect, $_POST['st_category']);
4a4cc3497a57 Added the packaging tab contents.
Michiel Broek <mbroek@mbse.eu>
parents: 159
diff changeset
167 $sql .= "', st_category_number='" . $_POST['st_category_number'];
151
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
168 $sql .= "', st_og_min='" . $_POST['st_og_min'];
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
169 $sql .= "', st_og_max='" . $_POST['st_og_max'];
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
170 $sql .= "', st_fg_min='" . $_POST['st_fg_min'];
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
171 $sql .= "', st_fg_max='" . $_POST['st_fg_max'];
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
172 $sql .= "', st_ibu_min='" . $_POST['st_ibu_min'];
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
173 $sql .= "', st_ibu_max='" . $_POST['st_ibu_max'];
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
174 $sql .= "', st_color_min='" . $_POST['st_color_min'];
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
175 $sql .= "', st_color_max='" . $_POST['st_color_max'];
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
176 $sql .= "', st_carb_min='" . $_POST['st_carb_min'];
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
177 $sql .= "', st_carb_max='" . $_POST['st_carb_max'];
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
178 $sql .= "', st_abv_min='" . $_POST['st_abv_min'];
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
179 $sql .= "', st_abv_max='" . $_POST['st_abv_max'];
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
180 $sql .= "', type='" . $_POST['type'];
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
181 $sql .= "', batch_size='" . $_POST['batch_size'];
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
182 $sql .= "', boil_size='" . $_POST['boil_size'];
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
183 $sql .= "', boil_time='" . $_POST['boil_time'];
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
184 $sql .= "', efficiency='" . $_POST['efficiency'];
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
185 $sql .= "', est_og='" . $_POST['est_og'];
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
186 $sql .= "', est_fg='" . $_POST['est_fg'];
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
187 $sql .= "', est_abv='" . $_POST['est_abv'];
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
188 $sql .= "', est_carb='" . $_POST['est_carb'];
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
189 $sql .= "', est_color='" . $_POST['est_color'];
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
190 $sql .= "', color_method='" . $_POST['color_method'];
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
191 $sql .= "', est_ibu='" . $_POST['est_ibu'];
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
192 $sql .= "', ibu_method='" . $_POST['ibu_method'];
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
193 $sql .= "', sparge_temp='" . $_POST['sparge_temp'];
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
194 $sql .= "', sparge_ph='" . $_POST['sparge_ph'];
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
195 $sql .= "', sparge_volume='" . $_POST['sparge_volume'];
159
6428dae0605d Backport water treatment to the product editor (inluding the bugs).
Michiel Broek <mbroek@mbse.eu>
parents: 151
diff changeset
196 $sql .= "', sparge_source='" . $_POST['sparge_source'];
6428dae0605d Backport water treatment to the product editor (inluding the bugs).
Michiel Broek <mbroek@mbse.eu>
parents: 151
diff changeset
197 $sql .= "', sparge_acid_type='" . $_POST['sparge_acid_type'];
6428dae0605d Backport water treatment to the product editor (inluding the bugs).
Michiel Broek <mbroek@mbse.eu>
parents: 151
diff changeset
198 $sql .= "', sparge_acid_perc='" . $_POST['sparge_acid_perc'];
6428dae0605d Backport water treatment to the product editor (inluding the bugs).
Michiel Broek <mbroek@mbse.eu>
parents: 151
diff changeset
199 $sql .= "', sparge_acid_amount='" . $_POST['sparge_acid_amount'];
151
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
200 $sql .= "', mash_ph='" . $_POST['mash_ph'];
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
201 $sql .= "', mash_name='" . $_POST['mash_name'];
159
6428dae0605d Backport water treatment to the product editor (inluding the bugs).
Michiel Broek <mbroek@mbse.eu>
parents: 151
diff changeset
202 ($_POST['calc_acid'] == 'true') ? $sql .= "', calc_acid='1" : $sql .= "', calc_acid='0";
151
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
203 if (isset($_POST['w1_name'])) {
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
204 $sql .= "', w1_name='" . mysqli_real_escape_string($connect, $_POST['w1_name']);
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
205 $sql .= "', w1_amount='" . $_POST['w1_amount'];
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
206 $sql .= "', w1_calcium='" . $_POST['w1_calcium'];
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
207 $sql .= "', w1_sulfate='" . $_POST['w1_sulfate'];
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
208 $sql .= "', w1_chloride='" . $_POST['w1_chloride'];
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
209 $sql .= "', w1_sodium='" . $_POST['w1_sodium'];
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
210 $sql .= "', w1_magnesium='" . $_POST['w1_magnesium'];
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
211 $sql .= "', w1_total_alkalinity='" . $_POST['w1_total_alkalinity'];
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
212 $sql .= "', w1_ph='" . $_POST['w1_ph'];
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
213 $sql .= "', w1_cost='" . $_POST['w1_cost'];
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
214 }
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
215 if (isset($_POST['w2_name'])) {
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
216 $sql .= "', w2_name='" . mysqli_real_escape_string($connect, $_POST['w2_name']);
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
217 $sql .= "', w2_amount='" . $_POST['w2_amount'];
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
218 $sql .= "', w2_calcium='" . $_POST['w2_calcium'];
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
219 $sql .= "', w2_sulfate='" . $_POST['w2_sulfate'];
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
220 $sql .= "', w2_chloride='" . $_POST['w2_chloride'];
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
221 $sql .= "', w2_sodium='" . $_POST['w2_sodium'];
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
222 $sql .= "', w2_magnesium='" . $_POST['w2_magnesium'];
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
223 $sql .= "', w2_total_alkalinity='" . $_POST['w2_total_alkalinity'];
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
224 $sql .= "', w2_ph='" . $_POST['w2_ph'];
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
225 $sql .= "', w2_cost='" . $_POST['w2_cost'];
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
226 }
111
8c4ba91adf58 Basic screens for brew products.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
227 syslog(LOG_NOTICE, $sql);
151
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
228
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
229 if (isset($_POST['fermentables'])) {
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
230 $array = $_POST['fermentables'];
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
231 foreach($array as $key => $item){
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
232 foreach ($disallowed as $disallowed_key) {
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
233 unset($array[$key]["$disallowed_key"]);
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
234 }
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
235 }
164
0a5abea575a9 Added the last tab, fermentation to the product editer.
Michiel Broek <mbroek@mbse.eu>
parents: 163
diff changeset
236 // syslog(LOG_NOTICE, "json_fermentables=: ".str_replace($rescapers,$rreplacements,json_encode($array)));
151
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
237 $sql .= "', json_fermentables='" . str_replace($rescapers,$rreplacements,json_encode($array));
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
238 }
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
239
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
240 if (isset($_POST['hops'])) {
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
241 $array = $_POST['hops'];
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
242 foreach($array as $key => $item){
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
243 foreach ($disallowed as $disallowed_key) {
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
244 unset($array[$key]["$disallowed_key"]);
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
245 }
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
246 }
164
0a5abea575a9 Added the last tab, fermentation to the product editer.
Michiel Broek <mbroek@mbse.eu>
parents: 163
diff changeset
247 // syslog(LOG_NOTICE, "json_hops: ".str_replace($rescapers,$rreplacements,json_encode($array)));
151
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
248 $sql .= "', json_hops='" . str_replace($rescapers,$rreplacements,json_encode($array));
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
249 }
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
250
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
251 if (isset($_POST['miscs'])) {
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
252 $array = $_POST['miscs'];
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
253 foreach($array as $key => $item){
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
254 foreach ($disallowed as $disallowed_key) {
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
255 unset($array[$key]["$disallowed_key"]);
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
256 }
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
257 }
164
0a5abea575a9 Added the last tab, fermentation to the product editer.
Michiel Broek <mbroek@mbse.eu>
parents: 163
diff changeset
258 // syslog(LOG_NOTICE, "json_miscs: ".str_replace($rescapers,$rreplacements,json_encode($array)));
151
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
259 $sql .= "', json_miscs='" . str_replace($rescapers,$rreplacements,json_encode($array));
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
260 }
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
261
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
262 if (isset($_POST['yeasts'])) {
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
263 $array = $_POST['yeasts'];
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
264 foreach($array as $key => $item){
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
265 foreach ($disallowed as $disallowed_key) {
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
266 unset($array[$key]["$disallowed_key"]);
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
267 }
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
268 }
164
0a5abea575a9 Added the last tab, fermentation to the product editer.
Michiel Broek <mbroek@mbse.eu>
parents: 163
diff changeset
269 // syslog(LOG_NOTICE, "json_yeasts: ". str_replace($rescapers,$rreplacements,json_encode($array)));
151
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
270 $sql .= "', json_yeasts='" . str_replace($rescapers,$rreplacements,json_encode($array));
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
271 }
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
272
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
273 if (isset($_POST['mashs'])) {
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
274 $array = $_POST['mashs'];
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
275 foreach($array as $key => $item){
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
276 foreach ($disallowed as $disallowed_key) {
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
277 unset($array[$key]["$disallowed_key"]);
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
278 }
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
279 }
164
0a5abea575a9 Added the last tab, fermentation to the product editer.
Michiel Broek <mbroek@mbse.eu>
parents: 163
diff changeset
280 // syslog(LOG_NOTICE, "json_mashs: ".str_replace($rescapers,$rreplacements,json_encode($array)));
151
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
281 $sql .= "', json_mashs='" . str_replace($rescapers,$rreplacements,json_encode($array));
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
282 }
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
283
111
8c4ba91adf58 Basic screens for brew products.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
284 if (isset($_POST['insert'])) {
8c4ba91adf58 Basic screens for brew products.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
285 $sql .= "';";
8c4ba91adf58 Basic screens for brew products.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
286 }
8c4ba91adf58 Basic screens for brew products.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
287 if (isset($_POST['update'])) {
8c4ba91adf58 Basic screens for brew products.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
288 $sql .= "' WHERE record='" . $_POST['record'] . "';";
8c4ba91adf58 Basic screens for brew products.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
289 }
8c4ba91adf58 Basic screens for brew products.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
290
159
6428dae0605d Backport water treatment to the product editor (inluding the bugs).
Michiel Broek <mbroek@mbse.eu>
parents: 151
diff changeset
291 $result = mysqli_query($connect, $sql);
6428dae0605d Backport water treatment to the product editor (inluding the bugs).
Michiel Broek <mbroek@mbse.eu>
parents: 151
diff changeset
292 if (! $result) {
6428dae0605d Backport water treatment to the product editor (inluding the bugs).
Michiel Broek <mbroek@mbse.eu>
parents: 151
diff changeset
293 syslog(LOG_NOTICE, "db_product: result: ".mysqli_error($connect));
6428dae0605d Backport water treatment to the product editor (inluding the bugs).
Michiel Broek <mbroek@mbse.eu>
parents: 151
diff changeset
294 } else {
6428dae0605d Backport water treatment to the product editor (inluding the bugs).
Michiel Broek <mbroek@mbse.eu>
parents: 151
diff changeset
295 if (isset($_POST['update'])) {
6428dae0605d Backport water treatment to the product editor (inluding the bugs).
Michiel Broek <mbroek@mbse.eu>
parents: 151
diff changeset
296 syslog(LOG_NOTICE, "db_product: updated record ".$_POST['record']);
6428dae0605d Backport water treatment to the product editor (inluding the bugs).
Michiel Broek <mbroek@mbse.eu>
parents: 151
diff changeset
297 } else {
6428dae0605d Backport water treatment to the product editor (inluding the bugs).
Michiel Broek <mbroek@mbse.eu>
parents: 151
diff changeset
298 $lastid = mysqli_insert_id($connect);
6428dae0605d Backport water treatment to the product editor (inluding the bugs).
Michiel Broek <mbroek@mbse.eu>
parents: 151
diff changeset
299 syslog(LOG_NOTICE, "db_product: inserted record ".$lastid);
6428dae0605d Backport water treatment to the product editor (inluding the bugs).
Michiel Broek <mbroek@mbse.eu>
parents: 151
diff changeset
300 }
6428dae0605d Backport water treatment to the product editor (inluding the bugs).
Michiel Broek <mbroek@mbse.eu>
parents: 151
diff changeset
301 }
6428dae0605d Backport water treatment to the product editor (inluding the bugs).
Michiel Broek <mbroek@mbse.eu>
parents: 151
diff changeset
302 echo $result;
111
8c4ba91adf58 Basic screens for brew products.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
303
8c4ba91adf58 Basic screens for brew products.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
304 } else if (isset($_POST['delete'])) {
119
ae5e8d740173 Renamed some fields in prod_main to prevent ambigous names with the join. Delete product also deletes the corresponding recipe. Fixed equipment load and save. Read data from the product main joined with prod_recipes completed. The brewday page is now almost complete, the calculations must be added.
Michiel Broek <mbroek@mbse.eu>
parents: 115
diff changeset
305 /*
151
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
306 * DELETE command.
119
ae5e8d740173 Renamed some fields in prod_main to prevent ambigous names with the join. Delete product also deletes the corresponding recipe. Fixed equipment load and save. Read data from the product main joined with prod_recipes completed. The brewday page is now almost complete, the calculations must be added.
Michiel Broek <mbroek@mbse.eu>
parents: 115
diff changeset
307 */
151
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
308 $sql = "DELETE FROM `products` WHERE uuid='".$_POST['uuid']."';";
119
ae5e8d740173 Renamed some fields in prod_main to prevent ambigous names with the join. Delete product also deletes the corresponding recipe. Fixed equipment load and save. Read data from the product main joined with prod_recipes completed. The brewday page is now almost complete, the calculations must be added.
Michiel Broek <mbroek@mbse.eu>
parents: 115
diff changeset
309 $result = mysqli_query($connect, $sql);
ae5e8d740173 Renamed some fields in prod_main to prevent ambigous names with the join. Delete product also deletes the corresponding recipe. Fixed equipment load and save. Read data from the product main joined with prod_recipes completed. The brewday page is now almost complete, the calculations must be added.
Michiel Broek <mbroek@mbse.eu>
parents: 115
diff changeset
310 if (! $result) {
ae5e8d740173 Renamed some fields in prod_main to prevent ambigous names with the join. Delete product also deletes the corresponding recipe. Fixed equipment load and save. Read data from the product main joined with prod_recipes completed. The brewday page is now almost complete, the calculations must be added.
Michiel Broek <mbroek@mbse.eu>
parents: 115
diff changeset
311 syslog(LOG_NOTICE, "db_product: ".$sql." result: ".mysqli_error($connect));
ae5e8d740173 Renamed some fields in prod_main to prevent ambigous names with the join. Delete product also deletes the corresponding recipe. Fixed equipment load and save. Read data from the product main joined with prod_recipes completed. The brewday page is now almost complete, the calculations must be added.
Michiel Broek <mbroek@mbse.eu>
parents: 115
diff changeset
312 } else {
ae5e8d740173 Renamed some fields in prod_main to prevent ambigous names with the join. Delete product also deletes the corresponding recipe. Fixed equipment load and save. Read data from the product main joined with prod_recipes completed. The brewday page is now almost complete, the calculations must be added.
Michiel Broek <mbroek@mbse.eu>
parents: 115
diff changeset
313 syslog(LOG_NOTICE, "db_product: deleted product uuid ".$_POST['uuid']);
ae5e8d740173 Renamed some fields in prod_main to prevent ambigous names with the join. Delete product also deletes the corresponding recipe. Fixed equipment load and save. Read data from the product main joined with prod_recipes completed. The brewday page is now almost complete, the calculations must be added.
Michiel Broek <mbroek@mbse.eu>
parents: 115
diff changeset
314 }
ae5e8d740173 Renamed some fields in prod_main to prevent ambigous names with the join. Delete product also deletes the corresponding recipe. Fixed equipment load and save. Read data from the product main joined with prod_recipes completed. The brewday page is now almost complete, the calculations must be added.
Michiel Broek <mbroek@mbse.eu>
parents: 115
diff changeset
315 echo $result;
111
8c4ba91adf58 Basic screens for brew products.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
316
8c4ba91adf58 Basic screens for brew products.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
317 } else {
119
ae5e8d740173 Renamed some fields in prod_main to prevent ambigous names with the join. Delete product also deletes the corresponding recipe. Fixed equipment load and save. Read data from the product main joined with prod_recipes completed. The brewday page is now almost complete, the calculations must be added.
Michiel Broek <mbroek@mbse.eu>
parents: 115
diff changeset
318 /*
ae5e8d740173 Renamed some fields in prod_main to prevent ambigous names with the join. Delete product also deletes the corresponding recipe. Fixed equipment load and save. Read data from the product main joined with prod_recipes completed. The brewday page is now almost complete, the calculations must be added.
Michiel Broek <mbroek@mbse.eu>
parents: 115
diff changeset
319 * SELECT, produce a list of products that are not yet Closed.
ae5e8d740173 Renamed some fields in prod_main to prevent ambigous names with the join. Delete product also deletes the corresponding recipe. Fixed equipment load and save. Read data from the product main joined with prod_recipes completed. The brewday page is now almost complete, the calculations must be added.
Michiel Broek <mbroek@mbse.eu>
parents: 115
diff changeset
320 */
111
8c4ba91adf58 Basic screens for brew products.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
321 if (isset($_GET['select']) && ($_GET['select'] == "inprod")) {
151
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
322 $query = "SELECT record,name,code,birth,stage FROM products WHERE stage != 'Closed' ORDER BY birth,code;";
111
8c4ba91adf58 Basic screens for brew products.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
323 $result = mysqli_query($connect, $query) or die("SQL Error 1: " . mysqli_error($connect));
8c4ba91adf58 Basic screens for brew products.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
324 while ($row = mysqli_fetch_array($result, MYSQLI_ASSOC)) {
114
4935e86b2775 Small fixes for prject import from Brouwhulp. Fixes for poduct database read/write. New menu entries. Equipment select in product editor. Started brewday editor. Added conditions on some buttons and edit fields. Screen layout changes.
Michiel Broek <mbroek@mbse.eu>
parents: 112
diff changeset
325 $brews[] = array(
4935e86b2775 Small fixes for prject import from Brouwhulp. Fixes for poduct database read/write. New menu entries. Equipment select in product editor. Started brewday editor. Added conditions on some buttons and edit fields. Screen layout changes.
Michiel Broek <mbroek@mbse.eu>
parents: 112
diff changeset
326 'record' => $row['record'],
151
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
327 'name' => $row['name'],
114
4935e86b2775 Small fixes for prject import from Brouwhulp. Fixes for poduct database read/write. New menu entries. Equipment select in product editor. Started brewday editor. Added conditions on some buttons and edit fields. Screen layout changes.
Michiel Broek <mbroek@mbse.eu>
parents: 112
diff changeset
328 'code' => $row['code'],
4935e86b2775 Small fixes for prject import from Brouwhulp. Fixes for poduct database read/write. New menu entries. Equipment select in product editor. Started brewday editor. Added conditions on some buttons and edit fields. Screen layout changes.
Michiel Broek <mbroek@mbse.eu>
parents: 112
diff changeset
329 'birth' => $row['birth'],
4935e86b2775 Small fixes for prject import from Brouwhulp. Fixes for poduct database read/write. New menu entries. Equipment select in product editor. Started brewday editor. Added conditions on some buttons and edit fields. Screen layout changes.
Michiel Broek <mbroek@mbse.eu>
parents: 112
diff changeset
330 'stage' => $row['stage']
4935e86b2775 Small fixes for prject import from Brouwhulp. Fixes for poduct database read/write. New menu entries. Equipment select in product editor. Started brewday editor. Added conditions on some buttons and edit fields. Screen layout changes.
Michiel Broek <mbroek@mbse.eu>
parents: 112
diff changeset
331 );
111
8c4ba91adf58 Basic screens for brew products.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
332 }
114
4935e86b2775 Small fixes for prject import from Brouwhulp. Fixes for poduct database read/write. New menu entries. Equipment select in product editor. Started brewday editor. Added conditions on some buttons and edit fields. Screen layout changes.
Michiel Broek <mbroek@mbse.eu>
parents: 112
diff changeset
333 echo json_encode($brews);
111
8c4ba91adf58 Basic screens for brew products.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
334 return;
8c4ba91adf58 Basic screens for brew products.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
335 }
8c4ba91adf58 Basic screens for brew products.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
336
8c4ba91adf58 Basic screens for brew products.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
337 /*
185
4c25db9e8102 Added configuration settings for MQTT in config.php. Finished screen box sizes for the fermenters monitor. Select beername and code from the current brew products and send it to the fermenter. Added switch commands to the fermenter. Delay data get from the fermenter after sending any command so there is time to process the commands. Turn switches off when the mode changes. Removed 0.2 degrees setpoint diffs for low and high, the fermenter must deal with it. Prevent turning the heater and cooler together on.
Michiel Broek <mbroek@mbse.eu>
parents: 166
diff changeset
338 * SELECT, produce a list of products that can be fermented.
4c25db9e8102 Added configuration settings for MQTT in config.php. Finished screen box sizes for the fermenters monitor. Select beername and code from the current brew products and send it to the fermenter. Added switch commands to the fermenter. Delay data get from the fermenter after sending any command so there is time to process the commands. Turn switches off when the mode changes. Removed 0.2 degrees setpoint diffs for low and high, the fermenter must deal with it. Prevent turning the heater and cooler together on.
Michiel Broek <mbroek@mbse.eu>
parents: 166
diff changeset
339 */
4c25db9e8102 Added configuration settings for MQTT in config.php. Finished screen box sizes for the fermenters monitor. Select beername and code from the current brew products and send it to the fermenter. Added switch commands to the fermenter. Delay data get from the fermenter after sending any command so there is time to process the commands. Turn switches off when the mode changes. Removed 0.2 degrees setpoint diffs for low and high, the fermenter must deal with it. Prevent turning the heater and cooler together on.
Michiel Broek <mbroek@mbse.eu>
parents: 166
diff changeset
340 if (isset($_GET['select']) && ($_GET['select'] == "ferment")) {
4c25db9e8102 Added configuration settings for MQTT in config.php. Finished screen box sizes for the fermenters monitor. Select beername and code from the current brew products and send it to the fermenter. Added switch commands to the fermenter. Delay data get from the fermenter after sending any command so there is time to process the commands. Turn switches off when the mode changes. Removed 0.2 degrees setpoint diffs for low and high, the fermenter must deal with it. Prevent turning the heater and cooler together on.
Michiel Broek <mbroek@mbse.eu>
parents: 166
diff changeset
341 $query = "SELECT code,name,stage FROM products WHERE ";
4c25db9e8102 Added configuration settings for MQTT in config.php. Finished screen box sizes for the fermenters monitor. Select beername and code from the current brew products and send it to the fermenter. Added switch commands to the fermenter. Delay data get from the fermenter after sending any command so there is time to process the commands. Turn switches off when the mode changes. Removed 0.2 degrees setpoint diffs for low and high, the fermenter must deal with it. Prevent turning the heater and cooler together on.
Michiel Broek <mbroek@mbse.eu>
parents: 166
diff changeset
342 $query .= "stage='Wait' OR stage='Brew' OR stage='Primary' OR stage='Secondary' OR stage='Tertiary' OR stage='Carbonation' ORDER BY code;";
4c25db9e8102 Added configuration settings for MQTT in config.php. Finished screen box sizes for the fermenters monitor. Select beername and code from the current brew products and send it to the fermenter. Added switch commands to the fermenter. Delay data get from the fermenter after sending any command so there is time to process the commands. Turn switches off when the mode changes. Removed 0.2 degrees setpoint diffs for low and high, the fermenter must deal with it. Prevent turning the heater and cooler together on.
Michiel Broek <mbroek@mbse.eu>
parents: 166
diff changeset
343 $result = mysqli_query($connect, $query) or die("SQL Error 1: " . mysqli_error($connect));
4c25db9e8102 Added configuration settings for MQTT in config.php. Finished screen box sizes for the fermenters monitor. Select beername and code from the current brew products and send it to the fermenter. Added switch commands to the fermenter. Delay data get from the fermenter after sending any command so there is time to process the commands. Turn switches off when the mode changes. Removed 0.2 degrees setpoint diffs for low and high, the fermenter must deal with it. Prevent turning the heater and cooler together on.
Michiel Broek <mbroek@mbse.eu>
parents: 166
diff changeset
344 while ($row = mysqli_fetch_array($result, MYSQLI_ASSOC)) {
4c25db9e8102 Added configuration settings for MQTT in config.php. Finished screen box sizes for the fermenters monitor. Select beername and code from the current brew products and send it to the fermenter. Added switch commands to the fermenter. Delay data get from the fermenter after sending any command so there is time to process the commands. Turn switches off when the mode changes. Removed 0.2 degrees setpoint diffs for low and high, the fermenter must deal with it. Prevent turning the heater and cooler together on.
Michiel Broek <mbroek@mbse.eu>
parents: 166
diff changeset
345 $brews[] = array(
4c25db9e8102 Added configuration settings for MQTT in config.php. Finished screen box sizes for the fermenters monitor. Select beername and code from the current brew products and send it to the fermenter. Added switch commands to the fermenter. Delay data get from the fermenter after sending any command so there is time to process the commands. Turn switches off when the mode changes. Removed 0.2 degrees setpoint diffs for low and high, the fermenter must deal with it. Prevent turning the heater and cooler together on.
Michiel Broek <mbroek@mbse.eu>
parents: 166
diff changeset
346 'code' => $row['code'],
4c25db9e8102 Added configuration settings for MQTT in config.php. Finished screen box sizes for the fermenters monitor. Select beername and code from the current brew products and send it to the fermenter. Added switch commands to the fermenter. Delay data get from the fermenter after sending any command so there is time to process the commands. Turn switches off when the mode changes. Removed 0.2 degrees setpoint diffs for low and high, the fermenter must deal with it. Prevent turning the heater and cooler together on.
Michiel Broek <mbroek@mbse.eu>
parents: 166
diff changeset
347 'name' => $row['name'],
4c25db9e8102 Added configuration settings for MQTT in config.php. Finished screen box sizes for the fermenters monitor. Select beername and code from the current brew products and send it to the fermenter. Added switch commands to the fermenter. Delay data get from the fermenter after sending any command so there is time to process the commands. Turn switches off when the mode changes. Removed 0.2 degrees setpoint diffs for low and high, the fermenter must deal with it. Prevent turning the heater and cooler together on.
Michiel Broek <mbroek@mbse.eu>
parents: 166
diff changeset
348 'stage' => $row['stage']
4c25db9e8102 Added configuration settings for MQTT in config.php. Finished screen box sizes for the fermenters monitor. Select beername and code from the current brew products and send it to the fermenter. Added switch commands to the fermenter. Delay data get from the fermenter after sending any command so there is time to process the commands. Turn switches off when the mode changes. Removed 0.2 degrees setpoint diffs for low and high, the fermenter must deal with it. Prevent turning the heater and cooler together on.
Michiel Broek <mbroek@mbse.eu>
parents: 166
diff changeset
349 );
4c25db9e8102 Added configuration settings for MQTT in config.php. Finished screen box sizes for the fermenters monitor. Select beername and code from the current brew products and send it to the fermenter. Added switch commands to the fermenter. Delay data get from the fermenter after sending any command so there is time to process the commands. Turn switches off when the mode changes. Removed 0.2 degrees setpoint diffs for low and high, the fermenter must deal with it. Prevent turning the heater and cooler together on.
Michiel Broek <mbroek@mbse.eu>
parents: 166
diff changeset
350 }
4c25db9e8102 Added configuration settings for MQTT in config.php. Finished screen box sizes for the fermenters monitor. Select beername and code from the current brew products and send it to the fermenter. Added switch commands to the fermenter. Delay data get from the fermenter after sending any command so there is time to process the commands. Turn switches off when the mode changes. Removed 0.2 degrees setpoint diffs for low and high, the fermenter must deal with it. Prevent turning the heater and cooler together on.
Michiel Broek <mbroek@mbse.eu>
parents: 166
diff changeset
351 echo json_encode($brews);
4c25db9e8102 Added configuration settings for MQTT in config.php. Finished screen box sizes for the fermenters monitor. Select beername and code from the current brew products and send it to the fermenter. Added switch commands to the fermenter. Delay data get from the fermenter after sending any command so there is time to process the commands. Turn switches off when the mode changes. Removed 0.2 degrees setpoint diffs for low and high, the fermenter must deal with it. Prevent turning the heater and cooler together on.
Michiel Broek <mbroek@mbse.eu>
parents: 166
diff changeset
352 return;
4c25db9e8102 Added configuration settings for MQTT in config.php. Finished screen box sizes for the fermenters monitor. Select beername and code from the current brew products and send it to the fermenter. Added switch commands to the fermenter. Delay data get from the fermenter after sending any command so there is time to process the commands. Turn switches off when the mode changes. Removed 0.2 degrees setpoint diffs for low and high, the fermenter must deal with it. Prevent turning the heater and cooler together on.
Michiel Broek <mbroek@mbse.eu>
parents: 166
diff changeset
353 }
4c25db9e8102 Added configuration settings for MQTT in config.php. Finished screen box sizes for the fermenters monitor. Select beername and code from the current brew products and send it to the fermenter. Added switch commands to the fermenter. Delay data get from the fermenter after sending any command so there is time to process the commands. Turn switches off when the mode changes. Removed 0.2 degrees setpoint diffs for low and high, the fermenter must deal with it. Prevent turning the heater and cooler together on.
Michiel Broek <mbroek@mbse.eu>
parents: 166
diff changeset
354
4c25db9e8102 Added configuration settings for MQTT in config.php. Finished screen box sizes for the fermenters monitor. Select beername and code from the current brew products and send it to the fermenter. Added switch commands to the fermenter. Delay data get from the fermenter after sending any command so there is time to process the commands. Turn switches off when the mode changes. Removed 0.2 degrees setpoint diffs for low and high, the fermenter must deal with it. Prevent turning the heater and cooler together on.
Michiel Broek <mbroek@mbse.eu>
parents: 166
diff changeset
355 /*
119
ae5e8d740173 Renamed some fields in prod_main to prevent ambigous names with the join. Delete product also deletes the corresponding recipe. Fixed equipment load and save. Read data from the product main joined with prod_recipes completed. The brewday page is now almost complete, the calculations must be added.
Michiel Broek <mbroek@mbse.eu>
parents: 115
diff changeset
356 * Default, select all or a given record.
111
8c4ba91adf58 Basic screens for brew products.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
357 */
115
ad31f4bd4036 Inventory database script added missing fields. Product database script added JOIN with the prod_recipes table.
Michiel Broek <mbroek@mbse.eu>
parents: 114
diff changeset
358 if (isset($_GET['record'])) {
151
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
359 $query = "SELECT * FROM products WHERE record='" . $_GET['record'] . "';";
115
ad31f4bd4036 Inventory database script added missing fields. Product database script added JOIN with the prod_recipes table.
Michiel Broek <mbroek@mbse.eu>
parents: 114
diff changeset
360 } else {
151
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
361 $query = "SELECT * FROM products ORDER BY birth,code;";
115
ad31f4bd4036 Inventory database script added missing fields. Product database script added JOIN with the prod_recipes table.
Michiel Broek <mbroek@mbse.eu>
parents: 114
diff changeset
362 }
111
8c4ba91adf58 Basic screens for brew products.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
363 $result = mysqli_query($connect, $query) or die("SQL Error 1: " . mysqli_error($connect));
115
ad31f4bd4036 Inventory database script added missing fields. Product database script added JOIN with the prod_recipes table.
Michiel Broek <mbroek@mbse.eu>
parents: 114
diff changeset
364 $brews = '[';
ad31f4bd4036 Inventory database script added missing fields. Product database script added JOIN with the prod_recipes table.
Michiel Broek <mbroek@mbse.eu>
parents: 114
diff changeset
365 $comma = FALSE;
111
8c4ba91adf58 Basic screens for brew products.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
366 while ($row = mysqli_fetch_array($result, MYSQLI_ASSOC)) {
115
ad31f4bd4036 Inventory database script added missing fields. Product database script added JOIN with the prod_recipes table.
Michiel Broek <mbroek@mbse.eu>
parents: 114
diff changeset
367 // Manual encode to JSON.
ad31f4bd4036 Inventory database script added missing fields. Product database script added JOIN with the prod_recipes table.
Michiel Broek <mbroek@mbse.eu>
parents: 114
diff changeset
368 if ($comma)
ad31f4bd4036 Inventory database script added missing fields. Product database script added JOIN with the prod_recipes table.
Michiel Broek <mbroek@mbse.eu>
parents: 114
diff changeset
369 $brews .= ',';
ad31f4bd4036 Inventory database script added missing fields. Product database script added JOIN with the prod_recipes table.
Michiel Broek <mbroek@mbse.eu>
parents: 114
diff changeset
370 $comma = TRUE;
ad31f4bd4036 Inventory database script added missing fields. Product database script added JOIN with the prod_recipes table.
Michiel Broek <mbroek@mbse.eu>
parents: 114
diff changeset
371 $brew = '{"record":' . $row['record'];
151
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
372 $brew .= ',"uuid":"' . str_replace($escapers, $replacements, $row['uuid']);
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
373 $brew .= '","name":"' . str_replace($escapers, $replacements, $row['name']);
115
ad31f4bd4036 Inventory database script added missing fields. Product database script added JOIN with the prod_recipes table.
Michiel Broek <mbroek@mbse.eu>
parents: 114
diff changeset
374 $brew .= '","code":"' . str_replace($escapers, $replacements, $row['code']);
ad31f4bd4036 Inventory database script added missing fields. Product database script added JOIN with the prod_recipes table.
Michiel Broek <mbroek@mbse.eu>
parents: 114
diff changeset
375 $brew .= '","birth":"' . str_replace($escapers, $replacements, $row['birth']);
ad31f4bd4036 Inventory database script added missing fields. Product database script added JOIN with the prod_recipes table.
Michiel Broek <mbroek@mbse.eu>
parents: 114
diff changeset
376 $brew .= '","stage":"' . str_replace($escapers, $replacements, $row['stage']);
151
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
377 $brew .= '","notes":"' . str_replace($escapers, $replacements, $row['notes']);
115
ad31f4bd4036 Inventory database script added missing fields. Product database script added JOIN with the prod_recipes table.
Michiel Broek <mbroek@mbse.eu>
parents: 114
diff changeset
378 $brew .= '","log_brew":' . $row['log_brew'];
ad31f4bd4036 Inventory database script added missing fields. Product database script added JOIN with the prod_recipes table.
Michiel Broek <mbroek@mbse.eu>
parents: 114
diff changeset
379 $brew .= ',"log_fermentation":' . $row['log_fermentation'];
ad31f4bd4036 Inventory database script added missing fields. Product database script added JOIN with the prod_recipes table.
Michiel Broek <mbroek@mbse.eu>
parents: 114
diff changeset
380 $brew .= ',"inventory_reduced":' . $row['inventory_reduced'];
151
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
381 $brew .= ',"locked":' . $row['locked'];
115
ad31f4bd4036 Inventory database script added missing fields. Product database script added JOIN with the prod_recipes table.
Michiel Broek <mbroek@mbse.eu>
parents: 114
diff changeset
382 $brew .= ',"eq_name":"' . str_replace($escapers, $replacements, $row['eq_name']);
ad31f4bd4036 Inventory database script added missing fields. Product database script added JOIN with the prod_recipes table.
Michiel Broek <mbroek@mbse.eu>
parents: 114
diff changeset
383 $brew .= '","eq_notes":"' . str_replace($escapers, $replacements, $row['eq_notes']);
ad31f4bd4036 Inventory database script added missing fields. Product database script added JOIN with the prod_recipes table.
Michiel Broek <mbroek@mbse.eu>
parents: 114
diff changeset
384 $brew .= '","eq_boil_size":' . floatval($row['eq_boil_size']);
ad31f4bd4036 Inventory database script added missing fields. Product database script added JOIN with the prod_recipes table.
Michiel Broek <mbroek@mbse.eu>
parents: 114
diff changeset
385 $brew .= ',"eq_batch_size":' . floatval($row['eq_batch_size']);
ad31f4bd4036 Inventory database script added missing fields. Product database script added JOIN with the prod_recipes table.
Michiel Broek <mbroek@mbse.eu>
parents: 114
diff changeset
386 $brew .= ',"eq_tun_volume":' . floatval($row['eq_tun_volume']);
ad31f4bd4036 Inventory database script added missing fields. Product database script added JOIN with the prod_recipes table.
Michiel Broek <mbroek@mbse.eu>
parents: 114
diff changeset
387 $brew .= ',"eq_tun_weight":' . floatval($row['eq_tun_weight']);
ad31f4bd4036 Inventory database script added missing fields. Product database script added JOIN with the prod_recipes table.
Michiel Broek <mbroek@mbse.eu>
parents: 114
diff changeset
388 $brew .= ',"eq_tun_specific_heat":' . floatval($row['eq_tun_specific_heat']);
ad31f4bd4036 Inventory database script added missing fields. Product database script added JOIN with the prod_recipes table.
Michiel Broek <mbroek@mbse.eu>
parents: 114
diff changeset
389 $brew .= ',"eq_tun_material":"' . $row['eq_tun_material'];
ad31f4bd4036 Inventory database script added missing fields. Product database script added JOIN with the prod_recipes table.
Michiel Broek <mbroek@mbse.eu>
parents: 114
diff changeset
390 $brew .= '","eq_tun_height":' . floatval($row['eq_tun_height']);
ad31f4bd4036 Inventory database script added missing fields. Product database script added JOIN with the prod_recipes table.
Michiel Broek <mbroek@mbse.eu>
parents: 114
diff changeset
391 $brew .= ',"eq_top_up_water":' . floatval($row['eq_top_up_water']);
ad31f4bd4036 Inventory database script added missing fields. Product database script added JOIN with the prod_recipes table.
Michiel Broek <mbroek@mbse.eu>
parents: 114
diff changeset
392 $brew .= ',"eq_trub_chiller_loss":' . floatval($row['eq_trub_chiller_loss']);
ad31f4bd4036 Inventory database script added missing fields. Product database script added JOIN with the prod_recipes table.
Michiel Broek <mbroek@mbse.eu>
parents: 114
diff changeset
393 $brew .= ',"eq_evap_rate":' . floatval($row['eq_evap_rate']);
ad31f4bd4036 Inventory database script added missing fields. Product database script added JOIN with the prod_recipes table.
Michiel Broek <mbroek@mbse.eu>
parents: 114
diff changeset
394 $brew .= ',"eq_boil_time":' . floatval($row['eq_boil_time']);
ad31f4bd4036 Inventory database script added missing fields. Product database script added JOIN with the prod_recipes table.
Michiel Broek <mbroek@mbse.eu>
parents: 114
diff changeset
395 $brew .= ',"eq_calc_boil_volume":' . $row['eq_calc_boil_volume'];
ad31f4bd4036 Inventory database script added missing fields. Product database script added JOIN with the prod_recipes table.
Michiel Broek <mbroek@mbse.eu>
parents: 114
diff changeset
396 $brew .= ',"eq_calc_boil_volume":' . floatval($row['eq_calc_boil_volume']);
ad31f4bd4036 Inventory database script added missing fields. Product database script added JOIN with the prod_recipes table.
Michiel Broek <mbroek@mbse.eu>
parents: 114
diff changeset
397 $brew .= ',"eq_top_up_kettle":' . floatval($row['eq_top_up_kettle']);
ad31f4bd4036 Inventory database script added missing fields. Product database script added JOIN with the prod_recipes table.
Michiel Broek <mbroek@mbse.eu>
parents: 114
diff changeset
398 $brew .= ',"eq_hop_utilization":' . floatval($row['eq_hop_utilization']);
ad31f4bd4036 Inventory database script added missing fields. Product database script added JOIN with the prod_recipes table.
Michiel Broek <mbroek@mbse.eu>
parents: 114
diff changeset
399 $brew .= ',"eq_lauter_volume":' . floatval($row['eq_lauter_volume']);
ad31f4bd4036 Inventory database script added missing fields. Product database script added JOIN with the prod_recipes table.
Michiel Broek <mbroek@mbse.eu>
parents: 114
diff changeset
400 $brew .= ',"eq_lauter_height":' . floatval($row['eq_lauter_height']);
ad31f4bd4036 Inventory database script added missing fields. Product database script added JOIN with the prod_recipes table.
Michiel Broek <mbroek@mbse.eu>
parents: 114
diff changeset
401 $brew .= ',"eq_lauter_deadspace":' . floatval($row['eq_lauter_deadspace']);
ad31f4bd4036 Inventory database script added missing fields. Product database script added JOIN with the prod_recipes table.
Michiel Broek <mbroek@mbse.eu>
parents: 114
diff changeset
402 $brew .= ',"eq_kettle_volume":' . floatval($row['eq_kettle_volume']);
ad31f4bd4036 Inventory database script added missing fields. Product database script added JOIN with the prod_recipes table.
Michiel Broek <mbroek@mbse.eu>
parents: 114
diff changeset
403 $brew .= ',"eq_kettle_height":' . floatval($row['eq_kettle_height']);
ad31f4bd4036 Inventory database script added missing fields. Product database script added JOIN with the prod_recipes table.
Michiel Broek <mbroek@mbse.eu>
parents: 114
diff changeset
404 $brew .= ',"eq_mash_volume":' . floatval($row['eq_mash_volume']);
149
ff45488d480e Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents: 121
diff changeset
405 $brew .= ',"eq_mash_max":' . floatval($row['eq_mash_max']);
115
ad31f4bd4036 Inventory database script added missing fields. Product database script added JOIN with the prod_recipes table.
Michiel Broek <mbroek@mbse.eu>
parents: 114
diff changeset
406 $brew .= ',"eq_efficiency":' . floatval($row['eq_efficiency']);
ad31f4bd4036 Inventory database script added missing fields. Product database script added JOIN with the prod_recipes table.
Michiel Broek <mbroek@mbse.eu>
parents: 114
diff changeset
407 $brew .= ',"eq_top_up_water":' . floatval($row['eq_top_up_water']);
ad31f4bd4036 Inventory database script added missing fields. Product database script added JOIN with the prod_recipes table.
Michiel Broek <mbroek@mbse.eu>
parents: 114
diff changeset
408 $brew .= ',"brew_date_start":"' . $row['brew_date_start'];
ad31f4bd4036 Inventory database script added missing fields. Product database script added JOIN with the prod_recipes table.
Michiel Broek <mbroek@mbse.eu>
parents: 114
diff changeset
409 $brew .= '","brew_mash_ph":' . floatval($row['brew_mash_ph']);
ad31f4bd4036 Inventory database script added missing fields. Product database script added JOIN with the prod_recipes table.
Michiel Broek <mbroek@mbse.eu>
parents: 114
diff changeset
410 $brew .= ',"brew_mash_sg":' . floatval($row['brew_mash_sg']);
ad31f4bd4036 Inventory database script added missing fields. Product database script added JOIN with the prod_recipes table.
Michiel Broek <mbroek@mbse.eu>
parents: 114
diff changeset
411 $brew .= ',"brew_sparge_temperature":' . floatval($row['brew_sparge_temperature']);
ad31f4bd4036 Inventory database script added missing fields. Product database script added JOIN with the prod_recipes table.
Michiel Broek <mbroek@mbse.eu>
parents: 114
diff changeset
412 $brew .= ',"brew_sparge_volume":' . floatval($row['brew_sparge_volume']);
121
875aeb365e1c Added sparge pH during import. Added several calculations. Added calculated estimates to the brewday screen.
Michiel Broek <mbroek@mbse.eu>
parents: 119
diff changeset
413 $brew .= ',"brew_sparge_ph":' . floatval($row['brew_sparge_ph']);
115
ad31f4bd4036 Inventory database script added missing fields. Product database script added JOIN with the prod_recipes table.
Michiel Broek <mbroek@mbse.eu>
parents: 114
diff changeset
414 $brew .= ',"brew_preboil_volume":' . floatval($row['brew_preboil_volume']);
ad31f4bd4036 Inventory database script added missing fields. Product database script added JOIN with the prod_recipes table.
Michiel Broek <mbroek@mbse.eu>
parents: 114
diff changeset
415 $brew .= ',"brew_preboil_sg":' . floatval($row['brew_preboil_sg']);
ad31f4bd4036 Inventory database script added missing fields. Product database script added JOIN with the prod_recipes table.
Michiel Broek <mbroek@mbse.eu>
parents: 114
diff changeset
416 $brew .= ',"brew_preboil_ph":' . floatval($row['brew_preboil_ph']);
ad31f4bd4036 Inventory database script added missing fields. Product database script added JOIN with the prod_recipes table.
Michiel Broek <mbroek@mbse.eu>
parents: 114
diff changeset
417 $brew .= ',"brew_aboil_volume":' . floatval($row['brew_aboil_volume']);
ad31f4bd4036 Inventory database script added missing fields. Product database script added JOIN with the prod_recipes table.
Michiel Broek <mbroek@mbse.eu>
parents: 114
diff changeset
418 $brew .= ',"brew_aboil_sg":' . floatval($row['brew_aboil_sg']);
ad31f4bd4036 Inventory database script added missing fields. Product database script added JOIN with the prod_recipes table.
Michiel Broek <mbroek@mbse.eu>
parents: 114
diff changeset
419 $brew .= ',"brew_aboil_ph":' . floatval($row['brew_aboil_ph']);
ad31f4bd4036 Inventory database script added missing fields. Product database script added JOIN with the prod_recipes table.
Michiel Broek <mbroek@mbse.eu>
parents: 114
diff changeset
420 $brew .= ',"brew_aboil_efficiency":' . floatval($row['brew_aboil_efficiency']);
ad31f4bd4036 Inventory database script added missing fields. Product database script added JOIN with the prod_recipes table.
Michiel Broek <mbroek@mbse.eu>
parents: 114
diff changeset
421 $brew .= ',"brew_cooling_method":"' . $row['brew_cooling_method'];
ad31f4bd4036 Inventory database script added missing fields. Product database script added JOIN with the prod_recipes table.
Michiel Broek <mbroek@mbse.eu>
parents: 114
diff changeset
422 $brew .= '","brew_cooling_time":' . floatval($row['brew_cooling_time']);
ad31f4bd4036 Inventory database script added missing fields. Product database script added JOIN with the prod_recipes table.
Michiel Broek <mbroek@mbse.eu>
parents: 114
diff changeset
423 $brew .= ',"brew_cooling_to":' . floatval($row['brew_cooling_to']);
ad31f4bd4036 Inventory database script added missing fields. Product database script added JOIN with the prod_recipes table.
Michiel Broek <mbroek@mbse.eu>
parents: 114
diff changeset
424 $brew .= ',"brew_whirlpool9":' . floatval($row['brew_whirlpool9']);
ad31f4bd4036 Inventory database script added missing fields. Product database script added JOIN with the prod_recipes table.
Michiel Broek <mbroek@mbse.eu>
parents: 114
diff changeset
425 $brew .= ',"brew_whirlpool7":' . floatval($row['brew_whirlpool7']);
ad31f4bd4036 Inventory database script added missing fields. Product database script added JOIN with the prod_recipes table.
Michiel Broek <mbroek@mbse.eu>
parents: 114
diff changeset
426 $brew .= ',"brew_whirlpool6":' . floatval($row['brew_whirlpool6']);
ad31f4bd4036 Inventory database script added missing fields. Product database script added JOIN with the prod_recipes table.
Michiel Broek <mbroek@mbse.eu>
parents: 114
diff changeset
427 $brew .= ',"brew_whirlpool2":' . floatval($row['brew_whirlpool2']);
ad31f4bd4036 Inventory database script added missing fields. Product database script added JOIN with the prod_recipes table.
Michiel Broek <mbroek@mbse.eu>
parents: 114
diff changeset
428 $brew .= ',"brew_fermenter_volume":' . floatval($row['brew_fermenter_volume']);
ad31f4bd4036 Inventory database script added missing fields. Product database script added JOIN with the prod_recipes table.
Michiel Broek <mbroek@mbse.eu>
parents: 114
diff changeset
429 $brew .= ',"brew_fermenter_extrawater":' . floatval($row['brew_fermenter_extrawater']);
ad31f4bd4036 Inventory database script added missing fields. Product database script added JOIN with the prod_recipes table.
Michiel Broek <mbroek@mbse.eu>
parents: 114
diff changeset
430 $brew .= ',"brew_aeration_time":' . floatval($row['brew_aeration_time']);
ad31f4bd4036 Inventory database script added missing fields. Product database script added JOIN with the prod_recipes table.
Michiel Broek <mbroek@mbse.eu>
parents: 114
diff changeset
431 $brew .= ',"brew_aeration_speed":' . floatval($row['brew_aeration_speed']);
119
ae5e8d740173 Renamed some fields in prod_main to prevent ambigous names with the join. Delete product also deletes the corresponding recipe. Fixed equipment load and save. Read data from the product main joined with prod_recipes completed. The brewday page is now almost complete, the calculations must be added.
Michiel Broek <mbroek@mbse.eu>
parents: 115
diff changeset
432 $brew .= ',"brew_aeration_type":"' . $row['brew_aeration_type'];
ae5e8d740173 Renamed some fields in prod_main to prevent ambigous names with the join. Delete product also deletes the corresponding recipe. Fixed equipment load and save. Read data from the product main joined with prod_recipes completed. The brewday page is now almost complete, the calculations must be added.
Michiel Broek <mbroek@mbse.eu>
parents: 115
diff changeset
433 $brew .= '","brew_fermenter_sg":' . floatval($row['brew_fermenter_sg']);
115
ad31f4bd4036 Inventory database script added missing fields. Product database script added JOIN with the prod_recipes table.
Michiel Broek <mbroek@mbse.eu>
parents: 114
diff changeset
434 $brew .= ',"brew_fermenter_ibu":' . floatval($row['brew_fermenter_ibu']);
ad31f4bd4036 Inventory database script added missing fields. Product database script added JOIN with the prod_recipes table.
Michiel Broek <mbroek@mbse.eu>
parents: 114
diff changeset
435 $brew .= ',"brew_date_end":"' . $row['brew_date_end'];
ad31f4bd4036 Inventory database script added missing fields. Product database script added JOIN with the prod_recipes table.
Michiel Broek <mbroek@mbse.eu>
parents: 114
diff changeset
436 $brew .= '","brew_log_available":' . $row['brew_log_available'];
163
4a4cc3497a57 Added the packaging tab contents.
Michiel Broek <mbroek@mbse.eu>
parents: 159
diff changeset
437 $brew .= ',"og":' . floatval($row['og']);
4a4cc3497a57 Added the packaging tab contents.
Michiel Broek <mbroek@mbse.eu>
parents: 159
diff changeset
438 $brew .= ',"fg":' . floatval($row['fg']);
115
ad31f4bd4036 Inventory database script added missing fields. Product database script added JOIN with the prod_recipes table.
Michiel Broek <mbroek@mbse.eu>
parents: 114
diff changeset
439 $brew .= ',"primary_start_temp":' . floatval($row['primary_start_temp']);
ad31f4bd4036 Inventory database script added missing fields. Product database script added JOIN with the prod_recipes table.
Michiel Broek <mbroek@mbse.eu>
parents: 114
diff changeset
440 $brew .= ',"primary_max_temp":' . floatval($row['primary_max_temp']);
ad31f4bd4036 Inventory database script added missing fields. Product database script added JOIN with the prod_recipes table.
Michiel Broek <mbroek@mbse.eu>
parents: 114
diff changeset
441 $brew .= ',"primary_end_temp":' . floatval($row['primary_end_temp']);
ad31f4bd4036 Inventory database script added missing fields. Product database script added JOIN with the prod_recipes table.
Michiel Broek <mbroek@mbse.eu>
parents: 114
diff changeset
442 $brew .= ',"primary_end_sg":' . floatval($row['primary_end_sg']);
ad31f4bd4036 Inventory database script added missing fields. Product database script added JOIN with the prod_recipes table.
Michiel Broek <mbroek@mbse.eu>
parents: 114
diff changeset
443 $brew .= ',"primary_end_date":"' . $row['primary_end_date'];
ad31f4bd4036 Inventory database script added missing fields. Product database script added JOIN with the prod_recipes table.
Michiel Broek <mbroek@mbse.eu>
parents: 114
diff changeset
444 $brew .= '","secondary_temp":' . floatval($row['secondary_temp']);
ad31f4bd4036 Inventory database script added missing fields. Product database script added JOIN with the prod_recipes table.
Michiel Broek <mbroek@mbse.eu>
parents: 114
diff changeset
445 $brew .= ',"secondary_end_date":"' . $row['secondary_end_date'];
ad31f4bd4036 Inventory database script added missing fields. Product database script added JOIN with the prod_recipes table.
Michiel Broek <mbroek@mbse.eu>
parents: 114
diff changeset
446 $brew .= '","tertiary_temp":' . floatval($row['tertiary_temp']);
ad31f4bd4036 Inventory database script added missing fields. Product database script added JOIN with the prod_recipes table.
Michiel Broek <mbroek@mbse.eu>
parents: 114
diff changeset
447 $brew .= ',"package_date":"' . $row['package_date'];
ad31f4bd4036 Inventory database script added missing fields. Product database script added JOIN with the prod_recipes table.
Michiel Broek <mbroek@mbse.eu>
parents: 114
diff changeset
448 $brew .= '","bottle_amount":' . floatval($row['bottle_amount']);
ad31f4bd4036 Inventory database script added missing fields. Product database script added JOIN with the prod_recipes table.
Michiel Broek <mbroek@mbse.eu>
parents: 114
diff changeset
449 $brew .= ',"bottle_carbonation":' . floatval($row['bottle_carbonation']);
ad31f4bd4036 Inventory database script added missing fields. Product database script added JOIN with the prod_recipes table.
Michiel Broek <mbroek@mbse.eu>
parents: 114
diff changeset
450 $brew .= ',"bottle_priming_sugar":"' . str_replace($escapers, $replacements, $row['bottle_priming_sugar']);
ad31f4bd4036 Inventory database script added missing fields. Product database script added JOIN with the prod_recipes table.
Michiel Broek <mbroek@mbse.eu>
parents: 114
diff changeset
451 $brew .= '","bottle_priming_amount":' . floatval($row['bottle_priming_amount']);
ad31f4bd4036 Inventory database script added missing fields. Product database script added JOIN with the prod_recipes table.
Michiel Broek <mbroek@mbse.eu>
parents: 114
diff changeset
452 $brew .= ',"bottle_carbonation_temp":' . floatval($row['bottle_carbonation_temp']);
ad31f4bd4036 Inventory database script added missing fields. Product database script added JOIN with the prod_recipes table.
Michiel Broek <mbroek@mbse.eu>
parents: 114
diff changeset
453 $brew .= ',"keg_amount":' . floatval($row['keg_amount']);
ad31f4bd4036 Inventory database script added missing fields. Product database script added JOIN with the prod_recipes table.
Michiel Broek <mbroek@mbse.eu>
parents: 114
diff changeset
454 $brew .= ',"keg_carbonation":' . floatval($row['keg_carbonation']);
ad31f4bd4036 Inventory database script added missing fields. Product database script added JOIN with the prod_recipes table.
Michiel Broek <mbroek@mbse.eu>
parents: 114
diff changeset
455 $brew .= ',"keg_priming_sugar":"' . str_replace($escapers, $replacements, $row['keg_priming_sugar']);
ad31f4bd4036 Inventory database script added missing fields. Product database script added JOIN with the prod_recipes table.
Michiel Broek <mbroek@mbse.eu>
parents: 114
diff changeset
456 $brew .= '","keg_priming_amount":' . floatval($row['keg_priming_amount']);
ad31f4bd4036 Inventory database script added missing fields. Product database script added JOIN with the prod_recipes table.
Michiel Broek <mbroek@mbse.eu>
parents: 114
diff changeset
457 $brew .= ',"keg_carbonation_temp":' . floatval($row['keg_carbonation_temp']);
ad31f4bd4036 Inventory database script added missing fields. Product database script added JOIN with the prod_recipes table.
Michiel Broek <mbroek@mbse.eu>
parents: 114
diff changeset
458 $brew .= ',"keg_forced_carb":' . floatval($row['keg_forced_carb']);
ad31f4bd4036 Inventory database script added missing fields. Product database script added JOIN with the prod_recipes table.
Michiel Broek <mbroek@mbse.eu>
parents: 114
diff changeset
459 $brew .= ',"keg_pressure":' . floatval($row['keg_pressure']);
ad31f4bd4036 Inventory database script added missing fields. Product database script added JOIN with the prod_recipes table.
Michiel Broek <mbroek@mbse.eu>
parents: 114
diff changeset
460 $brew .= ',"taste_notes":"' . str_replace($escapers, $replacements, $row['taste_notes']);
ad31f4bd4036 Inventory database script added missing fields. Product database script added JOIN with the prod_recipes table.
Michiel Broek <mbroek@mbse.eu>
parents: 114
diff changeset
461 $brew .= '","taste_rate":' . floatval($row['taste_rate']);
ad31f4bd4036 Inventory database script added missing fields. Product database script added JOIN with the prod_recipes table.
Michiel Broek <mbroek@mbse.eu>
parents: 114
diff changeset
462 $brew .= ',"taste_date":"' . str_replace($escapers, $replacements, $row['taste_date']);
ad31f4bd4036 Inventory database script added missing fields. Product database script added JOIN with the prod_recipes table.
Michiel Broek <mbroek@mbse.eu>
parents: 114
diff changeset
463 $brew .= '","taste_color":"' . str_replace($escapers, $replacements, $row['taste_color']);
ad31f4bd4036 Inventory database script added missing fields. Product database script added JOIN with the prod_recipes table.
Michiel Broek <mbroek@mbse.eu>
parents: 114
diff changeset
464 $brew .= '","taste_transparency":"' . str_replace($escapers, $replacements, $row['taste_transparency']);
ad31f4bd4036 Inventory database script added missing fields. Product database script added JOIN with the prod_recipes table.
Michiel Broek <mbroek@mbse.eu>
parents: 114
diff changeset
465 $brew .= '","taste_head":"' . str_replace($escapers, $replacements, $row['taste_head']);
ad31f4bd4036 Inventory database script added missing fields. Product database script added JOIN with the prod_recipes table.
Michiel Broek <mbroek@mbse.eu>
parents: 114
diff changeset
466 $brew .= '","taste_aroma":"' . str_replace($escapers, $replacements, $row['taste_aroma']);
ad31f4bd4036 Inventory database script added missing fields. Product database script added JOIN with the prod_recipes table.
Michiel Broek <mbroek@mbse.eu>
parents: 114
diff changeset
467 $brew .= '","taste_taste":"' . str_replace($escapers, $replacements, $row['taste_taste']);
ad31f4bd4036 Inventory database script added missing fields. Product database script added JOIN with the prod_recipes table.
Michiel Broek <mbroek@mbse.eu>
parents: 114
diff changeset
468 $brew .= '","taste_mouthfeel":"' . str_replace($escapers, $replacements, $row['taste_mouthfeel']);
ad31f4bd4036 Inventory database script added missing fields. Product database script added JOIN with the prod_recipes table.
Michiel Broek <mbroek@mbse.eu>
parents: 114
diff changeset
469 $brew .= '","taste_aftertaste":"' . str_replace($escapers, $replacements, $row['taste_aftertaste']);
ad31f4bd4036 Inventory database script added missing fields. Product database script added JOIN with the prod_recipes table.
Michiel Broek <mbroek@mbse.eu>
parents: 114
diff changeset
470 $brew .= '","st_guide":"' . str_replace($escapers, $replacements, $row['st_guide']);
ad31f4bd4036 Inventory database script added missing fields. Product database script added JOIN with the prod_recipes table.
Michiel Broek <mbroek@mbse.eu>
parents: 114
diff changeset
471 $brew .= '","st_letter":"' . str_replace($escapers, $replacements, $row['st_letter']);
ad31f4bd4036 Inventory database script added missing fields. Product database script added JOIN with the prod_recipes table.
Michiel Broek <mbroek@mbse.eu>
parents: 114
diff changeset
472 $brew .= '","st_name":"' . str_replace($escapers, $replacements, $row['st_name']);
ad31f4bd4036 Inventory database script added missing fields. Product database script added JOIN with the prod_recipes table.
Michiel Broek <mbroek@mbse.eu>
parents: 114
diff changeset
473 $brew .= '","st_type":"' . str_replace($escapers, $replacements, $row['st_type']);
ad31f4bd4036 Inventory database script added missing fields. Product database script added JOIN with the prod_recipes table.
Michiel Broek <mbroek@mbse.eu>
parents: 114
diff changeset
474 $brew .= '","st_category":"' . str_replace($escapers, $replacements, $row['st_category']);
ad31f4bd4036 Inventory database script added missing fields. Product database script added JOIN with the prod_recipes table.
Michiel Broek <mbroek@mbse.eu>
parents: 114
diff changeset
475 $brew .= '","st_category_number":' . floatval($row['st_category_number']);
ad31f4bd4036 Inventory database script added missing fields. Product database script added JOIN with the prod_recipes table.
Michiel Broek <mbroek@mbse.eu>
parents: 114
diff changeset
476 $brew .= ',"st_og_min":' . floatval($row['st_og_min']);
ad31f4bd4036 Inventory database script added missing fields. Product database script added JOIN with the prod_recipes table.
Michiel Broek <mbroek@mbse.eu>
parents: 114
diff changeset
477 $brew .= ',"st_og_max":' . floatval($row['st_og_max']);
ad31f4bd4036 Inventory database script added missing fields. Product database script added JOIN with the prod_recipes table.
Michiel Broek <mbroek@mbse.eu>
parents: 114
diff changeset
478 $brew .= ',"st_fg_min":' . floatval($row['st_fg_min']);
ad31f4bd4036 Inventory database script added missing fields. Product database script added JOIN with the prod_recipes table.
Michiel Broek <mbroek@mbse.eu>
parents: 114
diff changeset
479 $brew .= ',"st_fg_max":' . floatval($row['st_fg_max']);
ad31f4bd4036 Inventory database script added missing fields. Product database script added JOIN with the prod_recipes table.
Michiel Broek <mbroek@mbse.eu>
parents: 114
diff changeset
480 $brew .= ',"st_ibu_min":' . floatval($row['st_ibu_min']);
ad31f4bd4036 Inventory database script added missing fields. Product database script added JOIN with the prod_recipes table.
Michiel Broek <mbroek@mbse.eu>
parents: 114
diff changeset
481 $brew .= ',"st_ibu_max":' . floatval($row['st_ibu_max']);
ad31f4bd4036 Inventory database script added missing fields. Product database script added JOIN with the prod_recipes table.
Michiel Broek <mbroek@mbse.eu>
parents: 114
diff changeset
482 $brew .= ',"st_color_min":' . floatval($row['st_color_min']);
ad31f4bd4036 Inventory database script added missing fields. Product database script added JOIN with the prod_recipes table.
Michiel Broek <mbroek@mbse.eu>
parents: 114
diff changeset
483 $brew .= ',"st_color_max":' . floatval($row['st_color_max']);
ad31f4bd4036 Inventory database script added missing fields. Product database script added JOIN with the prod_recipes table.
Michiel Broek <mbroek@mbse.eu>
parents: 114
diff changeset
484 $brew .= ',"st_carb_min":' . floatval($row['st_carb_min']);
ad31f4bd4036 Inventory database script added missing fields. Product database script added JOIN with the prod_recipes table.
Michiel Broek <mbroek@mbse.eu>
parents: 114
diff changeset
485 $brew .= ',"st_carb_max":' . floatval($row['st_carb_max']);
ad31f4bd4036 Inventory database script added missing fields. Product database script added JOIN with the prod_recipes table.
Michiel Broek <mbroek@mbse.eu>
parents: 114
diff changeset
486 $brew .= ',"st_abv_min":' . floatval($row['st_abv_min']);
ad31f4bd4036 Inventory database script added missing fields. Product database script added JOIN with the prod_recipes table.
Michiel Broek <mbroek@mbse.eu>
parents: 114
diff changeset
487 $brew .= ',"st_abv_max":' . floatval($row['st_abv_max']);
151
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
488 $brew .= ',"type":"' . $row['type'];
115
ad31f4bd4036 Inventory database script added missing fields. Product database script added JOIN with the prod_recipes table.
Michiel Broek <mbroek@mbse.eu>
parents: 114
diff changeset
489 $brew .= '","batch_size":' . floatval($row['batch_size']);
ad31f4bd4036 Inventory database script added missing fields. Product database script added JOIN with the prod_recipes table.
Michiel Broek <mbroek@mbse.eu>
parents: 114
diff changeset
490 $brew .= ',"boil_size":' . floatval($row['boil_size']);
ad31f4bd4036 Inventory database script added missing fields. Product database script added JOIN with the prod_recipes table.
Michiel Broek <mbroek@mbse.eu>
parents: 114
diff changeset
491 $brew .= ',"boil_time":' . floatval($row['boil_time']);
ad31f4bd4036 Inventory database script added missing fields. Product database script added JOIN with the prod_recipes table.
Michiel Broek <mbroek@mbse.eu>
parents: 114
diff changeset
492 $brew .= ',"efficiency":' . floatval($row['efficiency']);
ad31f4bd4036 Inventory database script added missing fields. Product database script added JOIN with the prod_recipes table.
Michiel Broek <mbroek@mbse.eu>
parents: 114
diff changeset
493 $brew .= ',"est_og":' . floatval($row['est_og']);
ad31f4bd4036 Inventory database script added missing fields. Product database script added JOIN with the prod_recipes table.
Michiel Broek <mbroek@mbse.eu>
parents: 114
diff changeset
494 $brew .= ',"est_fg":' . floatval($row['est_fg']);
ad31f4bd4036 Inventory database script added missing fields. Product database script added JOIN with the prod_recipes table.
Michiel Broek <mbroek@mbse.eu>
parents: 114
diff changeset
495 $brew .= ',"est_abv":' . floatval($row['est_abv']);
ad31f4bd4036 Inventory database script added missing fields. Product database script added JOIN with the prod_recipes table.
Michiel Broek <mbroek@mbse.eu>
parents: 114
diff changeset
496 $brew .= ',"est_carb":' . floatval($row['est_carb']);
ad31f4bd4036 Inventory database script added missing fields. Product database script added JOIN with the prod_recipes table.
Michiel Broek <mbroek@mbse.eu>
parents: 114
diff changeset
497 $brew .= ',"est_color":' . floatval($row['est_color']);
ad31f4bd4036 Inventory database script added missing fields. Product database script added JOIN with the prod_recipes table.
Michiel Broek <mbroek@mbse.eu>
parents: 114
diff changeset
498 $brew .= ',"color_method":"' . $row['color_method'];
ad31f4bd4036 Inventory database script added missing fields. Product database script added JOIN with the prod_recipes table.
Michiel Broek <mbroek@mbse.eu>
parents: 114
diff changeset
499 $brew .= '","est_ibu":' . floatval($row['est_ibu']);
ad31f4bd4036 Inventory database script added missing fields. Product database script added JOIN with the prod_recipes table.
Michiel Broek <mbroek@mbse.eu>
parents: 114
diff changeset
500 $brew .= ',"ibu_method":"' . $row['ibu_method'];
149
ff45488d480e Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents: 121
diff changeset
501 $brew .= '","sparge_temp":' . floatval($row['sparge_temp']);
ff45488d480e Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents: 121
diff changeset
502 $brew .= ',"sparge_ph":' . floatval($row['sparge_ph']);
ff45488d480e Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents: 121
diff changeset
503 $brew .= ',"sparge_volume":' . floatval($row['sparge_volume']);
159
6428dae0605d Backport water treatment to the product editor (inluding the bugs).
Michiel Broek <mbroek@mbse.eu>
parents: 151
diff changeset
504 $brew .= ',"sparge_source":"' . $row['sparge_source'];
6428dae0605d Backport water treatment to the product editor (inluding the bugs).
Michiel Broek <mbroek@mbse.eu>
parents: 151
diff changeset
505 $brew .= '","sparge_acid_type":"' . $row['sparge_acid_type'];
149
ff45488d480e Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents: 121
diff changeset
506 $brew .= '","sparge_acid_perc":' . floatval($row['sparge_acid_perc']);
ff45488d480e Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents: 121
diff changeset
507 $brew .= ',"sparge_acid_amount":' . floatval($row['sparge_acid_amount']);
115
ad31f4bd4036 Inventory database script added missing fields. Product database script added JOIN with the prod_recipes table.
Michiel Broek <mbroek@mbse.eu>
parents: 114
diff changeset
508 $brew .= ',"mash_ph":' . $row['mash_ph'];
ad31f4bd4036 Inventory database script added missing fields. Product database script added JOIN with the prod_recipes table.
Michiel Broek <mbroek@mbse.eu>
parents: 114
diff changeset
509 $brew .= ',"mash_name":"' . $row['mash_name'];
149
ff45488d480e Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents: 121
diff changeset
510 $brew .= '","calc_acid":' . $row['calc_acid'];
ff45488d480e Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents: 121
diff changeset
511 $brew .= ',"w1_name":"' . str_replace($escapers, $replacements, $row['w1_name']);
ff45488d480e Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents: 121
diff changeset
512 $brew .= '","w1_amount":' . $row['w1_amount'];
ff45488d480e Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents: 121
diff changeset
513 $brew .= ',"w1_calcium":' . $row['w1_calcium'];
ff45488d480e Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents: 121
diff changeset
514 $brew .= ',"w1_sulfate":' . $row['w1_sulfate'];
ff45488d480e Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents: 121
diff changeset
515 $brew .= ',"w1_chloride":' . $row['w1_chloride'];
ff45488d480e Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents: 121
diff changeset
516 $brew .= ',"w1_sodium":' . $row['w1_sodium'];
ff45488d480e Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents: 121
diff changeset
517 $brew .= ',"w1_magnesium":' . $row['w1_magnesium'];
ff45488d480e Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents: 121
diff changeset
518 $brew .= ',"w1_total_alkalinity":' . $row['w1_total_alkalinity'];
ff45488d480e Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents: 121
diff changeset
519 $brew .= ',"w1_ph":' . $row['w1_ph'];
ff45488d480e Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents: 121
diff changeset
520 $brew .= ',"w1_cost":' . $row['w1_cost'];
ff45488d480e Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents: 121
diff changeset
521 $brew .= ',"w2_name":"' . str_replace($escapers, $replacements, $row['w2_name']);
ff45488d480e Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents: 121
diff changeset
522 $brew .= '","w2_amount":' . $row['w2_amount'];
ff45488d480e Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents: 121
diff changeset
523 $brew .= ',"w2_calcium":' . $row['w2_calcium'];
ff45488d480e Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents: 121
diff changeset
524 $brew .= ',"w2_sulfate":' . $row['w2_sulfate'];
ff45488d480e Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents: 121
diff changeset
525 $brew .= ',"w2_chloride":' . $row['w2_chloride'];
ff45488d480e Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents: 121
diff changeset
526 $brew .= ',"w2_sodium":' . $row['w2_sodium'];
ff45488d480e Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents: 121
diff changeset
527 $brew .= ',"w2_magnesium":' . $row['w2_magnesium'];
ff45488d480e Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents: 121
diff changeset
528 $brew .= ',"w2_total_alkalinity":' . $row['w2_total_alkalinity'];
ff45488d480e Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents: 121
diff changeset
529 $brew .= ',"w2_ph":' . $row['w2_ph'];
ff45488d480e Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents: 121
diff changeset
530 $brew .= ',"w2_cost":' . $row['w2_cost'];
ff45488d480e Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents: 121
diff changeset
531 $brew .= ',"fermentables":' . $row['json_fermentables'];
115
ad31f4bd4036 Inventory database script added missing fields. Product database script added JOIN with the prod_recipes table.
Michiel Broek <mbroek@mbse.eu>
parents: 114
diff changeset
532 $brew .= ',"hops":' . $row['json_hops'];
ad31f4bd4036 Inventory database script added missing fields. Product database script added JOIN with the prod_recipes table.
Michiel Broek <mbroek@mbse.eu>
parents: 114
diff changeset
533 $brew .= ',"miscs":' . $row['json_miscs'];
ad31f4bd4036 Inventory database script added missing fields. Product database script added JOIN with the prod_recipes table.
Michiel Broek <mbroek@mbse.eu>
parents: 114
diff changeset
534 $brew .= ',"yeasts":' . $row['json_yeasts'];
ad31f4bd4036 Inventory database script added missing fields. Product database script added JOIN with the prod_recipes table.
Michiel Broek <mbroek@mbse.eu>
parents: 114
diff changeset
535 $brew .= ',"mashs":' . $row['json_mashs'];
ad31f4bd4036 Inventory database script added missing fields. Product database script added JOIN with the prod_recipes table.
Michiel Broek <mbroek@mbse.eu>
parents: 114
diff changeset
536 $brew .= '}';
151
2c9cfe2f0860 Merged prod_main and prod_recipe database tables into products. Added recipe tabs in the products editor.
Michiel Broek <mbroek@mbse.eu>
parents: 149
diff changeset
537 // syslog(LOG_NOTICE, $brew);
115
ad31f4bd4036 Inventory database script added missing fields. Product database script added JOIN with the prod_recipes table.
Michiel Broek <mbroek@mbse.eu>
parents: 114
diff changeset
538 $brews .= $brew;
111
8c4ba91adf58 Basic screens for brew products.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
539 }
115
ad31f4bd4036 Inventory database script added missing fields. Product database script added JOIN with the prod_recipes table.
Michiel Broek <mbroek@mbse.eu>
parents: 114
diff changeset
540 $brews .= ']';
ad31f4bd4036 Inventory database script added missing fields. Product database script added JOIN with the prod_recipes table.
Michiel Broek <mbroek@mbse.eu>
parents: 114
diff changeset
541 header("Content-type: application/json");
ad31f4bd4036 Inventory database script added missing fields. Product database script added JOIN with the prod_recipes table.
Michiel Broek <mbroek@mbse.eu>
parents: 114
diff changeset
542 echo $brews;
111
8c4ba91adf58 Basic screens for brew products.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
543 }
8c4ba91adf58 Basic screens for brew products.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
544 ?>

Mercurial Repository: bms

mercurial