Wed, 30 Jan 2019 16:40:23 +0100
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.
22 | 1 | <?php |
2 | require_once($_SERVER['DOCUMENT_ROOT'].'/includes/global.inc.php'); | |
45
95251bedfab4
Moved three inventory tables and screens to profiles
Michiel Broek <mbroek@mbse.eu>
parents:
22
diff
changeset
|
3 | page_header('Water profielen', 'profile_water'); |
22 | 4 | ?> |
5 | ||
6 | <div id="jqxgrid"></div> | |
7 | <div style="margin-top: 30px;"> | |
8 | <div id="cellbegineditevent"></div> | |
9 | <div style="margin-top: 10px;" id="cellendeditevent"></div> | |
10 | </div> | |
11 | ||
12 | <!-- Popup editor window. --> | |
13 | <div id="popupWindow"> | |
14 | <div>Wijzig brouwwater profiel.</div> | |
15 | <div style="overflow: hidden;"> | |
211
63d0e40c58b9
Water profile uses POST instead of GET. Added tooltips to the editor screen. Updated the editor screen. Total alkalinity and Bicarbonate update each other. More and smaller columns in the listing screen. Rearranged the editor screen.
Michiel Broek <mbroek@mbse.eu>
parents:
45
diff
changeset
|
16 | <table style="width: 100%;"> |
22 | 17 | <tr> |
18 | <td align="right" style="vertical-align: top;">Water naam:</td> | |
19 | <td align="left" colspan="3" style="vertical-align: top;"><input id="name" /></td> | |
20 | </tr> | |
21 | <tr> | |
22 | <td align="right" style="vertical-align: top;">Opmerkingen:</td> | |
23 | <td align="left" colspan="3"><textarea id="notes"></textarea></td> | |
24 | </tr> | |
25 | <tr> | |
211
63d0e40c58b9
Water profile uses POST instead of GET. Added tooltips to the editor screen. Updated the editor screen. Total alkalinity and Bicarbonate update each other. More and smaller columns in the listing screen. Rearranged the editor screen.
Michiel Broek <mbroek@mbse.eu>
parents:
45
diff
changeset
|
26 | <td colspan="4"> </td> |
63d0e40c58b9
Water profile uses POST instead of GET. Added tooltips to the editor screen. Updated the editor screen. Total alkalinity and Bicarbonate update each other. More and smaller columns in the listing screen. Rearranged the editor screen.
Michiel Broek <mbroek@mbse.eu>
parents:
45
diff
changeset
|
27 | </tr> |
63d0e40c58b9
Water profile uses POST instead of GET. Added tooltips to the editor screen. Updated the editor screen. Total alkalinity and Bicarbonate update each other. More and smaller columns in the listing screen. Rearranged the editor screen.
Michiel Broek <mbroek@mbse.eu>
parents:
45
diff
changeset
|
28 | <tr> |
63d0e40c58b9
Water profile uses POST instead of GET. Added tooltips to the editor screen. Updated the editor screen. Total alkalinity and Bicarbonate update each other. More and smaller columns in the listing screen. Rearranged the editor screen.
Michiel Broek <mbroek@mbse.eu>
parents:
45
diff
changeset
|
29 | <td style="vertical-align: top; float: right;">Calcium (Ca) mg/l:</td> |
63d0e40c58b9
Water profile uses POST instead of GET. Added tooltips to the editor screen. Updated the editor screen. Total alkalinity and Bicarbonate update each other. More and smaller columns in the listing screen. Rearranged the editor screen.
Michiel Broek <mbroek@mbse.eu>
parents:
45
diff
changeset
|
30 | <td><div id="calcium"></div></td> |
63d0e40c58b9
Water profile uses POST instead of GET. Added tooltips to the editor screen. Updated the editor screen. Total alkalinity and Bicarbonate update each other. More and smaller columns in the listing screen. Rearranged the editor screen.
Michiel Broek <mbroek@mbse.eu>
parents:
45
diff
changeset
|
31 | <td style="vertical-align: top; float: right;">Chloride (Cl) mg/l:</td> |
63d0e40c58b9
Water profile uses POST instead of GET. Added tooltips to the editor screen. Updated the editor screen. Total alkalinity and Bicarbonate update each other. More and smaller columns in the listing screen. Rearranged the editor screen.
Michiel Broek <mbroek@mbse.eu>
parents:
45
diff
changeset
|
32 | <td><div id="chloride"></div></td> |
63d0e40c58b9
Water profile uses POST instead of GET. Added tooltips to the editor screen. Updated the editor screen. Total alkalinity and Bicarbonate update each other. More and smaller columns in the listing screen. Rearranged the editor screen.
Michiel Broek <mbroek@mbse.eu>
parents:
45
diff
changeset
|
33 | </tr> |
63d0e40c58b9
Water profile uses POST instead of GET. Added tooltips to the editor screen. Updated the editor screen. Total alkalinity and Bicarbonate update each other. More and smaller columns in the listing screen. Rearranged the editor screen.
Michiel Broek <mbroek@mbse.eu>
parents:
45
diff
changeset
|
34 | <tr> |
63d0e40c58b9
Water profile uses POST instead of GET. Added tooltips to the editor screen. Updated the editor screen. Total alkalinity and Bicarbonate update each other. More and smaller columns in the listing screen. Rearranged the editor screen.
Michiel Broek <mbroek@mbse.eu>
parents:
45
diff
changeset
|
35 | <td style="vertical-align: top; float: right;">Magnesium (Mg) mg/l:</td> |
63d0e40c58b9
Water profile uses POST instead of GET. Added tooltips to the editor screen. Updated the editor screen. Total alkalinity and Bicarbonate update each other. More and smaller columns in the listing screen. Rearranged the editor screen.
Michiel Broek <mbroek@mbse.eu>
parents:
45
diff
changeset
|
36 | <td><div id="magnesium"></div></td> |
63d0e40c58b9
Water profile uses POST instead of GET. Added tooltips to the editor screen. Updated the editor screen. Total alkalinity and Bicarbonate update each other. More and smaller columns in the listing screen. Rearranged the editor screen.
Michiel Broek <mbroek@mbse.eu>
parents:
45
diff
changeset
|
37 | <td style="vertical-align: top; float: right;">Sulfaat (CaSO4) mg/l:</td> |
63d0e40c58b9
Water profile uses POST instead of GET. Added tooltips to the editor screen. Updated the editor screen. Total alkalinity and Bicarbonate update each other. More and smaller columns in the listing screen. Rearranged the editor screen.
Michiel Broek <mbroek@mbse.eu>
parents:
45
diff
changeset
|
38 | <td><div id="sulfate"></div></td> |
63d0e40c58b9
Water profile uses POST instead of GET. Added tooltips to the editor screen. Updated the editor screen. Total alkalinity and Bicarbonate update each other. More and smaller columns in the listing screen. Rearranged the editor screen.
Michiel Broek <mbroek@mbse.eu>
parents:
45
diff
changeset
|
39 | </tr> |
63d0e40c58b9
Water profile uses POST instead of GET. Added tooltips to the editor screen. Updated the editor screen. Total alkalinity and Bicarbonate update each other. More and smaller columns in the listing screen. Rearranged the editor screen.
Michiel Broek <mbroek@mbse.eu>
parents:
45
diff
changeset
|
40 | <tr> |
63d0e40c58b9
Water profile uses POST instead of GET. Added tooltips to the editor screen. Updated the editor screen. Total alkalinity and Bicarbonate update each other. More and smaller columns in the listing screen. Rearranged the editor screen.
Michiel Broek <mbroek@mbse.eu>
parents:
45
diff
changeset
|
41 | <td style="vertical-align: top; float: right;">Natrium (Na) mg/l:</td> |
63d0e40c58b9
Water profile uses POST instead of GET. Added tooltips to the editor screen. Updated the editor screen. Total alkalinity and Bicarbonate update each other. More and smaller columns in the listing screen. Rearranged the editor screen.
Michiel Broek <mbroek@mbse.eu>
parents:
45
diff
changeset
|
42 | <td><div id="sodium"></div></td> |
63d0e40c58b9
Water profile uses POST instead of GET. Added tooltips to the editor screen. Updated the editor screen. Total alkalinity and Bicarbonate update each other. More and smaller columns in the listing screen. Rearranged the editor screen.
Michiel Broek <mbroek@mbse.eu>
parents:
45
diff
changeset
|
43 | <td style="vertical-align: top; float: right;">Bicarbonaat (HCO3) mg/l:</td> <!-- Input for total_alkalinity --> |
63d0e40c58b9
Water profile uses POST instead of GET. Added tooltips to the editor screen. Updated the editor screen. Total alkalinity and Bicarbonate update each other. More and smaller columns in the listing screen. Rearranged the editor screen.
Michiel Broek <mbroek@mbse.eu>
parents:
45
diff
changeset
|
44 | <td><div id="bicarbonate"></div></td> |
63d0e40c58b9
Water profile uses POST instead of GET. Added tooltips to the editor screen. Updated the editor screen. Total alkalinity and Bicarbonate update each other. More and smaller columns in the listing screen. Rearranged the editor screen.
Michiel Broek <mbroek@mbse.eu>
parents:
45
diff
changeset
|
45 | </tr> |
63d0e40c58b9
Water profile uses POST instead of GET. Added tooltips to the editor screen. Updated the editor screen. Total alkalinity and Bicarbonate update each other. More and smaller columns in the listing screen. Rearranged the editor screen.
Michiel Broek <mbroek@mbse.eu>
parents:
45
diff
changeset
|
46 | <tr> |
63d0e40c58b9
Water profile uses POST instead of GET. Added tooltips to the editor screen. Updated the editor screen. Total alkalinity and Bicarbonate update each other. More and smaller columns in the listing screen. Rearranged the editor screen.
Michiel Broek <mbroek@mbse.eu>
parents:
45
diff
changeset
|
47 | <td style="vertical-align: top; float: right;">Zuurgraad (pH):</td> |
63d0e40c58b9
Water profile uses POST instead of GET. Added tooltips to the editor screen. Updated the editor screen. Total alkalinity and Bicarbonate update each other. More and smaller columns in the listing screen. Rearranged the editor screen.
Michiel Broek <mbroek@mbse.eu>
parents:
45
diff
changeset
|
48 | <td><div id="ph"></div></td> |
63d0e40c58b9
Water profile uses POST instead of GET. Added tooltips to the editor screen. Updated the editor screen. Total alkalinity and Bicarbonate update each other. More and smaller columns in the listing screen. Rearranged the editor screen.
Michiel Broek <mbroek@mbse.eu>
parents:
45
diff
changeset
|
49 | <td style="vertical-align: top; float: right;">Totale alkaliteit (CaCO3) mg/l:</td> |
63d0e40c58b9
Water profile uses POST instead of GET. Added tooltips to the editor screen. Updated the editor screen. Total alkalinity and Bicarbonate update each other. More and smaller columns in the listing screen. Rearranged the editor screen.
Michiel Broek <mbroek@mbse.eu>
parents:
45
diff
changeset
|
50 | <td><div id="total_alkalinity"></div></td> |
63d0e40c58b9
Water profile uses POST instead of GET. Added tooltips to the editor screen. Updated the editor screen. Total alkalinity and Bicarbonate update each other. More and smaller columns in the listing screen. Rearranged the editor screen.
Michiel Broek <mbroek@mbse.eu>
parents:
45
diff
changeset
|
51 | </tr> |
63d0e40c58b9
Water profile uses POST instead of GET. Added tooltips to the editor screen. Updated the editor screen. Total alkalinity and Bicarbonate update each other. More and smaller columns in the listing screen. Rearranged the editor screen.
Michiel Broek <mbroek@mbse.eu>
parents:
45
diff
changeset
|
52 | <tr> |
63d0e40c58b9
Water profile uses POST instead of GET. Added tooltips to the editor screen. Updated the editor screen. Total alkalinity and Bicarbonate update each other. More and smaller columns in the listing screen. Rearranged the editor screen.
Michiel Broek <mbroek@mbse.eu>
parents:
45
diff
changeset
|
53 | <td style="padding-top: 110px;" align="right"><input type="button" id="Delete" value="Verwijder" /></td> |
22 | 54 | <td align="right"></td> |
55 | <td align="right"></td> | |
211
63d0e40c58b9
Water profile uses POST instead of GET. Added tooltips to the editor screen. Updated the editor screen. Total alkalinity and Bicarbonate update each other. More and smaller columns in the listing screen. Rearranged the editor screen.
Michiel Broek <mbroek@mbse.eu>
parents:
45
diff
changeset
|
56 | <td style="padding-top: 110px;" align="left"> |
63d0e40c58b9
Water profile uses POST instead of GET. Added tooltips to the editor screen. Updated the editor screen. Total alkalinity and Bicarbonate update each other. More and smaller columns in the listing screen. Rearranged the editor screen.
Michiel Broek <mbroek@mbse.eu>
parents:
45
diff
changeset
|
57 | <input style="margin-right: 5px;" type="button" id="Save" value="Sla op" /> |
63d0e40c58b9
Water profile uses POST instead of GET. Added tooltips to the editor screen. Updated the editor screen. Total alkalinity and Bicarbonate update each other. More and smaller columns in the listing screen. Rearranged the editor screen.
Michiel Broek <mbroek@mbse.eu>
parents:
45
diff
changeset
|
58 | <input id="Cancel" type="button" value="Annuleer" /> |
22 | 59 | </td> |
60 | </tr> | |
61 | </table> | |
62 | </div> | |
63 | </div> | |
64 | ||
65 | <?php | |
66 | confirm_delete(); | |
67 | page_footer(); | |
68 | ?> |