Tue, 29 Jan 2019 21:52:08 +0100
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.
21
acb2d8098f19
Added inventory miscs and water sources.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
1 | <?php |
acb2d8098f19
Added inventory miscs and water sources.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
2 | require_once($_SERVER['DOCUMENT_ROOT'].'/includes/global.inc.php'); |
47
94cd5ac04b6a
Changed always_on_stock to unlimited_stock. Fixed html page. Added tooltips. Changed grid columns layout.
Michiel Broek <mbroek@mbse.eu>
parents:
46
diff
changeset
|
3 | page_header('Brouwwater voorraad', 'inv_waters'); |
21
acb2d8098f19
Added inventory miscs and water sources.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
4 | ?> |
acb2d8098f19
Added inventory miscs and water sources.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
5 | |
acb2d8098f19
Added inventory miscs and water sources.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
6 | <div id="jqxgrid"></div> |
acb2d8098f19
Added inventory miscs and water sources.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
7 | <div style="margin-top: 30px;"> |
acb2d8098f19
Added inventory miscs and water sources.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
8 | <div id="cellbegineditevent"></div> |
acb2d8098f19
Added inventory miscs and water sources.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
9 | <div style="margin-top: 10px;" id="cellendeditevent"></div> |
acb2d8098f19
Added inventory miscs and water sources.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
10 | </div> |
acb2d8098f19
Added inventory miscs and water sources.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
11 | |
acb2d8098f19
Added inventory miscs and water sources.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
12 | <!-- Popup editor window. --> |
acb2d8098f19
Added inventory miscs and water sources.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
13 | <div id="popupWindow"> |
47
94cd5ac04b6a
Changed always_on_stock to unlimited_stock. Fixed html page. Added tooltips. Changed grid columns layout.
Michiel Broek <mbroek@mbse.eu>
parents:
46
diff
changeset
|
14 | <div>Wijzig brouwwater.</div> |
21
acb2d8098f19
Added inventory miscs and water sources.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
15 | <div style="overflow: hidden;"> |
205
08488ac3bbb1
Inventory waters: use POST instead of GET. Redesigned web editor page. Total Alkalinity and Bicarbonate update eachother with calculated values.
Michiel Broek <mbroek@mbse.eu>
parents:
99
diff
changeset
|
16 | <table style="width: 100%;"> |
21
acb2d8098f19
Added inventory miscs and water sources.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
17 | <tr> |
47
94cd5ac04b6a
Changed always_on_stock to unlimited_stock. Fixed html page. Added tooltips. Changed grid columns layout.
Michiel Broek <mbroek@mbse.eu>
parents:
46
diff
changeset
|
18 | <td style="vertical-align: top; float: right;">Water naam:</td> |
21
acb2d8098f19
Added inventory miscs and water sources.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
19 | <td align="left" colspan="3" style="vertical-align: top;"><input id="name" /></td> |
acb2d8098f19
Added inventory miscs and water sources.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
20 | </tr> |
acb2d8098f19
Added inventory miscs and water sources.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
21 | <tr> |
205
08488ac3bbb1
Inventory waters: use POST instead of GET. Redesigned web editor page. Total Alkalinity and Bicarbonate update eachother with calculated values.
Michiel Broek <mbroek@mbse.eu>
parents:
99
diff
changeset
|
22 | <td style="vertical-align: top; float: right;">Opmerkingen:</td> |
08488ac3bbb1
Inventory waters: use POST instead of GET. Redesigned web editor page. Total Alkalinity and Bicarbonate update eachother with calculated values.
Michiel Broek <mbroek@mbse.eu>
parents:
99
diff
changeset
|
23 | <td colspan="3"><textarea id="notes"></textarea></td> |
08488ac3bbb1
Inventory waters: use POST instead of GET. Redesigned web editor page. Total Alkalinity and Bicarbonate update eachother with calculated values.
Michiel Broek <mbroek@mbse.eu>
parents:
99
diff
changeset
|
24 | </tr> |
08488ac3bbb1
Inventory waters: use POST instead of GET. Redesigned web editor page. Total Alkalinity and Bicarbonate update eachother with calculated values.
Michiel Broek <mbroek@mbse.eu>
parents:
99
diff
changeset
|
25 | <tr> |
08488ac3bbb1
Inventory waters: use POST instead of GET. Redesigned web editor page. Total Alkalinity and Bicarbonate update eachother with calculated values.
Michiel Broek <mbroek@mbse.eu>
parents:
99
diff
changeset
|
26 | <td colspan="4"> </td> |
08488ac3bbb1
Inventory waters: use POST instead of GET. Redesigned web editor page. Total Alkalinity and Bicarbonate update eachother with calculated values.
Michiel Broek <mbroek@mbse.eu>
parents:
99
diff
changeset
|
27 | </tr> |
08488ac3bbb1
Inventory waters: use POST instead of GET. Redesigned web editor page. Total Alkalinity and Bicarbonate update eachother with calculated values.
Michiel Broek <mbroek@mbse.eu>
parents:
99
diff
changeset
|
28 | <tr> |
47
94cd5ac04b6a
Changed always_on_stock to unlimited_stock. Fixed html page. Added tooltips. Changed grid columns layout.
Michiel Broek <mbroek@mbse.eu>
parents:
46
diff
changeset
|
29 | <td style="vertical-align: top; float: right;">Calcium (Ca) mg/l:</td> |
94cd5ac04b6a
Changed always_on_stock to unlimited_stock. Fixed html page. Added tooltips. Changed grid columns layout.
Michiel Broek <mbroek@mbse.eu>
parents:
46
diff
changeset
|
30 | <td><div id="calcium"></div></td> |
94cd5ac04b6a
Changed always_on_stock to unlimited_stock. Fixed html page. Added tooltips. Changed grid columns layout.
Michiel Broek <mbroek@mbse.eu>
parents:
46
diff
changeset
|
31 | <td style="vertical-align: top; float: right;">Chloride (Cl) mg/l:</td> |
94cd5ac04b6a
Changed always_on_stock to unlimited_stock. Fixed html page. Added tooltips. Changed grid columns layout.
Michiel Broek <mbroek@mbse.eu>
parents:
46
diff
changeset
|
32 | <td><div id="chloride"></div></td> |
21
acb2d8098f19
Added inventory miscs and water sources.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
33 | </tr> |
acb2d8098f19
Added inventory miscs and water sources.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
34 | <tr> |
205
08488ac3bbb1
Inventory waters: use POST instead of GET. Redesigned web editor page. Total Alkalinity and Bicarbonate update eachother with calculated values.
Michiel Broek <mbroek@mbse.eu>
parents:
99
diff
changeset
|
35 | <td style="vertical-align: top; float: right;">Magnesium (Mg) mg/l:</td> |
08488ac3bbb1
Inventory waters: use POST instead of GET. Redesigned web editor page. Total Alkalinity and Bicarbonate update eachother with calculated values.
Michiel Broek <mbroek@mbse.eu>
parents:
99
diff
changeset
|
36 | <td><div id="magnesium"></div></td> |
47
94cd5ac04b6a
Changed always_on_stock to unlimited_stock. Fixed html page. Added tooltips. Changed grid columns layout.
Michiel Broek <mbroek@mbse.eu>
parents:
46
diff
changeset
|
37 | <td style="vertical-align: top; float: right;">Sulfaat (CaSO4) mg/l:</td> |
94cd5ac04b6a
Changed always_on_stock to unlimited_stock. Fixed html page. Added tooltips. Changed grid columns layout.
Michiel Broek <mbroek@mbse.eu>
parents:
46
diff
changeset
|
38 | <td><div id="sulfate"></div></td> |
205
08488ac3bbb1
Inventory waters: use POST instead of GET. Redesigned web editor page. Total Alkalinity and Bicarbonate update eachother with calculated values.
Michiel Broek <mbroek@mbse.eu>
parents:
99
diff
changeset
|
39 | </tr> |
08488ac3bbb1
Inventory waters: use POST instead of GET. Redesigned web editor page. Total Alkalinity and Bicarbonate update eachother with calculated values.
Michiel Broek <mbroek@mbse.eu>
parents:
99
diff
changeset
|
40 | <tr> |
08488ac3bbb1
Inventory waters: use POST instead of GET. Redesigned web editor page. Total Alkalinity and Bicarbonate update eachother with calculated values.
Michiel Broek <mbroek@mbse.eu>
parents:
99
diff
changeset
|
41 | <td style="vertical-align: top; float: right;">Natrium (Na) mg/l:</td> |
08488ac3bbb1
Inventory waters: use POST instead of GET. Redesigned web editor page. Total Alkalinity and Bicarbonate update eachother with calculated values.
Michiel Broek <mbroek@mbse.eu>
parents:
99
diff
changeset
|
42 | <td><div id="sodium"></div></td> |
08488ac3bbb1
Inventory waters: use POST instead of GET. Redesigned web editor page. Total Alkalinity and Bicarbonate update eachother with calculated values.
Michiel Broek <mbroek@mbse.eu>
parents:
99
diff
changeset
|
43 | <td style="vertical-align: top; float: right;">Bicarbonaat (HCO3) mg/l:</td> <!-- Input for total_alkalinity --> |
08488ac3bbb1
Inventory waters: use POST instead of GET. Redesigned web editor page. Total Alkalinity and Bicarbonate update eachother with calculated values.
Michiel Broek <mbroek@mbse.eu>
parents:
99
diff
changeset
|
44 | <td><div id="bicarbonate"></div></td> |
08488ac3bbb1
Inventory waters: use POST instead of GET. Redesigned web editor page. Total Alkalinity and Bicarbonate update eachother with calculated values.
Michiel Broek <mbroek@mbse.eu>
parents:
99
diff
changeset
|
45 | </tr> |
08488ac3bbb1
Inventory waters: use POST instead of GET. Redesigned web editor page. Total Alkalinity and Bicarbonate update eachother with calculated values.
Michiel Broek <mbroek@mbse.eu>
parents:
99
diff
changeset
|
46 | <tr> |
47
94cd5ac04b6a
Changed always_on_stock to unlimited_stock. Fixed html page. Added tooltips. Changed grid columns layout.
Michiel Broek <mbroek@mbse.eu>
parents:
46
diff
changeset
|
47 | <td style="vertical-align: top; float: right;">Zuurgraad (pH):</td> |
94cd5ac04b6a
Changed always_on_stock to unlimited_stock. Fixed html page. Added tooltips. Changed grid columns layout.
Michiel Broek <mbroek@mbse.eu>
parents:
46
diff
changeset
|
48 | <td><div id="ph"></div></td> |
94cd5ac04b6a
Changed always_on_stock to unlimited_stock. Fixed html page. Added tooltips. Changed grid columns layout.
Michiel Broek <mbroek@mbse.eu>
parents:
46
diff
changeset
|
49 | <td style="vertical-align: top; float: right;">Totale alkaliteit (CaCO3) mg/l:</td> |
94cd5ac04b6a
Changed always_on_stock to unlimited_stock. Fixed html page. Added tooltips. Changed grid columns layout.
Michiel Broek <mbroek@mbse.eu>
parents:
46
diff
changeset
|
50 | <td><div id="total_alkalinity"></div></td> |
21
acb2d8098f19
Added inventory miscs and water sources.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
51 | </tr> |
acb2d8098f19
Added inventory miscs and water sources.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
52 | <tr> |
205
08488ac3bbb1
Inventory waters: use POST instead of GET. Redesigned web editor page. Total Alkalinity and Bicarbonate update eachother with calculated values.
Michiel Broek <mbroek@mbse.eu>
parents:
99
diff
changeset
|
53 | <td colspan="4"> </td> |
21
acb2d8098f19
Added inventory miscs and water sources.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
54 | </tr> |
acb2d8098f19
Added inventory miscs and water sources.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
55 | <tr> |
47
94cd5ac04b6a
Changed always_on_stock to unlimited_stock. Fixed html page. Added tooltips. Changed grid columns layout.
Michiel Broek <mbroek@mbse.eu>
parents:
46
diff
changeset
|
56 | <td style="vertical-align: top; float: right;">Onbeperkt op voorraad:</td> |
99
f433193f7bb6
Removed default water setting from the inventory_waters table. Added global setup record with default settings and the default water selection. Added a setup screen.
Michiel Broek <mbroek@mbse.eu>
parents:
47
diff
changeset
|
57 | <td colspan="3"><div id="unlimited_stock"></div></td> |
21
acb2d8098f19
Added inventory miscs and water sources.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
58 | </tr> |
acb2d8098f19
Added inventory miscs and water sources.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
59 | <tr> |
47
94cd5ac04b6a
Changed always_on_stock to unlimited_stock. Fixed html page. Added tooltips. Changed grid columns layout.
Michiel Broek <mbroek@mbse.eu>
parents:
46
diff
changeset
|
60 | <td style="vertical-align: top; float: right;">Voorraad:</td> |
94cd5ac04b6a
Changed always_on_stock to unlimited_stock. Fixed html page. Added tooltips. Changed grid columns layout.
Michiel Broek <mbroek@mbse.eu>
parents:
46
diff
changeset
|
61 | <td><div id="inventory"></div></td> |
94cd5ac04b6a
Changed always_on_stock to unlimited_stock. Fixed html page. Added tooltips. Changed grid columns layout.
Michiel Broek <mbroek@mbse.eu>
parents:
46
diff
changeset
|
62 | <td style="vertical-align: top; float: right;">Prijs per liter:</td> |
94cd5ac04b6a
Changed always_on_stock to unlimited_stock. Fixed html page. Added tooltips. Changed grid columns layout.
Michiel Broek <mbroek@mbse.eu>
parents:
46
diff
changeset
|
63 | <td><div id="cost"></div></td> |
94cd5ac04b6a
Changed always_on_stock to unlimited_stock. Fixed html page. Added tooltips. Changed grid columns layout.
Michiel Broek <mbroek@mbse.eu>
parents:
46
diff
changeset
|
64 | </tr> |
94cd5ac04b6a
Changed always_on_stock to unlimited_stock. Fixed html page. Added tooltips. Changed grid columns layout.
Michiel Broek <mbroek@mbse.eu>
parents:
46
diff
changeset
|
65 | <tr> |
205
08488ac3bbb1
Inventory waters: use POST instead of GET. Redesigned web editor page. Total Alkalinity and Bicarbonate update eachother with calculated values.
Michiel Broek <mbroek@mbse.eu>
parents:
99
diff
changeset
|
66 | <td style="padding-top: 110px; float: right;"><input type="button" id="Delete" value="Verwijder" /></td> |
47
94cd5ac04b6a
Changed always_on_stock to unlimited_stock. Fixed html page. Added tooltips. Changed grid columns layout.
Michiel Broek <mbroek@mbse.eu>
parents:
46
diff
changeset
|
67 | <td></td> |
94cd5ac04b6a
Changed always_on_stock to unlimited_stock. Fixed html page. Added tooltips. Changed grid columns layout.
Michiel Broek <mbroek@mbse.eu>
parents:
46
diff
changeset
|
68 | <td></td> |
205
08488ac3bbb1
Inventory waters: use POST instead of GET. Redesigned web editor page. Total Alkalinity and Bicarbonate update eachother with calculated values.
Michiel Broek <mbroek@mbse.eu>
parents:
99
diff
changeset
|
69 | <td style="padding-top: 110px;"><input style="margin-right: 5px;" type="button" id="Save" value="Sla op" /><input id="Cancel" type="button" value="Annuleer" /></td> |
21
acb2d8098f19
Added inventory miscs and water sources.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
70 | </tr> |
acb2d8098f19
Added inventory miscs and water sources.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
71 | </table> |
acb2d8098f19
Added inventory miscs and water sources.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
72 | </div> |
acb2d8098f19
Added inventory miscs and water sources.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
73 | </div> |
acb2d8098f19
Added inventory miscs and water sources.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
74 | |
acb2d8098f19
Added inventory miscs and water sources.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
75 | <?php |
acb2d8098f19
Added inventory miscs and water sources.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
76 | confirm_delete(); |
acb2d8098f19
Added inventory miscs and water sources.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
77 | page_footer(); |
acb2d8098f19
Added inventory miscs and water sources.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
78 | ?> |