Sat, 24 Aug 2019 19:48:23 +0200
Added comments about pitchrate
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 | 15 | $rescapers = array("'"); |
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 | } |
359
98354ef399cd
Lot's of improvements for recipes and products database load and save. Insert missing yeast tolerance field for old products and recipes. Recipe locked and calc_acid fields coverted to integer. In recipe edit screen removed the Print button. It is now included in the export screen. Added recipe export to forum screen.
Michiel Broek <mbroek@mbse.eu>
parents:
352
diff
changeset
|
35 | $sql .= "', locked='" . $_POST['locked']; |
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']; |
359
98354ef399cd
Lot's of improvements for recipes and products database load and save. Insert missing yeast tolerance field for old products and recipes. Recipe locked and calc_acid fields coverted to integer. In recipe edit screen removed the Print button. It is now included in the export screen. Added recipe export to forum screen.
Michiel Broek <mbroek@mbse.eu>
parents:
352
diff
changeset
|
78 | $sql .= "', calc_acid='" . $_POST['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
|
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 | } |
392
544d7d0183b2
Added 15 fields to the recipes table. Added 18 fields to the products table. These are calculated values that are now stored in the database so export programs can use these values without calculating them again. Product and recipe print have water and mash schedule added. Product print has brewday results added if the brewday is over. The ingredients layout changed in the product and recipe prints.
Michiel Broek <mbroek@mbse.eu>
parents:
359
diff
changeset
|
103 | $sql .= "', wg_amount='" . $_POST['wg_amount']; |
544d7d0183b2
Added 15 fields to the recipes table. Added 18 fields to the products table. These are calculated values that are now stored in the database so export programs can use these values without calculating them again. Product and recipe print have water and mash schedule added. Product print has brewday results added if the brewday is over. The ingredients layout changed in the product and recipe prints.
Michiel Broek <mbroek@mbse.eu>
parents:
359
diff
changeset
|
104 | $sql .= "', wg_calcium='" . $_POST['wg_calcium']; |
544d7d0183b2
Added 15 fields to the recipes table. Added 18 fields to the products table. These are calculated values that are now stored in the database so export programs can use these values without calculating them again. Product and recipe print have water and mash schedule added. Product print has brewday results added if the brewday is over. The ingredients layout changed in the product and recipe prints.
Michiel Broek <mbroek@mbse.eu>
parents:
359
diff
changeset
|
105 | $sql .= "', wg_sulfate='" . $_POST['wg_sulfate']; |
544d7d0183b2
Added 15 fields to the recipes table. Added 18 fields to the products table. These are calculated values that are now stored in the database so export programs can use these values without calculating them again. Product and recipe print have water and mash schedule added. Product print has brewday results added if the brewday is over. The ingredients layout changed in the product and recipe prints.
Michiel Broek <mbroek@mbse.eu>
parents:
359
diff
changeset
|
106 | $sql .= "', wg_chloride='" . $_POST['wg_chloride']; |
544d7d0183b2
Added 15 fields to the recipes table. Added 18 fields to the products table. These are calculated values that are now stored in the database so export programs can use these values without calculating them again. Product and recipe print have water and mash schedule added. Product print has brewday results added if the brewday is over. The ingredients layout changed in the product and recipe prints.
Michiel Broek <mbroek@mbse.eu>
parents:
359
diff
changeset
|
107 | $sql .= "', wg_sodium='" . $_POST['wg_sodium']; |
544d7d0183b2
Added 15 fields to the recipes table. Added 18 fields to the products table. These are calculated values that are now stored in the database so export programs can use these values without calculating them again. Product and recipe print have water and mash schedule added. Product print has brewday results added if the brewday is over. The ingredients layout changed in the product and recipe prints.
Michiel Broek <mbroek@mbse.eu>
parents:
359
diff
changeset
|
108 | $sql .= "', wg_magnesium='" . $_POST['wg_magnesium']; |
544d7d0183b2
Added 15 fields to the recipes table. Added 18 fields to the products table. These are calculated values that are now stored in the database so export programs can use these values without calculating them again. Product and recipe print have water and mash schedule added. Product print has brewday results added if the brewday is over. The ingredients layout changed in the product and recipe prints.
Michiel Broek <mbroek@mbse.eu>
parents:
359
diff
changeset
|
109 | $sql .= "', wg_total_alkalinity='" . $_POST['wg_total_alkalinity']; |
544d7d0183b2
Added 15 fields to the recipes table. Added 18 fields to the products table. These are calculated values that are now stored in the database so export programs can use these values without calculating them again. Product and recipe print have water and mash schedule added. Product print has brewday results added if the brewday is over. The ingredients layout changed in the product and recipe prints.
Michiel Broek <mbroek@mbse.eu>
parents:
359
diff
changeset
|
110 | $sql .= "', wg_ph='" . $_POST['wg_ph']; |
544d7d0183b2
Added 15 fields to the recipes table. Added 18 fields to the products table. These are calculated values that are now stored in the database so export programs can use these values without calculating them again. Product and recipe print have water and mash schedule added. Product print has brewday results added if the brewday is over. The ingredients layout changed in the product and recipe prints.
Michiel Broek <mbroek@mbse.eu>
parents:
359
diff
changeset
|
111 | $sql .= "', wb_calcium='" . $_POST['wb_calcium']; |
544d7d0183b2
Added 15 fields to the recipes table. Added 18 fields to the products table. These are calculated values that are now stored in the database so export programs can use these values without calculating them again. Product and recipe print have water and mash schedule added. Product print has brewday results added if the brewday is over. The ingredients layout changed in the product and recipe prints.
Michiel Broek <mbroek@mbse.eu>
parents:
359
diff
changeset
|
112 | $sql .= "', wb_sulfate='" . $_POST['wb_sulfate']; |
544d7d0183b2
Added 15 fields to the recipes table. Added 18 fields to the products table. These are calculated values that are now stored in the database so export programs can use these values without calculating them again. Product and recipe print have water and mash schedule added. Product print has brewday results added if the brewday is over. The ingredients layout changed in the product and recipe prints.
Michiel Broek <mbroek@mbse.eu>
parents:
359
diff
changeset
|
113 | $sql .= "', wb_chloride='" . $_POST['wb_chloride']; |
544d7d0183b2
Added 15 fields to the recipes table. Added 18 fields to the products table. These are calculated values that are now stored in the database so export programs can use these values without calculating them again. Product and recipe print have water and mash schedule added. Product print has brewday results added if the brewday is over. The ingredients layout changed in the product and recipe prints.
Michiel Broek <mbroek@mbse.eu>
parents:
359
diff
changeset
|
114 | $sql .= "', wb_sodium='" . $_POST['wb_sodium']; |
544d7d0183b2
Added 15 fields to the recipes table. Added 18 fields to the products table. These are calculated values that are now stored in the database so export programs can use these values without calculating them again. Product and recipe print have water and mash schedule added. Product print has brewday results added if the brewday is over. The ingredients layout changed in the product and recipe prints.
Michiel Broek <mbroek@mbse.eu>
parents:
359
diff
changeset
|
115 | $sql .= "', wb_magnesium='" . $_POST['wb_magnesium']; |
544d7d0183b2
Added 15 fields to the recipes table. Added 18 fields to the products table. These are calculated values that are now stored in the database so export programs can use these values without calculating them again. Product and recipe print have water and mash schedule added. Product print has brewday results added if the brewday is over. The ingredients layout changed in the product and recipe prints.
Michiel Broek <mbroek@mbse.eu>
parents:
359
diff
changeset
|
116 | $sql .= "', wb_total_alkalinity='" . $_POST['wb_total_alkalinity']; |
544d7d0183b2
Added 15 fields to the recipes table. Added 18 fields to the products table. These are calculated values that are now stored in the database so export programs can use these values without calculating them again. Product and recipe print have water and mash schedule added. Product print has brewday results added if the brewday is over. The ingredients layout changed in the product and recipe prints.
Michiel Broek <mbroek@mbse.eu>
parents:
359
diff
changeset
|
117 | $sql .= "', wb_ph='" . $_POST['wb_ph']; |
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
|
118 | $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
|
119 | $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
|
120 | $sql .= "', wa_base_name='" . $_POST['wa_base_name']; |
359
98354ef399cd
Lot's of improvements for recipes and products database load and save. Insert missing yeast tolerance field for old products and recipes. Recipe locked and calc_acid fields coverted to integer. In recipe edit screen removed the Print button. It is now included in the export screen. Added recipe export to forum screen.
Michiel Broek <mbroek@mbse.eu>
parents:
352
diff
changeset
|
121 | //syslog(LOG_NOTICE, $sql); |
60
dbbe408108ea
Added miscs inline editor. Switched to http POST because of GET limitations.
Michiel Broek <mbroek@mbse.eu>
parents:
57
diff
changeset
|
122 | |
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
|
123 | $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
|
124 | $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
|
125 | 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
|
126 | $array = $_POST['fermentables']; |
394
ccd85f0ed96c
Added ingredient sorting to the database write functions.
Michiel Broek <mbroek@mbse.eu>
parents:
392
diff
changeset
|
127 | // Sort the array |
ccd85f0ed96c
Added ingredient sorting to the database write functions.
Michiel Broek <mbroek@mbse.eu>
parents:
392
diff
changeset
|
128 | $added = array(); |
ccd85f0ed96c
Added ingredient sorting to the database write functions.
Michiel Broek <mbroek@mbse.eu>
parents:
392
diff
changeset
|
129 | $amount = array(); |
ccd85f0ed96c
Added ingredient sorting to the database write functions.
Michiel Broek <mbroek@mbse.eu>
parents:
392
diff
changeset
|
130 | for ($i = 0; $i < count($array); $i++) { |
ccd85f0ed96c
Added ingredient sorting to the database write functions.
Michiel Broek <mbroek@mbse.eu>
parents:
392
diff
changeset
|
131 | $added[] = $array[$i]['f_added']; |
ccd85f0ed96c
Added ingredient sorting to the database write functions.
Michiel Broek <mbroek@mbse.eu>
parents:
392
diff
changeset
|
132 | $amount[] = $array[$i]['f_amount']; |
ccd85f0ed96c
Added ingredient sorting to the database write functions.
Michiel Broek <mbroek@mbse.eu>
parents:
392
diff
changeset
|
133 | } |
ccd85f0ed96c
Added ingredient sorting to the database write functions.
Michiel Broek <mbroek@mbse.eu>
parents:
392
diff
changeset
|
134 | array_multisort($added, SORT_ASC, SORT_NUMERIC, |
ccd85f0ed96c
Added ingredient sorting to the database write functions.
Michiel Broek <mbroek@mbse.eu>
parents:
392
diff
changeset
|
135 | $amount, SORT_DESC, SORT_NUMERIC, |
ccd85f0ed96c
Added ingredient sorting to the database write functions.
Michiel Broek <mbroek@mbse.eu>
parents:
392
diff
changeset
|
136 | $array); |
ccd85f0ed96c
Added ingredient sorting to the database write functions.
Michiel Broek <mbroek@mbse.eu>
parents:
392
diff
changeset
|
137 | // Write the sorted array. |
60
dbbe408108ea
Added miscs inline editor. Switched to http POST because of GET limitations.
Michiel Broek <mbroek@mbse.eu>
parents:
57
diff
changeset
|
138 | 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
|
139 | /* |
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 | * 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
|
141 | */ |
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 | 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
|
143 | $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
|
144 | $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
|
145 | $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
|
146 | $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
|
147 | $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
|
148 | $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
|
149 | $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
|
150 | $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
|
151 | $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
|
152 | $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
|
153 | $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
|
154 | $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
|
155 | $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
|
156 | $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
|
157 | $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
|
158 | $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
|
159 | $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
|
160 | $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
|
161 | $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
|
162 | $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
|
163 | $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
|
164 | $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
|
165 | $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
|
166 | $fermentable .= ',"f_acid_to_ph_57":' . $item['f_acid_to_ph_57'] . '}'; |
225
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
223
diff
changeset
|
167 | //syslog(LOG_NOTICE, $fermentable); |
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
|
168 | $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
|
169 | } |
52
b1f2a893572f
More progress on the recipes design
Michiel Broek <mbroek@mbse.eu>
parents:
51
diff
changeset
|
170 | } |
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
|
171 | $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
|
172 | $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
|
173 | |
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
|
174 | $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
|
175 | $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
|
176 | 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
|
177 | $array = $_POST['hops']; |
394
ccd85f0ed96c
Added ingredient sorting to the database write functions.
Michiel Broek <mbroek@mbse.eu>
parents:
392
diff
changeset
|
178 | // Sort the array |
ccd85f0ed96c
Added ingredient sorting to the database write functions.
Michiel Broek <mbroek@mbse.eu>
parents:
392
diff
changeset
|
179 | $useat = array(); |
ccd85f0ed96c
Added ingredient sorting to the database write functions.
Michiel Broek <mbroek@mbse.eu>
parents:
392
diff
changeset
|
180 | $time = array(); |
ccd85f0ed96c
Added ingredient sorting to the database write functions.
Michiel Broek <mbroek@mbse.eu>
parents:
392
diff
changeset
|
181 | $amount = array(); |
ccd85f0ed96c
Added ingredient sorting to the database write functions.
Michiel Broek <mbroek@mbse.eu>
parents:
392
diff
changeset
|
182 | for ($i = 0; $i < count($array); $i++) { |
ccd85f0ed96c
Added ingredient sorting to the database write functions.
Michiel Broek <mbroek@mbse.eu>
parents:
392
diff
changeset
|
183 | $useat[] = $array[$i]['h_useat']; |
ccd85f0ed96c
Added ingredient sorting to the database write functions.
Michiel Broek <mbroek@mbse.eu>
parents:
392
diff
changeset
|
184 | $time[] = $array[$i]['h_time']; |
ccd85f0ed96c
Added ingredient sorting to the database write functions.
Michiel Broek <mbroek@mbse.eu>
parents:
392
diff
changeset
|
185 | $amount[] = $array[$i]['h_amount']; |
ccd85f0ed96c
Added ingredient sorting to the database write functions.
Michiel Broek <mbroek@mbse.eu>
parents:
392
diff
changeset
|
186 | } |
ccd85f0ed96c
Added ingredient sorting to the database write functions.
Michiel Broek <mbroek@mbse.eu>
parents:
392
diff
changeset
|
187 | array_multisort($useat, SORT_ASC, SORT_NUMERIC, |
ccd85f0ed96c
Added ingredient sorting to the database write functions.
Michiel Broek <mbroek@mbse.eu>
parents:
392
diff
changeset
|
188 | $time, SORT_DESC, SORT_NUMERIC, |
ccd85f0ed96c
Added ingredient sorting to the database write functions.
Michiel Broek <mbroek@mbse.eu>
parents:
392
diff
changeset
|
189 | $amount, SORT_DESC, SORT_NUMERIC, |
ccd85f0ed96c
Added ingredient sorting to the database write functions.
Michiel Broek <mbroek@mbse.eu>
parents:
392
diff
changeset
|
190 | $array); |
ccd85f0ed96c
Added ingredient sorting to the database write functions.
Michiel Broek <mbroek@mbse.eu>
parents:
392
diff
changeset
|
191 | // Write the sorted array. |
60
dbbe408108ea
Added miscs inline editor. Switched to http POST because of GET limitations.
Michiel Broek <mbroek@mbse.eu>
parents:
57
diff
changeset
|
192 | 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
|
193 | 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
|
194 | $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
|
195 | $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
|
196 | $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
|
197 | $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
|
198 | $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
|
199 | $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
|
200 | $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
|
201 | $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
|
202 | $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
|
203 | $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
|
204 | $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
|
205 | $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
|
206 | $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
|
207 | $hop .= ',"h_humulene":' . $item['h_humulene']; |
223
0de4455bd2a1
Fixed spelling area in all programs for caryophyllene. This is still wrong in brouwhulp, we correct it during database import. Also mycrene was spelled myrcene, my fault. The hops grid now uses a popup editor, this is not yet complete. Friendly weight display in the hop grid and added the inventory comlumn.
Michiel Broek <mbroek@mbse.eu>
parents:
222
diff
changeset
|
208 | $hop .= ',"h_caryophyllene":' . $item['h_caryophyllene']; |
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
|
209 | $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
|
210 | $hop .= ',"h_myrcene":' . $item['h_myrcene']; |
223
0de4455bd2a1
Fixed spelling area in all programs for caryophyllene. This is still wrong in brouwhulp, we correct it during database import. Also mycrene was spelled myrcene, my fault. The hops grid now uses a popup editor, this is not yet complete. Friendly weight display in the hop grid and added the inventory comlumn.
Michiel Broek <mbroek@mbse.eu>
parents:
222
diff
changeset
|
211 | $hop .= ',"h_total_oil":' . $item['h_total_oil'] . '}'; |
225
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
223
diff
changeset
|
212 | //syslog(LOG_NOTICE, $hop); |
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
|
213 | $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
|
214 | } |
dbbe408108ea
Added miscs inline editor. Switched to http POST because of GET limitations.
Michiel Broek <mbroek@mbse.eu>
parents:
57
diff
changeset
|
215 | } |
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
|
216 | $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
|
217 | $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
|
218 | |
225
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
223
diff
changeset
|
219 | $miscs = '['; |
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
223
diff
changeset
|
220 | $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
|
221 | 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
|
222 | $array = $_POST['miscs']; |
394
ccd85f0ed96c
Added ingredient sorting to the database write functions.
Michiel Broek <mbroek@mbse.eu>
parents:
392
diff
changeset
|
223 | // Sort the array |
ccd85f0ed96c
Added ingredient sorting to the database write functions.
Michiel Broek <mbroek@mbse.eu>
parents:
392
diff
changeset
|
224 | $use = array(); |
ccd85f0ed96c
Added ingredient sorting to the database write functions.
Michiel Broek <mbroek@mbse.eu>
parents:
392
diff
changeset
|
225 | $type = array(); |
ccd85f0ed96c
Added ingredient sorting to the database write functions.
Michiel Broek <mbroek@mbse.eu>
parents:
392
diff
changeset
|
226 | $amount = array(); |
ccd85f0ed96c
Added ingredient sorting to the database write functions.
Michiel Broek <mbroek@mbse.eu>
parents:
392
diff
changeset
|
227 | for ($i = 0; $i < count($array); $i++) { |
ccd85f0ed96c
Added ingredient sorting to the database write functions.
Michiel Broek <mbroek@mbse.eu>
parents:
392
diff
changeset
|
228 | $use[] = $array[$i]['m_use_use']; |
ccd85f0ed96c
Added ingredient sorting to the database write functions.
Michiel Broek <mbroek@mbse.eu>
parents:
392
diff
changeset
|
229 | $type[] = $array[$i]['m_type']; |
ccd85f0ed96c
Added ingredient sorting to the database write functions.
Michiel Broek <mbroek@mbse.eu>
parents:
392
diff
changeset
|
230 | $amount[] = $array[$i]['m_amount']; |
ccd85f0ed96c
Added ingredient sorting to the database write functions.
Michiel Broek <mbroek@mbse.eu>
parents:
392
diff
changeset
|
231 | } |
ccd85f0ed96c
Added ingredient sorting to the database write functions.
Michiel Broek <mbroek@mbse.eu>
parents:
392
diff
changeset
|
232 | array_multisort($use, SORT_ASC, SORT_NUMERIC, |
ccd85f0ed96c
Added ingredient sorting to the database write functions.
Michiel Broek <mbroek@mbse.eu>
parents:
392
diff
changeset
|
233 | $type, SORT_ASC, SORT_NUMERIC, |
ccd85f0ed96c
Added ingredient sorting to the database write functions.
Michiel Broek <mbroek@mbse.eu>
parents:
392
diff
changeset
|
234 | $amount, SORT_DESC, SORT_NUMERIC, |
ccd85f0ed96c
Added ingredient sorting to the database write functions.
Michiel Broek <mbroek@mbse.eu>
parents:
392
diff
changeset
|
235 | $array); |
ccd85f0ed96c
Added ingredient sorting to the database write functions.
Michiel Broek <mbroek@mbse.eu>
parents:
392
diff
changeset
|
236 | // Write the sorted array. |
225
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
223
diff
changeset
|
237 | foreach($array as $key => $item) { |
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
223
diff
changeset
|
238 | if ($comma) |
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
223
diff
changeset
|
239 | $miscs .= ','; |
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
223
diff
changeset
|
240 | $comma = TRUE; |
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
223
diff
changeset
|
241 | $misc = '{"m_name":"' . str_replace($rescapers,$rreplacements,$item['m_name']); |
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
223
diff
changeset
|
242 | $misc .= '","m_amount":' . $item['m_amount']; |
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
223
diff
changeset
|
243 | $misc .= ',"m_type":' . $item['m_type']; |
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
223
diff
changeset
|
244 | $misc .= ',"m_use_use":' . $item['m_use_use']; |
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
223
diff
changeset
|
245 | $misc .= ',"m_time":' . $item['m_time']; |
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
223
diff
changeset
|
246 | $misc .= ',"m_amount_is_weight":' . $item['m_amount_is_weight']; |
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
223
diff
changeset
|
247 | $misc .= ',"m_cost":' . $item['m_cost'] . '}'; |
226
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
248 | //syslog(LOG_NOTICE, $misc); |
225
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
223
diff
changeset
|
249 | $miscs .= $misc; |
60
dbbe408108ea
Added miscs inline editor. Switched to http POST because of GET limitations.
Michiel Broek <mbroek@mbse.eu>
parents:
57
diff
changeset
|
250 | } |
dbbe408108ea
Added miscs inline editor. Switched to http POST because of GET limitations.
Michiel Broek <mbroek@mbse.eu>
parents:
57
diff
changeset
|
251 | } |
225
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
223
diff
changeset
|
252 | $miscs .= ']'; |
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
223
diff
changeset
|
253 | $sql .= "', json_miscs='" . $miscs; |
52
b1f2a893572f
More progress on the recipes design
Michiel Broek <mbroek@mbse.eu>
parents:
51
diff
changeset
|
254 | |
226
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
255 | $yeasts = '['; |
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
256 | $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
|
257 | 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
|
258 | $array = $_POST['yeasts']; |
394
ccd85f0ed96c
Added ingredient sorting to the database write functions.
Michiel Broek <mbroek@mbse.eu>
parents:
392
diff
changeset
|
259 | // Sort the array |
ccd85f0ed96c
Added ingredient sorting to the database write functions.
Michiel Broek <mbroek@mbse.eu>
parents:
392
diff
changeset
|
260 | $use = array(); |
ccd85f0ed96c
Added ingredient sorting to the database write functions.
Michiel Broek <mbroek@mbse.eu>
parents:
392
diff
changeset
|
261 | $amount = array(); |
ccd85f0ed96c
Added ingredient sorting to the database write functions.
Michiel Broek <mbroek@mbse.eu>
parents:
392
diff
changeset
|
262 | for ($i = 0; $i < count($array); $i++) { |
ccd85f0ed96c
Added ingredient sorting to the database write functions.
Michiel Broek <mbroek@mbse.eu>
parents:
392
diff
changeset
|
263 | $use[] = $array[$i]['y_use']; |
ccd85f0ed96c
Added ingredient sorting to the database write functions.
Michiel Broek <mbroek@mbse.eu>
parents:
392
diff
changeset
|
264 | $amount[] = $array[$i]['y_amount']; |
ccd85f0ed96c
Added ingredient sorting to the database write functions.
Michiel Broek <mbroek@mbse.eu>
parents:
392
diff
changeset
|
265 | } |
ccd85f0ed96c
Added ingredient sorting to the database write functions.
Michiel Broek <mbroek@mbse.eu>
parents:
392
diff
changeset
|
266 | array_multisort($use, SORT_ASC, SORT_NUMERIC, |
ccd85f0ed96c
Added ingredient sorting to the database write functions.
Michiel Broek <mbroek@mbse.eu>
parents:
392
diff
changeset
|
267 | $amount, SORT_DESC, SORT_NUMERIC, |
ccd85f0ed96c
Added ingredient sorting to the database write functions.
Michiel Broek <mbroek@mbse.eu>
parents:
392
diff
changeset
|
268 | $array); |
ccd85f0ed96c
Added ingredient sorting to the database write functions.
Michiel Broek <mbroek@mbse.eu>
parents:
392
diff
changeset
|
269 | // Write the sorted array. |
226
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
270 | foreach($array as $key => $item) { |
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
271 | if ($comma) |
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
272 | $yeasts .= ','; |
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
273 | $comma = TRUE; |
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
274 | $yeast = '{"y_name":"' . str_replace($rescapers,$rreplacements,$item['y_name']); |
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
275 | $yeast .= '","y_laboratory":"' . str_replace($rescapers,$rreplacements,$item['y_laboratory']); |
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
276 | $yeast .= '","y_product_id":"' . str_replace($rescapers,$rreplacements,$item['y_product_id']); |
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
277 | $yeast .= '","y_amount":' . $item['y_amount']; |
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
278 | $yeast .= ',"y_type":' . $item['y_type']; |
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
279 | $yeast .= ',"y_form":' . $item['y_form']; |
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
280 | $yeast .= ',"y_min_temperature":' . $item['y_min_temperature']; |
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
281 | $yeast .= ',"y_max_temperature":' . $item['y_max_temperature']; |
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
282 | $yeast .= ',"y_flocculation":' . $item['y_flocculation']; |
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
283 | $yeast .= ',"y_attenuation":' . $item['y_attenuation']; |
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
284 | $yeast .= ',"y_cells":' . $item['y_cells']; |
332
f0ca77097236
Display alcohol tolerance in the yeast editor. Display in red when the recipe estimate is higher then the yeast tolerance.
Michiel Broek <mbroek@mbse.eu>
parents:
233
diff
changeset
|
285 | $yeast .= ',"y_tolerance":' . $item['y_tolerance']; |
226
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
286 | $yeast .= ',"y_inventory":' . $item['y_inventory']; |
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
287 | $yeast .= ',"y_use":' . $item['y_use']; |
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
288 | $yeast .= ',"y_cost":' . $item['y_cost'] . '}'; |
359
98354ef399cd
Lot's of improvements for recipes and products database load and save. Insert missing yeast tolerance field for old products and recipes. Recipe locked and calc_acid fields coverted to integer. In recipe edit screen removed the Print button. It is now included in the export screen. Added recipe export to forum screen.
Michiel Broek <mbroek@mbse.eu>
parents:
352
diff
changeset
|
289 | syslog(LOG_NOTICE, $yeast); |
226
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
290 | $yeasts .= $yeast; |
57
bb9a06aa9acd
Completed framework inline fermentables editor
Michiel Broek <mbroek@mbse.eu>
parents:
52
diff
changeset
|
291 | } |
bb9a06aa9acd
Completed framework inline fermentables editor
Michiel Broek <mbroek@mbse.eu>
parents:
52
diff
changeset
|
292 | } |
226
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
293 | $yeasts .= ']'; |
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
294 | $sql .= "', json_yeasts='" . $yeasts; |
57
bb9a06aa9acd
Completed framework inline fermentables editor
Michiel Broek <mbroek@mbse.eu>
parents:
52
diff
changeset
|
295 | |
228
98536f6539ee
The mash grid now uses a popup editor. There is now a dropdown mash selector to replace the mash scheme.
Michiel Broek <mbroek@mbse.eu>
parents:
226
diff
changeset
|
296 | $mashs = '['; |
98536f6539ee
The mash grid now uses a popup editor. There is now a dropdown mash selector to replace the mash scheme.
Michiel Broek <mbroek@mbse.eu>
parents:
226
diff
changeset
|
297 | $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
|
298 | 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
|
299 | $array = $_POST['mashs']; |
394
ccd85f0ed96c
Added ingredient sorting to the database write functions.
Michiel Broek <mbroek@mbse.eu>
parents:
392
diff
changeset
|
300 | // Sort the array |
ccd85f0ed96c
Added ingredient sorting to the database write functions.
Michiel Broek <mbroek@mbse.eu>
parents:
392
diff
changeset
|
301 | $temp = array(); |
ccd85f0ed96c
Added ingredient sorting to the database write functions.
Michiel Broek <mbroek@mbse.eu>
parents:
392
diff
changeset
|
302 | for ($i = 0; $i < count($array); $i++) { |
ccd85f0ed96c
Added ingredient sorting to the database write functions.
Michiel Broek <mbroek@mbse.eu>
parents:
392
diff
changeset
|
303 | $temp[] = $array[$i]['step_temp']; |
ccd85f0ed96c
Added ingredient sorting to the database write functions.
Michiel Broek <mbroek@mbse.eu>
parents:
392
diff
changeset
|
304 | } |
ccd85f0ed96c
Added ingredient sorting to the database write functions.
Michiel Broek <mbroek@mbse.eu>
parents:
392
diff
changeset
|
305 | array_multisort($temp, SORT_ASC, SORT_NUMERIC, $array); |
ccd85f0ed96c
Added ingredient sorting to the database write functions.
Michiel Broek <mbroek@mbse.eu>
parents:
392
diff
changeset
|
306 | // Write the sorted array. |
228
98536f6539ee
The mash grid now uses a popup editor. There is now a dropdown mash selector to replace the mash scheme.
Michiel Broek <mbroek@mbse.eu>
parents:
226
diff
changeset
|
307 | foreach($array as $key => $item) { |
98536f6539ee
The mash grid now uses a popup editor. There is now a dropdown mash selector to replace the mash scheme.
Michiel Broek <mbroek@mbse.eu>
parents:
226
diff
changeset
|
308 | if ($comma) |
98536f6539ee
The mash grid now uses a popup editor. There is now a dropdown mash selector to replace the mash scheme.
Michiel Broek <mbroek@mbse.eu>
parents:
226
diff
changeset
|
309 | $mashs .= ','; |
98536f6539ee
The mash grid now uses a popup editor. There is now a dropdown mash selector to replace the mash scheme.
Michiel Broek <mbroek@mbse.eu>
parents:
226
diff
changeset
|
310 | $comma = TRUE; |
98536f6539ee
The mash grid now uses a popup editor. There is now a dropdown mash selector to replace the mash scheme.
Michiel Broek <mbroek@mbse.eu>
parents:
226
diff
changeset
|
311 | $mash = '{"step_name":"' . str_replace($rescapers,$rreplacements,$item['step_name']); |
98536f6539ee
The mash grid now uses a popup editor. There is now a dropdown mash selector to replace the mash scheme.
Michiel Broek <mbroek@mbse.eu>
parents:
226
diff
changeset
|
312 | $mash .= '","step_type":' . $item['step_type']; |
98536f6539ee
The mash grid now uses a popup editor. There is now a dropdown mash selector to replace the mash scheme.
Michiel Broek <mbroek@mbse.eu>
parents:
226
diff
changeset
|
313 | if (isset($item['step_infuse_amount']) && $item['step_infuse_amount'] != "") |
98536f6539ee
The mash grid now uses a popup editor. There is now a dropdown mash selector to replace the mash scheme.
Michiel Broek <mbroek@mbse.eu>
parents:
226
diff
changeset
|
314 | $mash .= ',"step_infuse_amount":' . $item['step_infuse_amount']; |
98536f6539ee
The mash grid now uses a popup editor. There is now a dropdown mash selector to replace the mash scheme.
Michiel Broek <mbroek@mbse.eu>
parents:
226
diff
changeset
|
315 | else |
98536f6539ee
The mash grid now uses a popup editor. There is now a dropdown mash selector to replace the mash scheme.
Michiel Broek <mbroek@mbse.eu>
parents:
226
diff
changeset
|
316 | $mash .= ',"step_infuse_amount":0'; |
98536f6539ee
The mash grid now uses a popup editor. There is now a dropdown mash selector to replace the mash scheme.
Michiel Broek <mbroek@mbse.eu>
parents:
226
diff
changeset
|
317 | $mash .= ',"step_temp":' . $item['step_temp']; |
98536f6539ee
The mash grid now uses a popup editor. There is now a dropdown mash selector to replace the mash scheme.
Michiel Broek <mbroek@mbse.eu>
parents:
226
diff
changeset
|
318 | $mash .= ',"step_time":' . $item['step_time']; |
98536f6539ee
The mash grid now uses a popup editor. There is now a dropdown mash selector to replace the mash scheme.
Michiel Broek <mbroek@mbse.eu>
parents:
226
diff
changeset
|
319 | $mash .= ',"ramp_time":' . $item['ramp_time']; |
98536f6539ee
The mash grid now uses a popup editor. There is now a dropdown mash selector to replace the mash scheme.
Michiel Broek <mbroek@mbse.eu>
parents:
226
diff
changeset
|
320 | $mash .= ',"end_temp":' . $item['end_temp'] . '}'; |
98536f6539ee
The mash grid now uses a popup editor. There is now a dropdown mash selector to replace the mash scheme.
Michiel Broek <mbroek@mbse.eu>
parents:
226
diff
changeset
|
321 | $mashs .= $mash; |
359
98354ef399cd
Lot's of improvements for recipes and products database load and save. Insert missing yeast tolerance field for old products and recipes. Recipe locked and calc_acid fields coverted to integer. In recipe edit screen removed the Print button. It is now included in the export screen. Added recipe export to forum screen.
Michiel Broek <mbroek@mbse.eu>
parents:
352
diff
changeset
|
322 | //syslog(LOG_NOTICE, $mash); |
60
dbbe408108ea
Added miscs inline editor. Switched to http POST because of GET limitations.
Michiel Broek <mbroek@mbse.eu>
parents:
57
diff
changeset
|
323 | } |
dbbe408108ea
Added miscs inline editor. Switched to http POST because of GET limitations.
Michiel Broek <mbroek@mbse.eu>
parents:
57
diff
changeset
|
324 | } |
228
98536f6539ee
The mash grid now uses a popup editor. There is now a dropdown mash selector to replace the mash scheme.
Michiel Broek <mbroek@mbse.eu>
parents:
226
diff
changeset
|
325 | $mashs .= ']'; |
98536f6539ee
The mash grid now uses a popup editor. There is now a dropdown mash selector to replace the mash scheme.
Michiel Broek <mbroek@mbse.eu>
parents:
226
diff
changeset
|
326 | $sql .= "', json_mashs='" . $mashs; |
60
dbbe408108ea
Added miscs inline editor. Switched to http POST because of GET limitations.
Michiel Broek <mbroek@mbse.eu>
parents:
57
diff
changeset
|
327 | |
dbbe408108ea
Added miscs inline editor. Switched to http POST because of GET limitations.
Michiel Broek <mbroek@mbse.eu>
parents:
57
diff
changeset
|
328 | if (isset($_POST['insert'])) { |
52
b1f2a893572f
More progress on the recipes design
Michiel Broek <mbroek@mbse.eu>
parents:
51
diff
changeset
|
329 | $sql .= "';"; |
b1f2a893572f
More progress on the recipes design
Michiel Broek <mbroek@mbse.eu>
parents:
51
diff
changeset
|
330 | } |
60
dbbe408108ea
Added miscs inline editor. Switched to http POST because of GET limitations.
Michiel Broek <mbroek@mbse.eu>
parents:
57
diff
changeset
|
331 | 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
|
332 | $sql .= "' WHERE record='" . $_POST['record'] . "';"; |
52
b1f2a893572f
More progress on the recipes design
Michiel Broek <mbroek@mbse.eu>
parents:
51
diff
changeset
|
333 | } |
49
4d27a7fb1265
Finisched recipe import. Added recipe retrieve script.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
334 | |
52
b1f2a893572f
More progress on the recipes design
Michiel Broek <mbroek@mbse.eu>
parents:
51
diff
changeset
|
335 | $result = mysqli_query($connect, $sql); |
b1f2a893572f
More progress on the recipes design
Michiel Broek <mbroek@mbse.eu>
parents:
51
diff
changeset
|
336 | if (! $result) { |
61 | 337 | 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
|
338 | } else { |
60
dbbe408108ea
Added miscs inline editor. Switched to http POST because of GET limitations.
Michiel Broek <mbroek@mbse.eu>
parents:
57
diff
changeset
|
339 | 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
|
340 | 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
|
341 | } 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
|
342 | $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
|
343 | 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
|
344 | } |
dbbe408108ea
Added miscs inline editor. Switched to http POST because of GET limitations.
Michiel Broek <mbroek@mbse.eu>
parents:
57
diff
changeset
|
345 | } |
dbbe408108ea
Added miscs inline editor. Switched to http POST because of GET limitations.
Michiel Broek <mbroek@mbse.eu>
parents:
57
diff
changeset
|
346 | echo $result; |
dbbe408108ea
Added miscs inline editor. Switched to http POST because of GET limitations.
Michiel Broek <mbroek@mbse.eu>
parents:
57
diff
changeset
|
347 | |
dbbe408108ea
Added miscs inline editor. Switched to http POST because of GET limitations.
Michiel Broek <mbroek@mbse.eu>
parents:
57
diff
changeset
|
348 | } 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
|
349 | // DELETE COMMAND |
dbbe408108ea
Added miscs inline editor. Switched to http POST because of GET limitations.
Michiel Broek <mbroek@mbse.eu>
parents:
57
diff
changeset
|
350 | $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
|
351 | $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
|
352 | if (! $result) { |
61 | 353 | 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
|
354 | } else { |
dbbe408108ea
Added miscs inline editor. Switched to http POST because of GET limitations.
Michiel Broek <mbroek@mbse.eu>
parents:
57
diff
changeset
|
355 | 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
|
356 | } |
b1f2a893572f
More progress on the recipes design
Michiel Broek <mbroek@mbse.eu>
parents:
51
diff
changeset
|
357 | echo $result; |
49
4d27a7fb1265
Finisched recipe import. Added recipe retrieve script.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
358 | |
4d27a7fb1265
Finisched recipe import. Added recipe retrieve script.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
359 | } else { |
130
601920b902e5
Load a single recipe from the database instead of client side select.
Michiel Broek <mbroek@mbse.eu>
parents:
94
diff
changeset
|
360 | /* |
601920b902e5
Load a single recipe from the database instead of client side select.
Michiel Broek <mbroek@mbse.eu>
parents:
94
diff
changeset
|
361 | * 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
|
362 | */ |
601920b902e5
Load a single recipe from the database instead of client side select.
Michiel Broek <mbroek@mbse.eu>
parents:
94
diff
changeset
|
363 | 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
|
364 | $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
|
365 | } else { |
601920b902e5
Load a single recipe from the database instead of client side select.
Michiel Broek <mbroek@mbse.eu>
parents:
94
diff
changeset
|
366 | $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
|
367 | } |
49
4d27a7fb1265
Finisched recipe import. Added recipe retrieve script.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
368 | $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
|
369 | $recipes = '['; |
4d27a7fb1265
Finisched recipe import. Added recipe retrieve script.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
370 | $comma = FALSE; |
4d27a7fb1265
Finisched recipe import. Added recipe retrieve script.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
371 | while ($row = mysqli_fetch_array($result, MYSQLI_ASSOC)) { |
4d27a7fb1265
Finisched recipe import. Added recipe retrieve script.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
372 | // Manual encode to JSON. |
4d27a7fb1265
Finisched recipe import. Added recipe retrieve script.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
373 | if ($comma) { |
4d27a7fb1265
Finisched recipe import. Added recipe retrieve script.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
374 | $recipes .= ','; |
4d27a7fb1265
Finisched recipe import. Added recipe retrieve script.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
375 | } |
4d27a7fb1265
Finisched recipe import. Added recipe retrieve script.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
376 | $comma = TRUE; |
4d27a7fb1265
Finisched recipe import. Added recipe retrieve script.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
377 | $recipes .= '{"record":' . $row['record']; |
359
98354ef399cd
Lot's of improvements for recipes and products database load and save. Insert missing yeast tolerance field for old products and recipes. Recipe locked and calc_acid fields coverted to integer. In recipe edit screen removed the Print button. It is now included in the export screen. Added recipe export to forum screen.
Michiel Broek <mbroek@mbse.eu>
parents:
352
diff
changeset
|
378 | $recipes .= ',"uuid":"' . str_replace($escapers, $replacements, $row['uuid']); |
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
|
379 | $recipes .= '","locked":' . $row['locked']; |
51 | 380 | $recipes .= ',"st_guide":"' . str_replace($escapers, $replacements, $row['st_guide']); |
381 | $recipes .= '","st_letter":"' . str_replace($escapers, $replacements, $row['st_letter']); | |
382 | $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
|
383 | $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
|
384 | $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
|
385 | $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
|
386 | $recipes .= ',"st_og_min":' . floatval($row['st_og_min']); |
51 | 387 | $recipes .= ',"st_og_max":' . floatval($row['st_og_max']); |
388 | $recipes .= ',"st_fg_min":' . floatval($row['st_fg_min']); | |
389 | $recipes .= ',"st_fg_max":' . floatval($row['st_fg_max']); | |
390 | $recipes .= ',"st_ibu_min":' . floatval($row['st_ibu_min']); | |
391 | $recipes .= ',"st_ibu_max":' . floatval($row['st_ibu_max']); | |
392 | $recipes .= ',"st_color_min":' . floatval($row['st_color_min']); | |
393 | $recipes .= ',"st_color_max":' . floatval($row['st_color_max']); | |
394 | $recipes .= ',"st_carb_min":' . floatval($row['st_carb_min']); | |
395 | $recipes .= ',"st_carb_max":' . floatval($row['st_carb_max']); | |
396 | $recipes .= ',"st_abv_min":' . floatval($row['st_abv_min']); | |
397 | $recipes .= ',"st_abv_max":' . floatval($row['st_abv_max']); | |
398 | $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
|
399 | $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
|
400 | $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
|
401 | $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
|
402 | $recipes .= ',"boil_size":' . floatval($row['boil_size']); |
49
4d27a7fb1265
Finisched recipe import. Added recipe retrieve script.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
403 | $recipes .= ',"boil_time":' . floatval($row['boil_time']); |
4d27a7fb1265
Finisched recipe import. Added recipe retrieve script.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
404 | $recipes .= ',"efficiency":' . floatval($row['efficiency']); |
4d27a7fb1265
Finisched recipe import. Added recipe retrieve script.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
405 | $recipes .= ',"est_og":' . floatval($row['est_og']); |
4d27a7fb1265
Finisched recipe import. Added recipe retrieve script.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
406 | $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
|
407 | $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
|
408 | $recipes .= ',"est_carb":' . floatval($row['est_carb']); |
49
4d27a7fb1265
Finisched recipe import. Added recipe retrieve script.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
409 | $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
|
410 | $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
|
411 | $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
|
412 | $recipes .= ',"ibu_method":' . $row['ibu_method']; |
359
98354ef399cd
Lot's of improvements for recipes and products database load and save. Insert missing yeast tolerance field for old products and recipes. Recipe locked and calc_acid fields coverted to integer. In recipe edit screen removed the Print button. It is now included in the export screen. Added recipe export to forum screen.
Michiel Broek <mbroek@mbse.eu>
parents:
352
diff
changeset
|
413 | $recipes .= ',"sparge_temp":' . floatval($row['sparge_temp']); |
98354ef399cd
Lot's of improvements for recipes and products database load and save. Insert missing yeast tolerance field for old products and recipes. Recipe locked and calc_acid fields coverted to integer. In recipe edit screen removed the Print button. It is now included in the export screen. Added recipe export to forum screen.
Michiel Broek <mbroek@mbse.eu>
parents:
352
diff
changeset
|
414 | $recipes .= ',"sparge_ph":' . floatval($row['sparge_ph']); |
98354ef399cd
Lot's of improvements for recipes and products database load and save. Insert missing yeast tolerance field for old products and recipes. Recipe locked and calc_acid fields coverted to integer. In recipe edit screen removed the Print button. It is now included in the export screen. Added recipe export to forum screen.
Michiel Broek <mbroek@mbse.eu>
parents:
352
diff
changeset
|
415 | $recipes .= ',"sparge_volume":' . floatval($row['sparge_volume']); |
156
35860890224c
Added sparge water acid calculation. Added residual alkalinity calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
154
diff
changeset
|
416 | $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
|
417 | $recipes .= '","sparge_acid_type":' . $row['sparge_acid_type']; |
359
98354ef399cd
Lot's of improvements for recipes and products database load and save. Insert missing yeast tolerance field for old products and recipes. Recipe locked and calc_acid fields coverted to integer. In recipe edit screen removed the Print button. It is now included in the export screen. Added recipe export to forum screen.
Michiel Broek <mbroek@mbse.eu>
parents:
352
diff
changeset
|
418 | $recipes .= ',"sparge_acid_perc":' . floatval($row['sparge_acid_perc']); |
98354ef399cd
Lot's of improvements for recipes and products database load and save. Insert missing yeast tolerance field for old products and recipes. Recipe locked and calc_acid fields coverted to integer. In recipe edit screen removed the Print button. It is now included in the export screen. Added recipe export to forum screen.
Michiel Broek <mbroek@mbse.eu>
parents:
352
diff
changeset
|
419 | $recipes .= ',"sparge_acid_amount":' . floatval($row['sparge_acid_amount']); |
98354ef399cd
Lot's of improvements for recipes and products database load and save. Insert missing yeast tolerance field for old products and recipes. Recipe locked and calc_acid fields coverted to integer. In recipe edit screen removed the Print button. It is now included in the export screen. Added recipe export to forum screen.
Michiel Broek <mbroek@mbse.eu>
parents:
352
diff
changeset
|
420 | $recipes .= ',"mash_ph":' . floatval($row['mash_ph']); |
98354ef399cd
Lot's of improvements for recipes and products database load and save. Insert missing yeast tolerance field for old products and recipes. Recipe locked and calc_acid fields coverted to integer. In recipe edit screen removed the Print button. It is now included in the export screen. Added recipe export to forum screen.
Michiel Broek <mbroek@mbse.eu>
parents:
352
diff
changeset
|
421 | $recipes .= ',"mash_name":"' . str_replace($escapers, $replacements, $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
|
422 | $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
|
423 | $recipes .= ',"w1_name":"' . str_replace($escapers, $replacements, $row['w1_name']); |
359
98354ef399cd
Lot's of improvements for recipes and products database load and save. Insert missing yeast tolerance field for old products and recipes. Recipe locked and calc_acid fields coverted to integer. In recipe edit screen removed the Print button. It is now included in the export screen. Added recipe export to forum screen.
Michiel Broek <mbroek@mbse.eu>
parents:
352
diff
changeset
|
424 | $recipes .= '","w1_amount":' . floatval($row['w1_amount']); |
98354ef399cd
Lot's of improvements for recipes and products database load and save. Insert missing yeast tolerance field for old products and recipes. Recipe locked and calc_acid fields coverted to integer. In recipe edit screen removed the Print button. It is now included in the export screen. Added recipe export to forum screen.
Michiel Broek <mbroek@mbse.eu>
parents:
352
diff
changeset
|
425 | $recipes .= ',"w1_calcium":' . floatval($row['w1_calcium']); |
98354ef399cd
Lot's of improvements for recipes and products database load and save. Insert missing yeast tolerance field for old products and recipes. Recipe locked and calc_acid fields coverted to integer. In recipe edit screen removed the Print button. It is now included in the export screen. Added recipe export to forum screen.
Michiel Broek <mbroek@mbse.eu>
parents:
352
diff
changeset
|
426 | $recipes .= ',"w1_sulfate":' . floatval($row['w1_sulfate']); |
98354ef399cd
Lot's of improvements for recipes and products database load and save. Insert missing yeast tolerance field for old products and recipes. Recipe locked and calc_acid fields coverted to integer. In recipe edit screen removed the Print button. It is now included in the export screen. Added recipe export to forum screen.
Michiel Broek <mbroek@mbse.eu>
parents:
352
diff
changeset
|
427 | $recipes .= ',"w1_chloride":' . floatval($row['w1_chloride']); |
98354ef399cd
Lot's of improvements for recipes and products database load and save. Insert missing yeast tolerance field for old products and recipes. Recipe locked and calc_acid fields coverted to integer. In recipe edit screen removed the Print button. It is now included in the export screen. Added recipe export to forum screen.
Michiel Broek <mbroek@mbse.eu>
parents:
352
diff
changeset
|
428 | $recipes .= ',"w1_sodium":' . floatval($row['w1_sodium']); |
98354ef399cd
Lot's of improvements for recipes and products database load and save. Insert missing yeast tolerance field for old products and recipes. Recipe locked and calc_acid fields coverted to integer. In recipe edit screen removed the Print button. It is now included in the export screen. Added recipe export to forum screen.
Michiel Broek <mbroek@mbse.eu>
parents:
352
diff
changeset
|
429 | $recipes .= ',"w1_magnesium":' . floatval($row['w1_magnesium']); |
98354ef399cd
Lot's of improvements for recipes and products database load and save. Insert missing yeast tolerance field for old products and recipes. Recipe locked and calc_acid fields coverted to integer. In recipe edit screen removed the Print button. It is now included in the export screen. Added recipe export to forum screen.
Michiel Broek <mbroek@mbse.eu>
parents:
352
diff
changeset
|
430 | $recipes .= ',"w1_total_alkalinity":' . floatval($row['w1_total_alkalinity']); |
98354ef399cd
Lot's of improvements for recipes and products database load and save. Insert missing yeast tolerance field for old products and recipes. Recipe locked and calc_acid fields coverted to integer. In recipe edit screen removed the Print button. It is now included in the export screen. Added recipe export to forum screen.
Michiel Broek <mbroek@mbse.eu>
parents:
352
diff
changeset
|
431 | $recipes .= ',"w1_ph":' . floatval($row['w1_ph']); |
98354ef399cd
Lot's of improvements for recipes and products database load and save. Insert missing yeast tolerance field for old products and recipes. Recipe locked and calc_acid fields coverted to integer. In recipe edit screen removed the Print button. It is now included in the export screen. Added recipe export to forum screen.
Michiel Broek <mbroek@mbse.eu>
parents:
352
diff
changeset
|
432 | $recipes .= ',"w1_cost":' . floatval($row['w1_cost']); |
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
|
433 | $recipes .= ',"w2_name":"' . str_replace($escapers, $replacements, $row['w2_name']); |
359
98354ef399cd
Lot's of improvements for recipes and products database load and save. Insert missing yeast tolerance field for old products and recipes. Recipe locked and calc_acid fields coverted to integer. In recipe edit screen removed the Print button. It is now included in the export screen. Added recipe export to forum screen.
Michiel Broek <mbroek@mbse.eu>
parents:
352
diff
changeset
|
434 | $recipes .= '","w2_amount":' . floatval($row['w2_amount']); |
98354ef399cd
Lot's of improvements for recipes and products database load and save. Insert missing yeast tolerance field for old products and recipes. Recipe locked and calc_acid fields coverted to integer. In recipe edit screen removed the Print button. It is now included in the export screen. Added recipe export to forum screen.
Michiel Broek <mbroek@mbse.eu>
parents:
352
diff
changeset
|
435 | $recipes .= ',"w2_calcium":' . floatval($row['w2_calcium']); |
98354ef399cd
Lot's of improvements for recipes and products database load and save. Insert missing yeast tolerance field for old products and recipes. Recipe locked and calc_acid fields coverted to integer. In recipe edit screen removed the Print button. It is now included in the export screen. Added recipe export to forum screen.
Michiel Broek <mbroek@mbse.eu>
parents:
352
diff
changeset
|
436 | $recipes .= ',"w2_sulfate":' . floatval($row['w2_sulfate']); |
98354ef399cd
Lot's of improvements for recipes and products database load and save. Insert missing yeast tolerance field for old products and recipes. Recipe locked and calc_acid fields coverted to integer. In recipe edit screen removed the Print button. It is now included in the export screen. Added recipe export to forum screen.
Michiel Broek <mbroek@mbse.eu>
parents:
352
diff
changeset
|
437 | $recipes .= ',"w2_chloride":' . floatval($row['w2_chloride']); |
98354ef399cd
Lot's of improvements for recipes and products database load and save. Insert missing yeast tolerance field for old products and recipes. Recipe locked and calc_acid fields coverted to integer. In recipe edit screen removed the Print button. It is now included in the export screen. Added recipe export to forum screen.
Michiel Broek <mbroek@mbse.eu>
parents:
352
diff
changeset
|
438 | $recipes .= ',"w2_sodium":' . floatval($row['w2_sodium']); |
98354ef399cd
Lot's of improvements for recipes and products database load and save. Insert missing yeast tolerance field for old products and recipes. Recipe locked and calc_acid fields coverted to integer. In recipe edit screen removed the Print button. It is now included in the export screen. Added recipe export to forum screen.
Michiel Broek <mbroek@mbse.eu>
parents:
352
diff
changeset
|
439 | $recipes .= ',"w2_magnesium":' . floatval($row['w2_magnesium']); |
98354ef399cd
Lot's of improvements for recipes and products database load and save. Insert missing yeast tolerance field for old products and recipes. Recipe locked and calc_acid fields coverted to integer. In recipe edit screen removed the Print button. It is now included in the export screen. Added recipe export to forum screen.
Michiel Broek <mbroek@mbse.eu>
parents:
352
diff
changeset
|
440 | $recipes .= ',"w2_total_alkalinity":' . floatval($row['w2_total_alkalinity']); |
98354ef399cd
Lot's of improvements for recipes and products database load and save. Insert missing yeast tolerance field for old products and recipes. Recipe locked and calc_acid fields coverted to integer. In recipe edit screen removed the Print button. It is now included in the export screen. Added recipe export to forum screen.
Michiel Broek <mbroek@mbse.eu>
parents:
352
diff
changeset
|
441 | $recipes .= ',"w2_ph":' . floatval($row['w2_ph']); |
98354ef399cd
Lot's of improvements for recipes and products database load and save. Insert missing yeast tolerance field for old products and recipes. Recipe locked and calc_acid fields coverted to integer. In recipe edit screen removed the Print button. It is now included in the export screen. Added recipe export to forum screen.
Michiel Broek <mbroek@mbse.eu>
parents:
352
diff
changeset
|
442 | $recipes .= ',"w2_cost":' . floatval($row['w2_cost']); |
392
544d7d0183b2
Added 15 fields to the recipes table. Added 18 fields to the products table. These are calculated values that are now stored in the database so export programs can use these values without calculating them again. Product and recipe print have water and mash schedule added. Product print has brewday results added if the brewday is over. The ingredients layout changed in the product and recipe prints.
Michiel Broek <mbroek@mbse.eu>
parents:
359
diff
changeset
|
443 | $recipes .= ',"wg_amount":' . floatval($row['wg_amount']); |
544d7d0183b2
Added 15 fields to the recipes table. Added 18 fields to the products table. These are calculated values that are now stored in the database so export programs can use these values without calculating them again. Product and recipe print have water and mash schedule added. Product print has brewday results added if the brewday is over. The ingredients layout changed in the product and recipe prints.
Michiel Broek <mbroek@mbse.eu>
parents:
359
diff
changeset
|
444 | $recipes .= ',"wg_calcium":' . floatval($row['wg_calcium']); |
544d7d0183b2
Added 15 fields to the recipes table. Added 18 fields to the products table. These are calculated values that are now stored in the database so export programs can use these values without calculating them again. Product and recipe print have water and mash schedule added. Product print has brewday results added if the brewday is over. The ingredients layout changed in the product and recipe prints.
Michiel Broek <mbroek@mbse.eu>
parents:
359
diff
changeset
|
445 | $recipes .= ',"wg_sulfate":' . floatval($row['wg_sulfate']); |
544d7d0183b2
Added 15 fields to the recipes table. Added 18 fields to the products table. These are calculated values that are now stored in the database so export programs can use these values without calculating them again. Product and recipe print have water and mash schedule added. Product print has brewday results added if the brewday is over. The ingredients layout changed in the product and recipe prints.
Michiel Broek <mbroek@mbse.eu>
parents:
359
diff
changeset
|
446 | $recipes .= ',"wg_chloride":' . floatval($row['wg_chloride']); |
544d7d0183b2
Added 15 fields to the recipes table. Added 18 fields to the products table. These are calculated values that are now stored in the database so export programs can use these values without calculating them again. Product and recipe print have water and mash schedule added. Product print has brewday results added if the brewday is over. The ingredients layout changed in the product and recipe prints.
Michiel Broek <mbroek@mbse.eu>
parents:
359
diff
changeset
|
447 | $recipes .= ',"wg_sodium":' . floatval($row['wg_sodium']); |
544d7d0183b2
Added 15 fields to the recipes table. Added 18 fields to the products table. These are calculated values that are now stored in the database so export programs can use these values without calculating them again. Product and recipe print have water and mash schedule added. Product print has brewday results added if the brewday is over. The ingredients layout changed in the product and recipe prints.
Michiel Broek <mbroek@mbse.eu>
parents:
359
diff
changeset
|
448 | $recipes .= ',"wg_magnesium":' . floatval($row['wg_magnesium']); |
544d7d0183b2
Added 15 fields to the recipes table. Added 18 fields to the products table. These are calculated values that are now stored in the database so export programs can use these values without calculating them again. Product and recipe print have water and mash schedule added. Product print has brewday results added if the brewday is over. The ingredients layout changed in the product and recipe prints.
Michiel Broek <mbroek@mbse.eu>
parents:
359
diff
changeset
|
449 | $recipes .= ',"wg_total_alkalinity":' . floatval($row['wg_total_alkalinity']); |
544d7d0183b2
Added 15 fields to the recipes table. Added 18 fields to the products table. These are calculated values that are now stored in the database so export programs can use these values without calculating them again. Product and recipe print have water and mash schedule added. Product print has brewday results added if the brewday is over. The ingredients layout changed in the product and recipe prints.
Michiel Broek <mbroek@mbse.eu>
parents:
359
diff
changeset
|
450 | $recipes .= ',"wg_ph":' . floatval($row['wg_ph']); |
544d7d0183b2
Added 15 fields to the recipes table. Added 18 fields to the products table. These are calculated values that are now stored in the database so export programs can use these values without calculating them again. Product and recipe print have water and mash schedule added. Product print has brewday results added if the brewday is over. The ingredients layout changed in the product and recipe prints.
Michiel Broek <mbroek@mbse.eu>
parents:
359
diff
changeset
|
451 | $recipes .= ',"wb_calcium":' . floatval($row['wb_calcium']); |
544d7d0183b2
Added 15 fields to the recipes table. Added 18 fields to the products table. These are calculated values that are now stored in the database so export programs can use these values without calculating them again. Product and recipe print have water and mash schedule added. Product print has brewday results added if the brewday is over. The ingredients layout changed in the product and recipe prints.
Michiel Broek <mbroek@mbse.eu>
parents:
359
diff
changeset
|
452 | $recipes .= ',"wb_sulfate":' . floatval($row['wb_sulfate']); |
544d7d0183b2
Added 15 fields to the recipes table. Added 18 fields to the products table. These are calculated values that are now stored in the database so export programs can use these values without calculating them again. Product and recipe print have water and mash schedule added. Product print has brewday results added if the brewday is over. The ingredients layout changed in the product and recipe prints.
Michiel Broek <mbroek@mbse.eu>
parents:
359
diff
changeset
|
453 | $recipes .= ',"wb_chloride":' . floatval($row['wb_chloride']); |
544d7d0183b2
Added 15 fields to the recipes table. Added 18 fields to the products table. These are calculated values that are now stored in the database so export programs can use these values without calculating them again. Product and recipe print have water and mash schedule added. Product print has brewday results added if the brewday is over. The ingredients layout changed in the product and recipe prints.
Michiel Broek <mbroek@mbse.eu>
parents:
359
diff
changeset
|
454 | $recipes .= ',"wb_sodium":' . floatval($row['wb_sodium']); |
544d7d0183b2
Added 15 fields to the recipes table. Added 18 fields to the products table. These are calculated values that are now stored in the database so export programs can use these values without calculating them again. Product and recipe print have water and mash schedule added. Product print has brewday results added if the brewday is over. The ingredients layout changed in the product and recipe prints.
Michiel Broek <mbroek@mbse.eu>
parents:
359
diff
changeset
|
455 | $recipes .= ',"wb_magnesium":' . floatval($row['wb_magnesium']); |
544d7d0183b2
Added 15 fields to the recipes table. Added 18 fields to the products table. These are calculated values that are now stored in the database so export programs can use these values without calculating them again. Product and recipe print have water and mash schedule added. Product print has brewday results added if the brewday is over. The ingredients layout changed in the product and recipe prints.
Michiel Broek <mbroek@mbse.eu>
parents:
359
diff
changeset
|
456 | $recipes .= ',"wb_total_alkalinity":' . floatval($row['wb_total_alkalinity']); |
544d7d0183b2
Added 15 fields to the recipes table. Added 18 fields to the products table. These are calculated values that are now stored in the database so export programs can use these values without calculating them again. Product and recipe print have water and mash schedule added. Product print has brewday results added if the brewday is over. The ingredients layout changed in the product and recipe prints.
Michiel Broek <mbroek@mbse.eu>
parents:
359
diff
changeset
|
457 | $recipes .= ',"wb_ph":' . floatval($row['wb_ph']); |
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
|
458 | $recipes .= ',"wa_acid_name":' . $row['wa_acid_name']; |
359
98354ef399cd
Lot's of improvements for recipes and products database load and save. Insert missing yeast tolerance field for old products and recipes. Recipe locked and calc_acid fields coverted to integer. In recipe edit screen removed the Print button. It is now included in the export screen. Added recipe export to forum screen.
Michiel Broek <mbroek@mbse.eu>
parents:
352
diff
changeset
|
459 | $recipes .= ',"wa_acid_perc":' . floatval($row['wa_acid_perc']); |
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
|
460 | $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
|
461 | 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
|
462 | // 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
|
463 | $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
|
464 | 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
|
465 | $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
|
466 | $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
|
467 | $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
|
468 | $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
|
469 | $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
|
470 | 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
|
471 | 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
|
472 | $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
|
473 | $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
|
474 | } |
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
|
475 | 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
|
476 | } |
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
|
477 | } |
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
|
478 | $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
|
479 | |
78946739b3a6
All recipe data now has inventory information added.
Michiel Broek <mbroek@mbse.eu>
parents:
221
diff
changeset
|
480 | $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
|
481 | 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
|
482 | $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
|
483 | $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
|
484 | $sql2 = "SELECT inventory FROM inventory_hops "; |
78946739b3a6
All recipe data now has inventory information added.
Michiel Broek <mbroek@mbse.eu>
parents:
221
diff
changeset
|
485 | $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
|
486 | $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
|
487 | $sql2 .= " form='".$hops[$i]['h_form']."'"; |
78946739b3a6
All recipe data now has inventory information added.
Michiel Broek <mbroek@mbse.eu>
parents:
221
diff
changeset
|
488 | if ($result2 = mysqli_query($connect, $sql2)) { |
78946739b3a6
All recipe data now has inventory information added.
Michiel Broek <mbroek@mbse.eu>
parents:
221
diff
changeset
|
489 | if ($obj = mysqli_fetch_object($result2)) { |
78946739b3a6
All recipe data now has inventory information added.
Michiel Broek <mbroek@mbse.eu>
parents:
221
diff
changeset
|
490 | $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
|
491 | $hops[$i]['h_avail'] = 1; |
78946739b3a6
All recipe data now has inventory information added.
Michiel Broek <mbroek@mbse.eu>
parents:
221
diff
changeset
|
492 | } |
78946739b3a6
All recipe data now has inventory information added.
Michiel Broek <mbroek@mbse.eu>
parents:
221
diff
changeset
|
493 | mysqli_free_result($result2); |
78946739b3a6
All recipe data now has inventory information added.
Michiel Broek <mbroek@mbse.eu>
parents:
221
diff
changeset
|
494 | } |
78946739b3a6
All recipe data now has inventory information added.
Michiel Broek <mbroek@mbse.eu>
parents:
221
diff
changeset
|
495 | } |
78946739b3a6
All recipe data now has inventory information added.
Michiel Broek <mbroek@mbse.eu>
parents:
221
diff
changeset
|
496 | $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
|
497 | |
78946739b3a6
All recipe data now has inventory information added.
Michiel Broek <mbroek@mbse.eu>
parents:
221
diff
changeset
|
498 | $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
|
499 | 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
|
500 | $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
|
501 | $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
|
502 | $sql2 = "SELECT inventory FROM inventory_miscs "; |
78946739b3a6
All recipe data now has inventory information added.
Michiel Broek <mbroek@mbse.eu>
parents:
221
diff
changeset
|
503 | $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
|
504 | $sql2 .= " type='".$miscs[$i]['m_type']."'"; |
78946739b3a6
All recipe data now has inventory information added.
Michiel Broek <mbroek@mbse.eu>
parents:
221
diff
changeset
|
505 | if ($result2 = mysqli_query($connect, $sql2)) { |
78946739b3a6
All recipe data now has inventory information added.
Michiel Broek <mbroek@mbse.eu>
parents:
221
diff
changeset
|
506 | if ($obj = mysqli_fetch_object($result2)) { |
78946739b3a6
All recipe data now has inventory information added.
Michiel Broek <mbroek@mbse.eu>
parents:
221
diff
changeset
|
507 | $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
|
508 | $miscs[$i]['m_avail'] = 1; |
78946739b3a6
All recipe data now has inventory information added.
Michiel Broek <mbroek@mbse.eu>
parents:
221
diff
changeset
|
509 | } |
78946739b3a6
All recipe data now has inventory information added.
Michiel Broek <mbroek@mbse.eu>
parents:
221
diff
changeset
|
510 | mysqli_free_result($result2); |
78946739b3a6
All recipe data now has inventory information added.
Michiel Broek <mbroek@mbse.eu>
parents:
221
diff
changeset
|
511 | } |
78946739b3a6
All recipe data now has inventory information added.
Michiel Broek <mbroek@mbse.eu>
parents:
221
diff
changeset
|
512 | } |
78946739b3a6
All recipe data now has inventory information added.
Michiel Broek <mbroek@mbse.eu>
parents:
221
diff
changeset
|
513 | $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
|
514 | |
78946739b3a6
All recipe data now has inventory information added.
Michiel Broek <mbroek@mbse.eu>
parents:
221
diff
changeset
|
515 | $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
|
516 | 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
|
517 | $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
|
518 | $yeasts[$i]['y_avail'] = 0; // Ingredient not in db |
359
98354ef399cd
Lot's of improvements for recipes and products database load and save. Insert missing yeast tolerance field for old products and recipes. Recipe locked and calc_acid fields coverted to integer. In recipe edit screen removed the Print button. It is now included in the export screen. Added recipe export to forum screen.
Michiel Broek <mbroek@mbse.eu>
parents:
352
diff
changeset
|
519 | if (! isset($yeasts[$i]['y_tolerance'])) |
98354ef399cd
Lot's of improvements for recipes and products database load and save. Insert missing yeast tolerance field for old products and recipes. Recipe locked and calc_acid fields coverted to integer. In recipe edit screen removed the Print button. It is now included in the export screen. Added recipe export to forum screen.
Michiel Broek <mbroek@mbse.eu>
parents:
352
diff
changeset
|
520 | $yeasts[$i]['y_tolerance'] = 0; |
332
f0ca77097236
Display alcohol tolerance in the yeast editor. Display in red when the recipe estimate is higher then the yeast tolerance.
Michiel Broek <mbroek@mbse.eu>
parents:
233
diff
changeset
|
521 | $sql2 = "SELECT inventory,tolerance FROM inventory_yeasts "; |
222
78946739b3a6
All recipe data now has inventory information added.
Michiel Broek <mbroek@mbse.eu>
parents:
221
diff
changeset
|
522 | $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
|
523 | $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
|
524 | $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
|
525 | $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
|
526 | if ($result2 = mysqli_query($connect, $sql2)) { |
78946739b3a6
All recipe data now has inventory information added.
Michiel Broek <mbroek@mbse.eu>
parents:
221
diff
changeset
|
527 | if ($obj = mysqli_fetch_object($result2)) { |
78946739b3a6
All recipe data now has inventory information added.
Michiel Broek <mbroek@mbse.eu>
parents:
221
diff
changeset
|
528 | $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
|
529 | $yeasts[$i]['y_avail'] = 1; |
332
f0ca77097236
Display alcohol tolerance in the yeast editor. Display in red when the recipe estimate is higher then the yeast tolerance.
Michiel Broek <mbroek@mbse.eu>
parents:
233
diff
changeset
|
530 | if ($yeasts[$i]['y_tolerance'] == 0) { |
f0ca77097236
Display alcohol tolerance in the yeast editor. Display in red when the recipe estimate is higher then the yeast tolerance.
Michiel Broek <mbroek@mbse.eu>
parents:
233
diff
changeset
|
531 | $yeasts[$i]['y_tolerance'] = floatval($obj->tolerance); // Upgrade alcohol tolerance |
f0ca77097236
Display alcohol tolerance in the yeast editor. Display in red when the recipe estimate is higher then the yeast tolerance.
Michiel Broek <mbroek@mbse.eu>
parents:
233
diff
changeset
|
532 | } |
222
78946739b3a6
All recipe data now has inventory information added.
Michiel Broek <mbroek@mbse.eu>
parents:
221
diff
changeset
|
533 | } |
78946739b3a6
All recipe data now has inventory information added.
Michiel Broek <mbroek@mbse.eu>
parents:
221
diff
changeset
|
534 | mysqli_free_result($result2); |
78946739b3a6
All recipe data now has inventory information added.
Michiel Broek <mbroek@mbse.eu>
parents:
221
diff
changeset
|
535 | } |
78946739b3a6
All recipe data now has inventory information added.
Michiel Broek <mbroek@mbse.eu>
parents:
221
diff
changeset
|
536 | } |
78946739b3a6
All recipe data now has inventory information added.
Michiel Broek <mbroek@mbse.eu>
parents:
221
diff
changeset
|
537 | $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
|
538 | } 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
|
539 | // 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
|
540 | $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
|
541 | $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
|
542 | $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
|
543 | $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
|
544 | } |
352
9d2a4703bdac
Version 0.1.2 Calculate mash thickness.
Michiel Broek <mbroek@mbse.eu>
parents:
350
diff
changeset
|
545 | $recipes .= ',"mashs":' . $row['json_mashs']; |
49
4d27a7fb1265
Finisched recipe import. Added recipe retrieve script.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
546 | $recipes .= '}'; |
4d27a7fb1265
Finisched recipe import. Added recipe retrieve script.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
547 | } |
4d27a7fb1265
Finisched recipe import. Added recipe retrieve script.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
548 | $recipes .= ']'; |
4d27a7fb1265
Finisched recipe import. Added recipe retrieve script.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
549 | header("Content-type: application/json"); |
4d27a7fb1265
Finisched recipe import. Added recipe retrieve script.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
550 | echo $recipes; |
4d27a7fb1265
Finisched recipe import. Added recipe retrieve script.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
551 | } |
4d27a7fb1265
Finisched recipe import. Added recipe retrieve script.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
552 | ?> |