www/includes/db_recipes.php

Wed, 30 Jan 2019 18:58:47 +0100

author
Michiel Broek <mbroek@mbse.eu>
date
Wed, 30 Jan 2019 18:58:47 +0100
changeset 222
78946739b3a6
parent 221
a8aabb63fbcc
child 223
0de4455bd2a1
permissions
-rw-r--r--

All recipe data now has inventory information added.

49
4d27a7fb1265 Finisched recipe import. Added recipe retrieve script.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1 <?php
4d27a7fb1265 Finisched recipe import. Added recipe retrieve script.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
2
50
6d94167c2697 Next steps to implement a recipe editor
Michiel Broek <mbroek@mbse.eu>
parents: 49
diff changeset
3 require($_SERVER['DOCUMENT_ROOT']."/config.php");
6d94167c2697 Next steps to implement a recipe editor
Michiel Broek <mbroek@mbse.eu>
parents: 49
diff changeset
4 require($_SERVER['DOCUMENT_ROOT']."/version.php");
49
4d27a7fb1265 Finisched recipe import. Added recipe retrieve script.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
5
4d27a7fb1265 Finisched recipe import. Added recipe retrieve script.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
6 #Connect to the database
4d27a7fb1265 Finisched recipe import. Added recipe retrieve script.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
7 $connect = mysqli_connect(DBASE_HOST, DBASE_USER, DBASE_PASS, DBASE_NAME);
4d27a7fb1265 Finisched recipe import. Added recipe retrieve script.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
8 if (! $connect) {
4d27a7fb1265 Finisched recipe import. Added recipe retrieve script.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
9 die('Connect Error (' . mysqli_connect_errno() . ') ' . mysqli_connect_error());
4d27a7fb1265 Finisched recipe import. Added recipe retrieve script.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
10 }
77
a9f8de2d7b2b Fixed most charset problems. Added fpdf library. Added inventory pdf creation.
Michiel Broek <mbroek@mbse.eu>
parents: 72
diff changeset
11 mysqli_set_charset($connect, "utf8" );
49
4d27a7fb1265 Finisched recipe import. Added recipe retrieve script.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
12
50
6d94167c2697 Next steps to implement a recipe editor
Michiel Broek <mbroek@mbse.eu>
parents: 49
diff changeset
13 $escapers = array("\\", "/", "\"", "\n", "\r", "\t", "\x08", "\x0c");
6d94167c2697 Next steps to implement a recipe editor
Michiel Broek <mbroek@mbse.eu>
parents: 49
diff changeset
14 $replacements = array("\\\\", "\\/", "\\\"", "\\n", "\\r", "\\t", "\\f", "\\b");
61
3469979f83be Added inline yeast editor
Michiel Broek <mbroek@mbse.eu>
parents: 60
diff changeset
15 $rescapers = array("'");
3469979f83be Added inline yeast editor
Michiel Broek <mbroek@mbse.eu>
parents: 60
diff changeset
16 $rreplacements = array("\\'");
143
122f64716161 During recipes import of miscs ingredients, convert time in Secondary to days. The hop grid also display the country of origin. Misc ingredients now use a temporary weight table just like the hops.
Michiel Broek <mbroek@mbse.eu>
parents: 142
diff changeset
17 $disallowed = array('visibleindex','uniqueid','boundindex','uid','h_weight','m_weight');
50
6d94167c2697 Next steps to implement a recipe editor
Michiel Broek <mbroek@mbse.eu>
parents: 49
diff changeset
18
60
dbbe408108ea Added miscs inline editor. Switched to http POST because of GET limitations.
Michiel Broek <mbroek@mbse.eu>
parents: 57
diff changeset
19 if (isset($_POST['insert']) || isset($_POST['update'])) {
dbbe408108ea Added miscs inline editor. Switched to http POST because of GET limitations.
Michiel Broek <mbroek@mbse.eu>
parents: 57
diff changeset
20 if (isset($_POST['insert'])) {
52
b1f2a893572f More progress on the recipes design
Michiel Broek <mbroek@mbse.eu>
parents: 51
diff changeset
21 // INSERT COMMAND
60
dbbe408108ea Added miscs inline editor. Switched to http POST because of GET limitations.
Michiel Broek <mbroek@mbse.eu>
parents: 57
diff changeset
22 $sql = "INSERT INTO `recipes` SET ";
dbbe408108ea Added miscs inline editor. Switched to http POST because of GET limitations.
Michiel Broek <mbroek@mbse.eu>
parents: 57
diff changeset
23 }
dbbe408108ea Added miscs inline editor. Switched to http POST because of GET limitations.
Michiel Broek <mbroek@mbse.eu>
parents: 57
diff changeset
24 if (isset($_POST['update'])) {
dbbe408108ea Added miscs inline editor. Switched to http POST because of GET limitations.
Michiel Broek <mbroek@mbse.eu>
parents: 57
diff changeset
25 // UPDATE COMMAND
dbbe408108ea Added miscs inline editor. Switched to http POST because of GET limitations.
Michiel Broek <mbroek@mbse.eu>
parents: 57
diff changeset
26 $sql = "UPDATE `recipes` SET ";
52
b1f2a893572f More progress on the recipes design
Michiel Broek <mbroek@mbse.eu>
parents: 51
diff changeset
27 }
60
dbbe408108ea Added miscs inline editor. Switched to http POST because of GET limitations.
Michiel Broek <mbroek@mbse.eu>
parents: 57
diff changeset
28 // Basic settings
166
635033a29c48 Fixed new recipes uuid generation and saving missing new fields.
Michiel Broek <mbroek@mbse.eu>
parents: 156
diff changeset
29 if (isset($_POST['uuid'])) {
635033a29c48 Fixed new recipes uuid generation and saving missing new fields.
Michiel Broek <mbroek@mbse.eu>
parents: 156
diff changeset
30 $sql .= "uuid='" . $_POST['uuid'];
635033a29c48 Fixed new recipes uuid generation and saving missing new fields.
Michiel Broek <mbroek@mbse.eu>
parents: 156
diff changeset
31 } else {
635033a29c48 Fixed new recipes uuid generation and saving missing new fields.
Michiel Broek <mbroek@mbse.eu>
parents: 156
diff changeset
32 $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: 156
diff changeset
33 $sql .= "uuid='" . $uuid;
635033a29c48 Fixed new recipes uuid generation and saving missing new fields.
Michiel Broek <mbroek@mbse.eu>
parents: 156
diff changeset
34 }
168
ce92dc75cb09 Added locked setting to the recipes. Is not working well when a recipe is loaded and locked. Added uuid load and save for recipes. Mad a lot of variables local in functions. The subgrids are loaded async.
Michiel Broek <mbroek@mbse.eu>
parents: 166
diff changeset
35 ($_POST['locked'] == 'true') ? $sql .= "', locked='1" : $sql .= "', locked='0";
166
635033a29c48 Fixed new recipes uuid generation and saving missing new fields.
Michiel Broek <mbroek@mbse.eu>
parents: 156
diff changeset
36 $sql .= "', st_name='" . mysqli_real_escape_string($connect, $_POST['st_name']);
60
dbbe408108ea Added miscs inline editor. Switched to http POST because of GET limitations.
Michiel Broek <mbroek@mbse.eu>
parents: 57
diff changeset
37 $sql .= "', st_letter='" . mysqli_real_escape_string($connect, $_POST['st_letter']);
dbbe408108ea Added miscs inline editor. Switched to http POST because of GET limitations.
Michiel Broek <mbroek@mbse.eu>
parents: 57
diff changeset
38 $sql .= "', st_guide='" . mysqli_real_escape_string($connect, $_POST['st_guide']);
220
14e349ff2a10 Recipes import uses indexes instead of strings. Started rebuilding the recipes editor using indexes and standard formats. Rebuild the fermentable editor from grid editing to popup editing. Most calculations are using indexes for dropdown values.
Michiel Broek <mbroek@mbse.eu>
parents: 168
diff changeset
39 $sql .= "', st_type='" . $_POST['st_type'];
80
75b9227fb98c Added beginning of recipe print.
Michiel Broek <mbroek@mbse.eu>
parents: 77
diff changeset
40 $sql .= "', st_category='" . mysqli_real_escape_string($connect, $_POST['st_category']);
72
93a0be4f5be3 Added category and type to the recipe style. Added tooltips in the edit screen. Added Alcohol and Carbonation to the recipe style. Redesigned the main edit window and added the style limits.
Michiel Broek <mbroek@mbse.eu>
parents: 71
diff changeset
41 $sql .= "', st_category_number='" . $_POST['st_category_number'];
60
dbbe408108ea Added miscs inline editor. Switched to http POST because of GET limitations.
Michiel Broek <mbroek@mbse.eu>
parents: 57
diff changeset
42 $sql .= "', st_og_min='" . $_POST['st_og_min'];
dbbe408108ea Added miscs inline editor. Switched to http POST because of GET limitations.
Michiel Broek <mbroek@mbse.eu>
parents: 57
diff changeset
43 $sql .= "', st_og_max='" . $_POST['st_og_max'];
dbbe408108ea Added miscs inline editor. Switched to http POST because of GET limitations.
Michiel Broek <mbroek@mbse.eu>
parents: 57
diff changeset
44 $sql .= "', st_fg_min='" . $_POST['st_fg_min'];
dbbe408108ea Added miscs inline editor. Switched to http POST because of GET limitations.
Michiel Broek <mbroek@mbse.eu>
parents: 57
diff changeset
45 $sql .= "', st_fg_max='" . $_POST['st_fg_max'];
dbbe408108ea Added miscs inline editor. Switched to http POST because of GET limitations.
Michiel Broek <mbroek@mbse.eu>
parents: 57
diff changeset
46 $sql .= "', st_ibu_min='" . $_POST['st_ibu_min'];
dbbe408108ea Added miscs inline editor. Switched to http POST because of GET limitations.
Michiel Broek <mbroek@mbse.eu>
parents: 57
diff changeset
47 $sql .= "', st_ibu_max='" . $_POST['st_ibu_max'];
dbbe408108ea Added miscs inline editor. Switched to http POST because of GET limitations.
Michiel Broek <mbroek@mbse.eu>
parents: 57
diff changeset
48 $sql .= "', st_color_min='" . $_POST['st_color_min'];
dbbe408108ea Added miscs inline editor. Switched to http POST because of GET limitations.
Michiel Broek <mbroek@mbse.eu>
parents: 57
diff changeset
49 $sql .= "', st_color_max='" . $_POST['st_color_max'];
dbbe408108ea Added miscs inline editor. Switched to http POST because of GET limitations.
Michiel Broek <mbroek@mbse.eu>
parents: 57
diff changeset
50 $sql .= "', st_carb_min='" . $_POST['st_carb_min'];
dbbe408108ea Added miscs inline editor. Switched to http POST because of GET limitations.
Michiel Broek <mbroek@mbse.eu>
parents: 57
diff changeset
51 $sql .= "', st_carb_max='" . $_POST['st_carb_max'];
dbbe408108ea Added miscs inline editor. Switched to http POST because of GET limitations.
Michiel Broek <mbroek@mbse.eu>
parents: 57
diff changeset
52 $sql .= "', st_abv_min='" . $_POST['st_abv_min'];
dbbe408108ea Added miscs inline editor. Switched to http POST because of GET limitations.
Michiel Broek <mbroek@mbse.eu>
parents: 57
diff changeset
53 $sql .= "', st_abv_max='" . $_POST['st_abv_max'];
dbbe408108ea Added miscs inline editor. Switched to http POST because of GET limitations.
Michiel Broek <mbroek@mbse.eu>
parents: 57
diff changeset
54 $sql .= "', name='" . mysqli_real_escape_string($connect, $_POST['name']);
dbbe408108ea Added miscs inline editor. Switched to http POST because of GET limitations.
Michiel Broek <mbroek@mbse.eu>
parents: 57
diff changeset
55 $sql .= "', notes='" . mysqli_real_escape_string($connect, $_POST['notes']);
dbbe408108ea Added miscs inline editor. Switched to http POST because of GET limitations.
Michiel Broek <mbroek@mbse.eu>
parents: 57
diff changeset
56 $sql .= "', type='" . $_POST['type'];
dbbe408108ea Added miscs inline editor. Switched to http POST because of GET limitations.
Michiel Broek <mbroek@mbse.eu>
parents: 57
diff changeset
57 $sql .= "', batch_size='" . $_POST['batch_size'];
94
295c3af2a421 Include boil_size field in the recipes table. Calculate pre-boil SG. Use that in the IBU calculation.
Michiel Broek <mbroek@mbse.eu>
parents: 80
diff changeset
58 $sql .= "', boil_size='" . $_POST['boil_size'];
60
dbbe408108ea Added miscs inline editor. Switched to http POST because of GET limitations.
Michiel Broek <mbroek@mbse.eu>
parents: 57
diff changeset
59 $sql .= "', boil_time='" . $_POST['boil_time'];
dbbe408108ea Added miscs inline editor. Switched to http POST because of GET limitations.
Michiel Broek <mbroek@mbse.eu>
parents: 57
diff changeset
60 $sql .= "', efficiency='" . $_POST['efficiency'];
dbbe408108ea Added miscs inline editor. Switched to http POST because of GET limitations.
Michiel Broek <mbroek@mbse.eu>
parents: 57
diff changeset
61 $sql .= "', est_og='" . $_POST['est_og'];
dbbe408108ea Added miscs inline editor. Switched to http POST because of GET limitations.
Michiel Broek <mbroek@mbse.eu>
parents: 57
diff changeset
62 $sql .= "', est_fg='" . $_POST['est_fg'];
72
93a0be4f5be3 Added category and type to the recipe style. Added tooltips in the edit screen. Added Alcohol and Carbonation to the recipe style. Redesigned the main edit window and added the style limits.
Michiel Broek <mbroek@mbse.eu>
parents: 71
diff changeset
63 $sql .= "', est_abv='" . $_POST['est_abv'];
93a0be4f5be3 Added category and type to the recipe style. Added tooltips in the edit screen. Added Alcohol and Carbonation to the recipe style. Redesigned the main edit window and added the style limits.
Michiel Broek <mbroek@mbse.eu>
parents: 71
diff changeset
64 $sql .= "', est_carb='" . $_POST['est_carb'];
60
dbbe408108ea Added miscs inline editor. Switched to http POST because of GET limitations.
Michiel Broek <mbroek@mbse.eu>
parents: 57
diff changeset
65 $sql .= "', est_color='" . $_POST['est_color'];
dbbe408108ea Added miscs inline editor. Switched to http POST because of GET limitations.
Michiel Broek <mbroek@mbse.eu>
parents: 57
diff changeset
66 $sql .= "', color_method='" . $_POST['color_method'];
dbbe408108ea Added miscs inline editor. Switched to http POST because of GET limitations.
Michiel Broek <mbroek@mbse.eu>
parents: 57
diff changeset
67 $sql .= "', est_ibu='" . $_POST['est_ibu'];
dbbe408108ea Added miscs inline editor. Switched to http POST because of GET limitations.
Michiel Broek <mbroek@mbse.eu>
parents: 57
diff changeset
68 $sql .= "', ibu_method='" . $_POST['ibu_method'];
147
e6e5d007eb54 Added several sparge_ fields in the recipes databases. Added basic water mix calculator. Added fields on the water tab for water calculations.
Michiel Broek <mbroek@mbse.eu>
parents: 143
diff changeset
69 $sql .= "', sparge_temp='" . $_POST['sparge_temp'];
e6e5d007eb54 Added several sparge_ fields in the recipes databases. Added basic water mix calculator. Added fields on the water tab for water calculations.
Michiel Broek <mbroek@mbse.eu>
parents: 143
diff changeset
70 $sql .= "', sparge_ph='" . $_POST['sparge_ph'];
e6e5d007eb54 Added several sparge_ fields in the recipes databases. Added basic water mix calculator. Added fields on the water tab for water calculations.
Michiel Broek <mbroek@mbse.eu>
parents: 143
diff changeset
71 $sql .= "', sparge_volume='" . $_POST['sparge_volume'];
156
35860890224c Added sparge water acid calculation. Added residual alkalinity calculation.
Michiel Broek <mbroek@mbse.eu>
parents: 154
diff changeset
72 $sql .= "', sparge_source='" . $_POST['sparge_source'];
35860890224c Added sparge water acid calculation. Added residual alkalinity calculation.
Michiel Broek <mbroek@mbse.eu>
parents: 154
diff changeset
73 $sql .= "', sparge_acid_type='" . $_POST['sparge_acid_type'];
35860890224c Added sparge water acid calculation. Added residual alkalinity calculation.
Michiel Broek <mbroek@mbse.eu>
parents: 154
diff changeset
74 $sql .= "', sparge_acid_perc='" . $_POST['sparge_acid_perc'];
35860890224c Added sparge water acid calculation. Added residual alkalinity calculation.
Michiel Broek <mbroek@mbse.eu>
parents: 154
diff changeset
75 $sql .= "', sparge_acid_amount='" . $_POST['sparge_acid_amount'];
60
dbbe408108ea Added miscs inline editor. Switched to http POST because of GET limitations.
Michiel Broek <mbroek@mbse.eu>
parents: 57
diff changeset
76 $sql .= "', mash_ph='" . $_POST['mash_ph'];
dbbe408108ea Added miscs inline editor. Switched to http POST because of GET limitations.
Michiel Broek <mbroek@mbse.eu>
parents: 57
diff changeset
77 $sql .= "', mash_name='" . $_POST['mash_name'];
156
35860890224c Added sparge water acid calculation. Added residual alkalinity calculation.
Michiel Broek <mbroek@mbse.eu>
parents: 154
diff changeset
78 ($_POST['calc_acid'] == 'true') ? $sql .= "', calc_acid='1" : $sql .= "', calc_acid='0";
148
c0f0bbfefd63 Source waters are fixed, removed grid editor. Redesigned the water screen. Made a simple visual if water treatments are out of range. Water mixer for standard and dillute water works. Swapped the mash and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents: 147
diff changeset
79 if (isset($_POST['w1_name'])) {
c0f0bbfefd63 Source waters are fixed, removed grid editor. Redesigned the water screen. Made a simple visual if water treatments are out of range. Water mixer for standard and dillute water works. Swapped the mash and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents: 147
diff changeset
80 $sql .= "', w1_name='" . mysqli_real_escape_string($connect, $_POST['w1_name']);
c0f0bbfefd63 Source waters are fixed, removed grid editor. Redesigned the water screen. Made a simple visual if water treatments are out of range. Water mixer for standard and dillute water works. Swapped the mash and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents: 147
diff changeset
81 $sql .= "', w1_amount='" . $_POST['w1_amount'];
c0f0bbfefd63 Source waters are fixed, removed grid editor. Redesigned the water screen. Made a simple visual if water treatments are out of range. Water mixer for standard and dillute water works. Swapped the mash and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents: 147
diff changeset
82 $sql .= "', w1_calcium='" . $_POST['w1_calcium'];
c0f0bbfefd63 Source waters are fixed, removed grid editor. Redesigned the water screen. Made a simple visual if water treatments are out of range. Water mixer for standard and dillute water works. Swapped the mash and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents: 147
diff changeset
83 $sql .= "', w1_sulfate='" . $_POST['w1_sulfate'];
c0f0bbfefd63 Source waters are fixed, removed grid editor. Redesigned the water screen. Made a simple visual if water treatments are out of range. Water mixer for standard and dillute water works. Swapped the mash and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents: 147
diff changeset
84 $sql .= "', w1_chloride='" . $_POST['w1_chloride'];
c0f0bbfefd63 Source waters are fixed, removed grid editor. Redesigned the water screen. Made a simple visual if water treatments are out of range. Water mixer for standard and dillute water works. Swapped the mash and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents: 147
diff changeset
85 $sql .= "', w1_sodium='" . $_POST['w1_sodium'];
c0f0bbfefd63 Source waters are fixed, removed grid editor. Redesigned the water screen. Made a simple visual if water treatments are out of range. Water mixer for standard and dillute water works. Swapped the mash and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents: 147
diff changeset
86 $sql .= "', w1_magnesium='" . $_POST['w1_magnesium'];
c0f0bbfefd63 Source waters are fixed, removed grid editor. Redesigned the water screen. Made a simple visual if water treatments are out of range. Water mixer for standard and dillute water works. Swapped the mash and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents: 147
diff changeset
87 $sql .= "', w1_total_alkalinity='" . $_POST['w1_total_alkalinity'];
c0f0bbfefd63 Source waters are fixed, removed grid editor. Redesigned the water screen. Made a simple visual if water treatments are out of range. Water mixer for standard and dillute water works. Swapped the mash and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents: 147
diff changeset
88 $sql .= "', w1_ph='" . $_POST['w1_ph'];
c0f0bbfefd63 Source waters are fixed, removed grid editor. Redesigned the water screen. Made a simple visual if water treatments are out of range. Water mixer for standard and dillute water works. Swapped the mash and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents: 147
diff changeset
89 $sql .= "', w1_cost='" . $_POST['w1_cost'];
c0f0bbfefd63 Source waters are fixed, removed grid editor. Redesigned the water screen. Made a simple visual if water treatments are out of range. Water mixer for standard and dillute water works. Swapped the mash and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents: 147
diff changeset
90 }
c0f0bbfefd63 Source waters are fixed, removed grid editor. Redesigned the water screen. Made a simple visual if water treatments are out of range. Water mixer for standard and dillute water works. Swapped the mash and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents: 147
diff changeset
91 if (isset($_POST['w2_name'])) {
c0f0bbfefd63 Source waters are fixed, removed grid editor. Redesigned the water screen. Made a simple visual if water treatments are out of range. Water mixer for standard and dillute water works. Swapped the mash and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents: 147
diff changeset
92 $sql .= "', w2_name='" . mysqli_real_escape_string($connect, $_POST['w2_name']);
c0f0bbfefd63 Source waters are fixed, removed grid editor. Redesigned the water screen. Made a simple visual if water treatments are out of range. Water mixer for standard and dillute water works. Swapped the mash and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents: 147
diff changeset
93 $sql .= "', w2_amount='" . $_POST['w2_amount'];
c0f0bbfefd63 Source waters are fixed, removed grid editor. Redesigned the water screen. Made a simple visual if water treatments are out of range. Water mixer for standard and dillute water works. Swapped the mash and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents: 147
diff changeset
94 $sql .= "', w2_calcium='" . $_POST['w2_calcium'];
c0f0bbfefd63 Source waters are fixed, removed grid editor. Redesigned the water screen. Made a simple visual if water treatments are out of range. Water mixer for standard and dillute water works. Swapped the mash and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents: 147
diff changeset
95 $sql .= "', w2_sulfate='" . $_POST['w2_sulfate'];
c0f0bbfefd63 Source waters are fixed, removed grid editor. Redesigned the water screen. Made a simple visual if water treatments are out of range. Water mixer for standard and dillute water works. Swapped the mash and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents: 147
diff changeset
96 $sql .= "', w2_chloride='" . $_POST['w2_chloride'];
c0f0bbfefd63 Source waters are fixed, removed grid editor. Redesigned the water screen. Made a simple visual if water treatments are out of range. Water mixer for standard and dillute water works. Swapped the mash and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents: 147
diff changeset
97 $sql .= "', w2_sodium='" . $_POST['w2_sodium'];
c0f0bbfefd63 Source waters are fixed, removed grid editor. Redesigned the water screen. Made a simple visual if water treatments are out of range. Water mixer for standard and dillute water works. Swapped the mash and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents: 147
diff changeset
98 $sql .= "', w2_magnesium='" . $_POST['w2_magnesium'];
c0f0bbfefd63 Source waters are fixed, removed grid editor. Redesigned the water screen. Made a simple visual if water treatments are out of range. Water mixer for standard and dillute water works. Swapped the mash and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents: 147
diff changeset
99 $sql .= "', w2_total_alkalinity='" . $_POST['w2_total_alkalinity'];
c0f0bbfefd63 Source waters are fixed, removed grid editor. Redesigned the water screen. Made a simple visual if water treatments are out of range. Water mixer for standard and dillute water works. Swapped the mash and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents: 147
diff changeset
100 $sql .= "', w2_ph='" . $_POST['w2_ph'];
c0f0bbfefd63 Source waters are fixed, removed grid editor. Redesigned the water screen. Made a simple visual if water treatments are out of range. Water mixer for standard and dillute water works. Swapped the mash and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents: 147
diff changeset
101 $sql .= "', w2_cost='" . $_POST['w2_cost'];
c0f0bbfefd63 Source waters are fixed, removed grid editor. Redesigned the water screen. Made a simple visual if water treatments are out of range. Water mixer for standard and dillute water works. Swapped the mash and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents: 147
diff changeset
102 }
220
14e349ff2a10 Recipes import uses indexes instead of strings. Started rebuilding the recipes editor using indexes and standard formats. Rebuild the fermentable editor from grid editing to popup editing. Most calculations are using indexes for dropdown values.
Michiel Broek <mbroek@mbse.eu>
parents: 168
diff changeset
103 $sql .= "', wa_acid_name='" . $_POST['wa_acid_name'];
14e349ff2a10 Recipes import uses indexes instead of strings. Started rebuilding the recipes editor using indexes and standard formats. Rebuild the fermentable editor from grid editing to popup editing. Most calculations are using indexes for dropdown values.
Michiel Broek <mbroek@mbse.eu>
parents: 168
diff changeset
104 $sql .= "', wa_acid_perc='" . $_POST['wa_acid_perc'];
14e349ff2a10 Recipes import uses indexes instead of strings. Started rebuilding the recipes editor using indexes and standard formats. Rebuild the fermentable editor from grid editing to popup editing. Most calculations are using indexes for dropdown values.
Michiel Broek <mbroek@mbse.eu>
parents: 168
diff changeset
105 $sql .= "', wa_base_name='" . $_POST['wa_base_name'];
60
dbbe408108ea Added miscs inline editor. Switched to http POST because of GET limitations.
Michiel Broek <mbroek@mbse.eu>
parents: 57
diff changeset
106 syslog(LOG_NOTICE, $sql);
dbbe408108ea Added miscs inline editor. Switched to http POST because of GET limitations.
Michiel Broek <mbroek@mbse.eu>
parents: 57
diff changeset
107
220
14e349ff2a10 Recipes import uses indexes instead of strings. Started rebuilding the recipes editor using indexes and standard formats. Rebuild the fermentable editor from grid editing to popup editing. Most calculations are using indexes for dropdown values.
Michiel Broek <mbroek@mbse.eu>
parents: 168
diff changeset
108 $fermentables = '[';
14e349ff2a10 Recipes import uses indexes instead of strings. Started rebuilding the recipes editor using indexes and standard formats. Rebuild the fermentable editor from grid editing to popup editing. Most calculations are using indexes for dropdown values.
Michiel Broek <mbroek@mbse.eu>
parents: 168
diff changeset
109 $comma = FALSE;
60
dbbe408108ea Added miscs inline editor. Switched to http POST because of GET limitations.
Michiel Broek <mbroek@mbse.eu>
parents: 57
diff changeset
110 if (isset($_POST['fermentables'])) {
dbbe408108ea Added miscs inline editor. Switched to http POST because of GET limitations.
Michiel Broek <mbroek@mbse.eu>
parents: 57
diff changeset
111 $array = $_POST['fermentables'];
dbbe408108ea Added miscs inline editor. Switched to http POST because of GET limitations.
Michiel Broek <mbroek@mbse.eu>
parents: 57
diff changeset
112 foreach($array as $key => $item){
220
14e349ff2a10 Recipes import uses indexes instead of strings. Started rebuilding the recipes editor using indexes and standard formats. Rebuild the fermentable editor from grid editing to popup editing. Most calculations are using indexes for dropdown values.
Michiel Broek <mbroek@mbse.eu>
parents: 168
diff changeset
113 /*
14e349ff2a10 Recipes import uses indexes instead of strings. Started rebuilding the recipes editor using indexes and standard formats. Rebuild the fermentable editor from grid editing to popup editing. Most calculations are using indexes for dropdown values.
Michiel Broek <mbroek@mbse.eu>
parents: 168
diff changeset
114 * Manual encode to json.
14e349ff2a10 Recipes import uses indexes instead of strings. Started rebuilding the recipes editor using indexes and standard formats. Rebuild the fermentable editor from grid editing to popup editing. Most calculations are using indexes for dropdown values.
Michiel Broek <mbroek@mbse.eu>
parents: 168
diff changeset
115 */
14e349ff2a10 Recipes import uses indexes instead of strings. Started rebuilding the recipes editor using indexes and standard formats. Rebuild the fermentable editor from grid editing to popup editing. Most calculations are using indexes for dropdown values.
Michiel Broek <mbroek@mbse.eu>
parents: 168
diff changeset
116 if ($comma)
14e349ff2a10 Recipes import uses indexes instead of strings. Started rebuilding the recipes editor using indexes and standard formats. Rebuild the fermentable editor from grid editing to popup editing. Most calculations are using indexes for dropdown values.
Michiel Broek <mbroek@mbse.eu>
parents: 168
diff changeset
117 $fermentables .= ',';
14e349ff2a10 Recipes import uses indexes instead of strings. Started rebuilding the recipes editor using indexes and standard formats. Rebuild the fermentable editor from grid editing to popup editing. Most calculations are using indexes for dropdown values.
Michiel Broek <mbroek@mbse.eu>
parents: 168
diff changeset
118 $comma = TRUE;
14e349ff2a10 Recipes import uses indexes instead of strings. Started rebuilding the recipes editor using indexes and standard formats. Rebuild the fermentable editor from grid editing to popup editing. Most calculations are using indexes for dropdown values.
Michiel Broek <mbroek@mbse.eu>
parents: 168
diff changeset
119 $fermentable = '{"f_name":"' . str_replace($rescapers,$rreplacements,$item['f_name']);
14e349ff2a10 Recipes import uses indexes instead of strings. Started rebuilding the recipes editor using indexes and standard formats. Rebuild the fermentable editor from grid editing to popup editing. Most calculations are using indexes for dropdown values.
Michiel Broek <mbroek@mbse.eu>
parents: 168
diff changeset
120 $fermentable .= '","f_origin":"' . str_replace($rescapers,$rreplacements,$item['f_origin']);
14e349ff2a10 Recipes import uses indexes instead of strings. Started rebuilding the recipes editor using indexes and standard formats. Rebuild the fermentable editor from grid editing to popup editing. Most calculations are using indexes for dropdown values.
Michiel Broek <mbroek@mbse.eu>
parents: 168
diff changeset
121 $fermentable .= '","f_supplier":"' . str_replace($rescapers,$rreplacements,$item['f_supplier']);
14e349ff2a10 Recipes import uses indexes instead of strings. Started rebuilding the recipes editor using indexes and standard formats. Rebuild the fermentable editor from grid editing to popup editing. Most calculations are using indexes for dropdown values.
Michiel Broek <mbroek@mbse.eu>
parents: 168
diff changeset
122 $fermentable .= '","f_amount":' . $item['f_amount'];
14e349ff2a10 Recipes import uses indexes instead of strings. Started rebuilding the recipes editor using indexes and standard formats. Rebuild the fermentable editor from grid editing to popup editing. Most calculations are using indexes for dropdown values.
Michiel Broek <mbroek@mbse.eu>
parents: 168
diff changeset
123 $fermentable .= ',"f_cost":' . $item['f_cost'];
14e349ff2a10 Recipes import uses indexes instead of strings. Started rebuilding the recipes editor using indexes and standard formats. Rebuild the fermentable editor from grid editing to popup editing. Most calculations are using indexes for dropdown values.
Michiel Broek <mbroek@mbse.eu>
parents: 168
diff changeset
124 $fermentable .= ',"f_type":' . $item['f_type'];
14e349ff2a10 Recipes import uses indexes instead of strings. Started rebuilding the recipes editor using indexes and standard formats. Rebuild the fermentable editor from grid editing to popup editing. Most calculations are using indexes for dropdown values.
Michiel Broek <mbroek@mbse.eu>
parents: 168
diff changeset
125 $fermentable .= ',"f_yield":' . $item['f_yield'];
14e349ff2a10 Recipes import uses indexes instead of strings. Started rebuilding the recipes editor using indexes and standard formats. Rebuild the fermentable editor from grid editing to popup editing. Most calculations are using indexes for dropdown values.
Michiel Broek <mbroek@mbse.eu>
parents: 168
diff changeset
126 $fermentable .= ',"f_color":' . $item['f_color'];
14e349ff2a10 Recipes import uses indexes instead of strings. Started rebuilding the recipes editor using indexes and standard formats. Rebuild the fermentable editor from grid editing to popup editing. Most calculations are using indexes for dropdown values.
Michiel Broek <mbroek@mbse.eu>
parents: 168
diff changeset
127 $fermentable .= ',"f_coarse_fine_diff":' . $item['f_coarse_fine_diff'];
14e349ff2a10 Recipes import uses indexes instead of strings. Started rebuilding the recipes editor using indexes and standard formats. Rebuild the fermentable editor from grid editing to popup editing. Most calculations are using indexes for dropdown values.
Michiel Broek <mbroek@mbse.eu>
parents: 168
diff changeset
128 $fermentable .= ',"f_moisture":' . $item['f_moisture'];
14e349ff2a10 Recipes import uses indexes instead of strings. Started rebuilding the recipes editor using indexes and standard formats. Rebuild the fermentable editor from grid editing to popup editing. Most calculations are using indexes for dropdown values.
Michiel Broek <mbroek@mbse.eu>
parents: 168
diff changeset
129 $fermentable .= ',"f_diastatic_power":' . $item['f_diastatic_power'];
14e349ff2a10 Recipes import uses indexes instead of strings. Started rebuilding the recipes editor using indexes and standard formats. Rebuild the fermentable editor from grid editing to popup editing. Most calculations are using indexes for dropdown values.
Michiel Broek <mbroek@mbse.eu>
parents: 168
diff changeset
130 $fermentable .= ',"f_protein":' . $item['f_protein'];
14e349ff2a10 Recipes import uses indexes instead of strings. Started rebuilding the recipes editor using indexes and standard formats. Rebuild the fermentable editor from grid editing to popup editing. Most calculations are using indexes for dropdown values.
Michiel Broek <mbroek@mbse.eu>
parents: 168
diff changeset
131 $fermentable .= ',"f_dissolved_protein":' . $item['f_dissolved_protein'];
14e349ff2a10 Recipes import uses indexes instead of strings. Started rebuilding the recipes editor using indexes and standard formats. Rebuild the fermentable editor from grid editing to popup editing. Most calculations are using indexes for dropdown values.
Michiel Broek <mbroek@mbse.eu>
parents: 168
diff changeset
132 $fermentable .= ',"f_max_in_batch":' . $item['f_max_in_batch'];
14e349ff2a10 Recipes import uses indexes instead of strings. Started rebuilding the recipes editor using indexes and standard formats. Rebuild the fermentable editor from grid editing to popup editing. Most calculations are using indexes for dropdown values.
Michiel Broek <mbroek@mbse.eu>
parents: 168
diff changeset
133 $fermentable .= ',"f_graintype":' . $item['f_graintype'];
14e349ff2a10 Recipes import uses indexes instead of strings. Started rebuilding the recipes editor using indexes and standard formats. Rebuild the fermentable editor from grid editing to popup editing. Most calculations are using indexes for dropdown values.
Michiel Broek <mbroek@mbse.eu>
parents: 168
diff changeset
134 $fermentable .= ',"f_added":' . $item['f_added'];
14e349ff2a10 Recipes import uses indexes instead of strings. Started rebuilding the recipes editor using indexes and standard formats. Rebuild the fermentable editor from grid editing to popup editing. Most calculations are using indexes for dropdown values.
Michiel Broek <mbroek@mbse.eu>
parents: 168
diff changeset
135 $fermentable .= ',"f_recommend_mash":' . $item['f_recommend_mash'];
14e349ff2a10 Recipes import uses indexes instead of strings. Started rebuilding the recipes editor using indexes and standard formats. Rebuild the fermentable editor from grid editing to popup editing. Most calculations are using indexes for dropdown values.
Michiel Broek <mbroek@mbse.eu>
parents: 168
diff changeset
136 $fermentable .= ',"f_add_after_boil":' . $item['f_add_after_boil'];
14e349ff2a10 Recipes import uses indexes instead of strings. Started rebuilding the recipes editor using indexes and standard formats. Rebuild the fermentable editor from grid editing to popup editing. Most calculations are using indexes for dropdown values.
Michiel Broek <mbroek@mbse.eu>
parents: 168
diff changeset
137 $fermentable .= ',"f_adjust_to_total_100":' . $item['f_adjust_to_total_100'];
14e349ff2a10 Recipes import uses indexes instead of strings. Started rebuilding the recipes editor using indexes and standard formats. Rebuild the fermentable editor from grid editing to popup editing. Most calculations are using indexes for dropdown values.
Michiel Broek <mbroek@mbse.eu>
parents: 168
diff changeset
138 $fermentable .= ',"f_percentage":' . $item['f_percentage'];
14e349ff2a10 Recipes import uses indexes instead of strings. Started rebuilding the recipes editor using indexes and standard formats. Rebuild the fermentable editor from grid editing to popup editing. Most calculations are using indexes for dropdown values.
Michiel Broek <mbroek@mbse.eu>
parents: 168
diff changeset
139 $fermentable .= ',"f_di_ph":' . $item['f_di_ph'];
14e349ff2a10 Recipes import uses indexes instead of strings. Started rebuilding the recipes editor using indexes and standard formats. Rebuild the fermentable editor from grid editing to popup editing. Most calculations are using indexes for dropdown values.
Michiel Broek <mbroek@mbse.eu>
parents: 168
diff changeset
140 $fermentable .= ',"f_acid_to_ph_57":' . $item['f_acid_to_ph_57'] . '}';
14e349ff2a10 Recipes import uses indexes instead of strings. Started rebuilding the recipes editor using indexes and standard formats. Rebuild the fermentable editor from grid editing to popup editing. Most calculations are using indexes for dropdown values.
Michiel Broek <mbroek@mbse.eu>
parents: 168
diff changeset
141 syslog(LOG_NOTICE, $fermentable);
14e349ff2a10 Recipes import uses indexes instead of strings. Started rebuilding the recipes editor using indexes and standard formats. Rebuild the fermentable editor from grid editing to popup editing. Most calculations are using indexes for dropdown values.
Michiel Broek <mbroek@mbse.eu>
parents: 168
diff changeset
142 $fermentables .= $fermentable;
60
dbbe408108ea Added miscs inline editor. Switched to http POST because of GET limitations.
Michiel Broek <mbroek@mbse.eu>
parents: 57
diff changeset
143 }
52
b1f2a893572f More progress on the recipes design
Michiel Broek <mbroek@mbse.eu>
parents: 51
diff changeset
144 }
220
14e349ff2a10 Recipes import uses indexes instead of strings. Started rebuilding the recipes editor using indexes and standard formats. Rebuild the fermentable editor from grid editing to popup editing. Most calculations are using indexes for dropdown values.
Michiel Broek <mbroek@mbse.eu>
parents: 168
diff changeset
145 $fermentables .= ']';
14e349ff2a10 Recipes import uses indexes instead of strings. Started rebuilding the recipes editor using indexes and standard formats. Rebuild the fermentable editor from grid editing to popup editing. Most calculations are using indexes for dropdown values.
Michiel Broek <mbroek@mbse.eu>
parents: 168
diff changeset
146 $sql .= "', json_fermentables='" . $fermentables;
60
dbbe408108ea Added miscs inline editor. Switched to http POST because of GET limitations.
Michiel Broek <mbroek@mbse.eu>
parents: 57
diff changeset
147
220
14e349ff2a10 Recipes import uses indexes instead of strings. Started rebuilding the recipes editor using indexes and standard formats. Rebuild the fermentable editor from grid editing to popup editing. Most calculations are using indexes for dropdown values.
Michiel Broek <mbroek@mbse.eu>
parents: 168
diff changeset
148 $hops = '[';
14e349ff2a10 Recipes import uses indexes instead of strings. Started rebuilding the recipes editor using indexes and standard formats. Rebuild the fermentable editor from grid editing to popup editing. Most calculations are using indexes for dropdown values.
Michiel Broek <mbroek@mbse.eu>
parents: 168
diff changeset
149 $comma = FALSE;
60
dbbe408108ea Added miscs inline editor. Switched to http POST because of GET limitations.
Michiel Broek <mbroek@mbse.eu>
parents: 57
diff changeset
150 if (isset($_POST['hops'])) {
dbbe408108ea Added miscs inline editor. Switched to http POST because of GET limitations.
Michiel Broek <mbroek@mbse.eu>
parents: 57
diff changeset
151 $array = $_POST['hops'];
dbbe408108ea Added miscs inline editor. Switched to http POST because of GET limitations.
Michiel Broek <mbroek@mbse.eu>
parents: 57
diff changeset
152 foreach($array as $key => $item){
220
14e349ff2a10 Recipes import uses indexes instead of strings. Started rebuilding the recipes editor using indexes and standard formats. Rebuild the fermentable editor from grid editing to popup editing. Most calculations are using indexes for dropdown values.
Michiel Broek <mbroek@mbse.eu>
parents: 168
diff changeset
153 if ($comma)
14e349ff2a10 Recipes import uses indexes instead of strings. Started rebuilding the recipes editor using indexes and standard formats. Rebuild the fermentable editor from grid editing to popup editing. Most calculations are using indexes for dropdown values.
Michiel Broek <mbroek@mbse.eu>
parents: 168
diff changeset
154 $hops .= ',';
14e349ff2a10 Recipes import uses indexes instead of strings. Started rebuilding the recipes editor using indexes and standard formats. Rebuild the fermentable editor from grid editing to popup editing. Most calculations are using indexes for dropdown values.
Michiel Broek <mbroek@mbse.eu>
parents: 168
diff changeset
155 $comma = TRUE;
14e349ff2a10 Recipes import uses indexes instead of strings. Started rebuilding the recipes editor using indexes and standard formats. Rebuild the fermentable editor from grid editing to popup editing. Most calculations are using indexes for dropdown values.
Michiel Broek <mbroek@mbse.eu>
parents: 168
diff changeset
156 $hop = '{"h_name":"' . str_replace($rescapers,$rreplacements,$item['h_name']);
14e349ff2a10 Recipes import uses indexes instead of strings. Started rebuilding the recipes editor using indexes and standard formats. Rebuild the fermentable editor from grid editing to popup editing. Most calculations are using indexes for dropdown values.
Michiel Broek <mbroek@mbse.eu>
parents: 168
diff changeset
157 $hop .= '","h_origin":"' . str_replace($rescapers,$rreplacements,$item['h_origin']);
14e349ff2a10 Recipes import uses indexes instead of strings. Started rebuilding the recipes editor using indexes and standard formats. Rebuild the fermentable editor from grid editing to popup editing. Most calculations are using indexes for dropdown values.
Michiel Broek <mbroek@mbse.eu>
parents: 168
diff changeset
158 $hop .= '","h_amount":' . $item['h_amount'];
14e349ff2a10 Recipes import uses indexes instead of strings. Started rebuilding the recipes editor using indexes and standard formats. Rebuild the fermentable editor from grid editing to popup editing. Most calculations are using indexes for dropdown values.
Michiel Broek <mbroek@mbse.eu>
parents: 168
diff changeset
159 $hop .= ',"h_cost":' . $item['h_cost'];
14e349ff2a10 Recipes import uses indexes instead of strings. Started rebuilding the recipes editor using indexes and standard formats. Rebuild the fermentable editor from grid editing to popup editing. Most calculations are using indexes for dropdown values.
Michiel Broek <mbroek@mbse.eu>
parents: 168
diff changeset
160 $hop .= ',"h_type":' . $item['h_type'];
14e349ff2a10 Recipes import uses indexes instead of strings. Started rebuilding the recipes editor using indexes and standard formats. Rebuild the fermentable editor from grid editing to popup editing. Most calculations are using indexes for dropdown values.
Michiel Broek <mbroek@mbse.eu>
parents: 168
diff changeset
161 $hop .= ',"h_form":' . $item['h_form'];
14e349ff2a10 Recipes import uses indexes instead of strings. Started rebuilding the recipes editor using indexes and standard formats. Rebuild the fermentable editor from grid editing to popup editing. Most calculations are using indexes for dropdown values.
Michiel Broek <mbroek@mbse.eu>
parents: 168
diff changeset
162 $hop .= ',"h_useat":' . $item['h_useat'];
14e349ff2a10 Recipes import uses indexes instead of strings. Started rebuilding the recipes editor using indexes and standard formats. Rebuild the fermentable editor from grid editing to popup editing. Most calculations are using indexes for dropdown values.
Michiel Broek <mbroek@mbse.eu>
parents: 168
diff changeset
163 $hop .= ',"h_time":' . $item['h_time'];
14e349ff2a10 Recipes import uses indexes instead of strings. Started rebuilding the recipes editor using indexes and standard formats. Rebuild the fermentable editor from grid editing to popup editing. Most calculations are using indexes for dropdown values.
Michiel Broek <mbroek@mbse.eu>
parents: 168
diff changeset
164 $hop .= ',"h_alpha":' . $item['h_alpha'];
14e349ff2a10 Recipes import uses indexes instead of strings. Started rebuilding the recipes editor using indexes and standard formats. Rebuild the fermentable editor from grid editing to popup editing. Most calculations are using indexes for dropdown values.
Michiel Broek <mbroek@mbse.eu>
parents: 168
diff changeset
165 $hop .= ',"h_beta":' . $item['h_beta'];
14e349ff2a10 Recipes import uses indexes instead of strings. Started rebuilding the recipes editor using indexes and standard formats. Rebuild the fermentable editor from grid editing to popup editing. Most calculations are using indexes for dropdown values.
Michiel Broek <mbroek@mbse.eu>
parents: 168
diff changeset
166 $hop .= ',"h_hsi":' . $item['h_hsi'];
14e349ff2a10 Recipes import uses indexes instead of strings. Started rebuilding the recipes editor using indexes and standard formats. Rebuild the fermentable editor from grid editing to popup editing. Most calculations are using indexes for dropdown values.
Michiel Broek <mbroek@mbse.eu>
parents: 168
diff changeset
167 $hop .= ',"h_humulene":' . $item['h_humulene'];
14e349ff2a10 Recipes import uses indexes instead of strings. Started rebuilding the recipes editor using indexes and standard formats. Rebuild the fermentable editor from grid editing to popup editing. Most calculations are using indexes for dropdown values.
Michiel Broek <mbroek@mbse.eu>
parents: 168
diff changeset
168 $hop .= ',"h_carophyllene":' . $item['h_carophyllene'];
14e349ff2a10 Recipes import uses indexes instead of strings. Started rebuilding the recipes editor using indexes and standard formats. Rebuild the fermentable editor from grid editing to popup editing. Most calculations are using indexes for dropdown values.
Michiel Broek <mbroek@mbse.eu>
parents: 168
diff changeset
169 $hop .= ',"h_cohumulone":' . $item['h_cohumulone'];
14e349ff2a10 Recipes import uses indexes instead of strings. Started rebuilding the recipes editor using indexes and standard formats. Rebuild the fermentable editor from grid editing to popup editing. Most calculations are using indexes for dropdown values.
Michiel Broek <mbroek@mbse.eu>
parents: 168
diff changeset
170 $hop .= ',"h_myrcene":' . $item['h_myrcene'];
14e349ff2a10 Recipes import uses indexes instead of strings. Started rebuilding the recipes editor using indexes and standard formats. Rebuild the fermentable editor from grid editing to popup editing. Most calculations are using indexes for dropdown values.
Michiel Broek <mbroek@mbse.eu>
parents: 168
diff changeset
171 $hop .= ',"h_total_oil":' . $item['h_total_oil'];
14e349ff2a10 Recipes import uses indexes instead of strings. Started rebuilding the recipes editor using indexes and standard formats. Rebuild the fermentable editor from grid editing to popup editing. Most calculations are using indexes for dropdown values.
Michiel Broek <mbroek@mbse.eu>
parents: 168
diff changeset
172 $hop .= ',"h_weight":' . $item['h_weight'] . '}';
14e349ff2a10 Recipes import uses indexes instead of strings. Started rebuilding the recipes editor using indexes and standard formats. Rebuild the fermentable editor from grid editing to popup editing. Most calculations are using indexes for dropdown values.
Michiel Broek <mbroek@mbse.eu>
parents: 168
diff changeset
173 syslog(LOG_NOTICE, $hop);
14e349ff2a10 Recipes import uses indexes instead of strings. Started rebuilding the recipes editor using indexes and standard formats. Rebuild the fermentable editor from grid editing to popup editing. Most calculations are using indexes for dropdown values.
Michiel Broek <mbroek@mbse.eu>
parents: 168
diff changeset
174 $hops .= $hop;
60
dbbe408108ea Added miscs inline editor. Switched to http POST because of GET limitations.
Michiel Broek <mbroek@mbse.eu>
parents: 57
diff changeset
175 }
dbbe408108ea Added miscs inline editor. Switched to http POST because of GET limitations.
Michiel Broek <mbroek@mbse.eu>
parents: 57
diff changeset
176 }
220
14e349ff2a10 Recipes import uses indexes instead of strings. Started rebuilding the recipes editor using indexes and standard formats. Rebuild the fermentable editor from grid editing to popup editing. Most calculations are using indexes for dropdown values.
Michiel Broek <mbroek@mbse.eu>
parents: 168
diff changeset
177 $hops .= ']';
14e349ff2a10 Recipes import uses indexes instead of strings. Started rebuilding the recipes editor using indexes and standard formats. Rebuild the fermentable editor from grid editing to popup editing. Most calculations are using indexes for dropdown values.
Michiel Broek <mbroek@mbse.eu>
parents: 168
diff changeset
178 $sql .= "', json_hops='" . $hops;
60
dbbe408108ea Added miscs inline editor. Switched to http POST because of GET limitations.
Michiel Broek <mbroek@mbse.eu>
parents: 57
diff changeset
179
dbbe408108ea Added miscs inline editor. Switched to http POST because of GET limitations.
Michiel Broek <mbroek@mbse.eu>
parents: 57
diff changeset
180 if (isset($_POST['miscs'])) {
dbbe408108ea Added miscs inline editor. Switched to http POST because of GET limitations.
Michiel Broek <mbroek@mbse.eu>
parents: 57
diff changeset
181 $array = $_POST['miscs'];
dbbe408108ea Added miscs inline editor. Switched to http POST because of GET limitations.
Michiel Broek <mbroek@mbse.eu>
parents: 57
diff changeset
182 foreach($array as $key => $item){
dbbe408108ea Added miscs inline editor. Switched to http POST because of GET limitations.
Michiel Broek <mbroek@mbse.eu>
parents: 57
diff changeset
183 foreach ($disallowed as $disallowed_key) {
dbbe408108ea Added miscs inline editor. Switched to http POST because of GET limitations.
Michiel Broek <mbroek@mbse.eu>
parents: 57
diff changeset
184 unset($array[$key]["$disallowed_key"]);
dbbe408108ea Added miscs inline editor. Switched to http POST because of GET limitations.
Michiel Broek <mbroek@mbse.eu>
parents: 57
diff changeset
185 }
dbbe408108ea Added miscs inline editor. Switched to http POST because of GET limitations.
Michiel Broek <mbroek@mbse.eu>
parents: 57
diff changeset
186 }
61
3469979f83be Added inline yeast editor
Michiel Broek <mbroek@mbse.eu>
parents: 60
diff changeset
187 syslog(LOG_NOTICE, "json_miscs: ".str_replace($rescapers,$rreplacements,json_encode($array)));
3469979f83be Added inline yeast editor
Michiel Broek <mbroek@mbse.eu>
parents: 60
diff changeset
188 $sql .= "', json_miscs='" . str_replace($rescapers,$rreplacements,json_encode($array));
60
dbbe408108ea Added miscs inline editor. Switched to http POST because of GET limitations.
Michiel Broek <mbroek@mbse.eu>
parents: 57
diff changeset
189 }
52
b1f2a893572f More progress on the recipes design
Michiel Broek <mbroek@mbse.eu>
parents: 51
diff changeset
190
60
dbbe408108ea Added miscs inline editor. Switched to http POST because of GET limitations.
Michiel Broek <mbroek@mbse.eu>
parents: 57
diff changeset
191 if (isset($_POST['yeasts'])) {
dbbe408108ea Added miscs inline editor. Switched to http POST because of GET limitations.
Michiel Broek <mbroek@mbse.eu>
parents: 57
diff changeset
192 $array = $_POST['yeasts'];
dbbe408108ea Added miscs inline editor. Switched to http POST because of GET limitations.
Michiel Broek <mbroek@mbse.eu>
parents: 57
diff changeset
193 foreach($array as $key => $item){
dbbe408108ea Added miscs inline editor. Switched to http POST because of GET limitations.
Michiel Broek <mbroek@mbse.eu>
parents: 57
diff changeset
194 foreach ($disallowed as $disallowed_key) {
dbbe408108ea Added miscs inline editor. Switched to http POST because of GET limitations.
Michiel Broek <mbroek@mbse.eu>
parents: 57
diff changeset
195 unset($array[$key]["$disallowed_key"]);
dbbe408108ea Added miscs inline editor. Switched to http POST because of GET limitations.
Michiel Broek <mbroek@mbse.eu>
parents: 57
diff changeset
196 }
57
bb9a06aa9acd Completed framework inline fermentables editor
Michiel Broek <mbroek@mbse.eu>
parents: 52
diff changeset
197 }
61
3469979f83be Added inline yeast editor
Michiel Broek <mbroek@mbse.eu>
parents: 60
diff changeset
198 syslog(LOG_NOTICE, "json_yeasts: ". str_replace($rescapers,$rreplacements,json_encode($array)));
3469979f83be Added inline yeast editor
Michiel Broek <mbroek@mbse.eu>
parents: 60
diff changeset
199 $sql .= "', json_yeasts='" . str_replace($rescapers,$rreplacements,json_encode($array));
57
bb9a06aa9acd Completed framework inline fermentables editor
Michiel Broek <mbroek@mbse.eu>
parents: 52
diff changeset
200 }
bb9a06aa9acd Completed framework inline fermentables editor
Michiel Broek <mbroek@mbse.eu>
parents: 52
diff changeset
201
60
dbbe408108ea Added miscs inline editor. Switched to http POST because of GET limitations.
Michiel Broek <mbroek@mbse.eu>
parents: 57
diff changeset
202 if (isset($_POST['mashs'])) {
dbbe408108ea Added miscs inline editor. Switched to http POST because of GET limitations.
Michiel Broek <mbroek@mbse.eu>
parents: 57
diff changeset
203 $array = $_POST['mashs'];
dbbe408108ea Added miscs inline editor. Switched to http POST because of GET limitations.
Michiel Broek <mbroek@mbse.eu>
parents: 57
diff changeset
204 foreach($array as $key => $item){
dbbe408108ea Added miscs inline editor. Switched to http POST because of GET limitations.
Michiel Broek <mbroek@mbse.eu>
parents: 57
diff changeset
205 foreach ($disallowed as $disallowed_key) {
dbbe408108ea Added miscs inline editor. Switched to http POST because of GET limitations.
Michiel Broek <mbroek@mbse.eu>
parents: 57
diff changeset
206 unset($array[$key]["$disallowed_key"]);
dbbe408108ea Added miscs inline editor. Switched to http POST because of GET limitations.
Michiel Broek <mbroek@mbse.eu>
parents: 57
diff changeset
207 }
dbbe408108ea Added miscs inline editor. Switched to http POST because of GET limitations.
Michiel Broek <mbroek@mbse.eu>
parents: 57
diff changeset
208 }
61
3469979f83be Added inline yeast editor
Michiel Broek <mbroek@mbse.eu>
parents: 60
diff changeset
209 syslog(LOG_NOTICE, "json_mashs: ".str_replace($rescapers,$rreplacements,json_encode($array)));
3469979f83be Added inline yeast editor
Michiel Broek <mbroek@mbse.eu>
parents: 60
diff changeset
210 $sql .= "', json_mashs='" . str_replace($rescapers,$rreplacements,json_encode($array));
60
dbbe408108ea Added miscs inline editor. Switched to http POST because of GET limitations.
Michiel Broek <mbroek@mbse.eu>
parents: 57
diff changeset
211 }
dbbe408108ea Added miscs inline editor. Switched to http POST because of GET limitations.
Michiel Broek <mbroek@mbse.eu>
parents: 57
diff changeset
212
dbbe408108ea Added miscs inline editor. Switched to http POST because of GET limitations.
Michiel Broek <mbroek@mbse.eu>
parents: 57
diff changeset
213 if (isset($_POST['insert'])) {
52
b1f2a893572f More progress on the recipes design
Michiel Broek <mbroek@mbse.eu>
parents: 51
diff changeset
214 $sql .= "';";
b1f2a893572f More progress on the recipes design
Michiel Broek <mbroek@mbse.eu>
parents: 51
diff changeset
215 }
60
dbbe408108ea Added miscs inline editor. Switched to http POST because of GET limitations.
Michiel Broek <mbroek@mbse.eu>
parents: 57
diff changeset
216 if (isset($_POST['update'])) {
dbbe408108ea Added miscs inline editor. Switched to http POST because of GET limitations.
Michiel Broek <mbroek@mbse.eu>
parents: 57
diff changeset
217 $sql .= "' WHERE record='" . $_POST['record'] . "';";
52
b1f2a893572f More progress on the recipes design
Michiel Broek <mbroek@mbse.eu>
parents: 51
diff changeset
218 }
49
4d27a7fb1265 Finisched recipe import. Added recipe retrieve script.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
219
52
b1f2a893572f More progress on the recipes design
Michiel Broek <mbroek@mbse.eu>
parents: 51
diff changeset
220 $result = mysqli_query($connect, $sql);
b1f2a893572f More progress on the recipes design
Michiel Broek <mbroek@mbse.eu>
parents: 51
diff changeset
221 if (! $result) {
61
3469979f83be Added inline yeast editor
Michiel Broek <mbroek@mbse.eu>
parents: 60
diff changeset
222 syslog(LOG_NOTICE, "db_recipes: result: ".mysqli_error($connect));
52
b1f2a893572f More progress on the recipes design
Michiel Broek <mbroek@mbse.eu>
parents: 51
diff changeset
223 } else {
60
dbbe408108ea Added miscs inline editor. Switched to http POST because of GET limitations.
Michiel Broek <mbroek@mbse.eu>
parents: 57
diff changeset
224 if (isset($_POST['update'])) {
dbbe408108ea Added miscs inline editor. Switched to http POST because of GET limitations.
Michiel Broek <mbroek@mbse.eu>
parents: 57
diff changeset
225 syslog(LOG_NOTICE, "db_recipes: updated record ".$_POST['record']);
dbbe408108ea Added miscs inline editor. Switched to http POST because of GET limitations.
Michiel Broek <mbroek@mbse.eu>
parents: 57
diff changeset
226 } else {
72
93a0be4f5be3 Added category and type to the recipe style. Added tooltips in the edit screen. Added Alcohol and Carbonation to the recipe style. Redesigned the main edit window and added the style limits.
Michiel Broek <mbroek@mbse.eu>
parents: 71
diff changeset
227 $lastid = mysqli_insert_id($connect);
93a0be4f5be3 Added category and type to the recipe style. Added tooltips in the edit screen. Added Alcohol and Carbonation to the recipe style. Redesigned the main edit window and added the style limits.
Michiel Broek <mbroek@mbse.eu>
parents: 71
diff changeset
228 syslog(LOG_NOTICE, "db_recipes: inserted record ".$lastid);
60
dbbe408108ea Added miscs inline editor. Switched to http POST because of GET limitations.
Michiel Broek <mbroek@mbse.eu>
parents: 57
diff changeset
229 }
dbbe408108ea Added miscs inline editor. Switched to http POST because of GET limitations.
Michiel Broek <mbroek@mbse.eu>
parents: 57
diff changeset
230 }
dbbe408108ea Added miscs inline editor. Switched to http POST because of GET limitations.
Michiel Broek <mbroek@mbse.eu>
parents: 57
diff changeset
231 echo $result;
dbbe408108ea Added miscs inline editor. Switched to http POST because of GET limitations.
Michiel Broek <mbroek@mbse.eu>
parents: 57
diff changeset
232
dbbe408108ea Added miscs inline editor. Switched to http POST because of GET limitations.
Michiel Broek <mbroek@mbse.eu>
parents: 57
diff changeset
233 } else if (isset($_POST['delete'])) {
dbbe408108ea Added miscs inline editor. Switched to http POST because of GET limitations.
Michiel Broek <mbroek@mbse.eu>
parents: 57
diff changeset
234 // DELETE COMMAND
dbbe408108ea Added miscs inline editor. Switched to http POST because of GET limitations.
Michiel Broek <mbroek@mbse.eu>
parents: 57
diff changeset
235 $sql = "DELETE FROM `recipes` WHERE record='".$_POST['record']."';";
dbbe408108ea Added miscs inline editor. Switched to http POST because of GET limitations.
Michiel Broek <mbroek@mbse.eu>
parents: 57
diff changeset
236 $result = mysqli_query($connect, $sql);
dbbe408108ea Added miscs inline editor. Switched to http POST because of GET limitations.
Michiel Broek <mbroek@mbse.eu>
parents: 57
diff changeset
237 if (! $result) {
61
3469979f83be Added inline yeast editor
Michiel Broek <mbroek@mbse.eu>
parents: 60
diff changeset
238 syslog(LOG_NOTICE, "db_recipes: result: ".mysqli_error($connect));
60
dbbe408108ea Added miscs inline editor. Switched to http POST because of GET limitations.
Michiel Broek <mbroek@mbse.eu>
parents: 57
diff changeset
239 } else {
dbbe408108ea Added miscs inline editor. Switched to http POST because of GET limitations.
Michiel Broek <mbroek@mbse.eu>
parents: 57
diff changeset
240 syslog(LOG_NOTICE, "db_recipes: deleted record ".$_POST['record']);
52
b1f2a893572f More progress on the recipes design
Michiel Broek <mbroek@mbse.eu>
parents: 51
diff changeset
241 }
b1f2a893572f More progress on the recipes design
Michiel Broek <mbroek@mbse.eu>
parents: 51
diff changeset
242 echo $result;
49
4d27a7fb1265 Finisched recipe import. Added recipe retrieve script.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
243
4d27a7fb1265 Finisched recipe import. Added recipe retrieve script.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
244 } else {
130
601920b902e5 Load a single recipe from the database instead of client side select.
Michiel Broek <mbroek@mbse.eu>
parents: 94
diff changeset
245 /*
601920b902e5 Load a single recipe from the database instead of client side select.
Michiel Broek <mbroek@mbse.eu>
parents: 94
diff changeset
246 * Select all or a given record.
601920b902e5 Load a single recipe from the database instead of client side select.
Michiel Broek <mbroek@mbse.eu>
parents: 94
diff changeset
247 */
601920b902e5 Load a single recipe from the database instead of client side select.
Michiel Broek <mbroek@mbse.eu>
parents: 94
diff changeset
248 if (isset($_GET['record'])) {
601920b902e5 Load a single recipe from the database instead of client side select.
Michiel Broek <mbroek@mbse.eu>
parents: 94
diff changeset
249 $query = "SELECT * FROM recipes WHERE record='" . $_GET['record'] . "';";
601920b902e5 Load a single recipe from the database instead of client side select.
Michiel Broek <mbroek@mbse.eu>
parents: 94
diff changeset
250 } else {
601920b902e5 Load a single recipe from the database instead of client side select.
Michiel Broek <mbroek@mbse.eu>
parents: 94
diff changeset
251 $query = "SELECT * FROM recipes ORDER BY st_guide,st_letter,st_name,name";
601920b902e5 Load a single recipe from the database instead of client side select.
Michiel Broek <mbroek@mbse.eu>
parents: 94
diff changeset
252 }
49
4d27a7fb1265 Finisched recipe import. Added recipe retrieve script.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
253 $result = mysqli_query($connect, $query) or die("SQL Error 1: " . mysqli_error($connect));
4d27a7fb1265 Finisched recipe import. Added recipe retrieve script.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
254 $recipes = '[';
4d27a7fb1265 Finisched recipe import. Added recipe retrieve script.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
255 $comma = FALSE;
4d27a7fb1265 Finisched recipe import. Added recipe retrieve script.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
256 while ($row = mysqli_fetch_array($result, MYSQLI_ASSOC)) {
4d27a7fb1265 Finisched recipe import. Added recipe retrieve script.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
257 // Manual encode to JSON.
4d27a7fb1265 Finisched recipe import. Added recipe retrieve script.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
258 if ($comma) {
4d27a7fb1265 Finisched recipe import. Added recipe retrieve script.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
259 $recipes .= ',';
4d27a7fb1265 Finisched recipe import. Added recipe retrieve script.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
260 }
4d27a7fb1265 Finisched recipe import. Added recipe retrieve script.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
261 $comma = TRUE;
4d27a7fb1265 Finisched recipe import. Added recipe retrieve script.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
262 $recipes .= '{"record":' . $row['record'];
168
ce92dc75cb09 Added locked setting to the recipes. Is not working well when a recipe is loaded and locked. Added uuid load and save for recipes. Mad a lot of variables local in functions. The subgrids are loaded async.
Michiel Broek <mbroek@mbse.eu>
parents: 166
diff changeset
263 $recipes .= ',"uuid":"' . $row['uuid'];
ce92dc75cb09 Added locked setting to the recipes. Is not working well when a recipe is loaded and locked. Added uuid load and save for recipes. Mad a lot of variables local in functions. The subgrids are loaded async.
Michiel Broek <mbroek@mbse.eu>
parents: 166
diff changeset
264 $recipes .= '","locked":' . $row['locked'];
51
7224109adfe1 More recipe editor changes
Michiel Broek <mbroek@mbse.eu>
parents: 50
diff changeset
265 $recipes .= ',"st_guide":"' . str_replace($escapers, $replacements, $row['st_guide']);
7224109adfe1 More recipe editor changes
Michiel Broek <mbroek@mbse.eu>
parents: 50
diff changeset
266 $recipes .= '","st_letter":"' . str_replace($escapers, $replacements, $row['st_letter']);
7224109adfe1 More recipe editor changes
Michiel Broek <mbroek@mbse.eu>
parents: 50
diff changeset
267 $recipes .= '","st_name":"' . str_replace($escapers, $replacements, $row['st_name']);
220
14e349ff2a10 Recipes import uses indexes instead of strings. Started rebuilding the recipes editor using indexes and standard formats. Rebuild the fermentable editor from grid editing to popup editing. Most calculations are using indexes for dropdown values.
Michiel Broek <mbroek@mbse.eu>
parents: 168
diff changeset
268 $recipes .= '","st_type":' . $row['st_type'];
14e349ff2a10 Recipes import uses indexes instead of strings. Started rebuilding the recipes editor using indexes and standard formats. Rebuild the fermentable editor from grid editing to popup editing. Most calculations are using indexes for dropdown values.
Michiel Broek <mbroek@mbse.eu>
parents: 168
diff changeset
269 $recipes .= ',"st_category":"' . str_replace($escapers, $replacements, $row['st_category']);
72
93a0be4f5be3 Added category and type to the recipe style. Added tooltips in the edit screen. Added Alcohol and Carbonation to the recipe style. Redesigned the main edit window and added the style limits.
Michiel Broek <mbroek@mbse.eu>
parents: 71
diff changeset
270 $recipes .= '","st_category_number":' . floatval($row['st_category_number']);
93a0be4f5be3 Added category and type to the recipe style. Added tooltips in the edit screen. Added Alcohol and Carbonation to the recipe style. Redesigned the main edit window and added the style limits.
Michiel Broek <mbroek@mbse.eu>
parents: 71
diff changeset
271 $recipes .= ',"st_og_min":' . floatval($row['st_og_min']);
51
7224109adfe1 More recipe editor changes
Michiel Broek <mbroek@mbse.eu>
parents: 50
diff changeset
272 $recipes .= ',"st_og_max":' . floatval($row['st_og_max']);
7224109adfe1 More recipe editor changes
Michiel Broek <mbroek@mbse.eu>
parents: 50
diff changeset
273 $recipes .= ',"st_fg_min":' . floatval($row['st_fg_min']);
7224109adfe1 More recipe editor changes
Michiel Broek <mbroek@mbse.eu>
parents: 50
diff changeset
274 $recipes .= ',"st_fg_max":' . floatval($row['st_fg_max']);
7224109adfe1 More recipe editor changes
Michiel Broek <mbroek@mbse.eu>
parents: 50
diff changeset
275 $recipes .= ',"st_ibu_min":' . floatval($row['st_ibu_min']);
7224109adfe1 More recipe editor changes
Michiel Broek <mbroek@mbse.eu>
parents: 50
diff changeset
276 $recipes .= ',"st_ibu_max":' . floatval($row['st_ibu_max']);
7224109adfe1 More recipe editor changes
Michiel Broek <mbroek@mbse.eu>
parents: 50
diff changeset
277 $recipes .= ',"st_color_min":' . floatval($row['st_color_min']);
7224109adfe1 More recipe editor changes
Michiel Broek <mbroek@mbse.eu>
parents: 50
diff changeset
278 $recipes .= ',"st_color_max":' . floatval($row['st_color_max']);
7224109adfe1 More recipe editor changes
Michiel Broek <mbroek@mbse.eu>
parents: 50
diff changeset
279 $recipes .= ',"st_carb_min":' . floatval($row['st_carb_min']);
7224109adfe1 More recipe editor changes
Michiel Broek <mbroek@mbse.eu>
parents: 50
diff changeset
280 $recipes .= ',"st_carb_max":' . floatval($row['st_carb_max']);
7224109adfe1 More recipe editor changes
Michiel Broek <mbroek@mbse.eu>
parents: 50
diff changeset
281 $recipes .= ',"st_abv_min":' . floatval($row['st_abv_min']);
7224109adfe1 More recipe editor changes
Michiel Broek <mbroek@mbse.eu>
parents: 50
diff changeset
282 $recipes .= ',"st_abv_max":' . floatval($row['st_abv_max']);
7224109adfe1 More recipe editor changes
Michiel Broek <mbroek@mbse.eu>
parents: 50
diff changeset
283 $recipes .= ',"name":"' . str_replace($escapers, $replacements, $row['name']);
50
6d94167c2697 Next steps to implement a recipe editor
Michiel Broek <mbroek@mbse.eu>
parents: 49
diff changeset
284 $recipes .= '","notes":"' . str_replace($escapers, $replacements, $row['notes']);
220
14e349ff2a10 Recipes import uses indexes instead of strings. Started rebuilding the recipes editor using indexes and standard formats. Rebuild the fermentable editor from grid editing to popup editing. Most calculations are using indexes for dropdown values.
Michiel Broek <mbroek@mbse.eu>
parents: 168
diff changeset
285 $recipes .= '","type":' . $row['type'];
14e349ff2a10 Recipes import uses indexes instead of strings. Started rebuilding the recipes editor using indexes and standard formats. Rebuild the fermentable editor from grid editing to popup editing. Most calculations are using indexes for dropdown values.
Michiel Broek <mbroek@mbse.eu>
parents: 168
diff changeset
286 $recipes .= ',"batch_size":' . floatval($row['batch_size']);
94
295c3af2a421 Include boil_size field in the recipes table. Calculate pre-boil SG. Use that in the IBU calculation.
Michiel Broek <mbroek@mbse.eu>
parents: 80
diff changeset
287 $recipes .= ',"boil_size":' . floatval($row['boil_size']);
49
4d27a7fb1265 Finisched recipe import. Added recipe retrieve script.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
288 $recipes .= ',"boil_time":' . floatval($row['boil_time']);
4d27a7fb1265 Finisched recipe import. Added recipe retrieve script.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
289 $recipes .= ',"efficiency":' . floatval($row['efficiency']);
4d27a7fb1265 Finisched recipe import. Added recipe retrieve script.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
290 $recipes .= ',"est_og":' . floatval($row['est_og']);
4d27a7fb1265 Finisched recipe import. Added recipe retrieve script.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
291 $recipes .= ',"est_fg":' . floatval($row['est_fg']);
72
93a0be4f5be3 Added category and type to the recipe style. Added tooltips in the edit screen. Added Alcohol and Carbonation to the recipe style. Redesigned the main edit window and added the style limits.
Michiel Broek <mbroek@mbse.eu>
parents: 71
diff changeset
292 $recipes .= ',"est_abv":' . floatval($row['est_abv']);
93a0be4f5be3 Added category and type to the recipe style. Added tooltips in the edit screen. Added Alcohol and Carbonation to the recipe style. Redesigned the main edit window and added the style limits.
Michiel Broek <mbroek@mbse.eu>
parents: 71
diff changeset
293 $recipes .= ',"est_carb":' . floatval($row['est_carb']);
49
4d27a7fb1265 Finisched recipe import. Added recipe retrieve script.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
294 $recipes .= ',"est_color":' . floatval($row['est_color']);
220
14e349ff2a10 Recipes import uses indexes instead of strings. Started rebuilding the recipes editor using indexes and standard formats. Rebuild the fermentable editor from grid editing to popup editing. Most calculations are using indexes for dropdown values.
Michiel Broek <mbroek@mbse.eu>
parents: 168
diff changeset
295 $recipes .= ',"color_method":' . $row['color_method'];
14e349ff2a10 Recipes import uses indexes instead of strings. Started rebuilding the recipes editor using indexes and standard formats. Rebuild the fermentable editor from grid editing to popup editing. Most calculations are using indexes for dropdown values.
Michiel Broek <mbroek@mbse.eu>
parents: 168
diff changeset
296 $recipes .= ',"est_ibu":' . floatval($row['est_ibu']);
14e349ff2a10 Recipes import uses indexes instead of strings. Started rebuilding the recipes editor using indexes and standard formats. Rebuild the fermentable editor from grid editing to popup editing. Most calculations are using indexes for dropdown values.
Michiel Broek <mbroek@mbse.eu>
parents: 168
diff changeset
297 $recipes .= ',"ibu_method":' . $row['ibu_method'];
14e349ff2a10 Recipes import uses indexes instead of strings. Started rebuilding the recipes editor using indexes and standard formats. Rebuild the fermentable editor from grid editing to popup editing. Most calculations are using indexes for dropdown values.
Michiel Broek <mbroek@mbse.eu>
parents: 168
diff changeset
298 $recipes .= ',"sparge_temp":' . $row['sparge_temp'];
147
e6e5d007eb54 Added several sparge_ fields in the recipes databases. Added basic water mix calculator. Added fields on the water tab for water calculations.
Michiel Broek <mbroek@mbse.eu>
parents: 143
diff changeset
299 $recipes .= ',"sparge_ph":' . $row['sparge_ph'];
e6e5d007eb54 Added several sparge_ fields in the recipes databases. Added basic water mix calculator. Added fields on the water tab for water calculations.
Michiel Broek <mbroek@mbse.eu>
parents: 143
diff changeset
300 $recipes .= ',"sparge_volume":' . $row['sparge_volume'];
156
35860890224c Added sparge water acid calculation. Added residual alkalinity calculation.
Michiel Broek <mbroek@mbse.eu>
parents: 154
diff changeset
301 $recipes .= ',"sparge_source":"' . $row['sparge_source'];
220
14e349ff2a10 Recipes import uses indexes instead of strings. Started rebuilding the recipes editor using indexes and standard formats. Rebuild the fermentable editor from grid editing to popup editing. Most calculations are using indexes for dropdown values.
Michiel Broek <mbroek@mbse.eu>
parents: 168
diff changeset
302 $recipes .= '","sparge_acid_type":' . $row['sparge_acid_type'];
14e349ff2a10 Recipes import uses indexes instead of strings. Started rebuilding the recipes editor using indexes and standard formats. Rebuild the fermentable editor from grid editing to popup editing. Most calculations are using indexes for dropdown values.
Michiel Broek <mbroek@mbse.eu>
parents: 168
diff changeset
303 $recipes .= ',"sparge_acid_perc":' . $row['sparge_acid_perc'];
147
e6e5d007eb54 Added several sparge_ fields in the recipes databases. Added basic water mix calculator. Added fields on the water tab for water calculations.
Michiel Broek <mbroek@mbse.eu>
parents: 143
diff changeset
304 $recipes .= ',"sparge_acid_amount":' . $row['sparge_acid_amount'];
51
7224109adfe1 More recipe editor changes
Michiel Broek <mbroek@mbse.eu>
parents: 50
diff changeset
305 $recipes .= ',"mash_ph":' . $row['mash_ph'];
7224109adfe1 More recipe editor changes
Michiel Broek <mbroek@mbse.eu>
parents: 50
diff changeset
306 $recipes .= ',"mash_name":"' . $row['mash_name'];
147
e6e5d007eb54 Added several sparge_ fields in the recipes databases. Added basic water mix calculator. Added fields on the water tab for water calculations.
Michiel Broek <mbroek@mbse.eu>
parents: 143
diff changeset
307 $recipes .= '","calc_acid":' . $row['calc_acid'];
148
c0f0bbfefd63 Source waters are fixed, removed grid editor. Redesigned the water screen. Made a simple visual if water treatments are out of range. Water mixer for standard and dillute water works. Swapped the mash and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents: 147
diff changeset
308 $recipes .= ',"w1_name":"' . str_replace($escapers, $replacements, $row['w1_name']);
c0f0bbfefd63 Source waters are fixed, removed grid editor. Redesigned the water screen. Made a simple visual if water treatments are out of range. Water mixer for standard and dillute water works. Swapped the mash and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents: 147
diff changeset
309 $recipes .= '","w1_amount":' . $row['w1_amount'];
c0f0bbfefd63 Source waters are fixed, removed grid editor. Redesigned the water screen. Made a simple visual if water treatments are out of range. Water mixer for standard and dillute water works. Swapped the mash and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents: 147
diff changeset
310 $recipes .= ',"w1_calcium":' . $row['w1_calcium'];
c0f0bbfefd63 Source waters are fixed, removed grid editor. Redesigned the water screen. Made a simple visual if water treatments are out of range. Water mixer for standard and dillute water works. Swapped the mash and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents: 147
diff changeset
311 $recipes .= ',"w1_sulfate":' . $row['w1_sulfate'];
c0f0bbfefd63 Source waters are fixed, removed grid editor. Redesigned the water screen. Made a simple visual if water treatments are out of range. Water mixer for standard and dillute water works. Swapped the mash and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents: 147
diff changeset
312 $recipes .= ',"w1_chloride":' . $row['w1_chloride'];
c0f0bbfefd63 Source waters are fixed, removed grid editor. Redesigned the water screen. Made a simple visual if water treatments are out of range. Water mixer for standard and dillute water works. Swapped the mash and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents: 147
diff changeset
313 $recipes .= ',"w1_sodium":' . $row['w1_sodium'];
c0f0bbfefd63 Source waters are fixed, removed grid editor. Redesigned the water screen. Made a simple visual if water treatments are out of range. Water mixer for standard and dillute water works. Swapped the mash and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents: 147
diff changeset
314 $recipes .= ',"w1_magnesium":' . $row['w1_magnesium'];
c0f0bbfefd63 Source waters are fixed, removed grid editor. Redesigned the water screen. Made a simple visual if water treatments are out of range. Water mixer for standard and dillute water works. Swapped the mash and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents: 147
diff changeset
315 $recipes .= ',"w1_total_alkalinity":' . $row['w1_total_alkalinity'];
c0f0bbfefd63 Source waters are fixed, removed grid editor. Redesigned the water screen. Made a simple visual if water treatments are out of range. Water mixer for standard and dillute water works. Swapped the mash and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents: 147
diff changeset
316 $recipes .= ',"w1_ph":' . $row['w1_ph'];
c0f0bbfefd63 Source waters are fixed, removed grid editor. Redesigned the water screen. Made a simple visual if water treatments are out of range. Water mixer for standard and dillute water works. Swapped the mash and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents: 147
diff changeset
317 $recipes .= ',"w1_cost":' . $row['w1_cost'];
c0f0bbfefd63 Source waters are fixed, removed grid editor. Redesigned the water screen. Made a simple visual if water treatments are out of range. Water mixer for standard and dillute water works. Swapped the mash and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents: 147
diff changeset
318 $recipes .= ',"w2_name":"' . str_replace($escapers, $replacements, $row['w2_name']);
c0f0bbfefd63 Source waters are fixed, removed grid editor. Redesigned the water screen. Made a simple visual if water treatments are out of range. Water mixer for standard and dillute water works. Swapped the mash and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents: 147
diff changeset
319 $recipes .= '","w2_amount":' . $row['w2_amount'];
c0f0bbfefd63 Source waters are fixed, removed grid editor. Redesigned the water screen. Made a simple visual if water treatments are out of range. Water mixer for standard and dillute water works. Swapped the mash and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents: 147
diff changeset
320 $recipes .= ',"w2_calcium":' . $row['w2_calcium'];
c0f0bbfefd63 Source waters are fixed, removed grid editor. Redesigned the water screen. Made a simple visual if water treatments are out of range. Water mixer for standard and dillute water works. Swapped the mash and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents: 147
diff changeset
321 $recipes .= ',"w2_sulfate":' . $row['w2_sulfate'];
c0f0bbfefd63 Source waters are fixed, removed grid editor. Redesigned the water screen. Made a simple visual if water treatments are out of range. Water mixer for standard and dillute water works. Swapped the mash and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents: 147
diff changeset
322 $recipes .= ',"w2_chloride":' . $row['w2_chloride'];
c0f0bbfefd63 Source waters are fixed, removed grid editor. Redesigned the water screen. Made a simple visual if water treatments are out of range. Water mixer for standard and dillute water works. Swapped the mash and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents: 147
diff changeset
323 $recipes .= ',"w2_sodium":' . $row['w2_sodium'];
c0f0bbfefd63 Source waters are fixed, removed grid editor. Redesigned the water screen. Made a simple visual if water treatments are out of range. Water mixer for standard and dillute water works. Swapped the mash and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents: 147
diff changeset
324 $recipes .= ',"w2_magnesium":' . $row['w2_magnesium'];
c0f0bbfefd63 Source waters are fixed, removed grid editor. Redesigned the water screen. Made a simple visual if water treatments are out of range. Water mixer for standard and dillute water works. Swapped the mash and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents: 147
diff changeset
325 $recipes .= ',"w2_total_alkalinity":' . $row['w2_total_alkalinity'];
c0f0bbfefd63 Source waters are fixed, removed grid editor. Redesigned the water screen. Made a simple visual if water treatments are out of range. Water mixer for standard and dillute water works. Swapped the mash and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents: 147
diff changeset
326 $recipes .= ',"w2_ph":' . $row['w2_ph'];
c0f0bbfefd63 Source waters are fixed, removed grid editor. Redesigned the water screen. Made a simple visual if water treatments are out of range. Water mixer for standard and dillute water works. Swapped the mash and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents: 147
diff changeset
327 $recipes .= ',"w2_cost":' . $row['w2_cost'];
220
14e349ff2a10 Recipes import uses indexes instead of strings. Started rebuilding the recipes editor using indexes and standard formats. Rebuild the fermentable editor from grid editing to popup editing. Most calculations are using indexes for dropdown values.
Michiel Broek <mbroek@mbse.eu>
parents: 168
diff changeset
328 $recipes .= ',"wa_acid_name":' . $row['wa_acid_name'];
14e349ff2a10 Recipes import uses indexes instead of strings. Started rebuilding the recipes editor using indexes and standard formats. Rebuild the fermentable editor from grid editing to popup editing. Most calculations are using indexes for dropdown values.
Michiel Broek <mbroek@mbse.eu>
parents: 168
diff changeset
329 $recipes .= ',"wa_acid_perc":' . $row['wa_acid_perc'];
14e349ff2a10 Recipes import uses indexes instead of strings. Started rebuilding the recipes editor using indexes and standard formats. Rebuild the fermentable editor from grid editing to popup editing. Most calculations are using indexes for dropdown values.
Michiel Broek <mbroek@mbse.eu>
parents: 168
diff changeset
330 $recipes .= ',"wa_base_name":' . $row['wa_base_name'];
221
a8aabb63fbcc Added two missing fields in getfermentablesources.php. When getting a single recipe from the database, update the fermentables json data with available inventory and ingredient. Added inventory column in the fermentable grid. Added ingredient selection in the fermentable popup window to replace ingredient.
Michiel Broek <mbroek@mbse.eu>
parents: 220
diff changeset
331 if (isset($_GET['record'])) {
a8aabb63fbcc Added two missing fields in getfermentablesources.php. When getting a single recipe from the database, update the fermentables json data with available inventory and ingredient. Added inventory column in the fermentable grid. Added ingredient selection in the fermentable popup window to replace ingredient.
Michiel Broek <mbroek@mbse.eu>
parents: 220
diff changeset
332 // Append stock information.
a8aabb63fbcc Added two missing fields in getfermentablesources.php. When getting a single recipe from the database, update the fermentables json data with available inventory and ingredient. Added inventory column in the fermentable grid. Added ingredient selection in the fermentable popup window to replace ingredient.
Michiel Broek <mbroek@mbse.eu>
parents: 220
diff changeset
333 $fermentables = json_decode($row['json_fermentables'], true);
a8aabb63fbcc Added two missing fields in getfermentablesources.php. When getting a single recipe from the database, update the fermentables json data with available inventory and ingredient. Added inventory column in the fermentable grid. Added ingredient selection in the fermentable popup window to replace ingredient.
Michiel Broek <mbroek@mbse.eu>
parents: 220
diff changeset
334 for ($i = 0; $i < count($fermentables); $i++) {
a8aabb63fbcc Added two missing fields in getfermentablesources.php. When getting a single recipe from the database, update the fermentables json data with available inventory and ingredient. Added inventory column in the fermentable grid. Added ingredient selection in the fermentable popup window to replace ingredient.
Michiel Broek <mbroek@mbse.eu>
parents: 220
diff changeset
335 $fermentables[$i]['f_inventory'] = 0; // Not in stock
a8aabb63fbcc Added two missing fields in getfermentablesources.php. When getting a single recipe from the database, update the fermentables json data with available inventory and ingredient. Added inventory column in the fermentable grid. Added ingredient selection in the fermentable popup window to replace ingredient.
Michiel Broek <mbroek@mbse.eu>
parents: 220
diff changeset
336 $fermentables[$i]['f_avail'] = 0; // Ingredient not in db
a8aabb63fbcc Added two missing fields in getfermentablesources.php. When getting a single recipe from the database, update the fermentables json data with available inventory and ingredient. Added inventory column in the fermentable grid. Added ingredient selection in the fermentable popup window to replace ingredient.
Michiel Broek <mbroek@mbse.eu>
parents: 220
diff changeset
337 $sql2 = "SELECT inventory FROM inventory_fermentables ";
222
78946739b3a6 All recipe data now has inventory information added.
Michiel Broek <mbroek@mbse.eu>
parents: 221
diff changeset
338 $sql2 .= "WHERE name='".str_replace($rescapers, $rreplacements, $fermentables[$i]['f_name'])."' AND";
78946739b3a6 All recipe data now has inventory information added.
Michiel Broek <mbroek@mbse.eu>
parents: 221
diff changeset
339 $sql2 .= " supplier='".str_replace($rescapers, $rreplacements, $fermentables[$i]['f_supplier'])."'";
221
a8aabb63fbcc Added two missing fields in getfermentablesources.php. When getting a single recipe from the database, update the fermentables json data with available inventory and ingredient. Added inventory column in the fermentable grid. Added ingredient selection in the fermentable popup window to replace ingredient.
Michiel Broek <mbroek@mbse.eu>
parents: 220
diff changeset
340 if ($result2 = mysqli_query($connect, $sql2)) {
a8aabb63fbcc Added two missing fields in getfermentablesources.php. When getting a single recipe from the database, update the fermentables json data with available inventory and ingredient. Added inventory column in the fermentable grid. Added ingredient selection in the fermentable popup window to replace ingredient.
Michiel Broek <mbroek@mbse.eu>
parents: 220
diff changeset
341 if ($obj = mysqli_fetch_object($result2)) {
222
78946739b3a6 All recipe data now has inventory information added.
Michiel Broek <mbroek@mbse.eu>
parents: 221
diff changeset
342 $fermentables[$i]['f_inventory'] = floatval($obj->inventory);
221
a8aabb63fbcc Added two missing fields in getfermentablesources.php. When getting a single recipe from the database, update the fermentables json data with available inventory and ingredient. Added inventory column in the fermentable grid. Added ingredient selection in the fermentable popup window to replace ingredient.
Michiel Broek <mbroek@mbse.eu>
parents: 220
diff changeset
343 $fermentables[$i]['f_avail'] = 1;
a8aabb63fbcc Added two missing fields in getfermentablesources.php. When getting a single recipe from the database, update the fermentables json data with available inventory and ingredient. Added inventory column in the fermentable grid. Added ingredient selection in the fermentable popup window to replace ingredient.
Michiel Broek <mbroek@mbse.eu>
parents: 220
diff changeset
344 }
a8aabb63fbcc Added two missing fields in getfermentablesources.php. When getting a single recipe from the database, update the fermentables json data with available inventory and ingredient. Added inventory column in the fermentable grid. Added ingredient selection in the fermentable popup window to replace ingredient.
Michiel Broek <mbroek@mbse.eu>
parents: 220
diff changeset
345 mysqli_free_result($result2);
a8aabb63fbcc Added two missing fields in getfermentablesources.php. When getting a single recipe from the database, update the fermentables json data with available inventory and ingredient. Added inventory column in the fermentable grid. Added ingredient selection in the fermentable popup window to replace ingredient.
Michiel Broek <mbroek@mbse.eu>
parents: 220
diff changeset
346 }
a8aabb63fbcc Added two missing fields in getfermentablesources.php. When getting a single recipe from the database, update the fermentables json data with available inventory and ingredient. Added inventory column in the fermentable grid. Added ingredient selection in the fermentable popup window to replace ingredient.
Michiel Broek <mbroek@mbse.eu>
parents: 220
diff changeset
347 }
a8aabb63fbcc Added two missing fields in getfermentablesources.php. When getting a single recipe from the database, update the fermentables json data with available inventory and ingredient. Added inventory column in the fermentable grid. Added ingredient selection in the fermentable popup window to replace ingredient.
Michiel Broek <mbroek@mbse.eu>
parents: 220
diff changeset
348 $recipes .= ',"fermentables":' . json_encode($fermentables, JSON_UNESCAPED_UNICODE);
222
78946739b3a6 All recipe data now has inventory information added.
Michiel Broek <mbroek@mbse.eu>
parents: 221
diff changeset
349
78946739b3a6 All recipe data now has inventory information added.
Michiel Broek <mbroek@mbse.eu>
parents: 221
diff changeset
350 $hops = json_decode($row['json_hops'], true);
78946739b3a6 All recipe data now has inventory information added.
Michiel Broek <mbroek@mbse.eu>
parents: 221
diff changeset
351 for ($i = 0; $i < count($hops); $i++) {
78946739b3a6 All recipe data now has inventory information added.
Michiel Broek <mbroek@mbse.eu>
parents: 221
diff changeset
352 $hops[$i]['h_inventory'] = 0; // Not in stock
78946739b3a6 All recipe data now has inventory information added.
Michiel Broek <mbroek@mbse.eu>
parents: 221
diff changeset
353 $hops[$i]['h_avail'] = 0; // Ingredient not in db
78946739b3a6 All recipe data now has inventory information added.
Michiel Broek <mbroek@mbse.eu>
parents: 221
diff changeset
354 $sql2 = "SELECT inventory FROM inventory_hops ";
78946739b3a6 All recipe data now has inventory information added.
Michiel Broek <mbroek@mbse.eu>
parents: 221
diff changeset
355 $sql2 .= "WHERE name='".str_replace($rescapers, $rreplacements, $hops[$i]['h_name'])."' AND";
78946739b3a6 All recipe data now has inventory information added.
Michiel Broek <mbroek@mbse.eu>
parents: 221
diff changeset
356 $sql2 .= " origin='".str_replace($rescapers, $rreplacements, $hops[$i]['h_origin'])."' AND";
78946739b3a6 All recipe data now has inventory information added.
Michiel Broek <mbroek@mbse.eu>
parents: 221
diff changeset
357 $sql2 .= " form='".$hops[$i]['h_form']."'";
78946739b3a6 All recipe data now has inventory information added.
Michiel Broek <mbroek@mbse.eu>
parents: 221
diff changeset
358 if ($result2 = mysqli_query($connect, $sql2)) {
78946739b3a6 All recipe data now has inventory information added.
Michiel Broek <mbroek@mbse.eu>
parents: 221
diff changeset
359 if ($obj = mysqli_fetch_object($result2)) {
78946739b3a6 All recipe data now has inventory information added.
Michiel Broek <mbroek@mbse.eu>
parents: 221
diff changeset
360 $hops[$i]['h_inventory'] = floatval($obj->inventory);
78946739b3a6 All recipe data now has inventory information added.
Michiel Broek <mbroek@mbse.eu>
parents: 221
diff changeset
361 $hops[$i]['h_avail'] = 1;
78946739b3a6 All recipe data now has inventory information added.
Michiel Broek <mbroek@mbse.eu>
parents: 221
diff changeset
362 }
78946739b3a6 All recipe data now has inventory information added.
Michiel Broek <mbroek@mbse.eu>
parents: 221
diff changeset
363 mysqli_free_result($result2);
78946739b3a6 All recipe data now has inventory information added.
Michiel Broek <mbroek@mbse.eu>
parents: 221
diff changeset
364 }
78946739b3a6 All recipe data now has inventory information added.
Michiel Broek <mbroek@mbse.eu>
parents: 221
diff changeset
365 }
78946739b3a6 All recipe data now has inventory information added.
Michiel Broek <mbroek@mbse.eu>
parents: 221
diff changeset
366 // syslog(LOG_NOTICE, json_encode($hops, JSON_UNESCAPED_UNICODE));
78946739b3a6 All recipe data now has inventory information added.
Michiel Broek <mbroek@mbse.eu>
parents: 221
diff changeset
367 $recipes .= ',"hops":' . json_encode($hops, JSON_UNESCAPED_UNICODE);
78946739b3a6 All recipe data now has inventory information added.
Michiel Broek <mbroek@mbse.eu>
parents: 221
diff changeset
368
78946739b3a6 All recipe data now has inventory information added.
Michiel Broek <mbroek@mbse.eu>
parents: 221
diff changeset
369 $miscs = json_decode($row['json_miscs'], true);
78946739b3a6 All recipe data now has inventory information added.
Michiel Broek <mbroek@mbse.eu>
parents: 221
diff changeset
370 for ($i = 0; $i < count($miscs); $i++) {
78946739b3a6 All recipe data now has inventory information added.
Michiel Broek <mbroek@mbse.eu>
parents: 221
diff changeset
371 $miscs[$i]['m_inventory'] = 0; // Not in stock
78946739b3a6 All recipe data now has inventory information added.
Michiel Broek <mbroek@mbse.eu>
parents: 221
diff changeset
372 $miscs[$i]['m_avail'] = 0; // Ingredient not in db
78946739b3a6 All recipe data now has inventory information added.
Michiel Broek <mbroek@mbse.eu>
parents: 221
diff changeset
373 $sql2 = "SELECT inventory FROM inventory_miscs ";
78946739b3a6 All recipe data now has inventory information added.
Michiel Broek <mbroek@mbse.eu>
parents: 221
diff changeset
374 $sql2 .= "WHERE name='".str_replace($rescapers, $rreplacements, $miscs[$i]['m_name'])."' AND";
78946739b3a6 All recipe data now has inventory information added.
Michiel Broek <mbroek@mbse.eu>
parents: 221
diff changeset
375 $sql2 .= " type='".$miscs[$i]['m_type']."'";
78946739b3a6 All recipe data now has inventory information added.
Michiel Broek <mbroek@mbse.eu>
parents: 221
diff changeset
376 if ($result2 = mysqli_query($connect, $sql2)) {
78946739b3a6 All recipe data now has inventory information added.
Michiel Broek <mbroek@mbse.eu>
parents: 221
diff changeset
377 if ($obj = mysqli_fetch_object($result2)) {
78946739b3a6 All recipe data now has inventory information added.
Michiel Broek <mbroek@mbse.eu>
parents: 221
diff changeset
378 $miscs[$i]['m_inventory'] = floatval($obj->inventory);
78946739b3a6 All recipe data now has inventory information added.
Michiel Broek <mbroek@mbse.eu>
parents: 221
diff changeset
379 $miscs[$i]['m_avail'] = 1;
78946739b3a6 All recipe data now has inventory information added.
Michiel Broek <mbroek@mbse.eu>
parents: 221
diff changeset
380 }
78946739b3a6 All recipe data now has inventory information added.
Michiel Broek <mbroek@mbse.eu>
parents: 221
diff changeset
381 mysqli_free_result($result2);
78946739b3a6 All recipe data now has inventory information added.
Michiel Broek <mbroek@mbse.eu>
parents: 221
diff changeset
382 }
78946739b3a6 All recipe data now has inventory information added.
Michiel Broek <mbroek@mbse.eu>
parents: 221
diff changeset
383 }
78946739b3a6 All recipe data now has inventory information added.
Michiel Broek <mbroek@mbse.eu>
parents: 221
diff changeset
384 // syslog(LOG_NOTICE, json_encode($miscs, JSON_UNESCAPED_UNICODE));
78946739b3a6 All recipe data now has inventory information added.
Michiel Broek <mbroek@mbse.eu>
parents: 221
diff changeset
385 $recipes .= ',"miscs":' . json_encode($miscs, JSON_UNESCAPED_UNICODE);
78946739b3a6 All recipe data now has inventory information added.
Michiel Broek <mbroek@mbse.eu>
parents: 221
diff changeset
386
78946739b3a6 All recipe data now has inventory information added.
Michiel Broek <mbroek@mbse.eu>
parents: 221
diff changeset
387 $yeasts = json_decode($row['json_yeasts'], true);
78946739b3a6 All recipe data now has inventory information added.
Michiel Broek <mbroek@mbse.eu>
parents: 221
diff changeset
388 for ($i = 0; $i < count($yeasts); $i++) {
78946739b3a6 All recipe data now has inventory information added.
Michiel Broek <mbroek@mbse.eu>
parents: 221
diff changeset
389 $yeasts[$i]['y_inventory'] = 0; // Not in stock
78946739b3a6 All recipe data now has inventory information added.
Michiel Broek <mbroek@mbse.eu>
parents: 221
diff changeset
390 $yeasts[$i]['y_avail'] = 0; // Ingredient not in db
78946739b3a6 All recipe data now has inventory information added.
Michiel Broek <mbroek@mbse.eu>
parents: 221
diff changeset
391 $sql2 = "SELECT inventory FROM inventory_yeasts ";
78946739b3a6 All recipe data now has inventory information added.
Michiel Broek <mbroek@mbse.eu>
parents: 221
diff changeset
392 $sql2 .= "WHERE name='".str_replace($rescapers, $rreplacements, $yeasts[$i]['y_name'])."' AND";
78946739b3a6 All recipe data now has inventory information added.
Michiel Broek <mbroek@mbse.eu>
parents: 221
diff changeset
393 $sql2 .= " form='".str_replace($rescapers, $rreplacements, $yeasts[$i]['y_form'])."' AND";
78946739b3a6 All recipe data now has inventory information added.
Michiel Broek <mbroek@mbse.eu>
parents: 221
diff changeset
394 $sql2 .= " laboratory='".str_replace($rescapers, $rreplacements, $yeasts[$i]['y_laboratory'])."' AND";
78946739b3a6 All recipe data now has inventory information added.
Michiel Broek <mbroek@mbse.eu>
parents: 221
diff changeset
395 $sql2 .= " product_id='".str_replace($rescapers, $rreplacements, $yeasts[$i]['y_product_id'])."'";
78946739b3a6 All recipe data now has inventory information added.
Michiel Broek <mbroek@mbse.eu>
parents: 221
diff changeset
396 // syslog(LOG_NOTICE, $sql2);
78946739b3a6 All recipe data now has inventory information added.
Michiel Broek <mbroek@mbse.eu>
parents: 221
diff changeset
397 if ($result2 = mysqli_query($connect, $sql2)) {
78946739b3a6 All recipe data now has inventory information added.
Michiel Broek <mbroek@mbse.eu>
parents: 221
diff changeset
398 if ($obj = mysqli_fetch_object($result2)) {
78946739b3a6 All recipe data now has inventory information added.
Michiel Broek <mbroek@mbse.eu>
parents: 221
diff changeset
399 $yeasts[$i]['y_inventory'] = floatval($obj->inventory);
78946739b3a6 All recipe data now has inventory information added.
Michiel Broek <mbroek@mbse.eu>
parents: 221
diff changeset
400 $yeasts[$i]['y_avail'] = 1;
78946739b3a6 All recipe data now has inventory information added.
Michiel Broek <mbroek@mbse.eu>
parents: 221
diff changeset
401 }
78946739b3a6 All recipe data now has inventory information added.
Michiel Broek <mbroek@mbse.eu>
parents: 221
diff changeset
402 mysqli_free_result($result2);
78946739b3a6 All recipe data now has inventory information added.
Michiel Broek <mbroek@mbse.eu>
parents: 221
diff changeset
403 }
78946739b3a6 All recipe data now has inventory information added.
Michiel Broek <mbroek@mbse.eu>
parents: 221
diff changeset
404 }
78946739b3a6 All recipe data now has inventory information added.
Michiel Broek <mbroek@mbse.eu>
parents: 221
diff changeset
405 // syslog(LOG_NOTICE, json_encode($yeasts, JSON_UNESCAPED_UNICODE));
78946739b3a6 All recipe data now has inventory information added.
Michiel Broek <mbroek@mbse.eu>
parents: 221
diff changeset
406 $recipes .= ',"yeasts":' . json_encode($yeasts, JSON_UNESCAPED_UNICODE);
221
a8aabb63fbcc Added two missing fields in getfermentablesources.php. When getting a single recipe from the database, update the fermentables json data with available inventory and ingredient. Added inventory column in the fermentable grid. Added ingredient selection in the fermentable popup window to replace ingredient.
Michiel Broek <mbroek@mbse.eu>
parents: 220
diff changeset
407 } else {
a8aabb63fbcc Added two missing fields in getfermentablesources.php. When getting a single recipe from the database, update the fermentables json data with available inventory and ingredient. Added inventory column in the fermentable grid. Added ingredient selection in the fermentable popup window to replace ingredient.
Michiel Broek <mbroek@mbse.eu>
parents: 220
diff changeset
408 // Just leave it.
a8aabb63fbcc Added two missing fields in getfermentablesources.php. When getting a single recipe from the database, update the fermentables json data with available inventory and ingredient. Added inventory column in the fermentable grid. Added ingredient selection in the fermentable popup window to replace ingredient.
Michiel Broek <mbroek@mbse.eu>
parents: 220
diff changeset
409 $recipes .= ',"fermentables":' . $row['json_fermentables'];
a8aabb63fbcc Added two missing fields in getfermentablesources.php. When getting a single recipe from the database, update the fermentables json data with available inventory and ingredient. Added inventory column in the fermentable grid. Added ingredient selection in the fermentable popup window to replace ingredient.
Michiel Broek <mbroek@mbse.eu>
parents: 220
diff changeset
410 $recipes .= ',"hops":' . $row['json_hops'];
a8aabb63fbcc Added two missing fields in getfermentablesources.php. When getting a single recipe from the database, update the fermentables json data with available inventory and ingredient. Added inventory column in the fermentable grid. Added ingredient selection in the fermentable popup window to replace ingredient.
Michiel Broek <mbroek@mbse.eu>
parents: 220
diff changeset
411 $recipes .= ',"miscs":' . $row['json_miscs'];
a8aabb63fbcc Added two missing fields in getfermentablesources.php. When getting a single recipe from the database, update the fermentables json data with available inventory and ingredient. Added inventory column in the fermentable grid. Added ingredient selection in the fermentable popup window to replace ingredient.
Michiel Broek <mbroek@mbse.eu>
parents: 220
diff changeset
412 $recipes .= ',"yeasts":' . $row['json_yeasts'];
a8aabb63fbcc Added two missing fields in getfermentablesources.php. When getting a single recipe from the database, update the fermentables json data with available inventory and ingredient. Added inventory column in the fermentable grid. Added ingredient selection in the fermentable popup window to replace ingredient.
Michiel Broek <mbroek@mbse.eu>
parents: 220
diff changeset
413 }
51
7224109adfe1 More recipe editor changes
Michiel Broek <mbroek@mbse.eu>
parents: 50
diff changeset
414 $recipes .= ',"mashs":' . $row['json_mashs'];
49
4d27a7fb1265 Finisched recipe import. Added recipe retrieve script.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
415 $recipes .= '}';
4d27a7fb1265 Finisched recipe import. Added recipe retrieve script.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
416 }
4d27a7fb1265 Finisched recipe import. Added recipe retrieve script.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
417 $recipes .= ']';
4d27a7fb1265 Finisched recipe import. Added recipe retrieve script.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
418 header("Content-type: application/json");
4d27a7fb1265 Finisched recipe import. Added recipe retrieve script.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
419 echo $recipes;
4d27a7fb1265 Finisched recipe import. Added recipe retrieve script.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
420 }
4d27a7fb1265 Finisched recipe import. Added recipe retrieve script.
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
421 ?>

mercurial