Sat, 02 Mar 2019 17:42:08 +0100
Some extra firstcap keywords
68 | 1 | /***************************************************************************** |
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
|
2 | * Copyright (C) 2018-2019 |
68 | 3 | * |
4 | * Michiel Broek <mbroek at mbse dot eu> | |
5 | * | |
6 | * This file is part of BMS | |
7 | * | |
8 | * This is free software; you can redistribute it and/or modify it | |
9 | * under the terms of the GNU General Public License as published by the | |
10 | * Free Software Foundation; either version 2, or (at your option) any | |
11 | * later version. | |
12 | * | |
13 | * BrewCloud is distributed in the hope that it will be useful, but | |
14 | * WITHOUT ANY WARRANTY; without even the implied warranty of | |
15 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
16 | * General Public License for more details. | |
17 | * | |
18 | * You should have received a copy of the GNU General Public License | |
19 | * along with ThermFerm; see the file COPYING. If not, write to the Free | |
20 | * Software Foundation, 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. | |
21 | *****************************************************************************/ | |
22 | ||
23 | ||
24 | function createDelElements() { | |
25 | $('#eventWindow').jqxWindow({ | |
26 | theme: theme, | |
27 | position: { x: 490, y: 210 }, | |
28 | width: 300, | |
29 | height: 175, | |
30 | resizable: false, | |
31 | isModal: true, | |
32 | modalOpacity: 0.4, | |
33 | okButton: $('#delOk'), | |
34 | cancelButton: $('#delCancel'), | |
35 | initContent: function () { | |
36 | $('#delOk').jqxButton({ template: "danger", width: '65px', theme: theme }); | |
37 | $('#delCancel').jqxButton({ template: "success", width: '65px', theme: theme }); | |
38 | $('#delCancel').focus(); | |
39 | } | |
40 | }); | |
41 | $('#eventWindow').jqxWindow('hide'); | |
42 | } | |
43 | ||
44 | ||
45 | $(document).ready(function () { | |
46 | ||
149
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
47 | var to_100 = false; // Fermentables adjust to 100% |
96
107c12c3e49d
Renamed estimate_og() to estimate_sg() formula. Updated the formulas in javascript. The calcFermenter() function now only calculates the gravities. The colors still need to be added. When a recept is loaded in the editor, all tabs are selected once to load all subgrid data. Ugly and slow but it at least it works.
Michiel Broek <mbroek@mbse.eu>
parents:
95
diff
changeset
|
48 | var preboil_sg = 0; |
261
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
49 | // var sugarsm = 0; // Sugars after mash |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
50 | // var sugarsf = 0; // Sugars after boil |
149
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
51 | var psugar = 0; // Percentage real sugars |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
52 | var pcara = 0; // Percentage cara/crystal malts |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
53 | var svg = 77; // Default attenuation |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
54 | var mashkg = 0; // Malt in mash weight |
138
59874681fc13
Hop flavour and aroma sets global values. On the hop tab, show IBU and make room for the flavour and aroma presentation.
Michiel Broek <mbroek@mbse.eu>
parents:
137
diff
changeset
|
55 | var hop_flavour = 0; |
59874681fc13
Hop flavour and aroma sets global values. On the hop tab, show IBU and make room for the flavour and aroma presentation.
Michiel Broek <mbroek@mbse.eu>
parents:
137
diff
changeset
|
56 | var hop_aroma = 0; |
148
c0f0bbfefd63
Source waters are fixed, removed grid editor. Redesigned the water screen. Made a simple visual if water treatments are out of range. Water mixer for standard and dillute water works. Swapped the mash and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
147
diff
changeset
|
57 | var mash_infuse = 0; |
149
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
58 | var last_base = ''; |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
59 | var last_acid = ''; |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
60 | |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
61 | var MMCa = 40.048; |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
62 | var MMMg = 24.305; |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
63 | var MMNa = 22.98976928; |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
64 | var MMCl = 35.453; |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
65 | var MMSO4 = 96.0626; |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
66 | var MMCO3 = 60.01684; |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
67 | var MMHCO3 = 61.01684; |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
68 | var MMCaSO4 = 172.171; |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
69 | var MMCaCl2 = 147.015; |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
70 | var MMCaCO3 = 100.087; |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
71 | var MMMgSO4 = 246.475; |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
72 | var MMNaHCO3 = 84.007; |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
73 | var MMNa2CO3 = 105.996; |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
74 | var MMNaCl = 58.443; |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
75 | var MMCaOH2 = 74.06268; |
96
107c12c3e49d
Renamed estimate_og() to estimate_sg() formula. Updated the formulas in javascript. The calcFermenter() function now only calculates the gravities. The colors still need to be added. When a recept is loaded in the editor, all tabs are selected once to load all subgrid data. Ugly and slow but it at least it works.
Michiel Broek <mbroek@mbse.eu>
parents:
95
diff
changeset
|
76 | |
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:
175
diff
changeset
|
77 | var fermentableRow = 0; |
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:
175
diff
changeset
|
78 | var fermentableData = {}; |
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:
175
diff
changeset
|
79 | var hopRow = 0; |
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:
175
diff
changeset
|
80 | var hopData = {}; |
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:
175
diff
changeset
|
81 | var miscRow = 0; |
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:
175
diff
changeset
|
82 | var miscData = {}; |
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:
175
diff
changeset
|
83 | var yeastRow = 0; |
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:
175
diff
changeset
|
84 | var yeastData = {}; |
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:
227
diff
changeset
|
85 | var mashRow = 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:
227
diff
changeset
|
86 | var mashData = {}; |
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:
175
diff
changeset
|
87 | |
283
879b81864e4e
The product and recipe editors disable the top menu so the user is forced to exit using the buttons on the first tab.
Michiel Broek <mbroek@mbse.eu>
parents:
271
diff
changeset
|
88 | /* |
879b81864e4e
The product and recipe editors disable the top menu so the user is forced to exit using the buttons on the first tab.
Michiel Broek <mbroek@mbse.eu>
parents:
271
diff
changeset
|
89 | * Remove the top menu so that we MUST use the buttons to leave the editor. |
879b81864e4e
The product and recipe editors disable the top menu so the user is forced to exit using the buttons on the first tab.
Michiel Broek <mbroek@mbse.eu>
parents:
271
diff
changeset
|
90 | */ |
879b81864e4e
The product and recipe editors disable the top menu so the user is forced to exit using the buttons on the first tab.
Michiel Broek <mbroek@mbse.eu>
parents:
271
diff
changeset
|
91 | $('#jqxMenu').jqxMenu('destroy'); |
879b81864e4e
The product and recipe editors disable the top menu so the user is forced to exit using the buttons on the first tab.
Michiel Broek <mbroek@mbse.eu>
parents:
271
diff
changeset
|
92 | |
68 | 93 | console.log("record:" + my_record + " return:" + my_return + " theme:" + theme); |
129
7f41b61c3faf
Added a loader during recipe load. Recalculate percentages if a fermentable row is deleted. Don't edit amounts if using weight percentages. Update grid percentages if a fermentable amount is changed. Recalculate IBU's after changes with fermentables.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
94 | $("#jqxLoader").jqxLoader({ |
7f41b61c3faf
Added a loader during recipe load. Recalculate percentages if a fermentable row is deleted. Don't edit amounts if using weight percentages. Update grid percentages if a fermentable amount is changed. Recalculate IBU's after changes with fermentables.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
95 | width: 250, |
7f41b61c3faf
Added a loader during recipe load. Recalculate percentages if a fermentable row is deleted. Don't edit amounts if using weight percentages. Update grid percentages if a fermentable amount is changed. Recalculate IBU's after changes with fermentables.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
96 | height: 150, |
7f41b61c3faf
Added a loader during recipe load. Recalculate percentages if a fermentable row is deleted. Don't edit amounts if using weight percentages. Update grid percentages if a fermentable amount is changed. Recalculate IBU's after changes with fermentables.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
97 | isModal: true, |
7f41b61c3faf
Added a loader during recipe load. Recalculate percentages if a fermentable row is deleted. Don't edit amounts if using weight percentages. Update grid percentages if a fermentable amount is changed. Recalculate IBU's after changes with fermentables.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
98 | text: "Laden recept ...", |
7f41b61c3faf
Added a loader during recipe load. Recalculate percentages if a fermentable row is deleted. Don't edit amounts if using weight percentages. Update grid percentages if a fermentable amount is changed. Recalculate IBU's after changes with fermentables.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
99 | theme: theme |
7f41b61c3faf
Added a loader during recipe load. Recalculate percentages if a fermentable row is deleted. Don't edit amounts if using weight percentages. Update grid percentages if a fermentable amount is changed. Recalculate IBU's after changes with fermentables.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
100 | }); |
68 | 101 | |
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
|
102 | function setReadonly(ro) { |
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
|
103 | var rw = ! ro; |
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:
175
diff
changeset
|
104 | var w100 = 110; |
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
|
105 | var w80 = 80; |
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
|
106 | if (ro) { // jqxNumberInput width -20 for no spinbuttons |
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:
175
diff
changeset
|
107 | w100 = 90; |
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
|
108 | w80 = 60; |
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
|
109 | } |
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
|
110 | $("#batch_size").jqxNumberInput({ spinButtons: rw, readOnly: ro, width: w100 }); |
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
|
111 | $("#boil_size").jqxNumberInput({ spinButtons: rw, readOnly: ro, width: w100 }); |
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
|
112 | $("#boil_time").jqxNumberInput({ spinButtons: rw, readOnly: ro, width: w100 }); |
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
|
113 | $("#efficiency").jqxNumberInput({ spinButtons: rw, readOnly: ro, width: w100 }); |
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:
175
diff
changeset
|
114 | $("#est_og").jqxNumberInput({ spinButtons: rw, readOnly: ro, width: w100 }); |
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:
175
diff
changeset
|
115 | // id="st_fg_min" margin-left 15/35 maken |
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
|
116 | $("#type").jqxDropDownList({ disabled: ro }); |
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
|
117 | $("#styleSelect").jqxDropDownList({ disabled: ro }); |
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
|
118 | $("#color_method").jqxDropDownList({ disabled: ro }); |
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
|
119 | $("#ibu_method").jqxDropDownList({ disabled: ro }); |
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
|
120 | $("#Delete").jqxButton({ disabled: ro }); |
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
|
121 | $("#fermentableGrid").jqxGrid({ editable: rw }); |
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
|
122 | $("#faddrowbutton").jqxDropDownList({ disabled: ro }); |
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
|
123 | $("#finstockbutton").jqxCheckBox({ disabled: ro }); |
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
|
124 | $("#fdeleterowbutton").jqxButton({ disabled: ro }); |
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
|
125 | $("#hopGrid").jqxGrid({ editable: rw }); |
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
|
126 | $("#haddrowbutton").jqxDropDownList({ disabled: ro }); |
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
|
127 | $("#hinstockbutton").jqxCheckBox({ disabled: ro }); |
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
|
128 | $("#hdeleterowbutton").jqxButton({ disabled: ro }); |
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
|
129 | $("#miscGrid").jqxGrid({ editable: rw }); |
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
|
130 | $("#maddrowbutton").jqxDropDownList({ disabled: ro }); |
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
|
131 | $("#minstockbutton").jqxCheckBox({ disabled: ro }); |
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
|
132 | $("#mdeleterowbutton").jqxButton({ disabled: ro }); |
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
|
133 | $("#yeastGrid").jqxGrid({ editable: rw }); |
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
|
134 | $("#yaddrowbutton").jqxDropDownList({ disabled: ro }); |
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
|
135 | $("#yinstockbutton").jqxCheckBox({ disabled: ro }); |
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
|
136 | $("#ydeleterowbutton").jqxButton({ disabled: ro }); |
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
|
137 | $("#mashGrid").jqxGrid({ editable: rw }); |
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
|
138 | $("#saddrowbutton").jqxButton({ disabled: ro }); |
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
|
139 | $("#sdeleterowbutton").jqxButton({ disabled: ro }); |
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
|
140 | $("#w1_name").jqxDropDownList({ disabled: ro }); |
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
|
141 | $("#w2_name").jqxDropDownList({ disabled: ro }); |
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
|
142 | $("#pr_name").jqxDropDownList({ disabled: ro }); |
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
|
143 | $("#wa_cacl2").jqxNumberInput({ spinButtons: rw, readOnly: ro, width: w100 }); |
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
|
144 | $("#wa_caso4").jqxNumberInput({ spinButtons: rw, readOnly: ro, width: w100 }); |
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
|
145 | $("#wa_mgso4").jqxNumberInput({ spinButtons: rw, readOnly: ro, width: w100 }); |
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
|
146 | $("#wa_nacl").jqxNumberInput({ spinButtons: rw, readOnly: ro, width: w100 }); |
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
|
147 | $("#mash_ph").jqxNumberInput({ spinButtons: rw, readOnly: ro, width: w100 }); |
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
|
148 | $("#calc_acid").jqxCheckBox({ disabled: ro }); |
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
|
149 | $("#wa_base_name").jqxDropDownList({ disabled: ro }); |
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
|
150 | $("#wa_base").jqxNumberInput({ spinButtons: rw, readOnly: ro, width: w100 }); |
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
|
151 | $("#wa_acid_name").jqxDropDownList({ disabled: ro }); |
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
|
152 | $("#wa_acid").jqxNumberInput({ spinButtons: rw, readOnly: ro, width: w100 }); |
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
|
153 | $("#wa_acid_perc").jqxNumberInput({ spinButtons: rw, readOnly: ro, width: w80 }); |
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
|
154 | $("#sparge_temp").jqxNumberInput({ spinButtons: rw, readOnly: ro, width: w100 }); |
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
|
155 | $("#sparge_volume").jqxNumberInput({ spinButtons: rw, readOnly: ro, width: w100 }); |
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
|
156 | $("#sparge_ph").jqxNumberInput({ spinButtons: rw, readOnly: ro, width: w100 }); |
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
|
157 | $("#sparge_source").jqxDropDownList({ disabled: ro }); |
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
|
158 | $("#sparge_acid_type").jqxDropDownList({ disabled: ro }); |
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
|
159 | $("#sparge_acid_perc").jqxNumberInput({ spinButtons: rw, readOnly: ro, width: w100 }); |
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
|
160 | }; |
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
|
161 | |
96
107c12c3e49d
Renamed estimate_og() to estimate_sg() formula. Updated the formulas in javascript. The calcFermenter() function now only calculates the gravities. The colors still need to be added. When a recept is loaded in the editor, all tabs are selected once to load all subgrid data. Ugly and slow but it at least it works.
Michiel Broek <mbroek@mbse.eu>
parents:
95
diff
changeset
|
162 | function calcFermentables() { |
107c12c3e49d
Renamed estimate_og() to estimate_sg() formula. Updated the formulas in javascript. The calcFermenter() function now only calculates the gravities. The colors still need to be added. When a recept is loaded in the editor, all tabs are selected once to load all subgrid data. Ugly and slow but it at least it works.
Michiel Broek <mbroek@mbse.eu>
parents:
95
diff
changeset
|
163 | console.log("calcFermentables()"); |
261
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
164 | sugarsf = 0; // fermentable sugars mash + boil |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
165 | sugarsm = 0; // fermentable sugars in mash |
98
92d6bc8a4cdd
Added javascript formulas for color calculations. Added IBU total calculation. Better IBI calculation for the hop entries. Blocked selection of IBU calculation for Garetz, Mosher and Noonan. Better sg calculation in the recipe print.
Michiel Broek <mbroek@mbse.eu>
parents:
97
diff
changeset
|
166 | psugar = 0; |
92d6bc8a4cdd
Added javascript formulas for color calculations. Added IBU total calculation. Better IBI calculation for the hop entries. Blocked selection of IBU calculation for Garetz, Mosher and Noonan. Better sg calculation in the recipe print.
Michiel Broek <mbroek@mbse.eu>
parents:
97
diff
changeset
|
167 | pcara = 0; |
149
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
168 | mashkg = 0; |
261
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
169 | var vol = 0; // Volume sugars after boil |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
170 | var addedS = 0; // Added sugars after boil |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
171 | var addedmass = 0; // Added mass after boil |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
172 | var mvol = 0; // mash volume |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
173 | var colort = 0; // Colors srm * vol totals |
127
6d5e215d77d2
Added fermentables Moment dropdown list. Added fermentables adjust to 100% logic.
Michiel Broek <mbroek@mbse.eu>
parents:
126
diff
changeset
|
174 | var my_100 = false; |
261
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
175 | var mashtime = 0; // Total mash time |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
176 | var mashtemp = 0; // Average mash temperature |
96
107c12c3e49d
Renamed estimate_og() to estimate_sg() formula. Updated the formulas in javascript. The calcFermenter() function now only calculates the gravities. The colors still need to be added. When a recept is loaded in the editor, all tabs are selected once to load all subgrid data. Ugly and slow but it at least it works.
Michiel Broek <mbroek@mbse.eu>
parents:
95
diff
changeset
|
177 | |
261
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
178 | if ((rows = $('#mashGrid').jqxGrid('getrows'))) { |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
179 | for (var i = 0; i < rows.length; i++) { |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
180 | var row = rows[i]; |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
181 | if (row.step_type == 0) // Infusion |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
182 | mvol += parseFloat(row.step_infuse_amount); |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
183 | if (row.step_temp <= 75) { // Ignore mashout |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
184 | mashtime += row.step_time; |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
185 | mashtemp += row.step_time * row.step_temp; |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
186 | } |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
187 | } |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
188 | mashtemp = mashtemp / mashtime; |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
189 | } |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
190 | |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
191 | if (!(rows = $('#fermentableGrid').jqxGrid('getrows'))) { |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
192 | return; // grid not yet loaded. |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
193 | } |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
194 | |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
195 | var s = 0; |
73
454fc4558609
Added style selector in recipe editer. Better formatting of cellsrenderer fields. Added When field to the fermentables list. Attempts to calculate the fermentables.
Michiel Broek <mbroek@mbse.eu>
parents:
72
diff
changeset
|
196 | for (var i = 0; i < rows.length; i++) { |
454fc4558609
Added style selector in recipe editer. Better formatting of cellsrenderer fields. Added When field to the fermentables list. Attempts to calculate the fermentables.
Michiel Broek <mbroek@mbse.eu>
parents:
72
diff
changeset
|
197 | var row = rows[i]; |
127
6d5e215d77d2
Added fermentables Moment dropdown list. Added fermentables adjust to 100% logic.
Michiel Broek <mbroek@mbse.eu>
parents:
126
diff
changeset
|
198 | if (row.f_adjust_to_total_100) |
6d5e215d77d2
Added fermentables Moment dropdown list. Added fermentables adjust to 100% logic.
Michiel Broek <mbroek@mbse.eu>
parents:
126
diff
changeset
|
199 | my_100 = true; |
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:
175
diff
changeset
|
200 | if (row.f_type == 1) // Sugar |
96
107c12c3e49d
Renamed estimate_og() to estimate_sg() formula. Updated the formulas in javascript. The calcFermenter() function now only calculates the gravities. The colors still need to be added. When a recept is loaded in the editor, all tabs are selected once to load all subgrid data. Ugly and slow but it at least it works.
Michiel Broek <mbroek@mbse.eu>
parents:
95
diff
changeset
|
201 | psugar += row.f_percentage; |
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:
175
diff
changeset
|
202 | if (row.f_graintype == 2) // Crystal |
96
107c12c3e49d
Renamed estimate_og() to estimate_sg() formula. Updated the formulas in javascript. The calcFermenter() function now only calculates the gravities. The colors still need to be added. When a recept is loaded in the editor, all tabs are selected once to load all subgrid data. Ugly and slow but it at least it works.
Michiel Broek <mbroek@mbse.eu>
parents:
95
diff
changeset
|
203 | pcara += row.f_percentage; |
107c12c3e49d
Renamed estimate_og() to estimate_sg() formula. Updated the formulas in javascript. The calcFermenter() function now only calculates the gravities. The colors still need to be added. When a recept is loaded in the editor, all tabs are selected once to load all subgrid data. Ugly and slow but it at least it works.
Michiel Broek <mbroek@mbse.eu>
parents:
95
diff
changeset
|
204 | var d = row.f_amount * (row.f_yield / 100) * (1 - row.f_moisture / 100); |
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:
175
diff
changeset
|
205 | if (row.f_added == 0) { // Mash |
261
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
206 | if (mvol > 0) { // Only if mash already known |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
207 | mvol += row.f_amount * row.f_moisture / 100; |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
208 | s += d; |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
209 | } |
149
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
210 | d = parseFloat(dataRecord.efficiency) / 100 * d; |
97
22c277be7e7e
Don't count sugar for preboil gravity.
Michiel Broek <mbroek@mbse.eu>
parents:
96
diff
changeset
|
211 | sugarsm += d; |
149
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
212 | mashkg += row.f_amount; |
97
22c277be7e7e
Don't count sugar for preboil gravity.
Michiel Broek <mbroek@mbse.eu>
parents:
96
diff
changeset
|
213 | } |
261
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
214 | if (row.f_added == 0 || row.f_added == 1) // Mash or Boil |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
215 | sugarsf += d; |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
216 | if (row.f_added == 2 || row.f_added == 3) { |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
217 | var x = (row.f_yield / 100) * (1 - row.f_moisture / 100); |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
218 | addedS += row.f_amount * x; |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
219 | addedmass += row.f_amount; |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
220 | vol += (x * sugardensity + (1 - x) * 1) * row.f_amount; |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
221 | } |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
222 | colort += row.f_amount * ebc_to_srm(row.f_color); |
73
454fc4558609
Added style selector in recipe editer. Better formatting of cellsrenderer fields. Added When field to the fermentables list. Attempts to calculate the fermentables.
Michiel Broek <mbroek@mbse.eu>
parents:
72
diff
changeset
|
223 | } |
127
6d5e215d77d2
Added fermentables Moment dropdown list. Added fermentables adjust to 100% logic.
Michiel Broek <mbroek@mbse.eu>
parents:
126
diff
changeset
|
224 | to_100 = my_100; |
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:
175
diff
changeset
|
225 | if (to_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:
175
diff
changeset
|
226 | $("#wf_amount").jqxNumberInput({ width: 90, readOnly: true, spinButtons: false }); |
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:
175
diff
changeset
|
227 | } else { |
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:
175
diff
changeset
|
228 | $("#wf_amount").jqxNumberInput({ width: 110, readOnly: false, spinButtons: 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:
175
diff
changeset
|
229 | } |
261
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
230 | |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
231 | // Estimate total recipe OG. |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
232 | dataRecord.est_og = estimate_sg(sugarsf + addedS, parseFloat(dataRecord.batch_size)); |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
233 | $('#est_og').val(dataRecord.est_og); |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
234 | $('#est_og2').val(dataRecord.est_og); |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
235 | |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
236 | // Estimate SG in kettle before boil |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
237 | preboil_sg = estimate_sg(sugarsm, parseFloat(dataRecord.boil_size)); |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
238 | |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
239 | // Color of the wort |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
240 | var cw = colort / parseFloat(dataRecord.batch_size) * 8.34436; |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
241 | var color = kw_to_ebc(dataRecord.color_method, cw); |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
242 | dataRecord.est_color = color; |
139
eb1ac7487710
Added EBC color examples. Added simple progessbars for hop flavour and aroma contribution. We need something better. In the fermentables tab, above the grid display the malt color and OG estimates. Display supplier as well in the fermentables grid.
Michiel Broek <mbroek@mbse.eu>
parents:
138
diff
changeset
|
243 | $('#est_color').val(color); |
eb1ac7487710
Added EBC color examples. Added simple progessbars for hop flavour and aroma contribution. We need something better. In the fermentables tab, above the grid display the malt color and OG estimates. Display supplier as well in the fermentables grid.
Michiel Broek <mbroek@mbse.eu>
parents:
138
diff
changeset
|
244 | $('#est_color2').val(color); |
eb1ac7487710
Added EBC color examples. Added simple progessbars for hop flavour and aroma contribution. We need something better. In the fermentables tab, above the grid display the malt color and OG estimates. Display supplier as well in the fermentables grid.
Michiel Broek <mbroek@mbse.eu>
parents:
138
diff
changeset
|
245 | var scolor = ebc_to_color(color); |
eb1ac7487710
Added EBC color examples. Added simple progessbars for hop flavour and aroma contribution. We need something better. In the fermentables tab, above the grid display the malt color and OG estimates. Display supplier as well in the fermentables grid.
Michiel Broek <mbroek@mbse.eu>
parents:
138
diff
changeset
|
246 | document.getElementById("bcolor").style.background= scolor; |
eb1ac7487710
Added EBC color examples. Added simple progessbars for hop flavour and aroma contribution. We need something better. In the fermentables tab, above the grid display the malt color and OG estimates. Display supplier as well in the fermentables grid.
Michiel Broek <mbroek@mbse.eu>
parents:
138
diff
changeset
|
247 | document.getElementById("bcolor2").style.background= scolor; |
261
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
248 | |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
249 | // Progress bars |
149
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
250 | pmalts = mashkg / (dataRecord.boil_size / 3) * 100; |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
251 | $("#perc_malts").jqxProgressBar('val', pmalts); |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
252 | $("#perc_sugars").jqxProgressBar('val', psugar); |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
253 | $("#perc_cara").jqxProgressBar('val', pcara); |
261
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
254 | |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
255 | // Calculate estimated svg. |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
256 | svg = 0; // default. |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
257 | var rows = $('#yeastGrid').jqxGrid('getrows'); |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
258 | for (var i = 0; i < rows.length; i++) { |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
259 | var row = rows[i]; |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
260 | if (row.y_use == 0) { // Primary |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
261 | if (parseFloat(row.y_attenuation) > svg) |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
262 | svg = parseFloat(row.y_attenuation); // Take the highest if multiple yeasts. |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
263 | } |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
264 | // TODO: brett in secondary ?? |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
265 | } |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
266 | if (svg == 0) |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
267 | svg = 77; |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
268 | |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
269 | if ((mashkg > 0) && (mash_infuse > 0) && (mashtime > 0) && (mashtemp > 0)) { |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
270 | dataRecord.est_fg = estimate_fg(psugar, pcara, mash_infuse / mashkg, mashtime, mashtemp, svg, dataRecord.est_og); |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
271 | } else { |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
272 | dataRecord.est_fg = estimate_fg(psugar, pcara, 0, 0, 0, svg, dataRecord.est_og); |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
273 | } |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
274 | $('#est_fg').val(dataRecord.est_fg); |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
275 | $('#est_fg2').val(dataRecord.est_fg); |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
276 | |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
277 | dataRecord.est_abv = abvol(dataRecord.est_og, dataRecord.est_fg); |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
278 | $("#est_abv").val(dataRecord.est_abv); |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
279 | $("#est_abv2").val(dataRecord.est_abv); |
98
92d6bc8a4cdd
Added javascript formulas for color calculations. Added IBU total calculation. Better IBI calculation for the hop entries. Blocked selection of IBU calculation for Garetz, Mosher and Noonan. Better sg calculation in the recipe print.
Michiel Broek <mbroek@mbse.eu>
parents:
97
diff
changeset
|
280 | }; |
92d6bc8a4cdd
Added javascript formulas for color calculations. Added IBU total calculation. Better IBI calculation for the hop entries. Blocked selection of IBU calculation for Garetz, Mosher and Noonan. Better sg calculation in the recipe print.
Michiel Broek <mbroek@mbse.eu>
parents:
97
diff
changeset
|
281 | |
136
bcc4583fd013
Fixed estimate FG calculation during recipes import. Added estimate FG calculation in the recipe editor but do not yet update the recipe. Added SVG calculation to the recipes editor. Added calculations for hop aroma and flavour contribution.
Michiel Broek <mbroek@mbse.eu>
parents:
135
diff
changeset
|
282 | function hopFlavourContribution(bt, vol, use, amount) { |
bcc4583fd013
Fixed estimate FG calculation during recipes import. Added estimate FG calculation in the recipe editor but do not yet update the recipe. Added SVG calculation to the recipes editor. Added calculations for hop aroma and flavour contribution.
Michiel Broek <mbroek@mbse.eu>
parents:
135
diff
changeset
|
283 | var result; |
bcc4583fd013
Fixed estimate FG calculation during recipes import. Added estimate FG calculation in the recipe editor but do not yet update the recipe. Added SVG calculation to the recipes editor. Added calculations for hop aroma and flavour contribution.
Michiel Broek <mbroek@mbse.eu>
parents:
135
diff
changeset
|
284 | |
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:
175
diff
changeset
|
285 | if (use == 1) { // First wort |
138
59874681fc13
Hop flavour and aroma sets global values. On the hop tab, show IBU and make room for the flavour and aroma presentation.
Michiel Broek <mbroek@mbse.eu>
parents:
137
diff
changeset
|
286 | result = 0.15; // assume 15% flavourcontribution for fwh |
136
bcc4583fd013
Fixed estimate FG calculation during recipes import. Added estimate FG calculation in the recipe editor but do not yet update the recipe. Added SVG calculation to the recipes editor. Added calculations for hop aroma and flavour contribution.
Michiel Broek <mbroek@mbse.eu>
parents:
135
diff
changeset
|
287 | } else if (bt > 50) { |
138
59874681fc13
Hop flavour and aroma sets global values. On the hop tab, show IBU and make room for the flavour and aroma presentation.
Michiel Broek <mbroek@mbse.eu>
parents:
137
diff
changeset
|
288 | result = 0.10; // assume 10% flavourcontribution as a minimum |
136
bcc4583fd013
Fixed estimate FG calculation during recipes import. Added estimate FG calculation in the recipe editor but do not yet update the recipe. Added SVG calculation to the recipes editor. Added calculations for hop aroma and flavour contribution.
Michiel Broek <mbroek@mbse.eu>
parents:
135
diff
changeset
|
289 | } else { |
138
59874681fc13
Hop flavour and aroma sets global values. On the hop tab, show IBU and make room for the flavour and aroma presentation.
Michiel Broek <mbroek@mbse.eu>
parents:
137
diff
changeset
|
290 | result = 15.25 / (6 * Math.sqrt(2 * Math.PI)) * Math.exp(-0.5 * Math.pow((bt - 21) /6, 2)); |
59874681fc13
Hop flavour and aroma sets global values. On the hop tab, show IBU and make room for the flavour and aroma presentation.
Michiel Broek <mbroek@mbse.eu>
parents:
137
diff
changeset
|
291 | if (result < 0.10) |
59874681fc13
Hop flavour and aroma sets global values. On the hop tab, show IBU and make room for the flavour and aroma presentation.
Michiel Broek <mbroek@mbse.eu>
parents:
137
diff
changeset
|
292 | result = 0.10; // assume 10% flavourcontribution as a minimum |
136
bcc4583fd013
Fixed estimate FG calculation during recipes import. Added estimate FG calculation in the recipe editor but do not yet update the recipe. Added SVG calculation to the recipes editor. Added calculations for hop aroma and flavour contribution.
Michiel Broek <mbroek@mbse.eu>
parents:
135
diff
changeset
|
293 | } |
138
59874681fc13
Hop flavour and aroma sets global values. On the hop tab, show IBU and make room for the flavour and aroma presentation.
Michiel Broek <mbroek@mbse.eu>
parents:
137
diff
changeset
|
294 | result = (result * amount * 1000) / vol; |
59874681fc13
Hop flavour and aroma sets global values. On the hop tab, show IBU and make room for the flavour and aroma presentation.
Michiel Broek <mbroek@mbse.eu>
parents:
137
diff
changeset
|
295 | // console.log("hopFlavourContribution("+bt+","+vol+","+use+","+amount+"): "+result); |
59874681fc13
Hop flavour and aroma sets global values. On the hop tab, show IBU and make room for the flavour and aroma presentation.
Michiel Broek <mbroek@mbse.eu>
parents:
137
diff
changeset
|
296 | return result; |
136
bcc4583fd013
Fixed estimate FG calculation during recipes import. Added estimate FG calculation in the recipe editor but do not yet update the recipe. Added SVG calculation to the recipes editor. Added calculations for hop aroma and flavour contribution.
Michiel Broek <mbroek@mbse.eu>
parents:
135
diff
changeset
|
297 | } |
bcc4583fd013
Fixed estimate FG calculation during recipes import. Added estimate FG calculation in the recipe editor but do not yet update the recipe. Added SVG calculation to the recipes editor. Added calculations for hop aroma and flavour contribution.
Michiel Broek <mbroek@mbse.eu>
parents:
135
diff
changeset
|
298 | |
bcc4583fd013
Fixed estimate FG calculation during recipes import. Added estimate FG calculation in the recipe editor but do not yet update the recipe. Added SVG calculation to the recipes editor. Added calculations for hop aroma and flavour contribution.
Michiel Broek <mbroek@mbse.eu>
parents:
135
diff
changeset
|
299 | function hopAromaContribution(bt, vol, use, amount) { |
bcc4583fd013
Fixed estimate FG calculation during recipes import. Added estimate FG calculation in the recipe editor but do not yet update the recipe. Added SVG calculation to the recipes editor. Added calculations for hop aroma and flavour contribution.
Michiel Broek <mbroek@mbse.eu>
parents:
135
diff
changeset
|
300 | var result = 0; |
bcc4583fd013
Fixed estimate FG calculation during recipes import. Added estimate FG calculation in the recipe editor but do not yet update the recipe. Added SVG calculation to the recipes editor. Added calculations for hop aroma and flavour contribution.
Michiel Broek <mbroek@mbse.eu>
parents:
135
diff
changeset
|
301 | |
bcc4583fd013
Fixed estimate FG calculation during recipes import. Added estimate FG calculation in the recipe editor but do not yet update the recipe. Added SVG calculation to the recipes editor. Added calculations for hop aroma and flavour contribution.
Michiel Broek <mbroek@mbse.eu>
parents:
135
diff
changeset
|
302 | if (bt > 20) { |
bcc4583fd013
Fixed estimate FG calculation during recipes import. Added estimate FG calculation in the recipe editor but do not yet update the recipe. Added SVG calculation to the recipes editor. Added calculations for hop aroma and flavour contribution.
Michiel Broek <mbroek@mbse.eu>
parents:
135
diff
changeset
|
303 | result = 0; |
bcc4583fd013
Fixed estimate FG calculation during recipes import. Added estimate FG calculation in the recipe editor but do not yet update the recipe. Added SVG calculation to the recipes editor. Added calculations for hop aroma and flavour contribution.
Michiel Broek <mbroek@mbse.eu>
parents:
135
diff
changeset
|
304 | } else if (bt > 7.5) { |
138
59874681fc13
Hop flavour and aroma sets global values. On the hop tab, show IBU and make room for the flavour and aroma presentation.
Michiel Broek <mbroek@mbse.eu>
parents:
137
diff
changeset
|
305 | result = 10.03 / (4 * Math.sqrt(2 * Math.PI)) * Math.exp(-0.5 * Math.pow((bt - 7.5) /4, 2)); |
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:
175
diff
changeset
|
306 | } else if (use == 2) { // Boil |
138
59874681fc13
Hop flavour and aroma sets global values. On the hop tab, show IBU and make room for the flavour and aroma presentation.
Michiel Broek <mbroek@mbse.eu>
parents:
137
diff
changeset
|
307 | result = 1; |
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:
175
diff
changeset
|
308 | } else if (use == 3) { // Aroma / vlamuit |
138
59874681fc13
Hop flavour and aroma sets global values. On the hop tab, show IBU and make room for the flavour and aroma presentation.
Michiel Broek <mbroek@mbse.eu>
parents:
137
diff
changeset
|
309 | result = 1.2; |
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:
175
diff
changeset
|
310 | } else if (use == 4) { // Whirlpool |
138
59874681fc13
Hop flavour and aroma sets global values. On the hop tab, show IBU and make room for the flavour and aroma presentation.
Michiel Broek <mbroek@mbse.eu>
parents:
137
diff
changeset
|
311 | result = 1.2; |
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:
175
diff
changeset
|
312 | } else if (use == 5) { // Dry hop |
138
59874681fc13
Hop flavour and aroma sets global values. On the hop tab, show IBU and make room for the flavour and aroma presentation.
Michiel Broek <mbroek@mbse.eu>
parents:
137
diff
changeset
|
313 | result = 1.33; |
136
bcc4583fd013
Fixed estimate FG calculation during recipes import. Added estimate FG calculation in the recipe editor but do not yet update the recipe. Added SVG calculation to the recipes editor. Added calculations for hop aroma and flavour contribution.
Michiel Broek <mbroek@mbse.eu>
parents:
135
diff
changeset
|
314 | } |
138
59874681fc13
Hop flavour and aroma sets global values. On the hop tab, show IBU and make room for the flavour and aroma presentation.
Michiel Broek <mbroek@mbse.eu>
parents:
137
diff
changeset
|
315 | result = (result * amount * 1000) / vol; |
59874681fc13
Hop flavour and aroma sets global values. On the hop tab, show IBU and make room for the flavour and aroma presentation.
Michiel Broek <mbroek@mbse.eu>
parents:
137
diff
changeset
|
316 | // console.log("hopAromaContribution("+bt+","+vol+","+use+","+amount+"): "+result); |
59874681fc13
Hop flavour and aroma sets global values. On the hop tab, show IBU and make room for the flavour and aroma presentation.
Michiel Broek <mbroek@mbse.eu>
parents:
137
diff
changeset
|
317 | return result; |
136
bcc4583fd013
Fixed estimate FG calculation during recipes import. Added estimate FG calculation in the recipe editor but do not yet update the recipe. Added SVG calculation to the recipes editor. Added calculations for hop aroma and flavour contribution.
Michiel Broek <mbroek@mbse.eu>
parents:
135
diff
changeset
|
318 | } |
bcc4583fd013
Fixed estimate FG calculation during recipes import. Added estimate FG calculation in the recipe editor but do not yet update the recipe. Added SVG calculation to the recipes editor. Added calculations for hop aroma and flavour contribution.
Michiel Broek <mbroek@mbse.eu>
parents:
135
diff
changeset
|
319 | |
98
92d6bc8a4cdd
Added javascript formulas for color calculations. Added IBU total calculation. Better IBI calculation for the hop entries. Blocked selection of IBU calculation for Garetz, Mosher and Noonan. Better sg calculation in the recipe print.
Michiel Broek <mbroek@mbse.eu>
parents:
97
diff
changeset
|
320 | function calcIBUs() { |
92d6bc8a4cdd
Added javascript formulas for color calculations. Added IBU total calculation. Better IBI calculation for the hop entries. Blocked selection of IBU calculation for Garetz, Mosher and Noonan. Better sg calculation in the recipe print.
Michiel Broek <mbroek@mbse.eu>
parents:
97
diff
changeset
|
321 | var total_ibus = 0; |
138
59874681fc13
Hop flavour and aroma sets global values. On the hop tab, show IBU and make room for the flavour and aroma presentation.
Michiel Broek <mbroek@mbse.eu>
parents:
137
diff
changeset
|
322 | hop_aroma = hop_flavour = 0; |
125
f2c79ed6423a
Fixes and improvements for hops editing and calculations.
Michiel Broek <mbroek@mbse.eu>
parents:
99
diff
changeset
|
323 | var rows = $('#hopGrid').jqxGrid('getrows'); |
98
92d6bc8a4cdd
Added javascript formulas for color calculations. Added IBU total calculation. Better IBI calculation for the hop entries. Blocked selection of IBU calculation for Garetz, Mosher and Noonan. Better sg calculation in the recipe print.
Michiel Broek <mbroek@mbse.eu>
parents:
97
diff
changeset
|
324 | for (var i = 0; i < rows.length; i++) { |
92d6bc8a4cdd
Added javascript formulas for color calculations. Added IBU total calculation. Better IBI calculation for the hop entries. Blocked selection of IBU calculation for Garetz, Mosher and Noonan. Better sg calculation in the recipe print.
Michiel Broek <mbroek@mbse.eu>
parents:
97
diff
changeset
|
325 | var row = rows[i]; |
149
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
326 | total_ibus += toIBU(row.h_useat, row.h_form, preboil_sg, parseFloat(dataRecord.batch_size), |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
327 | parseFloat(row.h_amount), parseFloat(row.h_time), parseFloat(row.h_alpha), dataRecord.ibu_method); |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
328 | hop_flavour += hopFlavourContribution(parseFloat(row.h_time), parseFloat(dataRecord.batch_size), |
136
bcc4583fd013
Fixed estimate FG calculation during recipes import. Added estimate FG calculation in the recipe editor but do not yet update the recipe. Added SVG calculation to the recipes editor. Added calculations for hop aroma and flavour contribution.
Michiel Broek <mbroek@mbse.eu>
parents:
135
diff
changeset
|
329 | row.h_useat, parseFloat(row.h_amount)); |
149
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
330 | hop_aroma += hopAromaContribution(parseFloat(row.h_time), parseFloat(dataRecord.batch_size), |
138
59874681fc13
Hop flavour and aroma sets global values. On the hop tab, show IBU and make room for the flavour and aroma presentation.
Michiel Broek <mbroek@mbse.eu>
parents:
137
diff
changeset
|
331 | row.h_useat, parseFloat(row.h_amount)); |
98
92d6bc8a4cdd
Added javascript formulas for color calculations. Added IBU total calculation. Better IBI calculation for the hop entries. Blocked selection of IBU calculation for Garetz, Mosher and Noonan. Better sg calculation in the recipe print.
Michiel Broek <mbroek@mbse.eu>
parents:
97
diff
changeset
|
332 | } |
137
dfbf43b2797e
Store calculated estimate ibu and estimate fg.
Michiel Broek <mbroek@mbse.eu>
parents:
136
diff
changeset
|
333 | total_ibus = Math.round(total_ibus); |
138
59874681fc13
Hop flavour and aroma sets global values. On the hop tab, show IBU and make room for the flavour and aroma presentation.
Michiel Broek <mbroek@mbse.eu>
parents:
137
diff
changeset
|
334 | console.log("calcIBUs(): " + total_ibus + " flavour: " + hop_flavour + " aroma: " + hop_aroma); |
137
dfbf43b2797e
Store calculated estimate ibu and estimate fg.
Michiel Broek <mbroek@mbse.eu>
parents:
136
diff
changeset
|
335 | dataRecord.est_ibu = total_ibus; |
98
92d6bc8a4cdd
Added javascript formulas for color calculations. Added IBU total calculation. Better IBI calculation for the hop entries. Blocked selection of IBU calculation for Garetz, Mosher and Noonan. Better sg calculation in the recipe print.
Michiel Broek <mbroek@mbse.eu>
parents:
97
diff
changeset
|
336 | $('#est_ibu').val(total_ibus); |
138
59874681fc13
Hop flavour and aroma sets global values. On the hop tab, show IBU and make room for the flavour and aroma presentation.
Michiel Broek <mbroek@mbse.eu>
parents:
137
diff
changeset
|
337 | $('#est_ibu2').val(total_ibus); |
139
eb1ac7487710
Added EBC color examples. Added simple progessbars for hop flavour and aroma contribution. We need something better. In the fermentables tab, above the grid display the malt color and OG estimates. Display supplier as well in the fermentables grid.
Michiel Broek <mbroek@mbse.eu>
parents:
138
diff
changeset
|
338 | $("#hop_flavour").jqxProgressBar('val', hop_flavour * 10); |
eb1ac7487710
Added EBC color examples. Added simple progessbars for hop flavour and aroma contribution. We need something better. In the fermentables tab, above the grid display the malt color and OG estimates. Display supplier as well in the fermentables grid.
Michiel Broek <mbroek@mbse.eu>
parents:
138
diff
changeset
|
339 | $("#hop_aroma").jqxProgressBar('val', hop_aroma * 10); |
73
454fc4558609
Added style selector in recipe editer. Better formatting of cellsrenderer fields. Added When field to the fermentables list. Attempts to calculate the fermentables.
Michiel Broek <mbroek@mbse.eu>
parents:
72
diff
changeset
|
340 | }; |
454fc4558609
Added style selector in recipe editer. Better formatting of cellsrenderer fields. Added When field to the fermentables list. Attempts to calculate the fermentables.
Michiel Broek <mbroek@mbse.eu>
parents:
72
diff
changeset
|
341 | |
263
ed22ac46404b
Adjust water, hops, yeasts and miscs when the batch size or equipment changes.
Michiel Broek <mbroek@mbse.eu>
parents:
262
diff
changeset
|
342 | function adjustHops(factor) { |
ed22ac46404b
Adjust water, hops, yeasts and miscs when the batch size or equipment changes.
Michiel Broek <mbroek@mbse.eu>
parents:
262
diff
changeset
|
343 | |
ed22ac46404b
Adjust water, hops, yeasts and miscs when the batch size or equipment changes.
Michiel Broek <mbroek@mbse.eu>
parents:
262
diff
changeset
|
344 | console.log("adjustHops("+factor+")"); |
ed22ac46404b
Adjust water, hops, yeasts and miscs when the batch size or equipment changes.
Michiel Broek <mbroek@mbse.eu>
parents:
262
diff
changeset
|
345 | |
ed22ac46404b
Adjust water, hops, yeasts and miscs when the batch size or equipment changes.
Michiel Broek <mbroek@mbse.eu>
parents:
262
diff
changeset
|
346 | var rowscount = $("#hopGrid").jqxGrid('getdatainformation').rowscount; |
ed22ac46404b
Adjust water, hops, yeasts and miscs when the batch size or equipment changes.
Michiel Broek <mbroek@mbse.eu>
parents:
262
diff
changeset
|
347 | if (rowscount == 0) |
ed22ac46404b
Adjust water, hops, yeasts and miscs when the batch size or equipment changes.
Michiel Broek <mbroek@mbse.eu>
parents:
262
diff
changeset
|
348 | return; |
ed22ac46404b
Adjust water, hops, yeasts and miscs when the batch size or equipment changes.
Michiel Broek <mbroek@mbse.eu>
parents:
262
diff
changeset
|
349 | |
ed22ac46404b
Adjust water, hops, yeasts and miscs when the batch size or equipment changes.
Michiel Broek <mbroek@mbse.eu>
parents:
262
diff
changeset
|
350 | for (var i = 0; i < rowscount; i++) { |
ed22ac46404b
Adjust water, hops, yeasts and miscs when the batch size or equipment changes.
Michiel Broek <mbroek@mbse.eu>
parents:
262
diff
changeset
|
351 | var row = $("#hopGrid").jqxGrid('getrowdata', i); |
ed22ac46404b
Adjust water, hops, yeasts and miscs when the batch size or equipment changes.
Michiel Broek <mbroek@mbse.eu>
parents:
262
diff
changeset
|
352 | var amount = row.h_amount * factor; |
ed22ac46404b
Adjust water, hops, yeasts and miscs when the batch size or equipment changes.
Michiel Broek <mbroek@mbse.eu>
parents:
262
diff
changeset
|
353 | $("#hopGrid").jqxGrid('setcellvalue', i, "h_amount", amount); |
ed22ac46404b
Adjust water, hops, yeasts and miscs when the batch size or equipment changes.
Michiel Broek <mbroek@mbse.eu>
parents:
262
diff
changeset
|
354 | } |
ed22ac46404b
Adjust water, hops, yeasts and miscs when the batch size or equipment changes.
Michiel Broek <mbroek@mbse.eu>
parents:
262
diff
changeset
|
355 | }; |
ed22ac46404b
Adjust water, hops, yeasts and miscs when the batch size or equipment changes.
Michiel Broek <mbroek@mbse.eu>
parents:
262
diff
changeset
|
356 | |
ed22ac46404b
Adjust water, hops, yeasts and miscs when the batch size or equipment changes.
Michiel Broek <mbroek@mbse.eu>
parents:
262
diff
changeset
|
357 | function adjustMiscs(factor) { |
ed22ac46404b
Adjust water, hops, yeasts and miscs when the batch size or equipment changes.
Michiel Broek <mbroek@mbse.eu>
parents:
262
diff
changeset
|
358 | |
ed22ac46404b
Adjust water, hops, yeasts and miscs when the batch size or equipment changes.
Michiel Broek <mbroek@mbse.eu>
parents:
262
diff
changeset
|
359 | console.log("adjustMiscs("+factor+")"); |
ed22ac46404b
Adjust water, hops, yeasts and miscs when the batch size or equipment changes.
Michiel Broek <mbroek@mbse.eu>
parents:
262
diff
changeset
|
360 | |
ed22ac46404b
Adjust water, hops, yeasts and miscs when the batch size or equipment changes.
Michiel Broek <mbroek@mbse.eu>
parents:
262
diff
changeset
|
361 | var rowscount = $("#miscGrid").jqxGrid('getdatainformation').rowscount; |
ed22ac46404b
Adjust water, hops, yeasts and miscs when the batch size or equipment changes.
Michiel Broek <mbroek@mbse.eu>
parents:
262
diff
changeset
|
362 | if (rowscount == 0) |
ed22ac46404b
Adjust water, hops, yeasts and miscs when the batch size or equipment changes.
Michiel Broek <mbroek@mbse.eu>
parents:
262
diff
changeset
|
363 | return; |
ed22ac46404b
Adjust water, hops, yeasts and miscs when the batch size or equipment changes.
Michiel Broek <mbroek@mbse.eu>
parents:
262
diff
changeset
|
364 | |
ed22ac46404b
Adjust water, hops, yeasts and miscs when the batch size or equipment changes.
Michiel Broek <mbroek@mbse.eu>
parents:
262
diff
changeset
|
365 | for (var i = 0; i < rowscount; i++) { |
ed22ac46404b
Adjust water, hops, yeasts and miscs when the batch size or equipment changes.
Michiel Broek <mbroek@mbse.eu>
parents:
262
diff
changeset
|
366 | var row = $("#miscGrid").jqxGrid('getrowdata', i); |
ed22ac46404b
Adjust water, hops, yeasts and miscs when the batch size or equipment changes.
Michiel Broek <mbroek@mbse.eu>
parents:
262
diff
changeset
|
367 | var amount = row.m_amount * factor; |
ed22ac46404b
Adjust water, hops, yeasts and miscs when the batch size or equipment changes.
Michiel Broek <mbroek@mbse.eu>
parents:
262
diff
changeset
|
368 | $("#miscGrid").jqxGrid('setcellvalue', i, "m_amount", amount); |
ed22ac46404b
Adjust water, hops, yeasts and miscs when the batch size or equipment changes.
Michiel Broek <mbroek@mbse.eu>
parents:
262
diff
changeset
|
369 | switch (row.m_name) { |
ed22ac46404b
Adjust water, hops, yeasts and miscs when the batch size or equipment changes.
Michiel Broek <mbroek@mbse.eu>
parents:
262
diff
changeset
|
370 | case 'CaCl2': $("#wa_cacl2").val(row.m_amount * 1000); |
ed22ac46404b
Adjust water, hops, yeasts and miscs when the batch size or equipment changes.
Michiel Broek <mbroek@mbse.eu>
parents:
262
diff
changeset
|
371 | break; |
ed22ac46404b
Adjust water, hops, yeasts and miscs when the batch size or equipment changes.
Michiel Broek <mbroek@mbse.eu>
parents:
262
diff
changeset
|
372 | case 'CaSO4': $("#wa_caso4").val(row.m_amount * 1000); |
ed22ac46404b
Adjust water, hops, yeasts and miscs when the batch size or equipment changes.
Michiel Broek <mbroek@mbse.eu>
parents:
262
diff
changeset
|
373 | break; |
ed22ac46404b
Adjust water, hops, yeasts and miscs when the batch size or equipment changes.
Michiel Broek <mbroek@mbse.eu>
parents:
262
diff
changeset
|
374 | case 'MgSO4': $("#wa_mgso4").val(row.m_amount * 1000); |
ed22ac46404b
Adjust water, hops, yeasts and miscs when the batch size or equipment changes.
Michiel Broek <mbroek@mbse.eu>
parents:
262
diff
changeset
|
375 | break; |
ed22ac46404b
Adjust water, hops, yeasts and miscs when the batch size or equipment changes.
Michiel Broek <mbroek@mbse.eu>
parents:
262
diff
changeset
|
376 | case 'NaCl': $("#wa_nacl").val(row.m_amount * 1000); |
ed22ac46404b
Adjust water, hops, yeasts and miscs when the batch size or equipment changes.
Michiel Broek <mbroek@mbse.eu>
parents:
262
diff
changeset
|
377 | break; |
ed22ac46404b
Adjust water, hops, yeasts and miscs when the batch size or equipment changes.
Michiel Broek <mbroek@mbse.eu>
parents:
262
diff
changeset
|
378 | case 'Melkzuur': |
ed22ac46404b
Adjust water, hops, yeasts and miscs when the batch size or equipment changes.
Michiel Broek <mbroek@mbse.eu>
parents:
262
diff
changeset
|
379 | case 'Zoutzuur': |
ed22ac46404b
Adjust water, hops, yeasts and miscs when the batch size or equipment changes.
Michiel Broek <mbroek@mbse.eu>
parents:
262
diff
changeset
|
380 | case 'Fosforzuur': |
ed22ac46404b
Adjust water, hops, yeasts and miscs when the batch size or equipment changes.
Michiel Broek <mbroek@mbse.eu>
parents:
262
diff
changeset
|
381 | case 'Zwavelzuur': $("#wa_acid").val(row.m_amount * 1000); |
ed22ac46404b
Adjust water, hops, yeasts and miscs when the batch size or equipment changes.
Michiel Broek <mbroek@mbse.eu>
parents:
262
diff
changeset
|
382 | break; |
ed22ac46404b
Adjust water, hops, yeasts and miscs when the batch size or equipment changes.
Michiel Broek <mbroek@mbse.eu>
parents:
262
diff
changeset
|
383 | case 'NaHCO3': |
ed22ac46404b
Adjust water, hops, yeasts and miscs when the batch size or equipment changes.
Michiel Broek <mbroek@mbse.eu>
parents:
262
diff
changeset
|
384 | case 'Na2CO3': |
ed22ac46404b
Adjust water, hops, yeasts and miscs when the batch size or equipment changes.
Michiel Broek <mbroek@mbse.eu>
parents:
262
diff
changeset
|
385 | case 'CaCO3': |
ed22ac46404b
Adjust water, hops, yeasts and miscs when the batch size or equipment changes.
Michiel Broek <mbroek@mbse.eu>
parents:
262
diff
changeset
|
386 | case 'Ca(OH)2': $("#wa_base").val(row.m_amount * 1000); |
ed22ac46404b
Adjust water, hops, yeasts and miscs when the batch size or equipment changes.
Michiel Broek <mbroek@mbse.eu>
parents:
262
diff
changeset
|
387 | break; |
ed22ac46404b
Adjust water, hops, yeasts and miscs when the batch size or equipment changes.
Michiel Broek <mbroek@mbse.eu>
parents:
262
diff
changeset
|
388 | } |
ed22ac46404b
Adjust water, hops, yeasts and miscs when the batch size or equipment changes.
Michiel Broek <mbroek@mbse.eu>
parents:
262
diff
changeset
|
389 | } |
ed22ac46404b
Adjust water, hops, yeasts and miscs when the batch size or equipment changes.
Michiel Broek <mbroek@mbse.eu>
parents:
262
diff
changeset
|
390 | }; |
ed22ac46404b
Adjust water, hops, yeasts and miscs when the batch size or equipment changes.
Michiel Broek <mbroek@mbse.eu>
parents:
262
diff
changeset
|
391 | |
ed22ac46404b
Adjust water, hops, yeasts and miscs when the batch size or equipment changes.
Michiel Broek <mbroek@mbse.eu>
parents:
262
diff
changeset
|
392 | function adjustYeasts(factor) { |
ed22ac46404b
Adjust water, hops, yeasts and miscs when the batch size or equipment changes.
Michiel Broek <mbroek@mbse.eu>
parents:
262
diff
changeset
|
393 | |
ed22ac46404b
Adjust water, hops, yeasts and miscs when the batch size or equipment changes.
Michiel Broek <mbroek@mbse.eu>
parents:
262
diff
changeset
|
394 | console.log("adjustYeasts("+factor+")"); |
ed22ac46404b
Adjust water, hops, yeasts and miscs when the batch size or equipment changes.
Michiel Broek <mbroek@mbse.eu>
parents:
262
diff
changeset
|
395 | |
ed22ac46404b
Adjust water, hops, yeasts and miscs when the batch size or equipment changes.
Michiel Broek <mbroek@mbse.eu>
parents:
262
diff
changeset
|
396 | var rowscount = $("#yeastGrid").jqxGrid('getdatainformation').rowscount; |
ed22ac46404b
Adjust water, hops, yeasts and miscs when the batch size or equipment changes.
Michiel Broek <mbroek@mbse.eu>
parents:
262
diff
changeset
|
397 | if (rowscount == 0) |
ed22ac46404b
Adjust water, hops, yeasts and miscs when the batch size or equipment changes.
Michiel Broek <mbroek@mbse.eu>
parents:
262
diff
changeset
|
398 | return; |
ed22ac46404b
Adjust water, hops, yeasts and miscs when the batch size or equipment changes.
Michiel Broek <mbroek@mbse.eu>
parents:
262
diff
changeset
|
399 | |
ed22ac46404b
Adjust water, hops, yeasts and miscs when the batch size or equipment changes.
Michiel Broek <mbroek@mbse.eu>
parents:
262
diff
changeset
|
400 | for (var i = 0; i < rowscount; i++) { |
ed22ac46404b
Adjust water, hops, yeasts and miscs when the batch size or equipment changes.
Michiel Broek <mbroek@mbse.eu>
parents:
262
diff
changeset
|
401 | var row = $("#yeastGrid").jqxGrid('getrowdata', i); |
ed22ac46404b
Adjust water, hops, yeasts and miscs when the batch size or equipment changes.
Michiel Broek <mbroek@mbse.eu>
parents:
262
diff
changeset
|
402 | if (row.y_form == 1) { // Only adjust dry yeast |
ed22ac46404b
Adjust water, hops, yeasts and miscs when the batch size or equipment changes.
Michiel Broek <mbroek@mbse.eu>
parents:
262
diff
changeset
|
403 | var amount = row.y_amount * factor; |
ed22ac46404b
Adjust water, hops, yeasts and miscs when the batch size or equipment changes.
Michiel Broek <mbroek@mbse.eu>
parents:
262
diff
changeset
|
404 | $("#yeastGrid").jqxGrid('setcellvalue', i, "y_amount", amount); |
ed22ac46404b
Adjust water, hops, yeasts and miscs when the batch size or equipment changes.
Michiel Broek <mbroek@mbse.eu>
parents:
262
diff
changeset
|
405 | } |
ed22ac46404b
Adjust water, hops, yeasts and miscs when the batch size or equipment changes.
Michiel Broek <mbroek@mbse.eu>
parents:
262
diff
changeset
|
406 | } |
ed22ac46404b
Adjust water, hops, yeasts and miscs when the batch size or equipment changes.
Michiel Broek <mbroek@mbse.eu>
parents:
262
diff
changeset
|
407 | }; |
ed22ac46404b
Adjust water, hops, yeasts and miscs when the batch size or equipment changes.
Michiel Broek <mbroek@mbse.eu>
parents:
262
diff
changeset
|
408 | |
ed22ac46404b
Adjust water, hops, yeasts and miscs when the batch size or equipment changes.
Michiel Broek <mbroek@mbse.eu>
parents:
262
diff
changeset
|
409 | function adjustWaters(factor) { |
ed22ac46404b
Adjust water, hops, yeasts and miscs when the batch size or equipment changes.
Michiel Broek <mbroek@mbse.eu>
parents:
262
diff
changeset
|
410 | |
ed22ac46404b
Adjust water, hops, yeasts and miscs when the batch size or equipment changes.
Michiel Broek <mbroek@mbse.eu>
parents:
262
diff
changeset
|
411 | console.log("adjustWaters("+factor+")"); |
ed22ac46404b
Adjust water, hops, yeasts and miscs when the batch size or equipment changes.
Michiel Broek <mbroek@mbse.eu>
parents:
262
diff
changeset
|
412 | |
ed22ac46404b
Adjust water, hops, yeasts and miscs when the batch size or equipment changes.
Michiel Broek <mbroek@mbse.eu>
parents:
262
diff
changeset
|
413 | var rowscount = $("#mashGrid").jqxGrid('getdatainformation').rowscount; |
ed22ac46404b
Adjust water, hops, yeasts and miscs when the batch size or equipment changes.
Michiel Broek <mbroek@mbse.eu>
parents:
262
diff
changeset
|
414 | if (rowscount == 0) |
ed22ac46404b
Adjust water, hops, yeasts and miscs when the batch size or equipment changes.
Michiel Broek <mbroek@mbse.eu>
parents:
262
diff
changeset
|
415 | return; |
ed22ac46404b
Adjust water, hops, yeasts and miscs when the batch size or equipment changes.
Michiel Broek <mbroek@mbse.eu>
parents:
262
diff
changeset
|
416 | |
ed22ac46404b
Adjust water, hops, yeasts and miscs when the batch size or equipment changes.
Michiel Broek <mbroek@mbse.eu>
parents:
262
diff
changeset
|
417 | mash_infuse = 0; |
ed22ac46404b
Adjust water, hops, yeasts and miscs when the batch size or equipment changes.
Michiel Broek <mbroek@mbse.eu>
parents:
262
diff
changeset
|
418 | for (var i = 0; i < rowscount; i++) { |
ed22ac46404b
Adjust water, hops, yeasts and miscs when the batch size or equipment changes.
Michiel Broek <mbroek@mbse.eu>
parents:
262
diff
changeset
|
419 | var row = $("#mashGrid").jqxGrid('getrowdata', i); |
ed22ac46404b
Adjust water, hops, yeasts and miscs when the batch size or equipment changes.
Michiel Broek <mbroek@mbse.eu>
parents:
262
diff
changeset
|
420 | if (row.step_type == 0) { // Infusion |
ed22ac46404b
Adjust water, hops, yeasts and miscs when the batch size or equipment changes.
Michiel Broek <mbroek@mbse.eu>
parents:
262
diff
changeset
|
421 | var amount = Math.round(row.step_infuse_amount * factor * 10) / 10; |
ed22ac46404b
Adjust water, hops, yeasts and miscs when the batch size or equipment changes.
Michiel Broek <mbroek@mbse.eu>
parents:
262
diff
changeset
|
422 | $("#mashGrid").jqxGrid('setcellvalue', i, "step_infuse_amount", amount); |
ed22ac46404b
Adjust water, hops, yeasts and miscs when the batch size or equipment changes.
Michiel Broek <mbroek@mbse.eu>
parents:
262
diff
changeset
|
423 | mash_infuse += amount; |
ed22ac46404b
Adjust water, hops, yeasts and miscs when the batch size or equipment changes.
Michiel Broek <mbroek@mbse.eu>
parents:
262
diff
changeset
|
424 | } |
ed22ac46404b
Adjust water, hops, yeasts and miscs when the batch size or equipment changes.
Michiel Broek <mbroek@mbse.eu>
parents:
262
diff
changeset
|
425 | } |
ed22ac46404b
Adjust water, hops, yeasts and miscs when the batch size or equipment changes.
Michiel Broek <mbroek@mbse.eu>
parents:
262
diff
changeset
|
426 | if (dataRecord.w2_amount == 0) { |
ed22ac46404b
Adjust water, hops, yeasts and miscs when the batch size or equipment changes.
Michiel Broek <mbroek@mbse.eu>
parents:
262
diff
changeset
|
427 | dataRecord.w1_amount = mash_infuse; |
ed22ac46404b
Adjust water, hops, yeasts and miscs when the batch size or equipment changes.
Michiel Broek <mbroek@mbse.eu>
parents:
262
diff
changeset
|
428 | $("#w1_amount").val(mash_infuse); |
ed22ac46404b
Adjust water, hops, yeasts and miscs when the batch size or equipment changes.
Michiel Broek <mbroek@mbse.eu>
parents:
262
diff
changeset
|
429 | } else { |
ed22ac46404b
Adjust water, hops, yeasts and miscs when the batch size or equipment changes.
Michiel Broek <mbroek@mbse.eu>
parents:
262
diff
changeset
|
430 | dataRecord.w1_amount = (dataRecord.w1_amount / (dataRecord.w1_amount + dataRecord.w2_amount)) * mash_infuse; |
ed22ac46404b
Adjust water, hops, yeasts and miscs when the batch size or equipment changes.
Michiel Broek <mbroek@mbse.eu>
parents:
262
diff
changeset
|
431 | dataRecord.w2_amount = (dataRecord.w2_amount / (dataRecord.w1_amount + dataRecord.w2_amount)) * mash_infuse; |
ed22ac46404b
Adjust water, hops, yeasts and miscs when the batch size or equipment changes.
Michiel Broek <mbroek@mbse.eu>
parents:
262
diff
changeset
|
432 | $("#w1_amount").val(dataRecord.w1_amount); |
ed22ac46404b
Adjust water, hops, yeasts and miscs when the batch size or equipment changes.
Michiel Broek <mbroek@mbse.eu>
parents:
262
diff
changeset
|
433 | $("#w2_amount").val(dataRecord.w2_amount); |
ed22ac46404b
Adjust water, hops, yeasts and miscs when the batch size or equipment changes.
Michiel Broek <mbroek@mbse.eu>
parents:
262
diff
changeset
|
434 | } |
264
24139883b9fa
Adjust water volumes if mash infusion amount is changed.
Michiel Broek <mbroek@mbse.eu>
parents:
263
diff
changeset
|
435 | $('#wg_amount').val(mash_infuse); |
263
ed22ac46404b
Adjust water, hops, yeasts and miscs when the batch size or equipment changes.
Michiel Broek <mbroek@mbse.eu>
parents:
262
diff
changeset
|
436 | }; |
ed22ac46404b
Adjust water, hops, yeasts and miscs when the batch size or equipment changes.
Michiel Broek <mbroek@mbse.eu>
parents:
262
diff
changeset
|
437 | |
154
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
438 | /* function GetBUGUMin() { |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
439 | |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
440 | var Result = 0; |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
441 | |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
442 | if (((dataRecord.st_og_max + dataRecord.st_og_min) > 0) && ((dataRecord.st_ibu_max + dataRecord.st_ibu_min) > 0)) { |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
443 | var G = (dataRecord.st_og_max - dataRecord.st_og_min) / ((dataRecord.st_og_max + dataRecord.st_og_min) / 2); |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
444 | var B = (dataRecord.st_ibu_max - dataRecord.st_ibu_min) / ((dataRecord.st_ibu_max + dataRecord.st_ibu_min) / 2); |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
445 | if (G > B) |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
446 | Result = ((dataRecord.st_ibu_max + dataRecord.st_ibu_min) / 2) / (1000 * (dataRecord.st_og_max - 1)); |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
447 | else |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
448 | Result = dataRecord.st_ibu_min / (1000 * (((dataRecord.st_og_max + dataRecord.st_og_min) / 2) - 1)); |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
449 | } |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
450 | console.log("GetBUGUMin(): "+Result); |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
451 | return Result; |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
452 | } |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
453 | |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
454 | function GetBUGUMax() { |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
455 | |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
456 | var Result = 0; |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
457 | |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
458 | if (((dataRecord.st_og_max + dataRecord.st_og_min) > 0) && ((dataRecord.st_ibu_max + dataRecord.st_ibu_min) > 0) && (dataRecord.st_og_min > 0)) { |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
459 | var G = (dataRecord.st_og_max - dataRecord.st_og_min) / ((dataRecord.st_og_max + dataRecord.st_og_min) / 2); |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
460 | var B = (dataRecord.st_ibu_max - dataRecord.st_ibu_min) / ((dataRecord.st_ibu_max + dataRecord.st_ibu_min) / 2); |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
461 | if (G > B) |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
462 | Result = ((dataRecord.st_ibu_min + dataRecord.st_ibu_max) / 2) / (1000 * (dataRecord.st_og_min - 1)); |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
463 | else |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
464 | Result = dataRecord.st_ibu_max / (1000 * (((dataRecord.st_og_max + dataRecord.st_og_min) / 2) - 1)); |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
465 | |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
466 | } |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
467 | console.log("GetBUGUMax(): "+Result); |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
468 | return Result; |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
469 | } */ |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
470 | |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
471 | function GetBUGU() { |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
472 | var gu = (dataRecord.est_og - 1) * 1000; |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
473 | if (gu > 0) |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
474 | return dataRecord.est_ibu / gu; |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
475 | else |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
476 | return 0.5; |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
477 | } |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
478 | |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
479 | function GetOptClSO4ratio() { |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
480 | var BUGU = GetBUGU(); |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
481 | return (-1.2 * BUGU + 1.4); |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
482 | } |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
483 | |
149
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
484 | function setWaterAgent(name, amount) { |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
485 | console.log("setWaterAgent(" + name + ", " + amount + ")"); |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
486 | var rows = $('#miscGrid').jqxGrid('getrows'); |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
487 | if (amount == 0) { |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
488 | for (var i = 0; i < rows.length; i++) { |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
489 | var row = rows[i]; |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
490 | if (row.m_name == name) { |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
491 | var id = $("#miscGrid").jqxGrid('getrowid', i); |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
492 | var commit = $("#miscGrid").jqxGrid('deleterow', id); |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
493 | } |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
494 | } |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
495 | } else { |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
496 | var found = false; |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
497 | for (var i = 0; i < rows.length; i++) { |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
498 | var row = rows[i]; |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
499 | if (row.m_name == name) { |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
500 | found = true; |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
501 | $("#miscGrid").jqxGrid('setcellvalue', i, 'm_amount', amount / 1000); |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
502 | break; |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
503 | } |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
504 | } |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
505 | if (! found) { |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
506 | var miscs = new $.jqx.dataAdapter(miscInvSource, { |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
507 | loadComplete: function () { |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
508 | var records = miscs.records; |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
509 | for (var i = 0; i < records.length; i++) { |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
510 | var record = records[i]; |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
511 | if (record.name == name) { |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
512 | var row = {}; |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
513 | row["m_name"] = record.name; |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
514 | row["m_amount"] = amount / 1000; |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
515 | row["m_cost"] = record.cost; |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
516 | row["m_type"] = record.type; |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
517 | row["m_use_use"] = record.use_use; |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
518 | row["m_time"] = 0; |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
519 | row["m_amount_is_weight"] = record.amount_is_weight; |
225
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
224
diff
changeset
|
520 | row["m_inventory"] = record.inventory; |
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
224
diff
changeset
|
521 | row["m_avail"] = 1; |
149
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
522 | var commit = $("#miscGrid").jqxGrid('addrow', null, row); |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
523 | } |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
524 | } |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
525 | } |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
526 | }); |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
527 | miscs.dataBind(); |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
528 | return; |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
529 | } |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
530 | } |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
531 | } |
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:
146
diff
changeset
|
532 | |
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
|
533 | function setRangeIndicator(ion, rangeCode) { |
262 | 534 | if (rangeCode == "low") |
535 | $("#wr_"+ion).html("<img src='images/dialog-error.png'><span style='font-size: 10px; font-style: italic;'>"+rangeCode + "</span>"); | |
536 | else if (rangeCode == "high") | |
537 | $("#wr_"+ion).html("<img src='images/dialog-error.png'><span style='font-size: 10px; font-style: italic;'>"+rangeCode+"</span>"); | |
538 | else | |
539 | $("#wr_"+ion).html("<img src='images/dialog-ok-apply.png'>"); | |
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
|
540 | } |
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
|
541 | |
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
|
542 | function mix(v1, v2, c1, c2) { |
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
|
543 | if ((v1 + v2) > 0) { |
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
|
544 | return ((v1 * c1) + (v2 * c2)) / (v1 + v2); |
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
|
545 | } |
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
|
546 | return 0; |
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
|
547 | } |
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
|
548 | |
156
35860890224c
Added sparge water acid calculation. Added residual alkalinity calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
155
diff
changeset
|
549 | // mg/l as CaCO3 |
35860890224c
Added sparge water acid calculation. Added residual alkalinity calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
155
diff
changeset
|
550 | function ResidualAlkalinity(total_alkalinity, calcium, magnesium) { |
35860890224c
Added sparge water acid calculation. Added residual alkalinity calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
155
diff
changeset
|
551 | return total_alkalinity - (calcium / 1.4 + magnesium / 1.7); |
35860890224c
Added sparge water acid calculation. Added residual alkalinity calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
155
diff
changeset
|
552 | } |
35860890224c
Added sparge water acid calculation. Added residual alkalinity calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
155
diff
changeset
|
553 | |
149
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
554 | var Ka1 = 0.0000004445; |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
555 | var Ka2 = 0.0000000000468; |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
556 | |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
557 | function PartCO3(pH) { |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
558 | var H = Math.pow(10, -pH); |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
559 | return 100 * Ka1 * Ka2 / (H*H + H * Ka1 + Ka1 * Ka2); |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
560 | } |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
561 | |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
562 | function PartHCO3(pH) { |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
563 | var H = Math.pow(10, -pH); |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
564 | return 100 * Ka1 * H / (H*H + H * Ka1 + Ka1 * Ka2); |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
565 | } |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
566 | |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
567 | function Charge(pH) { |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
568 | return (-2 * PartCO3(pH) - PartHCO3(pH)); |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
569 | } |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
570 | |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
571 | //Z alkalinity is the amount of acid (in mEq/l) needed to bring water to the target pH (Z pH) |
156
35860890224c
Added sparge water acid calculation. Added residual alkalinity calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
155
diff
changeset
|
572 | function ZAlkalinity(pHZ) { |
149
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
573 | var C43 = Charge(4.3); |
158
3b9e4dfb0476
Fixes and optimisations for water calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
156
diff
changeset
|
574 | var Cw = Charge(parseFloat($("#wg_ph").jqxNumberInput('decimal'))); |
149
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
575 | var Cz = Charge(pHZ); |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
576 | var DeltaCNaught = -C43+Cw; |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
577 | var CT = parseFloat($("#wg_total_alkalinity").jqxNumberInput('decimal')) / 50 / DeltaCNaught; |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
578 | var DeltaCZ = -Cz+Cw; |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
579 | return CT * DeltaCZ; |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
580 | } |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
581 | |
154
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
582 | //Z Residual alkalinity is the amount of acid (in mEq/l) needed to bring the water in the mash to the target pH (Z pH) |
156
35860890224c
Added sparge water acid calculation. Added residual alkalinity calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
155
diff
changeset
|
583 | function ZRA(pHZ) { |
149
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
584 | |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
585 | var Calc = parseFloat($("#wg_calcium").jqxNumberInput('decimal')) / (MMCa / 2); |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
586 | var Magn = parseFloat($("#wg_magnesium").jqxNumberInput('decimal')) / (MMMg / 2); |
156
35860890224c
Added sparge water acid calculation. Added residual alkalinity calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
155
diff
changeset
|
587 | var Z = ZAlkalinity(pHZ); |
149
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
588 | return Z - (Calc / 3.5 + Magn / 7); |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
589 | } |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
590 | |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
591 | function ProtonDeficit(pHZ) { |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
592 | |
156
35860890224c
Added sparge water acid calculation. Added residual alkalinity calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
155
diff
changeset
|
593 | var Result = ZRA(pHZ) * parseFloat($("#wg_amount").jqxNumberInput('decimal')); |
35860890224c
Added sparge water acid calculation. Added residual alkalinity calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
155
diff
changeset
|
594 | // proton deficit for the grist |
154
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
595 | var rows = $('#fermentableGrid').jqxGrid('getrows'); |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
596 | for (var i = 0; i < rows.length; i++) { |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
597 | var row = rows[i]; |
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:
175
diff
changeset
|
598 | if (row.f_added == 0 && row.f_graintype != 6) { // Added == Mash && graintype != No Malt |
154
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
599 | // Check if acid is required |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
600 | var C1 = 0; |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
601 | if ((row.f_di_ph != 5.7) && ((row.f_acid_to_ph_57 < - 0.1) || (row.f_acid_to_ph_57 > 0.1))) { |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
602 | C1 = row.f_acid_to_ph_57 / (row.f_di_ph - 5.7); |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
603 | } else { |
156
35860890224c
Added sparge water acid calculation. Added residual alkalinity calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
155
diff
changeset
|
604 | // If the acid_to_ph_5.7 is unknown from the maltster, guess the required acid. |
154
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
605 | var ebc = row.f_color; |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
606 | switch (row.f_graintype) { |
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:
175
diff
changeset
|
607 | case 0: // Base, Special, Kilned |
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:
175
diff
changeset
|
608 | case 3: |
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:
175
diff
changeset
|
609 | case 5: C1 = 0.014 * ebc - 34.192; |
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:
175
diff
changeset
|
610 | break; |
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:
175
diff
changeset
|
611 | case 2: C1 = -0.0597 * ebc - 32.457; // Crystal |
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:
175
diff
changeset
|
612 | break; |
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:
175
diff
changeset
|
613 | case 1: C1 = 0.0107 * ebc - 54.768; // Roast |
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:
175
diff
changeset
|
614 | break; |
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:
175
diff
changeset
|
615 | case 4: C1 = -149; // Sour malt |
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:
175
diff
changeset
|
616 | break; |
154
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
617 | } |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
618 | } |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
619 | x = C1 * (pHZ - row.f_di_ph); // AcidRequired(ZpH) |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
620 | // console.log(row.f_name+" C1: "+C1+" ZpH: "+pHZ+" di_ph: "+row.f_di_ph+" acid rquired: "+x); |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
621 | Result += x * row.f_amount; |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
622 | } |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
623 | } |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
624 | // console.log("Final: "+Result); |
149
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
625 | return Result; |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
626 | } |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
627 | |
154
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
628 | function MashpH() { |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
629 | var n = 0; |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
630 | var pH = 5.4; |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
631 | var deltapH = 0.001; |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
632 | var deltapd = 0.1; |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
633 | var pd = ProtonDeficit(pH); |
155
041af8a82d77
Some pH calculations cane use twice as much loops, probably because we have better float precision then the original pascal code. More variables to prevent html reads. Use predicted mash pH (the grist in demi water) to calculate the pH shift from the tapwater to the target pH. It's better but not right yet. Or it is right and brouwhulp is far off.
Michiel Broek <mbroek@mbse.eu>
parents:
154
diff
changeset
|
634 | while (((pd < -deltapd) || (pd > deltapd)) && (n < 2000)) { |
154
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
635 | n++; |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
636 | if (pd < -deltapd) |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
637 | pH -= deltapH; |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
638 | else if (pd > deltapd) |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
639 | pH += deltapH; |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
640 | pd = ProtonDeficit(pH); |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
641 | } |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
642 | console.log("MashpH() n: "+n+" pH: "+pH); |
155
041af8a82d77
Some pH calculations cane use twice as much loops, probably because we have better float precision then the original pascal code. More variables to prevent html reads. Use predicted mash pH (the grist in demi water) to calculate the pH shift from the tapwater to the target pH. It's better but not right yet. Or it is right and brouwhulp is far off.
Michiel Broek <mbroek@mbse.eu>
parents:
154
diff
changeset
|
643 | return pH; |
154
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
644 | } |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
645 | |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
646 | function GetAcidSpecs(AT) { |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
647 | switch(AT) { |
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:
175
diff
changeset
|
648 | case 0: return { // Melkzuur |
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:
175
diff
changeset
|
649 | pK1: 3.08, |
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:
175
diff
changeset
|
650 | pK2: 20, |
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:
175
diff
changeset
|
651 | pK3: 20, |
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:
175
diff
changeset
|
652 | MolWt: 90.08, |
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:
175
diff
changeset
|
653 | AcidSG: 1214, |
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:
175
diff
changeset
|
654 | AcidPrc: 0.88 |
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:
175
diff
changeset
|
655 | }; |
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:
175
diff
changeset
|
656 | case 1: return { // Zoutzuur |
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:
175
diff
changeset
|
657 | pK1: -10, |
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:
175
diff
changeset
|
658 | pK2: 20, |
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:
175
diff
changeset
|
659 | pK3: 20, |
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:
175
diff
changeset
|
660 | MolWt: 36.46, |
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:
175
diff
changeset
|
661 | AcidSG: 1142, |
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:
175
diff
changeset
|
662 | AcidPrc: 0.28 |
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:
175
diff
changeset
|
663 | }; |
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:
175
diff
changeset
|
664 | case 2: return { // Fosforzuur |
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:
175
diff
changeset
|
665 | pK1: 2.12, |
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:
175
diff
changeset
|
666 | pK2: 7.20, |
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:
175
diff
changeset
|
667 | pK3: 12.44, |
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:
175
diff
changeset
|
668 | MolWt: 98.00, |
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:
175
diff
changeset
|
669 | AcidSG: 1170, |
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:
175
diff
changeset
|
670 | AcidPrc: 0.25 |
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:
175
diff
changeset
|
671 | }; |
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:
175
diff
changeset
|
672 | case 3: return { // Zwavelzuur |
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:
175
diff
changeset
|
673 | pK1: -10, |
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:
175
diff
changeset
|
674 | pK2: 1.92, |
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:
175
diff
changeset
|
675 | pK3: 20, |
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:
175
diff
changeset
|
676 | MolWt: 98.07, |
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:
175
diff
changeset
|
677 | AcidSG: 1700, |
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:
175
diff
changeset
|
678 | AcidPrc: 0.93 |
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:
175
diff
changeset
|
679 | }; |
154
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
680 | } |
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:
175
diff
changeset
|
681 | console.log("Bummer, AT is " + AT); |
154
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
682 | } |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
683 | |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
684 | // Procedure TFrmWaterAdjustment.CalcWater2; |
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:
146
diff
changeset
|
685 | function calcWater() { |
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:
146
diff
changeset
|
686 | |
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:
146
diff
changeset
|
687 | console.log("calcWater()"); |
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:
146
diff
changeset
|
688 | var liters = 0; |
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:
146
diff
changeset
|
689 | var calcium = 0; |
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:
146
diff
changeset
|
690 | var magnesium = 0; |
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:
146
diff
changeset
|
691 | var sodium = 0; |
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:
146
diff
changeset
|
692 | var total_alkalinity = 0; |
154
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
693 | var bicarbonate = 0; |
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:
146
diff
changeset
|
694 | var chloride = 0; |
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:
146
diff
changeset
|
695 | var sulfate = 0; |
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:
146
diff
changeset
|
696 | var ph = 0; |
149
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
697 | var RA = 0; |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
698 | var acid = 0; |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
699 | var frac = 0; |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
700 | var TpH = 0; |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
701 | var protonDeficit = 0; |
148
c0f0bbfefd63
Source waters are fixed, removed grid editor. Redesigned the water screen. Made a simple visual if water treatments are out of range. Water mixer for standard and dillute water works. Swapped the mash and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
147
diff
changeset
|
702 | |
154
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
703 | if (dataRecord.w1_name == "") { |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
704 | return; |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
705 | } |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
706 | // Check for a recipe too. Fermentables, Mash schedule? |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
707 | |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
708 | // If there is a dillute water source, mix the waters. |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
709 | if (dataRecord.w2_name != "") { |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
710 | liters = dataRecord.w1_amount + dataRecord.w2_amount; |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
711 | calcium = mix(dataRecord.w1_amount, dataRecord.w2_amount, dataRecord.w1_calcium, dataRecord.w2_calcium); |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
712 | magnesium = mix(dataRecord.w1_amount, dataRecord.w2_amount, dataRecord.w1_magnesium, dataRecord.w2_magnesium); |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
713 | sodium = mix(dataRecord.w1_amount, dataRecord.w2_amount, dataRecord.w1_sodium, dataRecord.w2_sodium); |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
714 | chloride = mix(dataRecord.w1_amount, dataRecord.w2_amount, dataRecord.w1_chloride, dataRecord.w2_chloride); |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
715 | sulfate = mix(dataRecord.w1_amount, dataRecord.w2_amount, dataRecord.w1_sulfate, dataRecord.w2_sulfate); |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
716 | total_alkalinity = mix(dataRecord.w1_amount, dataRecord.w2_amount, dataRecord.w1_total_alkalinity, dataRecord.w2_total_alkalinity); |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
717 | ph = -Math.log10(((Math.pow(10, -dataRecord.w1_ph) * dataRecord.w1_amount) + (Math.pow(10, -dataRecord.w2_ph) * dataRecord.w2_amount)) / liters); |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
718 | } else { |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
719 | liters = dataRecord.w1_amount; |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
720 | calcium = dataRecord.w1_calcium; |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
721 | magnesium = dataRecord.w1_magnesium; |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
722 | sodium = dataRecord.w1_sodium; |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
723 | chloride = dataRecord.w1_chloride; |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
724 | sulfate = dataRecord.w1_sulfate; |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
725 | total_alkalinity = dataRecord.w1_total_alkalinity; |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
726 | ph = dataRecord.w1_ph; |
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:
146
diff
changeset
|
727 | } |
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
|
728 | $('#wg_amount').val(liters); |
155
041af8a82d77
Some pH calculations cane use twice as much loops, probably because we have better float precision then the original pascal code. More variables to prevent html reads. Use predicted mash pH (the grist in demi water) to calculate the pH shift from the tapwater to the target pH. It's better but not right yet. Or it is right and brouwhulp is far off.
Michiel Broek <mbroek@mbse.eu>
parents:
154
diff
changeset
|
729 | var wg_calcium = calcium; |
149
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
730 | $('#wg_calcium').val(Math.round(calcium * 10) / 10); |
155
041af8a82d77
Some pH calculations cane use twice as much loops, probably because we have better float precision then the original pascal code. More variables to prevent html reads. Use predicted mash pH (the grist in demi water) to calculate the pH shift from the tapwater to the target pH. It's better but not right yet. Or it is right and brouwhulp is far off.
Michiel Broek <mbroek@mbse.eu>
parents:
154
diff
changeset
|
731 | var wg_magnesium = magnesium; |
149
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
732 | $('#wg_magnesium').val(Math.round(magnesium * 10) / 10); |
155
041af8a82d77
Some pH calculations cane use twice as much loops, probably because we have better float precision then the original pascal code. More variables to prevent html reads. Use predicted mash pH (the grist in demi water) to calculate the pH shift from the tapwater to the target pH. It's better but not right yet. Or it is right and brouwhulp is far off.
Michiel Broek <mbroek@mbse.eu>
parents:
154
diff
changeset
|
733 | var wg_sodium = sodium; |
149
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
734 | $('#wg_sodium').val(Math.round(sodium * 10) / 10); |
155
041af8a82d77
Some pH calculations cane use twice as much loops, probably because we have better float precision then the original pascal code. More variables to prevent html reads. Use predicted mash pH (the grist in demi water) to calculate the pH shift from the tapwater to the target pH. It's better but not right yet. Or it is right and brouwhulp is far off.
Michiel Broek <mbroek@mbse.eu>
parents:
154
diff
changeset
|
735 | var wg_total_alkalinity = total_alkalinity; |
149
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
736 | $('#wg_total_alkalinity').val(Math.round(total_alkalinity * 10) / 10); |
155
041af8a82d77
Some pH calculations cane use twice as much loops, probably because we have better float precision then the original pascal code. More variables to prevent html reads. Use predicted mash pH (the grist in demi water) to calculate the pH shift from the tapwater to the target pH. It's better but not right yet. Or it is right and brouwhulp is far off.
Michiel Broek <mbroek@mbse.eu>
parents:
154
diff
changeset
|
737 | var wg_chloride = chloride; |
149
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
738 | $('#wg_chloride').val(Math.round(chloride * 10) / 10); |
155
041af8a82d77
Some pH calculations cane use twice as much loops, probably because we have better float precision then the original pascal code. More variables to prevent html reads. Use predicted mash pH (the grist in demi water) to calculate the pH shift from the tapwater to the target pH. It's better but not right yet. Or it is right and brouwhulp is far off.
Michiel Broek <mbroek@mbse.eu>
parents:
154
diff
changeset
|
739 | var wg_sulfate = sulfate; |
149
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
740 | $('#wg_sulfate').val(Math.round(sulfate * 10) / 10); |
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:
146
diff
changeset
|
741 | // Note: brouwhulp has the malts included here in the result. |
155
041af8a82d77
Some pH calculations cane use twice as much loops, probably because we have better float precision then the original pascal code. More variables to prevent html reads. Use predicted mash pH (the grist in demi water) to calculate the pH shift from the tapwater to the target pH. It's better but not right yet. Or it is right and brouwhulp is far off.
Michiel Broek <mbroek@mbse.eu>
parents:
154
diff
changeset
|
742 | var wg_ph = ph; |
149
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
743 | $('#wg_ph').val(Math.round(ph * 10) / 10); |
155
041af8a82d77
Some pH calculations cane use twice as much loops, probably because we have better float precision then the original pascal code. More variables to prevent html reads. Use predicted mash pH (the grist in demi water) to calculate the pH shift from the tapwater to the target pH. It's better but not right yet. Or it is right and brouwhulp is far off.
Michiel Broek <mbroek@mbse.eu>
parents:
154
diff
changeset
|
744 | $('#wb_ph').val(Math.round(MashpH() * 10) / 10); |
154
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
745 | bicarbonate = total_alkalinity * 1.22; |
155
041af8a82d77
Some pH calculations cane use twice as much loops, probably because we have better float precision then the original pascal code. More variables to prevent html reads. Use predicted mash pH (the grist in demi water) to calculate the pH shift from the tapwater to the target pH. It's better but not right yet. Or it is right and brouwhulp is far off.
Michiel Broek <mbroek@mbse.eu>
parents:
154
diff
changeset
|
746 | var wg_bicarbonate = bicarbonate; |
149
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
747 | |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
748 | // Noot: de volgende berekeningen geven bijna gelijke resultaten in Brun'water. |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
749 | // Calculate Ca |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
750 | RA = parseFloat($("#wa_cacl2").jqxNumberInput('decimal')) * MMCa / MMCaCl2 + |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
751 | parseFloat($("#wa_caso4").jqxNumberInput('decimal')) * MMCa / MMCaSO4; |
154
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
752 | calcium += 1000 * RA / liters; |
149
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
753 | |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
754 | // Calculate Mg |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
755 | RA = parseFloat($("#wa_mgso4").jqxNumberInput('decimal')) * MMMg / MMMgSO4; |
154
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
756 | magnesium += 1000 * RA / liters; |
149
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
757 | |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
758 | // Calculate Na |
154
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
759 | RA = parseFloat($("#wa_nacl").jqxNumberInput('decimal')) * MMNa / MMNaCl; |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
760 | sodium += 1000 * RA / liters; |
149
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
761 | |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
762 | // Calculate SO4 |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
763 | RA = parseFloat($("#wa_caso4").jqxNumberInput('decimal')) * MMSO4 / MMCaSO4 + |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
764 | parseFloat($("#wa_mgso4").jqxNumberInput('decimal')) * MMSO4 / MMMgSO4; |
154
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
765 | sulfate += 1000 * RA / liters; |
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
|
766 | |
149
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
767 | // Calculate Cl |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
768 | RA = 2 * parseFloat($("#wa_cacl2").jqxNumberInput('decimal')) * MMCl / MMCaCl2 + |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
769 | parseFloat($("#wa_nacl").jqxNumberInput('decimal')) * MMCl / MMNaCl; |
154
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
770 | chloride += 1000 * RA / liters; |
149
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
771 | // Einde noot. |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
772 | |
230
8edca0488e65
Finished the water treatment in the recipes editor. It seems that the recipes editor is ready.
Michiel Broek <mbroek@mbse.eu>
parents:
229
diff
changeset
|
773 | if ($("#wa_acid_name").val() < 0 || $("#wa_acid_name").val() > 3) { |
8edca0488e65
Finished the water treatment in the recipes editor. It seems that the recipes editor is ready.
Michiel Broek <mbroek@mbse.eu>
parents:
229
diff
changeset
|
774 | console.log("fix wa_acid_name"); |
8edca0488e65
Finished the water treatment in the recipes editor. It seems that the recipes editor is ready.
Michiel Broek <mbroek@mbse.eu>
parents:
229
diff
changeset
|
775 | $("#wa_acid_name").val(0); |
8edca0488e65
Finished the water treatment in the recipes editor. It seems that the recipes editor is ready.
Michiel Broek <mbroek@mbse.eu>
parents:
229
diff
changeset
|
776 | dataRecord.wa_acid_name = 0; |
155
041af8a82d77
Some pH calculations cane use twice as much loops, probably because we have better float precision then the original pascal code. More variables to prevent html reads. Use predicted mash pH (the grist in demi water) to calculate the pH shift from the tapwater to the target pH. It's better but not right yet. Or it is right and brouwhulp is far off.
Michiel Broek <mbroek@mbse.eu>
parents:
154
diff
changeset
|
777 | } |
230
8edca0488e65
Finished the water treatment in the recipes editor. It seems that the recipes editor is ready.
Michiel Broek <mbroek@mbse.eu>
parents:
229
diff
changeset
|
778 | if (last_acid == '') |
8edca0488e65
Finished the water treatment in the recipes editor. It seems that the recipes editor is ready.
Michiel Broek <mbroek@mbse.eu>
parents:
229
diff
changeset
|
779 | last_acid = AcidTypeData[$("#wa_acid_name").val()].nl; |
8edca0488e65
Finished the water treatment in the recipes editor. It seems that the recipes editor is ready.
Michiel Broek <mbroek@mbse.eu>
parents:
229
diff
changeset
|
780 | |
8edca0488e65
Finished the water treatment in the recipes editor. It seems that the recipes editor is ready.
Michiel Broek <mbroek@mbse.eu>
parents:
229
diff
changeset
|
781 | if ($("#wa_base_name").val() < 0 || $("#wa_base_name").val() > 3) { |
8edca0488e65
Finished the water treatment in the recipes editor. It seems that the recipes editor is ready.
Michiel Broek <mbroek@mbse.eu>
parents:
229
diff
changeset
|
782 | console.log("fix wa_base_name"); |
8edca0488e65
Finished the water treatment in the recipes editor. It seems that the recipes editor is ready.
Michiel Broek <mbroek@mbse.eu>
parents:
229
diff
changeset
|
783 | $("#wa_base_name").val(0); |
8edca0488e65
Finished the water treatment in the recipes editor. It seems that the recipes editor is ready.
Michiel Broek <mbroek@mbse.eu>
parents:
229
diff
changeset
|
784 | dataRecord.wa_base_name = 0; |
155
041af8a82d77
Some pH calculations cane use twice as much loops, probably because we have better float precision then the original pascal code. More variables to prevent html reads. Use predicted mash pH (the grist in demi water) to calculate the pH shift from the tapwater to the target pH. It's better but not right yet. Or it is right and brouwhulp is far off.
Michiel Broek <mbroek@mbse.eu>
parents:
154
diff
changeset
|
785 | } |
230
8edca0488e65
Finished the water treatment in the recipes editor. It seems that the recipes editor is ready.
Michiel Broek <mbroek@mbse.eu>
parents:
229
diff
changeset
|
786 | if (last_base == '') |
8edca0488e65
Finished the water treatment in the recipes editor. It seems that the recipes editor is ready.
Michiel Broek <mbroek@mbse.eu>
parents:
229
diff
changeset
|
787 | last_base = BaseTypeData[$("#wa_base_name").val()].nl; |
155
041af8a82d77
Some pH calculations cane use twice as much loops, probably because we have better float precision then the original pascal code. More variables to prevent html reads. Use predicted mash pH (the grist in demi water) to calculate the pH shift from the tapwater to the target pH. It's better but not right yet. Or it is right and brouwhulp is far off.
Michiel Broek <mbroek@mbse.eu>
parents:
154
diff
changeset
|
788 | |
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:
175
diff
changeset
|
789 | var AT = dataRecord.wa_acid_name; // parseFloat($("#wa_acid_name").jqxNumberInput('decimal')); |
230
8edca0488e65
Finished the water treatment in the recipes editor. It seems that the recipes editor is ready.
Michiel Broek <mbroek@mbse.eu>
parents:
229
diff
changeset
|
790 | var BT = dataRecord.wa_base_name; //parseFloat($("#wa_base_name").jqxNumberInput('decimal')); |
154
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
791 | |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
792 | var result = GetAcidSpecs(AT); |
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
|
793 | var pK1 = result.pK1; |
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
|
794 | var pK2 = result.pK2; |
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
|
795 | var pK3 = result.pK3; |
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
|
796 | var MolWt = result.MolWt; |
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
|
797 | var AcidSG = result.AcidSG; |
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
|
798 | var AcidPrc = result.AcidPrc; |
154
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
799 | |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
800 | if (dataRecord.calc_acid) { |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
801 | TpH = parseFloat(dataRecord.mash_ph); |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
802 | protonDeficit = ProtonDeficit(TpH); |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
803 | console.log("calc_acid tgt: "+TpH+" protonDeficit: "+protonDeficit); |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
804 | if (protonDeficit > 0) { // Add acid |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
805 | $("#wa_base").val(0); |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
806 | setWaterAgent(last_base, 0); |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
807 | frac = CalcFrac(TpH, pK1, pK2, pK3); |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
808 | Acid = protonDeficit / frac; |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
809 | Acid *= MolWt; // mg |
155
041af8a82d77
Some pH calculations cane use twice as much loops, probably because we have better float precision then the original pascal code. More variables to prevent html reads. Use predicted mash pH (the grist in demi water) to calculate the pH shift from the tapwater to the target pH. It's better but not right yet. Or it is right and brouwhulp is far off.
Michiel Broek <mbroek@mbse.eu>
parents:
154
diff
changeset
|
810 | Acidmg = Acid; |
154
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
811 | Acid = Acid / AcidSG; // ml |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
812 | |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
813 | if (parseFloat($("#wa_acid_perc").jqxNumberInput('decimal')) == 0) |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
814 | $("#wa_acid_perc").val(AcidPrc); |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
815 | Acid = Acid * AcidPrc / (parseFloat($("#wa_acid_perc").jqxNumberInput('decimal')) / 100); // ml |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
816 | console.log("Final ml: "+Acid); |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
817 | $("#wa_acid").val(Math.round(Acid * 100) / 100); |
230
8edca0488e65
Finished the water treatment in the recipes editor. It seems that the recipes editor is ready.
Michiel Broek <mbroek@mbse.eu>
parents:
229
diff
changeset
|
818 | setWaterAgent(AcidTypeData[AT].nl, Math.round(Acid * 100) / 100); |
154
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
819 | |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
820 | bicarbonate = bicarbonate - protonDeficit * frac / liters; |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
821 | total_alkalinity = bicarbonate * 50 / 61; |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
822 | } else if (protonDeficit < 0) { //Add base |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
823 | $("#wa_acid").val(0); |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
824 | setWaterAgent(last_acid, 0); |
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
|
825 | var r1d = Math.pow(10, (TpH - 6.38)); |
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
|
826 | var r2d = Math.pow(10, (TpH - 10.38)); |
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
|
827 | var f1d = 1 / (1 + r1d + r1d * r2d); |
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
|
828 | var f2d = f1d * r1d; |
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
|
829 | var f3d = f2d * r2d; |
154
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
830 | switch (BT) { |
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:
175
diff
changeset
|
831 | case 0: RA = -protonDeficit / (f1d - f3d); //Sodiumbicarbonate, mmol totaal |
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:
175
diff
changeset
|
832 | RA = RA * MMNaHCO3/1000; //gram |
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:
175
diff
changeset
|
833 | $("#wa_base").val(Math.round(RA * 100) / 100); |
230
8edca0488e65
Finished the water treatment in the recipes editor. It seems that the recipes editor is ready.
Michiel Broek <mbroek@mbse.eu>
parents:
229
diff
changeset
|
834 | setWaterAgent('NaHCO3', Math.round(RA * 100) / 100); |
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:
175
diff
changeset
|
835 | if (liters > 0) { |
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:
175
diff
changeset
|
836 | // Na |
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:
175
diff
changeset
|
837 | RA = parseFloat($("#wa_nacl").jqxNumberInput('decimal')) * MMNa / MMNaCl + |
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:
175
diff
changeset
|
838 | parseFloat($("#wa_base").jqxNumberInput('decimal')) * MMNa / MMNaHCO3; |
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:
175
diff
changeset
|
839 | RA = 1000 * RA / liters; |
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:
175
diff
changeset
|
840 | sodium = wg_sodium + RA; |
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:
175
diff
changeset
|
841 | // HCO3 |
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:
175
diff
changeset
|
842 | RA = parseFloat($("#wa_base").jqxNumberInput('decimal')) * MMHCO3 / MMNaHCO3; |
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:
175
diff
changeset
|
843 | RA = 1000 * RA / liters; |
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:
175
diff
changeset
|
844 | bicarbonate = wg_bicarbonate + RA; |
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:
175
diff
changeset
|
845 | total_alkalinity = bicarbonate * 50 / 61; |
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:
175
diff
changeset
|
846 | RA = ResidualAlkalinity(wb_total_alkalinity, wb_calcium, wb_magnesium); |
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:
175
diff
changeset
|
847 | } |
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:
175
diff
changeset
|
848 | break; |
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:
175
diff
changeset
|
849 | case 1: RA = -protonDeficit / (2 * f1d + f2d); // Sodiumcarbonate, mmol totaal |
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:
175
diff
changeset
|
850 | RA = RA * MMNa2CO3/1000; //gram |
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:
175
diff
changeset
|
851 | $("#wa_base").val(Math.round(RA * 100) / 100); |
230
8edca0488e65
Finished the water treatment in the recipes editor. It seems that the recipes editor is ready.
Michiel Broek <mbroek@mbse.eu>
parents:
229
diff
changeset
|
852 | setWaterAgent('Na2CO3', Math.round(RA * 100) / 100); |
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:
175
diff
changeset
|
853 | if (liters > 0) { |
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:
175
diff
changeset
|
854 | RA = parseFloat($("#wa_nacl").jqxNumberInput('decimal')) * MMNa / MMNaCl + |
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:
175
diff
changeset
|
855 | parseFloat($("#wa_base").jqxNumberInput('decimal')) * 2 * MMNa / MMNa2CO3; |
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:
175
diff
changeset
|
856 | RA = 1000 * RA / liters; |
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:
175
diff
changeset
|
857 | sodium = wg_sodium + RA; |
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:
175
diff
changeset
|
858 | // HCO3 |
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:
175
diff
changeset
|
859 | RA = parseFloat($("#wa_base").jqxNumberInput('decimal')) * MMHCO3 / MMNa2CO3; |
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:
175
diff
changeset
|
860 | RA = 1000 * RA / liters; |
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:
175
diff
changeset
|
861 | bicarbonate = wg_bicarbonate + RA; |
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:
175
diff
changeset
|
862 | total_alkalinity = bicarbonate * 50 / 61; |
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:
175
diff
changeset
|
863 | RA = ResidualAlkalinity(wb_total_alkalinity, wb_calcium, wb_magnesium); |
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:
175
diff
changeset
|
864 | } |
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:
175
diff
changeset
|
865 | break; |
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:
175
diff
changeset
|
866 | case 2: RA = -protonDeficit * (f1d - f3d); // Calciumcarbonate, mmol totaal |
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:
175
diff
changeset
|
867 | RA = RA * MMCaCO3/1000; //gram |
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:
175
diff
changeset
|
868 | //but only 1/3 is effective, so add 3 times as much |
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:
175
diff
changeset
|
869 | RA = 3 * RA; |
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:
175
diff
changeset
|
870 | $("#wa_base").val(Math.round(RA * 100) / 100); |
230
8edca0488e65
Finished the water treatment in the recipes editor. It seems that the recipes editor is ready.
Michiel Broek <mbroek@mbse.eu>
parents:
229
diff
changeset
|
871 | setWaterAgent('CaCO3', Math.round(RA * 100) / 100); |
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:
175
diff
changeset
|
872 | if (liters > 0) { |
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:
175
diff
changeset
|
873 | //Bicarbonate |
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:
175
diff
changeset
|
874 | RA = parseFloat($("#wa_base").jqxNumberInput('decimal')) / 3 * MMHCO3 / MMCaCO3; |
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:
175
diff
changeset
|
875 | RA = 1000 * RA / liters; |
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:
175
diff
changeset
|
876 | bicarbonate = wg_bicarbonate + RA; |
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:
175
diff
changeset
|
877 | total_alkalinity = bicarbonate * 50 / 61; |
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:
175
diff
changeset
|
878 | //Ca precipitates out as Ca10(PO4)6(OH)2 |
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:
175
diff
changeset
|
879 | RA = parseFloat($("#wa_cacl2").jqxNumberInput('decimal')) * MMCa / MMCaCl2 + |
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:
175
diff
changeset
|
880 | parseFloat($("#wa_caso4").jqxNumberInput('decimal')) * MMCa / MMCaSO4 + |
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:
175
diff
changeset
|
881 | parseFloat($("#wa_base").jqxNumberInput('decimal')) * MMCa / MMCaCO3; |
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:
175
diff
changeset
|
882 | RA = 1000 * RA / liters; |
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:
175
diff
changeset
|
883 | calcium = wg_calcium + RA; |
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:
175
diff
changeset
|
884 | RA = ResidualAlkalinity(wb_total_alkalinity, wb_calcium, wb_magnesium); |
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:
175
diff
changeset
|
885 | } |
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:
175
diff
changeset
|
886 | break; |
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:
175
diff
changeset
|
887 | case 3: RA = -protonDeficit / 19.3; // Calciumhydroxide |
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:
175
diff
changeset
|
888 | $("#wa_base").val(Math.round(RA * 100) / 100); |
230
8edca0488e65
Finished the water treatment in the recipes editor. It seems that the recipes editor is ready.
Michiel Broek <mbroek@mbse.eu>
parents:
229
diff
changeset
|
889 | setWaterAgent('Ca(OH)2', Math.round(RA * 100) / 100); |
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:
175
diff
changeset
|
890 | if (liters > 0) { |
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:
175
diff
changeset
|
891 | // Bicarbonate |
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:
175
diff
changeset
|
892 | RA = -protonDeficit / liters; |
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:
175
diff
changeset
|
893 | total_alkalinity = wg_total_alkalinity + RA; |
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:
175
diff
changeset
|
894 | bicarbonate = total_alkalinity * 61 / 50; |
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:
175
diff
changeset
|
895 | // Calcium |
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:
175
diff
changeset
|
896 | RA = parseFloat($("#wa_cacl2").jqxNumberInput('decimal')) * MMCa / MMCaCl2 + |
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:
175
diff
changeset
|
897 | parseFloat($("#wa_caso4").jqxNumberInput('decimal')) * MMCa / MMCaSO4 + |
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:
175
diff
changeset
|
898 | parseFloat($("#wa_base").jqxNumberInput('decimal')) * MMCa / MMCaOH2; |
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:
175
diff
changeset
|
899 | RA = 1000 * RA / liters; |
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:
175
diff
changeset
|
900 | calcium = wg_calcium + RA; |
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:
175
diff
changeset
|
901 | RA = ResidualAlkalinity(wb_total_alkalinity, wb_calcium, wb_magnesium); |
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:
175
diff
changeset
|
902 | } |
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:
175
diff
changeset
|
903 | break; |
154
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
904 | } |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
905 | } |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
906 | ph = TpH; |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
907 | $('#wb_ph').val(Math.round(ph * 10) / 10); |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
908 | } else { // Manual |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
909 | console.log("calc_acid no"); |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
910 | // First add base salts |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
911 | if (parseFloat($("#wa_base").jqxNumberInput('decimal')) > 0) { |
156
35860890224c
Added sparge water acid calculation. Added residual alkalinity calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
155
diff
changeset
|
912 | if (liters > 0) { |
35860890224c
Added sparge water acid calculation. Added residual alkalinity calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
155
diff
changeset
|
913 | switch (BT) { |
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:
175
diff
changeset
|
914 | case 0: // Sodiumbicarbonate, Na |
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:
175
diff
changeset
|
915 | RA = parseFloat($("#wa_nacl").jqxNumberInput('decimal')) * MMNa / MMNaCl + |
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:
175
diff
changeset
|
916 | parseFloat($("#wa_base").jqxNumberInput('decimal')) * MMNa / MMNaHCO3; |
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:
175
diff
changeset
|
917 | RA = 1000 * RA / liters; |
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:
175
diff
changeset
|
918 | sodium = wg_sodium + RA; |
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:
175
diff
changeset
|
919 | // HCO3 |
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:
175
diff
changeset
|
920 | RA = parseFloat($("#wa_base").jqxNumberInput('decimal')) * MMHCO3 / MMNaHCO3; |
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:
175
diff
changeset
|
921 | RA = 1000 * RA / liters; |
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:
175
diff
changeset
|
922 | bicarbonate = wg_bicarbonate + RA; |
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:
175
diff
changeset
|
923 | total_alkalinity = bicarbonate * 50 / 61; |
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:
175
diff
changeset
|
924 | RA = ResidualAlkalinity(wb_total_alkalinity, wb_calcium, wb_magnesium); |
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:
175
diff
changeset
|
925 | break; |
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:
175
diff
changeset
|
926 | case 1: // Sodiumcarbonate |
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:
175
diff
changeset
|
927 | RA = parseFloat($("#wa_nacl").jqxNumberInput('decimal')) * MMNa / MMNaCl + |
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:
175
diff
changeset
|
928 | parseFloat($("#wa_base").jqxNumberInput('decimal')) * 2 * MMNa / MMNa2CO3; |
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:
175
diff
changeset
|
929 | RA = 1000 * RA / liters; |
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:
175
diff
changeset
|
930 | sodium = wg_sodium + RA; |
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:
175
diff
changeset
|
931 | // HCO3 |
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:
175
diff
changeset
|
932 | RA = parseFloat($("#wa_base").jqxNumberInput('decimal')) * MMHCO3 / MMNa2CO3; |
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:
175
diff
changeset
|
933 | RA = 1000 * RA / liters; |
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:
175
diff
changeset
|
934 | bicarbonate = wg_bicarbonate + RA; |
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:
175
diff
changeset
|
935 | total_alkalinity = bicarbonate * 50 / 61; |
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:
175
diff
changeset
|
936 | RA = ResidualAlkalinity(wb_total_alkalinity, wb_calcium, wb_magnesium); |
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:
175
diff
changeset
|
937 | break; |
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:
175
diff
changeset
|
938 | case 2: // Calciumcarbonate: Bicarbonate |
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:
175
diff
changeset
|
939 | RA = parseFloat($("#wa_base").jqxNumberInput('decimal')) / 3 * MMHCO3 / MMCaCO3; |
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:
175
diff
changeset
|
940 | RA = 1000 * RA / liters; |
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:
175
diff
changeset
|
941 | bicarbonate = wg_bicarbonate + RA; |
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:
175
diff
changeset
|
942 | total_alkalinity = bicarbonate * 50 / 61; |
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:
175
diff
changeset
|
943 | RA = ResidualAlkalinity(wb_total_alkalinity, wb_calcium, wb_magnesium); |
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:
175
diff
changeset
|
944 | // Ca |
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:
175
diff
changeset
|
945 | RA = parseFloat($("#wa_cacl2").jqxNumberInput('decimal')) * MMCa / MMCaCl2 + |
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:
175
diff
changeset
|
946 | parseFloat($("#wa_caso4").jqxNumberInput('decimal')) * MMCa / MMCaSO4 + |
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:
175
diff
changeset
|
947 | parseFloat($("#wa_base").jqxNumberInput('decimal')) * MMCa / MMCaCO3; |
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:
175
diff
changeset
|
948 | RA = 1000 * RA / liters; |
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:
175
diff
changeset
|
949 | calcium = wg_calcium + RA; |
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:
175
diff
changeset
|
950 | break; |
156
35860890224c
Added sparge water acid calculation. Added residual alkalinity calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
155
diff
changeset
|
951 | } |
35860890224c
Added sparge water acid calculation. Added residual alkalinity calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
155
diff
changeset
|
952 | } |
154
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
953 | } |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
954 | |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
955 | TpH = parseFloat(dataRecord.mash_ph); |
158
3b9e4dfb0476
Fixes and optimisations for water calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
156
diff
changeset
|
956 | pHa = MashpH(); // This one is in demi water, should be in adjusted water??? |
154
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
957 | // Then calculate the new pH with added acids |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
958 | if (parseFloat($("#wa_acid").jqxNumberInput('decimal')) > 0) { |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
959 | console.log("TpH: "+TpH+" water: "+pHa); |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
960 | Acid = parseFloat($("#wa_acid").jqxNumberInput('decimal')); |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
961 | if (parseFloat($("#wa_acid_perc").jqxNumberInput('decimal')) == 0) |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
962 | $("#wa_acid_perc").val(AcidPrc); |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
963 | Acid = Acid / AcidPrc * (parseFloat($("#wa_acid_perc").jqxNumberInput('decimal')) / 100); // ml |
158
3b9e4dfb0476
Fixes and optimisations for water calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
156
diff
changeset
|
964 | Acid *= AcidSG; // ml |
3b9e4dfb0476
Fixes and optimisations for water calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
156
diff
changeset
|
965 | Acid /= MolWt; // mg |
155
041af8a82d77
Some pH calculations cane use twice as much loops, probably because we have better float precision then the original pascal code. More variables to prevent html reads. Use predicted mash pH (the grist in demi water) to calculate the pH shift from the tapwater to the target pH. It's better but not right yet. Or it is right and brouwhulp is far off.
Michiel Broek <mbroek@mbse.eu>
parents:
154
diff
changeset
|
966 | Acidmg = Acid; |
154
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
967 | |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
968 | //find the pH where the protondeficit = protondeficit by the acid |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
969 | frac = CalcFrac(pHa, pK1, pK2, pK3); |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
970 | protonDeficit = Acid * frac; |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
971 | |
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
|
972 | var deltapH = 0.001; |
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
|
973 | var deltapd = 0.1; |
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
|
974 | var pd = ProtonDeficit(pHa); |
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
|
975 | var n = 0; |
158
3b9e4dfb0476
Fixes and optimisations for water calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
156
diff
changeset
|
976 | // console.log("n: "+n+" pd: "+pd+" protonDeficit: "+protonDeficit+" frac: "+frac+" pHa: "+pHa); |
154
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
977 | |
155
041af8a82d77
Some pH calculations cane use twice as much loops, probably because we have better float precision then the original pascal code. More variables to prevent html reads. Use predicted mash pH (the grist in demi water) to calculate the pH shift from the tapwater to the target pH. It's better but not right yet. Or it is right and brouwhulp is far off.
Michiel Broek <mbroek@mbse.eu>
parents:
154
diff
changeset
|
978 | while (((pd < (protonDeficit - deltapd)) || (pd > (protonDeficit + deltapd))) && (n < 2000)) { |
154
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
979 | n++; |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
980 | if (pd < (protonDeficit-deltapd)) |
158
3b9e4dfb0476
Fixes and optimisations for water calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
156
diff
changeset
|
981 | pHa -= deltapH; |
154
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
982 | else if (pd > (protonDeficit+deltapd)) |
158
3b9e4dfb0476
Fixes and optimisations for water calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
156
diff
changeset
|
983 | pHa += deltapH; |
154
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
984 | frac = CalcFrac(pHa, pK1, pK2, pK3); |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
985 | protonDeficit = Acid * frac; |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
986 | pd = ProtonDeficit(pHa); |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
987 | } |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
988 | console.log("n: "+n+" pd: "+pd+" protonDeficit: "+protonDeficit+" frac: "+frac+" pHa: "+pHa); |
155
041af8a82d77
Some pH calculations cane use twice as much loops, probably because we have better float precision then the original pascal code. More variables to prevent html reads. Use predicted mash pH (the grist in demi water) to calculate the pH shift from the tapwater to the target pH. It's better but not right yet. Or it is right and brouwhulp is far off.
Michiel Broek <mbroek@mbse.eu>
parents:
154
diff
changeset
|
989 | RA = wg_bicarbonate - protonDeficit * frac / liters; |
041af8a82d77
Some pH calculations cane use twice as much loops, probably because we have better float precision then the original pascal code. More variables to prevent html reads. Use predicted mash pH (the grist in demi water) to calculate the pH shift from the tapwater to the target pH. It's better but not right yet. Or it is right and brouwhulp is far off.
Michiel Broek <mbroek@mbse.eu>
parents:
154
diff
changeset
|
990 | bicarbonate = RA; |
041af8a82d77
Some pH calculations cane use twice as much loops, probably because we have better float precision then the original pascal code. More variables to prevent html reads. Use predicted mash pH (the grist in demi water) to calculate the pH shift from the tapwater to the target pH. It's better but not right yet. Or it is right and brouwhulp is far off.
Michiel Broek <mbroek@mbse.eu>
parents:
154
diff
changeset
|
991 | total_alkalinity = RA * 50 / 61; |
041af8a82d77
Some pH calculations cane use twice as much loops, probably because we have better float precision then the original pascal code. More variables to prevent html reads. Use predicted mash pH (the grist in demi water) to calculate the pH shift from the tapwater to the target pH. It's better but not right yet. Or it is right and brouwhulp is far off.
Michiel Broek <mbroek@mbse.eu>
parents:
154
diff
changeset
|
992 | ph = pHa; |
041af8a82d77
Some pH calculations cane use twice as much loops, probably because we have better float precision then the original pascal code. More variables to prevent html reads. Use predicted mash pH (the grist in demi water) to calculate the pH shift from the tapwater to the target pH. It's better but not right yet. Or it is right and brouwhulp is far off.
Michiel Broek <mbroek@mbse.eu>
parents:
154
diff
changeset
|
993 | $('#wb_ph').val(Math.round(ph * 10) / 10); |
154
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
994 | } |
149
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
995 | } |
154
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
996 | |
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:
175
diff
changeset
|
997 | if ((AT == 3) && (liters > 0)) { // Sulfuctic / Zwavelzuur |
155
041af8a82d77
Some pH calculations cane use twice as much loops, probably because we have better float precision then the original pascal code. More variables to prevent html reads. Use predicted mash pH (the grist in demi water) to calculate the pH shift from the tapwater to the target pH. It's better but not right yet. Or it is right and brouwhulp is far off.
Michiel Broek <mbroek@mbse.eu>
parents:
154
diff
changeset
|
998 | RA = parseFloat($("#wa_caso4").jqxNumberInput('decimal')) * MMSO4 / MMCaSO4 + |
041af8a82d77
Some pH calculations cane use twice as much loops, probably because we have better float precision then the original pascal code. More variables to prevent html reads. Use predicted mash pH (the grist in demi water) to calculate the pH shift from the tapwater to the target pH. It's better but not right yet. Or it is right and brouwhulp is far off.
Michiel Broek <mbroek@mbse.eu>
parents:
154
diff
changeset
|
999 | parseFloat($("#wa_mgso4").jqxNumberInput('decimal')) * MMSO4 / MMMgSO4 + |
041af8a82d77
Some pH calculations cane use twice as much loops, probably because we have better float precision then the original pascal code. More variables to prevent html reads. Use predicted mash pH (the grist in demi water) to calculate the pH shift from the tapwater to the target pH. It's better but not right yet. Or it is right and brouwhulp is far off.
Michiel Broek <mbroek@mbse.eu>
parents:
154
diff
changeset
|
1000 | Acidmg / 1000 * MMSO4 / (MMSO4 + 2); |
041af8a82d77
Some pH calculations cane use twice as much loops, probably because we have better float precision then the original pascal code. More variables to prevent html reads. Use predicted mash pH (the grist in demi water) to calculate the pH shift from the tapwater to the target pH. It's better but not right yet. Or it is right and brouwhulp is far off.
Michiel Broek <mbroek@mbse.eu>
parents:
154
diff
changeset
|
1001 | RA = 1000 * RA / liters; |
041af8a82d77
Some pH calculations cane use twice as much loops, probably because we have better float precision then the original pascal code. More variables to prevent html reads. Use predicted mash pH (the grist in demi water) to calculate the pH shift from the tapwater to the target pH. It's better but not right yet. Or it is right and brouwhulp is far off.
Michiel Broek <mbroek@mbse.eu>
parents:
154
diff
changeset
|
1002 | sulfate = wg_sulfate + RA; // Not add to sulfate?? |
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:
175
diff
changeset
|
1003 | } else if ((AT == 1) && (liters > 0)) { // Hydrochloric, Zoutzuur |
155
041af8a82d77
Some pH calculations cane use twice as much loops, probably because we have better float precision then the original pascal code. More variables to prevent html reads. Use predicted mash pH (the grist in demi water) to calculate the pH shift from the tapwater to the target pH. It's better but not right yet. Or it is right and brouwhulp is far off.
Michiel Broek <mbroek@mbse.eu>
parents:
154
diff
changeset
|
1004 | RA = parseFloat($("#wa_cacl2").jqxNumberInput('decimal')) * MMCl / MMCaCl2 + |
041af8a82d77
Some pH calculations cane use twice as much loops, probably because we have better float precision then the original pascal code. More variables to prevent html reads. Use predicted mash pH (the grist in demi water) to calculate the pH shift from the tapwater to the target pH. It's better but not right yet. Or it is right and brouwhulp is far off.
Michiel Broek <mbroek@mbse.eu>
parents:
154
diff
changeset
|
1005 | parseFloat($("#wa_nacl").jqxNumberInput('decimal')) * MMCl / MMNaCl + |
230
8edca0488e65
Finished the water treatment in the recipes editor. It seems that the recipes editor is ready.
Michiel Broek <mbroek@mbse.eu>
parents:
229
diff
changeset
|
1006 | Acidmg / 1000 * MMCl / (MMCl + 1); |
155
041af8a82d77
Some pH calculations cane use twice as much loops, probably because we have better float precision then the original pascal code. More variables to prevent html reads. Use predicted mash pH (the grist in demi water) to calculate the pH shift from the tapwater to the target pH. It's better but not right yet. Or it is right and brouwhulp is far off.
Michiel Broek <mbroek@mbse.eu>
parents:
154
diff
changeset
|
1007 | RA = 1000 * RA / liters; |
041af8a82d77
Some pH calculations cane use twice as much loops, probably because we have better float precision then the original pascal code. More variables to prevent html reads. Use predicted mash pH (the grist in demi water) to calculate the pH shift from the tapwater to the target pH. It's better but not right yet. Or it is right and brouwhulp is far off.
Michiel Broek <mbroek@mbse.eu>
parents:
154
diff
changeset
|
1008 | chloride = wg_chloride + RA; |
041af8a82d77
Some pH calculations cane use twice as much loops, probably because we have better float precision then the original pascal code. More variables to prevent html reads. Use predicted mash pH (the grist in demi water) to calculate the pH shift from the tapwater to the target pH. It's better but not right yet. Or it is right and brouwhulp is far off.
Michiel Broek <mbroek@mbse.eu>
parents:
154
diff
changeset
|
1009 | } |
154
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
1010 | |
156
35860890224c
Added sparge water acid calculation. Added residual alkalinity calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
155
diff
changeset
|
1011 | // 2:1 Sulfate to Chroride IPA's, Pale Ales. |
35860890224c
Added sparge water acid calculation. Added residual alkalinity calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
155
diff
changeset
|
1012 | // 1:1 Sulfate to Chloride Balanced |
35860890224c
Added sparge water acid calculation. Added residual alkalinity calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
155
diff
changeset
|
1013 | // 1:2 Sulfate to Chloride Malty |
154
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
1014 | $('#tgt_bu').val(Math.round(GetBUGU() * 100) / 100); |
155
041af8a82d77
Some pH calculations cane use twice as much loops, probably because we have better float precision then the original pascal code. More variables to prevent html reads. Use predicted mash pH (the grist in demi water) to calculate the pH shift from the tapwater to the target pH. It's better but not right yet. Or it is right and brouwhulp is far off.
Michiel Broek <mbroek@mbse.eu>
parents:
154
diff
changeset
|
1015 | $('#tgt_cl_so4').val(Math.round(GetOptClSO4ratio() * 10) / 10); // Show real value too |
156
35860890224c
Added sparge water acid calculation. Added residual alkalinity calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
155
diff
changeset
|
1016 | if (sulfate > 0) |
35860890224c
Added sparge water acid calculation. Added residual alkalinity calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
155
diff
changeset
|
1017 | RA = chloride / sulfate; |
35860890224c
Added sparge water acid calculation. Added residual alkalinity calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
155
diff
changeset
|
1018 | else |
35860890224c
Added sparge water acid calculation. Added residual alkalinity calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
155
diff
changeset
|
1019 | RA = 10; |
35860890224c
Added sparge water acid calculation. Added residual alkalinity calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
155
diff
changeset
|
1020 | var piCLSO4_low = 0.8 * GetOptClSO4ratio(); |
35860890224c
Added sparge water acid calculation. Added residual alkalinity calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
155
diff
changeset
|
1021 | var piCLSO4_high = 1.2 * GetOptClSO4ratio(); |
35860890224c
Added sparge water acid calculation. Added residual alkalinity calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
155
diff
changeset
|
1022 | console.log("low: "+piCLSO4_low+" val: "+RA+" high: "+piCLSO4_high); |
149
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
1023 | |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
1024 | $('#wb_calcium').val(Math.round(calcium * 10) / 10); |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
1025 | $('#wb_magnesium').val(Math.round(magnesium * 10) / 10); |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
1026 | $('#wb_sodium').val(Math.round(sodium * 10) / 10); |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
1027 | $('#wb_sulfate').val(Math.round(sulfate * 10) / 10); |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
1028 | $('#wb_chloride').val(Math.round(chloride * 10) / 10); |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
1029 | $('#wb_total_alkalinity').val(Math.round(total_alkalinity * 10) / 10); |
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
|
1030 | |
149
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
1031 | if (calcium < 40) { |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
1032 | setRangeIndicator("calcium", "low"); |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
1033 | } else if (calcium > 150) { |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
1034 | setRangeIndicator("calcium", "high"); |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
1035 | } else { |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
1036 | setRangeIndicator("calcium", "normal"); |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
1037 | } |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
1038 | if (magnesium >= 0 && magnesium <= 30) { |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
1039 | setRangeIndicator("magnesium", "normal"); |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
1040 | } else { |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
1041 | setRangeIndicator("magnesium", "high"); |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
1042 | } |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
1043 | if (sodium <= 150) { |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
1044 | setRangeIndicator("sodium", "normal"); |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
1045 | } else { |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
1046 | setRangeIndicator("sodium", "high"); |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
1047 | } |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
1048 | if (chloride <= 100) { |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
1049 | setRangeIndicator("chloride", "normal"); |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
1050 | } else { |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
1051 | setRangeIndicator("chloride", "high"); |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
1052 | } |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
1053 | if (sulfate <= 350) { |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
1054 | setRangeIndicator("sulfate", "normal"); |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
1055 | } else { |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
1056 | setRangeIndicator("sulfate", "high"); |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
1057 | } |
154
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
1058 | if (ph < 5.2) { |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
1059 | setRangeIndicator("ph", "low"); |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
1060 | } else if (ph > 5.6) { |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
1061 | setRangeIndicator("ph", "high"); |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
1062 | } else { |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
1063 | setRangeIndicator("ph", "normal"); |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
1064 | } |
156
35860890224c
Added sparge water acid calculation. Added residual alkalinity calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
155
diff
changeset
|
1065 | calcSparge(); |
35860890224c
Added sparge water acid calculation. Added residual alkalinity calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
155
diff
changeset
|
1066 | } |
35860890224c
Added sparge water acid calculation. Added residual alkalinity calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
155
diff
changeset
|
1067 | |
35860890224c
Added sparge water acid calculation. Added residual alkalinity calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
155
diff
changeset
|
1068 | function calcSparge() { |
35860890224c
Added sparge water acid calculation. Added residual alkalinity calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
155
diff
changeset
|
1069 | |
35860890224c
Added sparge water acid calculation. Added residual alkalinity calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
155
diff
changeset
|
1070 | // Code from BrewBuddy/Brouwhulp, who got it from http://www.brewery.org/brewery/library/Acidi0,00fWaterAJD0497.html |
35860890224c
Added sparge water acid calculation. Added residual alkalinity calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
155
diff
changeset
|
1071 | var TargetpH = dataRecord.sparge_ph; |
35860890224c
Added sparge water acid calculation. Added residual alkalinity calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
155
diff
changeset
|
1072 | var Source_pH = dataRecord.w1_ph; |
35860890224c
Added sparge water acid calculation. Added residual alkalinity calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
155
diff
changeset
|
1073 | var Source_alkalinity = dataRecord.w1_total_alkalinity; |
158
3b9e4dfb0476
Fixes and optimisations for water calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
156
diff
changeset
|
1074 | // Select watersource or fallback to the first source. |
230
8edca0488e65
Finished the water treatment in the recipes editor. It seems that the recipes editor is ready.
Michiel Broek <mbroek@mbse.eu>
parents:
229
diff
changeset
|
1075 | if (dataRecord.sparge_source == 1) { // Source 2 |
156
35860890224c
Added sparge water acid calculation. Added residual alkalinity calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
155
diff
changeset
|
1076 | if (dataRecord.w2_ph > 0.0) { |
35860890224c
Added sparge water acid calculation. Added residual alkalinity calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
155
diff
changeset
|
1077 | Source_pH = dataRecord.w2_ph; |
35860890224c
Added sparge water acid calculation. Added residual alkalinity calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
155
diff
changeset
|
1078 | Source_alkalinity = dataRecord.w2_total_alkalinity; |
35860890224c
Added sparge water acid calculation. Added residual alkalinity calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
155
diff
changeset
|
1079 | } else { |
230
8edca0488e65
Finished the water treatment in the recipes editor. It seems that the recipes editor is ready.
Michiel Broek <mbroek@mbse.eu>
parents:
229
diff
changeset
|
1080 | dataRecord.sparge_source = 0; // Source 1 |
8edca0488e65
Finished the water treatment in the recipes editor. It seems that the recipes editor is ready.
Michiel Broek <mbroek@mbse.eu>
parents:
229
diff
changeset
|
1081 | $("#sparge_source").val(0); |
156
35860890224c
Added sparge water acid calculation. Added residual alkalinity calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
155
diff
changeset
|
1082 | } |
230
8edca0488e65
Finished the water treatment in the recipes editor. It seems that the recipes editor is ready.
Michiel Broek <mbroek@mbse.eu>
parents:
229
diff
changeset
|
1083 | } else if (dataRecord.sparge_source == 2) { // Mixed |
156
35860890224c
Added sparge water acid calculation. Added residual alkalinity calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
155
diff
changeset
|
1084 | if (dataRecord.w2_ph > 0.0) { |
35860890224c
Added sparge water acid calculation. Added residual alkalinity calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
155
diff
changeset
|
1085 | Source_pH = parseFloat($("#wg_ph").jqxNumberInput('decimal')); |
35860890224c
Added sparge water acid calculation. Added residual alkalinity calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
155
diff
changeset
|
1086 | Source_alkalinity = parseFloat($("#wg_total_alkalinity").jqxNumberInput('decimal')); |
35860890224c
Added sparge water acid calculation. Added residual alkalinity calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
155
diff
changeset
|
1087 | } else { |
230
8edca0488e65
Finished the water treatment in the recipes editor. It seems that the recipes editor is ready.
Michiel Broek <mbroek@mbse.eu>
parents:
229
diff
changeset
|
1088 | dataRecord.sparge_source = 0; |
8edca0488e65
Finished the water treatment in the recipes editor. It seems that the recipes editor is ready.
Michiel Broek <mbroek@mbse.eu>
parents:
229
diff
changeset
|
1089 | $("#sparge_source").val(0); |
156
35860890224c
Added sparge water acid calculation. Added residual alkalinity calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
155
diff
changeset
|
1090 | } |
35860890224c
Added sparge water acid calculation. Added residual alkalinity calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
155
diff
changeset
|
1091 | } |
35860890224c
Added sparge water acid calculation. Added residual alkalinity calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
155
diff
changeset
|
1092 | |
35860890224c
Added sparge water acid calculation. Added residual alkalinity calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
155
diff
changeset
|
1093 | console.log("calcSparge() target pH: "+TargetpH+" Source: "+Source_pH+" alkalinity: "+Source_alkalinity); |
35860890224c
Added sparge water acid calculation. Added residual alkalinity calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
155
diff
changeset
|
1094 | |
35860890224c
Added sparge water acid calculation. Added residual alkalinity calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
155
diff
changeset
|
1095 | // Step 1: Compute the mole fractions of carbonic (f1o), bicarbonate (f2o) and carbonate(f3o) at the water pH |
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
|
1096 | var r1 = Math.pow(10, Source_pH - 6.38); |
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
|
1097 | var r2 = Math.pow(10, Source_pH - 10.33); |
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
|
1098 | var d = 1 + r1 + r1*r2; |
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
|
1099 | var f1 = 1/d; |
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
|
1100 | var f2 = r1/d; |
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
|
1101 | var f3 = r1 * r2 / d; |
156
35860890224c
Added sparge water acid calculation. Added residual alkalinity calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
155
diff
changeset
|
1102 | |
35860890224c
Added sparge water acid calculation. Added residual alkalinity calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
155
diff
changeset
|
1103 | //Step 2. Compute the mole fractions at pH = 4.3 (the pH which defines alkalinity) |
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
|
1104 | var r143 = Math.pow(10, 4.3 - 6.38); |
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
|
1105 | var r243 = Math.pow(10, 4.3 - 10.33); |
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
|
1106 | var d43 = 1 + r143 + r143*r243; |
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
|
1107 | var f143 = 1/d43; |
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
|
1108 | var f243 = r143 / d43; |
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
|
1109 | var f343 = r143 * r243 / d43; |
156
35860890224c
Added sparge water acid calculation. Added residual alkalinity calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
155
diff
changeset
|
1110 | |
35860890224c
Added sparge water acid calculation. Added residual alkalinity calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
155
diff
changeset
|
1111 | //Step 3. Convert the sample alkalinity to milliequivalents/L |
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
|
1112 | var alkalinity = Source_alkalinity / 50; |
156
35860890224c
Added sparge water acid calculation. Added residual alkalinity calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
155
diff
changeset
|
1113 | //Step 4. Solve |
35860890224c
Added sparge water acid calculation. Added residual alkalinity calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
155
diff
changeset
|
1114 | alkalinity = alkalinity / ((f143-f1)+(f3-f343)); |
35860890224c
Added sparge water acid calculation. Added residual alkalinity calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
155
diff
changeset
|
1115 | |
35860890224c
Added sparge water acid calculation. Added residual alkalinity calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
155
diff
changeset
|
1116 | //Step 5. Compute mole fractions at desired pH |
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
|
1117 | var r1g = Math.pow(10, TargetpH - 6.38); |
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
|
1118 | var r2g = Math.pow(10, TargetpH - 10.33); |
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
|
1119 | var dg = 1 + r1g + r1g*r2g; |
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
|
1120 | var f1g = 1/dg; |
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
|
1121 | var f2g = r1g / dg; |
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
|
1122 | var f3g = r1g * r2g / dg; |
156
35860890224c
Added sparge water acid calculation. Added residual alkalinity calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
155
diff
changeset
|
1123 | |
35860890224c
Added sparge water acid calculation. Added residual alkalinity calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
155
diff
changeset
|
1124 | //Step 6. Use these to compute the milliequivalents acid required per liter (mEq/L) |
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
|
1125 | var Acid = alkalinity * ((f1g-f1)+(f3-f3g)) + Math.pow(10, -TargetpH) - Math.pow(10, -Source_pH); //mEq/l |
230
8edca0488e65
Finished the water treatment in the recipes editor. It seems that the recipes editor is ready.
Michiel Broek <mbroek@mbse.eu>
parents:
229
diff
changeset
|
1126 | if (dataRecord.sparge_acid_type < 0 || dataRecord.sparge_acid_type > 3) { |
8edca0488e65
Finished the water treatment in the recipes editor. It seems that the recipes editor is ready.
Michiel Broek <mbroek@mbse.eu>
parents:
229
diff
changeset
|
1127 | dataRecord.sparge_acid_type = 0; |
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:
175
diff
changeset
|
1128 | $("#sparge_acid_type").val(0); |
156
35860890224c
Added sparge water acid calculation. Added residual alkalinity calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
155
diff
changeset
|
1129 | } |
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
|
1130 | var AT = dataRecord.sparge_acid_type; |
156
35860890224c
Added sparge water acid calculation. Added residual alkalinity calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
155
diff
changeset
|
1131 | var result = GetAcidSpecs(AT); |
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
|
1132 | var pK1 = result.pK1; |
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
|
1133 | var pK2 = result.pK2; |
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
|
1134 | var pK3 = result.pK3; |
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
|
1135 | var MolWt = result.MolWt; |
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
|
1136 | var AcidSG = result.AcidSG; |
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
|
1137 | var AcidPrc = result.AcidPrc; |
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
|
1138 | var fract = CalcFrac(TargetpH, pK1, pK2, pK3); |
156
35860890224c
Added sparge water acid calculation. Added residual alkalinity calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
155
diff
changeset
|
1139 | |
35860890224c
Added sparge water acid calculation. Added residual alkalinity calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
155
diff
changeset
|
1140 | //Step 9. Now divide the mEq required by the "fraction". This is the required number of moles of acid. |
35860890224c
Added sparge water acid calculation. Added residual alkalinity calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
155
diff
changeset
|
1141 | Acid /= fract; |
35860890224c
Added sparge water acid calculation. Added residual alkalinity calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
155
diff
changeset
|
1142 | |
35860890224c
Added sparge water acid calculation. Added residual alkalinity calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
155
diff
changeset
|
1143 | //Step 10. Multiply by molecular weight of the acid |
35860890224c
Added sparge water acid calculation. Added residual alkalinity calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
155
diff
changeset
|
1144 | Acid *= MolWt; //mg |
35860890224c
Added sparge water acid calculation. Added residual alkalinity calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
155
diff
changeset
|
1145 | |
35860890224c
Added sparge water acid calculation. Added residual alkalinity calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
155
diff
changeset
|
1146 | Acid = Acid / AcidSG; //ml ; 88% lactic solution |
35860890224c
Added sparge water acid calculation. Added residual alkalinity calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
155
diff
changeset
|
1147 | f1 = dataRecord.sparge_acid_perc; |
35860890224c
Added sparge water acid calculation. Added residual alkalinity calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
155
diff
changeset
|
1148 | if (f1 <= 0.1) |
35860890224c
Added sparge water acid calculation. Added residual alkalinity calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
155
diff
changeset
|
1149 | f1 = AcidPrc; |
35860890224c
Added sparge water acid calculation. Added residual alkalinity calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
155
diff
changeset
|
1150 | Acid = Acid * AcidPrc / (f1 / 100); |
35860890224c
Added sparge water acid calculation. Added residual alkalinity calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
155
diff
changeset
|
1151 | |
35860890224c
Added sparge water acid calculation. Added residual alkalinity calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
155
diff
changeset
|
1152 | Acid *= dataRecord.sparge_volume; //ml lactic acid total |
35860890224c
Added sparge water acid calculation. Added residual alkalinity calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
155
diff
changeset
|
1153 | Acid = Math.round(Acid * 100) / 100; |
35860890224c
Added sparge water acid calculation. Added residual alkalinity calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
155
diff
changeset
|
1154 | dataRecord.sparge_acid_amount = Acid / 1000; |
35860890224c
Added sparge water acid calculation. Added residual alkalinity calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
155
diff
changeset
|
1155 | $("#sparge_acid_amount").val(Acid); |
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:
146
diff
changeset
|
1156 | } |
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:
146
diff
changeset
|
1157 | |
254
3d61397fe9cd
Rework the volume to the fermenter and things that depend on that. New layout on the brewday tab. The calculation model is simpler then the brouwhulp version.
Michiel Broek <mbroek@mbse.eu>
parents:
245
diff
changeset
|
1158 | /* |
3d61397fe9cd
Rework the volume to the fermenter and things that depend on that. New layout on the brewday tab. The calculation model is simpler then the brouwhulp version.
Michiel Broek <mbroek@mbse.eu>
parents:
245
diff
changeset
|
1159 | * Change OG of recipe but keep the water volumes. |
3d61397fe9cd
Rework the volume to the fermenter and things that depend on that. New layout on the brewday tab. The calculation model is simpler then the brouwhulp version.
Michiel Broek <mbroek@mbse.eu>
parents:
245
diff
changeset
|
1160 | */ |
133
22d28dd9c041
Added ABV calculation. Added calculate fermentables from OG calculation. Scale fermentables when the OG changes.
Michiel Broek <mbroek@mbse.eu>
parents:
132
diff
changeset
|
1161 | function calcFermentablesFromOG(OG) { |
22d28dd9c041
Added ABV calculation. Added calculate fermentables from OG calculation. Scale fermentables when the OG changes.
Michiel Broek <mbroek@mbse.eu>
parents:
132
diff
changeset
|
1162 | |
22d28dd9c041
Added ABV calculation. Added calculate fermentables from OG calculation. Scale fermentables when the OG changes.
Michiel Broek <mbroek@mbse.eu>
parents:
132
diff
changeset
|
1163 | console.log("calcFermentablesFromOG("+OG+")"); |
254
3d61397fe9cd
Rework the volume to the fermenter and things that depend on that. New layout on the brewday tab. The calculation model is simpler then the brouwhulp version.
Michiel Broek <mbroek@mbse.eu>
parents:
245
diff
changeset
|
1164 | var efficiency = parseFloat($("#efficiency").jqxNumberInput('decimal')); |
3d61397fe9cd
Rework the volume to the fermenter and things that depend on that. New layout on the brewday tab. The calculation model is simpler then the brouwhulp version.
Michiel Broek <mbroek@mbse.eu>
parents:
245
diff
changeset
|
1165 | var sug = sg_to_plato(OG) * parseFloat($("#batch_size").jqxNumberInput('decimal')) * OG / 100; //total amount of sugars in kg |
3d61397fe9cd
Rework the volume to the fermenter and things that depend on that. New layout on the brewday tab. The calculation model is simpler then the brouwhulp version.
Michiel Broek <mbroek@mbse.eu>
parents:
245
diff
changeset
|
1166 | var tot = 0; |
3d61397fe9cd
Rework the volume to the fermenter and things that depend on that. New layout on the brewday tab. The calculation model is simpler then the brouwhulp version.
Michiel Broek <mbroek@mbse.eu>
parents:
245
diff
changeset
|
1167 | var rowscount = $("#fermentableGrid").jqxGrid('getdatainformation').rowscount; |
3d61397fe9cd
Rework the volume to the fermenter and things that depend on that. New layout on the brewday tab. The calculation model is simpler then the brouwhulp version.
Michiel Broek <mbroek@mbse.eu>
parents:
245
diff
changeset
|
1168 | |
3d61397fe9cd
Rework the volume to the fermenter and things that depend on that. New layout on the brewday tab. The calculation model is simpler then the brouwhulp version.
Michiel Broek <mbroek@mbse.eu>
parents:
245
diff
changeset
|
1169 | for (var i = 0; i < rowscount; i++) { |
3d61397fe9cd
Rework the volume to the fermenter and things that depend on that. New layout on the brewday tab. The calculation model is simpler then the brouwhulp version.
Michiel Broek <mbroek@mbse.eu>
parents:
245
diff
changeset
|
1170 | var row = $("#fermentableGrid").jqxGrid('getrowdata', i); |
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
|
1171 | var d = row.f_percentage / 100 * (row.f_yield / 100) * (1 - row.f_moisture / 100); |
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:
175
diff
changeset
|
1172 | if (row.f_added == 0) // Mash |
133
22d28dd9c041
Added ABV calculation. Added calculate fermentables from OG calculation. Scale fermentables when the OG changes.
Michiel Broek <mbroek@mbse.eu>
parents:
132
diff
changeset
|
1173 | d = efficiency / 100 * d; |
22d28dd9c041
Added ABV calculation. Added calculate fermentables from OG calculation. Scale fermentables when the OG changes.
Michiel Broek <mbroek@mbse.eu>
parents:
132
diff
changeset
|
1174 | tot += d; |
22d28dd9c041
Added ABV calculation. Added calculate fermentables from OG calculation. Scale fermentables when the OG changes.
Michiel Broek <mbroek@mbse.eu>
parents:
132
diff
changeset
|
1175 | } |
22d28dd9c041
Added ABV calculation. Added calculate fermentables from OG calculation. Scale fermentables when the OG changes.
Michiel Broek <mbroek@mbse.eu>
parents:
132
diff
changeset
|
1176 | var totmass = 0; |
22d28dd9c041
Added ABV calculation. Added calculate fermentables from OG calculation. Scale fermentables when the OG changes.
Michiel Broek <mbroek@mbse.eu>
parents:
132
diff
changeset
|
1177 | if (tot) |
22d28dd9c041
Added ABV calculation. Added calculate fermentables from OG calculation. Scale fermentables when the OG changes.
Michiel Broek <mbroek@mbse.eu>
parents:
132
diff
changeset
|
1178 | totmass = sug / tot; |
22d28dd9c041
Added ABV calculation. Added calculate fermentables from OG calculation. Scale fermentables when the OG changes.
Michiel Broek <mbroek@mbse.eu>
parents:
132
diff
changeset
|
1179 | |
22d28dd9c041
Added ABV calculation. Added calculate fermentables from OG calculation. Scale fermentables when the OG changes.
Michiel Broek <mbroek@mbse.eu>
parents:
132
diff
changeset
|
1180 | if (totmass) { |
254
3d61397fe9cd
Rework the volume to the fermenter and things that depend on that. New layout on the brewday tab. The calculation model is simpler then the brouwhulp version.
Michiel Broek <mbroek@mbse.eu>
parents:
245
diff
changeset
|
1181 | for (i = 0; i < rowscount; i++) { |
3d61397fe9cd
Rework the volume to the fermenter and things that depend on that. New layout on the brewday tab. The calculation model is simpler then the brouwhulp version.
Michiel Broek <mbroek@mbse.eu>
parents:
245
diff
changeset
|
1182 | var row = $("#fermentableGrid").jqxGrid('getrowdata', i); |
3d61397fe9cd
Rework the volume to the fermenter and things that depend on that. New layout on the brewday tab. The calculation model is simpler then the brouwhulp version.
Michiel Broek <mbroek@mbse.eu>
parents:
245
diff
changeset
|
1183 | var amount = row.f_percentage / 100 * totmass; |
3d61397fe9cd
Rework the volume to the fermenter and things that depend on that. New layout on the brewday tab. The calculation model is simpler then the brouwhulp version.
Michiel Broek <mbroek@mbse.eu>
parents:
245
diff
changeset
|
1184 | $("#fermentableGrid").jqxGrid('setcellvalue', i, "f_amount", amount); |
133
22d28dd9c041
Added ABV calculation. Added calculate fermentables from OG calculation. Scale fermentables when the OG changes.
Michiel Broek <mbroek@mbse.eu>
parents:
132
diff
changeset
|
1185 | } |
22d28dd9c041
Added ABV calculation. Added calculate fermentables from OG calculation. Scale fermentables when the OG changes.
Michiel Broek <mbroek@mbse.eu>
parents:
132
diff
changeset
|
1186 | } |
22d28dd9c041
Added ABV calculation. Added calculate fermentables from OG calculation. Scale fermentables when the OG changes.
Michiel Broek <mbroek@mbse.eu>
parents:
132
diff
changeset
|
1187 | }; |
22d28dd9c041
Added ABV calculation. Added calculate fermentables from OG calculation. Scale fermentables when the OG changes.
Michiel Broek <mbroek@mbse.eu>
parents:
132
diff
changeset
|
1188 | |
73
454fc4558609
Added style selector in recipe editer. Better formatting of cellsrenderer fields. Added When field to the fermentables list. Attempts to calculate the fermentables.
Michiel Broek <mbroek@mbse.eu>
parents:
72
diff
changeset
|
1189 | function calcInit () { |
454fc4558609
Added style selector in recipe editer. Better formatting of cellsrenderer fields. Added When field to the fermentables list. Attempts to calculate the fermentables.
Michiel Broek <mbroek@mbse.eu>
parents:
72
diff
changeset
|
1190 | console.log("calc.init()"); |
135
cd1403633e96
Added boil time change logic. Better precision.
Michiel Broek <mbroek@mbse.eu>
parents:
134
diff
changeset
|
1191 | |
154
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
1192 | $("#calc_acid").on('checked', function (event) { |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
1193 | dataRecord.calc_acid = true; |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
1194 | calcWater(); |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
1195 | }); |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
1196 | $("#calc_acid").on('unchecked', function (event) { |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
1197 | dataRecord.calc_acid = false; |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
1198 | calcWater(); |
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
1199 | }); |
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
|
1200 | $("#w1_name").jqxDropDownList('selectItem', dataRecord.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
|
1201 | $("#w2_name").jqxDropDownList('selectItem', dataRecord.w2_name); |
149
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
1202 | // Fix tap water if zero using mash infuse amount. |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
1203 | if (parseFloat($("#wg_amount").jqxNumberInput('decimal')) == 0 && mash_infuse > 0) { |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
1204 | $("#w1_amount").val(mash_infuse); |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
1205 | dataRecord.w1_amount = mash_infuse; |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
1206 | $("#wg_amount").val(mash_infuse); |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
1207 | $("#w2_amount").val(0); |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
1208 | dataRecord.w2_amount = 0; |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
1209 | } |
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
|
1210 | calcWater(); |
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
|
1211 | $("#w2_amount").on('change', function (event) { |
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
|
1212 | var newval = parseFloat(event.args.value); |
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
|
1213 | |
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
|
1214 | if (newval > mash_infuse) { |
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
|
1215 | $("#w2_amount").val(dataRecord.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
|
1216 | return; |
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
|
1217 | } |
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
|
1218 | dataRecord.w1_amount = parseFloat($("#wg_amount").jqxNumberInput('decimal')) - newval; |
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
|
1219 | $("#w1_amount").val(dataRecord.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
|
1220 | dataRecord.w2_amount = newval; |
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
|
1221 | console.log("new: "+event.args.value+" w1: "+dataRecord.w1_amount+" w2: "+dataRecord.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
|
1222 | calcWater(); |
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
|
1223 | }); |
149
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
1224 | $('#wa_cacl2').on('change', function (event) { |
232
daf2d9d6fa18
When adding yeast the flocculation and cells fields were not added. Possible fix for double water agents in the miscs grid. Better efforts to set the initial water infuse amount. The new recipe wizzard now uses indexed fields. In recipe print fixed the yeast amount and cost.
Michiel Broek <mbroek@mbse.eu>
parents:
230
diff
changeset
|
1225 | if (event.args) { |
daf2d9d6fa18
When adding yeast the flocculation and cells fields were not added. Possible fix for double water agents in the miscs grid. Better efforts to set the initial water infuse amount. The new recipe wizzard now uses indexed fields. In recipe print fixed the yeast amount and cost.
Michiel Broek <mbroek@mbse.eu>
parents:
230
diff
changeset
|
1226 | setWaterAgent('CaCl2', 0); // This can prevent double entries. |
daf2d9d6fa18
When adding yeast the flocculation and cells fields were not added. Possible fix for double water agents in the miscs grid. Better efforts to set the initial water infuse amount. The new recipe wizzard now uses indexed fields. In recipe print fixed the yeast amount and cost.
Michiel Broek <mbroek@mbse.eu>
parents:
230
diff
changeset
|
1227 | setWaterAgent('CaCl2', event.args.value); |
daf2d9d6fa18
When adding yeast the flocculation and cells fields were not added. Possible fix for double water agents in the miscs grid. Better efforts to set the initial water infuse amount. The new recipe wizzard now uses indexed fields. In recipe print fixed the yeast amount and cost.
Michiel Broek <mbroek@mbse.eu>
parents:
230
diff
changeset
|
1228 | calcWater(); |
daf2d9d6fa18
When adding yeast the flocculation and cells fields were not added. Possible fix for double water agents in the miscs grid. Better efforts to set the initial water infuse amount. The new recipe wizzard now uses indexed fields. In recipe print fixed the yeast amount and cost.
Michiel Broek <mbroek@mbse.eu>
parents:
230
diff
changeset
|
1229 | } |
149
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
1230 | }); |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
1231 | $('#wa_caso4').on('change', function (event) { |
232
daf2d9d6fa18
When adding yeast the flocculation and cells fields were not added. Possible fix for double water agents in the miscs grid. Better efforts to set the initial water infuse amount. The new recipe wizzard now uses indexed fields. In recipe print fixed the yeast amount and cost.
Michiel Broek <mbroek@mbse.eu>
parents:
230
diff
changeset
|
1232 | if (event.args) { |
daf2d9d6fa18
When adding yeast the flocculation and cells fields were not added. Possible fix for double water agents in the miscs grid. Better efforts to set the initial water infuse amount. The new recipe wizzard now uses indexed fields. In recipe print fixed the yeast amount and cost.
Michiel Broek <mbroek@mbse.eu>
parents:
230
diff
changeset
|
1233 | setWaterAgent('CaSO4', 0); |
daf2d9d6fa18
When adding yeast the flocculation and cells fields were not added. Possible fix for double water agents in the miscs grid. Better efforts to set the initial water infuse amount. The new recipe wizzard now uses indexed fields. In recipe print fixed the yeast amount and cost.
Michiel Broek <mbroek@mbse.eu>
parents:
230
diff
changeset
|
1234 | setWaterAgent('CaSO4', event.args.value); |
daf2d9d6fa18
When adding yeast the flocculation and cells fields were not added. Possible fix for double water agents in the miscs grid. Better efforts to set the initial water infuse amount. The new recipe wizzard now uses indexed fields. In recipe print fixed the yeast amount and cost.
Michiel Broek <mbroek@mbse.eu>
parents:
230
diff
changeset
|
1235 | calcWater(); |
daf2d9d6fa18
When adding yeast the flocculation and cells fields were not added. Possible fix for double water agents in the miscs grid. Better efforts to set the initial water infuse amount. The new recipe wizzard now uses indexed fields. In recipe print fixed the yeast amount and cost.
Michiel Broek <mbroek@mbse.eu>
parents:
230
diff
changeset
|
1236 | } |
149
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
1237 | }); |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
1238 | $('#wa_mgso4').on('change', function (event) { |
232
daf2d9d6fa18
When adding yeast the flocculation and cells fields were not added. Possible fix for double water agents in the miscs grid. Better efforts to set the initial water infuse amount. The new recipe wizzard now uses indexed fields. In recipe print fixed the yeast amount and cost.
Michiel Broek <mbroek@mbse.eu>
parents:
230
diff
changeset
|
1239 | if (event.args) { |
daf2d9d6fa18
When adding yeast the flocculation and cells fields were not added. Possible fix for double water agents in the miscs grid. Better efforts to set the initial water infuse amount. The new recipe wizzard now uses indexed fields. In recipe print fixed the yeast amount and cost.
Michiel Broek <mbroek@mbse.eu>
parents:
230
diff
changeset
|
1240 | setWaterAgent('MgSO4', 0); |
daf2d9d6fa18
When adding yeast the flocculation and cells fields were not added. Possible fix for double water agents in the miscs grid. Better efforts to set the initial water infuse amount. The new recipe wizzard now uses indexed fields. In recipe print fixed the yeast amount and cost.
Michiel Broek <mbroek@mbse.eu>
parents:
230
diff
changeset
|
1241 | setWaterAgent('MgSO4', event.args.value); |
daf2d9d6fa18
When adding yeast the flocculation and cells fields were not added. Possible fix for double water agents in the miscs grid. Better efforts to set the initial water infuse amount. The new recipe wizzard now uses indexed fields. In recipe print fixed the yeast amount and cost.
Michiel Broek <mbroek@mbse.eu>
parents:
230
diff
changeset
|
1242 | calcWater(); |
daf2d9d6fa18
When adding yeast the flocculation and cells fields were not added. Possible fix for double water agents in the miscs grid. Better efforts to set the initial water infuse amount. The new recipe wizzard now uses indexed fields. In recipe print fixed the yeast amount and cost.
Michiel Broek <mbroek@mbse.eu>
parents:
230
diff
changeset
|
1243 | } |
149
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
1244 | }); |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
1245 | $('#wa_nacl').on('change', function (event) { |
232
daf2d9d6fa18
When adding yeast the flocculation and cells fields were not added. Possible fix for double water agents in the miscs grid. Better efforts to set the initial water infuse amount. The new recipe wizzard now uses indexed fields. In recipe print fixed the yeast amount and cost.
Michiel Broek <mbroek@mbse.eu>
parents:
230
diff
changeset
|
1246 | if (event.args) { |
daf2d9d6fa18
When adding yeast the flocculation and cells fields were not added. Possible fix for double water agents in the miscs grid. Better efforts to set the initial water infuse amount. The new recipe wizzard now uses indexed fields. In recipe print fixed the yeast amount and cost.
Michiel Broek <mbroek@mbse.eu>
parents:
230
diff
changeset
|
1247 | setWaterAgent('NaCl', 0); |
daf2d9d6fa18
When adding yeast the flocculation and cells fields were not added. Possible fix for double water agents in the miscs grid. Better efforts to set the initial water infuse amount. The new recipe wizzard now uses indexed fields. In recipe print fixed the yeast amount and cost.
Michiel Broek <mbroek@mbse.eu>
parents:
230
diff
changeset
|
1248 | setWaterAgent('NaCl', event.args.value); |
daf2d9d6fa18
When adding yeast the flocculation and cells fields were not added. Possible fix for double water agents in the miscs grid. Better efforts to set the initial water infuse amount. The new recipe wizzard now uses indexed fields. In recipe print fixed the yeast amount and cost.
Michiel Broek <mbroek@mbse.eu>
parents:
230
diff
changeset
|
1249 | calcWater(); |
daf2d9d6fa18
When adding yeast the flocculation and cells fields were not added. Possible fix for double water agents in the miscs grid. Better efforts to set the initial water infuse amount. The new recipe wizzard now uses indexed fields. In recipe print fixed the yeast amount and cost.
Michiel Broek <mbroek@mbse.eu>
parents:
230
diff
changeset
|
1250 | } |
149
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
1251 | }); |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
1252 | $('#wa_base_name').on('change', function (event) { |
230
8edca0488e65
Finished the water treatment in the recipes editor. It seems that the recipes editor is ready.
Michiel Broek <mbroek@mbse.eu>
parents:
229
diff
changeset
|
1253 | if (event.args) { |
8edca0488e65
Finished the water treatment in the recipes editor. It seems that the recipes editor is ready.
Michiel Broek <mbroek@mbse.eu>
parents:
229
diff
changeset
|
1254 | var index = event.args.index; |
8edca0488e65
Finished the water treatment in the recipes editor. It seems that the recipes editor is ready.
Michiel Broek <mbroek@mbse.eu>
parents:
229
diff
changeset
|
1255 | console.log("wa_base_name "+index); |
8edca0488e65
Finished the water treatment in the recipes editor. It seems that the recipes editor is ready.
Michiel Broek <mbroek@mbse.eu>
parents:
229
diff
changeset
|
1256 | setWaterAgent(last_base, 0); |
8edca0488e65
Finished the water treatment in the recipes editor. It seems that the recipes editor is ready.
Michiel Broek <mbroek@mbse.eu>
parents:
229
diff
changeset
|
1257 | last_base = BaseTypeData[index].nl; |
8edca0488e65
Finished the water treatment in the recipes editor. It seems that the recipes editor is ready.
Michiel Broek <mbroek@mbse.eu>
parents:
229
diff
changeset
|
1258 | setWaterAgent(last_base, parseFloat($("#wa_base").jqxNumberInput('decimal'))); |
8edca0488e65
Finished the water treatment in the recipes editor. It seems that the recipes editor is ready.
Michiel Broek <mbroek@mbse.eu>
parents:
229
diff
changeset
|
1259 | dataRecord.wa_base_name = index; |
8edca0488e65
Finished the water treatment in the recipes editor. It seems that the recipes editor is ready.
Michiel Broek <mbroek@mbse.eu>
parents:
229
diff
changeset
|
1260 | calcWater(); |
8edca0488e65
Finished the water treatment in the recipes editor. It seems that the recipes editor is ready.
Michiel Broek <mbroek@mbse.eu>
parents:
229
diff
changeset
|
1261 | } |
149
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
1262 | }); |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
1263 | $('#wa_base').on('change', function (event) { |
230
8edca0488e65
Finished the water treatment in the recipes editor. It seems that the recipes editor is ready.
Michiel Broek <mbroek@mbse.eu>
parents:
229
diff
changeset
|
1264 | var name = BaseTypeData[$("#wa_base_name").val()].nl; |
8edca0488e65
Finished the water treatment in the recipes editor. It seems that the recipes editor is ready.
Michiel Broek <mbroek@mbse.eu>
parents:
229
diff
changeset
|
1265 | setWaterAgent(name, parseFloat(event.args.value)); |
149
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
1266 | calcWater(); |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
1267 | }); |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
1268 | $('#wa_acid_name').on('change', function (event) { |
230
8edca0488e65
Finished the water treatment in the recipes editor. It seems that the recipes editor is ready.
Michiel Broek <mbroek@mbse.eu>
parents:
229
diff
changeset
|
1269 | if (event.args) { |
8edca0488e65
Finished the water treatment in the recipes editor. It seems that the recipes editor is ready.
Michiel Broek <mbroek@mbse.eu>
parents:
229
diff
changeset
|
1270 | var index = event.args.index; |
8edca0488e65
Finished the water treatment in the recipes editor. It seems that the recipes editor is ready.
Michiel Broek <mbroek@mbse.eu>
parents:
229
diff
changeset
|
1271 | console.log("wa_acid_name "+index); |
8edca0488e65
Finished the water treatment in the recipes editor. It seems that the recipes editor is ready.
Michiel Broek <mbroek@mbse.eu>
parents:
229
diff
changeset
|
1272 | setWaterAgent(last_acid, 0); |
8edca0488e65
Finished the water treatment in the recipes editor. It seems that the recipes editor is ready.
Michiel Broek <mbroek@mbse.eu>
parents:
229
diff
changeset
|
1273 | last_acid = AcidTypeData[index].nl; |
8edca0488e65
Finished the water treatment in the recipes editor. It seems that the recipes editor is ready.
Michiel Broek <mbroek@mbse.eu>
parents:
229
diff
changeset
|
1274 | setWaterAgent(last_acid, parseFloat($("#wa_acid").jqxNumberInput('decimal'))); |
8edca0488e65
Finished the water treatment in the recipes editor. It seems that the recipes editor is ready.
Michiel Broek <mbroek@mbse.eu>
parents:
229
diff
changeset
|
1275 | dataRecord.wa_acid_name = index; |
8edca0488e65
Finished the water treatment in the recipes editor. It seems that the recipes editor is ready.
Michiel Broek <mbroek@mbse.eu>
parents:
229
diff
changeset
|
1276 | calcWater(); |
8edca0488e65
Finished the water treatment in the recipes editor. It seems that the recipes editor is ready.
Michiel Broek <mbroek@mbse.eu>
parents:
229
diff
changeset
|
1277 | } |
149
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
1278 | }); |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
1279 | $('#wa_acid').on('change', function (event) { |
230
8edca0488e65
Finished the water treatment in the recipes editor. It seems that the recipes editor is ready.
Michiel Broek <mbroek@mbse.eu>
parents:
229
diff
changeset
|
1280 | var name = AcidTypeData[$("#wa_acid_name").val()].nl; |
8edca0488e65
Finished the water treatment in the recipes editor. It seems that the recipes editor is ready.
Michiel Broek <mbroek@mbse.eu>
parents:
229
diff
changeset
|
1281 | setWaterAgent(name, parseFloat(event.args.value)); |
149
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
1282 | calcWater(); |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
1283 | }); |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
1284 | $('#wa_acid_perc').on('change', function (event) { calcWater(); }); |
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
|
1285 | |
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:
175
diff
changeset
|
1286 | $('#color_method').on('change', function (event) { |
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:
175
diff
changeset
|
1287 | dataRecord.color_method = event.args.index; |
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:
175
diff
changeset
|
1288 | calcFermentables(); |
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:
175
diff
changeset
|
1289 | }); |
98
92d6bc8a4cdd
Added javascript formulas for color calculations. Added IBU total calculation. Better IBI calculation for the hop entries. Blocked selection of IBU calculation for Garetz, Mosher and Noonan. Better sg calculation in the recipe print.
Michiel Broek <mbroek@mbse.eu>
parents:
97
diff
changeset
|
1290 | $('#ibu_method').on('change', function (event) { |
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:
175
diff
changeset
|
1291 | dataRecord.ibu_method = event.args.index; |
98
92d6bc8a4cdd
Added javascript formulas for color calculations. Added IBU total calculation. Better IBI calculation for the hop entries. Blocked selection of IBU calculation for Garetz, Mosher and Noonan. Better sg calculation in the recipe print.
Michiel Broek <mbroek@mbse.eu>
parents:
97
diff
changeset
|
1292 | calcFermentables(); |
92d6bc8a4cdd
Added javascript formulas for color calculations. Added IBU total calculation. Better IBI calculation for the hop entries. Blocked selection of IBU calculation for Garetz, Mosher and Noonan. Better sg calculation in the recipe print.
Michiel Broek <mbroek@mbse.eu>
parents:
97
diff
changeset
|
1293 | calcIBUs(); |
92d6bc8a4cdd
Added javascript formulas for color calculations. Added IBU total calculation. Better IBI calculation for the hop entries. Blocked selection of IBU calculation for Garetz, Mosher and Noonan. Better sg calculation in the recipe print.
Michiel Broek <mbroek@mbse.eu>
parents:
97
diff
changeset
|
1294 | }); |
134
be59b9127978
Added change batch size and efficiency.
Michiel Broek <mbroek@mbse.eu>
parents:
133
diff
changeset
|
1295 | $('#batch_size').on('change', function (event) { |
135
cd1403633e96
Added boil time change logic. Better precision.
Michiel Broek <mbroek@mbse.eu>
parents:
134
diff
changeset
|
1296 | console.log("batch_size change:"+event.args.value+" old:"+dataRecord.batch_size); |
cd1403633e96
Added boil time change logic. Better precision.
Michiel Broek <mbroek@mbse.eu>
parents:
134
diff
changeset
|
1297 | var new_boil = parseFloat(event.args.value) + dataRecord.boil_size - dataRecord.batch_size; |
263
ed22ac46404b
Adjust water, hops, yeasts and miscs when the batch size or equipment changes.
Michiel Broek <mbroek@mbse.eu>
parents:
262
diff
changeset
|
1298 | var factor = parseFloat(event.args.value) / dataRecord.batch_size; |
135
cd1403633e96
Added boil time change logic. Better precision.
Michiel Broek <mbroek@mbse.eu>
parents:
134
diff
changeset
|
1299 | dataRecord.boil_size = new_boil; |
cd1403633e96
Added boil time change logic. Better precision.
Michiel Broek <mbroek@mbse.eu>
parents:
134
diff
changeset
|
1300 | $("#boil_size").val(Math.round(new_boil * 100) / 100); |
263
ed22ac46404b
Adjust water, hops, yeasts and miscs when the batch size or equipment changes.
Michiel Broek <mbroek@mbse.eu>
parents:
262
diff
changeset
|
1301 | dataRecord.sparge_volume *= factor; |
ed22ac46404b
Adjust water, hops, yeasts and miscs when the batch size or equipment changes.
Michiel Broek <mbroek@mbse.eu>
parents:
262
diff
changeset
|
1302 | $("#sparge_volume").val(dataRecord.sparge_volume); |
135
cd1403633e96
Added boil time change logic. Better precision.
Michiel Broek <mbroek@mbse.eu>
parents:
134
diff
changeset
|
1303 | dataRecord.batch_size = parseFloat(event.args.value); |
134
be59b9127978
Added change batch size and efficiency.
Michiel Broek <mbroek@mbse.eu>
parents:
133
diff
changeset
|
1304 | calcFermentablesFromOG(parseFloat($("#est_og").jqxNumberInput('decimal'))); // Keep the OG |
263
ed22ac46404b
Adjust water, hops, yeasts and miscs when the batch size or equipment changes.
Michiel Broek <mbroek@mbse.eu>
parents:
262
diff
changeset
|
1305 | adjustWaters(factor); |
134
be59b9127978
Added change batch size and efficiency.
Michiel Broek <mbroek@mbse.eu>
parents:
133
diff
changeset
|
1306 | calcFermentables(); |
263
ed22ac46404b
Adjust water, hops, yeasts and miscs when the batch size or equipment changes.
Michiel Broek <mbroek@mbse.eu>
parents:
262
diff
changeset
|
1307 | adjustHops(factor); |
ed22ac46404b
Adjust water, hops, yeasts and miscs when the batch size or equipment changes.
Michiel Broek <mbroek@mbse.eu>
parents:
262
diff
changeset
|
1308 | adjustMiscs(factor); |
ed22ac46404b
Adjust water, hops, yeasts and miscs when the batch size or equipment changes.
Michiel Broek <mbroek@mbse.eu>
parents:
262
diff
changeset
|
1309 | adjustYeasts(factor); |
134
be59b9127978
Added change batch size and efficiency.
Michiel Broek <mbroek@mbse.eu>
parents:
133
diff
changeset
|
1310 | calcIBUs(); |
263
ed22ac46404b
Adjust water, hops, yeasts and miscs when the batch size or equipment changes.
Michiel Broek <mbroek@mbse.eu>
parents:
262
diff
changeset
|
1311 | calcWater(); |
ed22ac46404b
Adjust water, hops, yeasts and miscs when the batch size or equipment changes.
Michiel Broek <mbroek@mbse.eu>
parents:
262
diff
changeset
|
1312 | calcSparge(); |
134
be59b9127978
Added change batch size and efficiency.
Michiel Broek <mbroek@mbse.eu>
parents:
133
diff
changeset
|
1313 | }); |
be59b9127978
Added change batch size and efficiency.
Michiel Broek <mbroek@mbse.eu>
parents:
133
diff
changeset
|
1314 | $('#boil_time').on('change', function (event) { |
135
cd1403633e96
Added boil time change logic. Better precision.
Michiel Broek <mbroek@mbse.eu>
parents:
134
diff
changeset
|
1315 | console.log("boil_time change:"+parseFloat(event.args.value)+" old:"+dataRecord.boil_time); |
cd1403633e96
Added boil time change logic. Better precision.
Michiel Broek <mbroek@mbse.eu>
parents:
134
diff
changeset
|
1316 | var old_evap = parseFloat(dataRecord.boil_size) - parseFloat(dataRecord.batch_size); |
cd1403633e96
Added boil time change logic. Better precision.
Michiel Broek <mbroek@mbse.eu>
parents:
134
diff
changeset
|
1317 | var new_evap = old_evap * (parseFloat(event.args.value) / dataRecord.boil_time); |
cd1403633e96
Added boil time change logic. Better precision.
Michiel Broek <mbroek@mbse.eu>
parents:
134
diff
changeset
|
1318 | var new_boil = parseFloat(dataRecord.batch_size) + new_evap; |
cd1403633e96
Added boil time change logic. Better precision.
Michiel Broek <mbroek@mbse.eu>
parents:
134
diff
changeset
|
1319 | // console.log("old_evap:"+old_evap+" new_evap:"+new_evap+" new_boil:"+new_boil); |
cd1403633e96
Added boil time change logic. Better precision.
Michiel Broek <mbroek@mbse.eu>
parents:
134
diff
changeset
|
1320 | dataRecord.boil_time = parseFloat(event.args.value); |
cd1403633e96
Added boil time change logic. Better precision.
Michiel Broek <mbroek@mbse.eu>
parents:
134
diff
changeset
|
1321 | dataRecord.boil_size = new_boil; |
cd1403633e96
Added boil time change logic. Better precision.
Michiel Broek <mbroek@mbse.eu>
parents:
134
diff
changeset
|
1322 | $("#boil_size").val(Math.round(new_boil * 100) / 100); |
cd1403633e96
Added boil time change logic. Better precision.
Michiel Broek <mbroek@mbse.eu>
parents:
134
diff
changeset
|
1323 | calcFermentables(); |
cd1403633e96
Added boil time change logic. Better precision.
Michiel Broek <mbroek@mbse.eu>
parents:
134
diff
changeset
|
1324 | // TODO: adjust the hops, miscs, yeast, water. |
cd1403633e96
Added boil time change logic. Better precision.
Michiel Broek <mbroek@mbse.eu>
parents:
134
diff
changeset
|
1325 | calcIBUs(); |
134
be59b9127978
Added change batch size and efficiency.
Michiel Broek <mbroek@mbse.eu>
parents:
133
diff
changeset
|
1326 | }); |
be59b9127978
Added change batch size and efficiency.
Michiel Broek <mbroek@mbse.eu>
parents:
133
diff
changeset
|
1327 | $('#efficiency').on('change', function (event) { |
be59b9127978
Added change batch size and efficiency.
Michiel Broek <mbroek@mbse.eu>
parents:
133
diff
changeset
|
1328 | console.log("efficiency change:"+event.args.value); |
be59b9127978
Added change batch size and efficiency.
Michiel Broek <mbroek@mbse.eu>
parents:
133
diff
changeset
|
1329 | calcFermentables(); |
be59b9127978
Added change batch size and efficiency.
Michiel Broek <mbroek@mbse.eu>
parents:
133
diff
changeset
|
1330 | calcIBUs(); |
be59b9127978
Added change batch size and efficiency.
Michiel Broek <mbroek@mbse.eu>
parents:
133
diff
changeset
|
1331 | }); |
be59b9127978
Added change batch size and efficiency.
Michiel Broek <mbroek@mbse.eu>
parents:
133
diff
changeset
|
1332 | $('#est_og').on('change', function (event) { |
be59b9127978
Added change batch size and efficiency.
Michiel Broek <mbroek@mbse.eu>
parents:
133
diff
changeset
|
1333 | console.log("est_og change:"+event.args.value); |
be59b9127978
Added change batch size and efficiency.
Michiel Broek <mbroek@mbse.eu>
parents:
133
diff
changeset
|
1334 | calcFermentablesFromOG(event.args.value); // Adjust fermentables amounts |
be59b9127978
Added change batch size and efficiency.
Michiel Broek <mbroek@mbse.eu>
parents:
133
diff
changeset
|
1335 | calcFermentables(); // Update the recipe details |
be59b9127978
Added change batch size and efficiency.
Michiel Broek <mbroek@mbse.eu>
parents:
133
diff
changeset
|
1336 | calcIBUs(); // and the IBU's. |
be59b9127978
Added change batch size and efficiency.
Michiel Broek <mbroek@mbse.eu>
parents:
133
diff
changeset
|
1337 | }); |
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:
146
diff
changeset
|
1338 | $('#mash_ph').on('change', function (event) { |
149
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
1339 | dataRecord.mash_ph = parseFloat(event.args.value); |
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:
146
diff
changeset
|
1340 | calcWater(); |
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:
146
diff
changeset
|
1341 | }); |
156
35860890224c
Added sparge water acid calculation. Added residual alkalinity calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
155
diff
changeset
|
1342 | |
35860890224c
Added sparge water acid calculation. Added residual alkalinity calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
155
diff
changeset
|
1343 | $('#sparge_ph').on('change', function (event) { |
35860890224c
Added sparge water acid calculation. Added residual alkalinity calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
155
diff
changeset
|
1344 | dataRecord.sparge_ph = parseFloat(event.args.value); |
35860890224c
Added sparge water acid calculation. Added residual alkalinity calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
155
diff
changeset
|
1345 | calcSparge(); |
35860890224c
Added sparge water acid calculation. Added residual alkalinity calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
155
diff
changeset
|
1346 | }); |
35860890224c
Added sparge water acid calculation. Added residual alkalinity calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
155
diff
changeset
|
1347 | $('#sparge_volume').on('change', function (event) { |
35860890224c
Added sparge water acid calculation. Added residual alkalinity calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
155
diff
changeset
|
1348 | dataRecord.sparge_volume = parseFloat(event.args.value); |
35860890224c
Added sparge water acid calculation. Added residual alkalinity calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
155
diff
changeset
|
1349 | calcSparge(); |
35860890224c
Added sparge water acid calculation. Added residual alkalinity calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
155
diff
changeset
|
1350 | }); |
35860890224c
Added sparge water acid calculation. Added residual alkalinity calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
155
diff
changeset
|
1351 | $('#sparge_source').on('change', function (event) { |
230
8edca0488e65
Finished the water treatment in the recipes editor. It seems that the recipes editor is ready.
Michiel Broek <mbroek@mbse.eu>
parents:
229
diff
changeset
|
1352 | if (event.args) { |
8edca0488e65
Finished the water treatment in the recipes editor. It seems that the recipes editor is ready.
Michiel Broek <mbroek@mbse.eu>
parents:
229
diff
changeset
|
1353 | var index = event.args.index; |
8edca0488e65
Finished the water treatment in the recipes editor. It seems that the recipes editor is ready.
Michiel Broek <mbroek@mbse.eu>
parents:
229
diff
changeset
|
1354 | dataRecord.sparge_source= index; |
8edca0488e65
Finished the water treatment in the recipes editor. It seems that the recipes editor is ready.
Michiel Broek <mbroek@mbse.eu>
parents:
229
diff
changeset
|
1355 | calcSparge(); |
8edca0488e65
Finished the water treatment in the recipes editor. It seems that the recipes editor is ready.
Michiel Broek <mbroek@mbse.eu>
parents:
229
diff
changeset
|
1356 | } |
156
35860890224c
Added sparge water acid calculation. Added residual alkalinity calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
155
diff
changeset
|
1357 | }); |
35860890224c
Added sparge water acid calculation. Added residual alkalinity calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
155
diff
changeset
|
1358 | $('#sparge_acid_type').on('change', function (event) { |
230
8edca0488e65
Finished the water treatment in the recipes editor. It seems that the recipes editor is ready.
Michiel Broek <mbroek@mbse.eu>
parents:
229
diff
changeset
|
1359 | if (event.args) { |
8edca0488e65
Finished the water treatment in the recipes editor. It seems that the recipes editor is ready.
Michiel Broek <mbroek@mbse.eu>
parents:
229
diff
changeset
|
1360 | var index = event.args.index; |
8edca0488e65
Finished the water treatment in the recipes editor. It seems that the recipes editor is ready.
Michiel Broek <mbroek@mbse.eu>
parents:
229
diff
changeset
|
1361 | dataRecord.sparge_acid_type = index; |
8edca0488e65
Finished the water treatment in the recipes editor. It seems that the recipes editor is ready.
Michiel Broek <mbroek@mbse.eu>
parents:
229
diff
changeset
|
1362 | console.log("new sparge_acid_type: "+dataRecord.sparge_acid_type); |
8edca0488e65
Finished the water treatment in the recipes editor. It seems that the recipes editor is ready.
Michiel Broek <mbroek@mbse.eu>
parents:
229
diff
changeset
|
1363 | calcSparge(); |
8edca0488e65
Finished the water treatment in the recipes editor. It seems that the recipes editor is ready.
Michiel Broek <mbroek@mbse.eu>
parents:
229
diff
changeset
|
1364 | } |
156
35860890224c
Added sparge water acid calculation. Added residual alkalinity calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
155
diff
changeset
|
1365 | }); |
35860890224c
Added sparge water acid calculation. Added residual alkalinity calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
155
diff
changeset
|
1366 | $('#sparge_acid_perc').on('change', function (event) { |
35860890224c
Added sparge water acid calculation. Added residual alkalinity calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
155
diff
changeset
|
1367 | dataRecord.sparge_acid_perc = parseFloat(event.args.value); |
35860890224c
Added sparge water acid calculation. Added residual alkalinity calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
155
diff
changeset
|
1368 | calcSparge(); |
35860890224c
Added sparge water acid calculation. Added residual alkalinity calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
155
diff
changeset
|
1369 | }); |
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
|
1370 | $('#locked').on('checked', function (event) { |
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
|
1371 | setReadonly(true); |
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
|
1372 | }); |
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
|
1373 | $('#locked').on('unchecked', function (event) { |
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
|
1374 | setReadonly(false); |
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
|
1375 | }); |
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
|
1376 | // setReadonly(false); |
73
454fc4558609
Added style selector in recipe editer. Better formatting of cellsrenderer fields. Added When field to the fermentables list. Attempts to calculate the fermentables.
Michiel Broek <mbroek@mbse.eu>
parents:
72
diff
changeset
|
1377 | }; |
454fc4558609
Added style selector in recipe editer. Better formatting of cellsrenderer fields. Added When field to the fermentables list. Attempts to calculate the fermentables.
Michiel Broek <mbroek@mbse.eu>
parents:
72
diff
changeset
|
1378 | |
454fc4558609
Added style selector in recipe editer. Better formatting of cellsrenderer fields. Added When field to the fermentables list. Attempts to calculate the fermentables.
Michiel Broek <mbroek@mbse.eu>
parents:
72
diff
changeset
|
1379 | $("#styleSelect").jqxDropDownList({ |
454fc4558609
Added style selector in recipe editer. Better formatting of cellsrenderer fields. Added When field to the fermentables list. Attempts to calculate the fermentables.
Michiel Broek <mbroek@mbse.eu>
parents:
72
diff
changeset
|
1380 | placeHolder: "Kies bierstijl:", |
454fc4558609
Added style selector in recipe editer. Better formatting of cellsrenderer fields. Added When field to the fermentables list. Attempts to calculate the fermentables.
Michiel Broek <mbroek@mbse.eu>
parents:
72
diff
changeset
|
1381 | theme: theme, |
454fc4558609
Added style selector in recipe editer. Better formatting of cellsrenderer fields. Added When field to the fermentables list. Attempts to calculate the fermentables.
Michiel Broek <mbroek@mbse.eu>
parents:
72
diff
changeset
|
1382 | source: styleslist, |
454fc4558609
Added style selector in recipe editer. Better formatting of cellsrenderer fields. Added When field to the fermentables list. Attempts to calculate the fermentables.
Michiel Broek <mbroek@mbse.eu>
parents:
72
diff
changeset
|
1383 | displayMember: "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:
175
diff
changeset
|
1384 | width: 180, |
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:
175
diff
changeset
|
1385 | height: 23, |
73
454fc4558609
Added style selector in recipe editer. Better formatting of cellsrenderer fields. Added When field to the fermentables list. Attempts to calculate the fermentables.
Michiel Broek <mbroek@mbse.eu>
parents:
72
diff
changeset
|
1386 | dropDownVerticalAlignment: 'top', |
454fc4558609
Added style selector in recipe editer. Better formatting of cellsrenderer fields. Added When field to the fermentables list. Attempts to calculate the fermentables.
Michiel Broek <mbroek@mbse.eu>
parents:
72
diff
changeset
|
1387 | dropDownWidth: 500, |
454fc4558609
Added style selector in recipe editer. Better formatting of cellsrenderer fields. Added When field to the fermentables list. Attempts to calculate the fermentables.
Michiel Broek <mbroek@mbse.eu>
parents:
72
diff
changeset
|
1388 | dropDownHeight: 380, |
454fc4558609
Added style selector in recipe editer. Better formatting of cellsrenderer fields. Added When field to the fermentables list. Attempts to calculate the fermentables.
Michiel Broek <mbroek@mbse.eu>
parents:
72
diff
changeset
|
1389 | renderer: function (index, label, value) { |
454fc4558609
Added style selector in recipe editer. Better formatting of cellsrenderer fields. Added When field to the fermentables list. Attempts to calculate the fermentables.
Michiel Broek <mbroek@mbse.eu>
parents:
72
diff
changeset
|
1390 | var datarecord = styleslist.records[index]; |
454fc4558609
Added style selector in recipe editer. Better formatting of cellsrenderer fields. Added When field to the fermentables list. Attempts to calculate the fermentables.
Michiel Broek <mbroek@mbse.eu>
parents:
72
diff
changeset
|
1391 | return datarecord.style_guide + " " + datarecord.style_letter+ " " + datarecord.name; |
454fc4558609
Added style selector in recipe editer. Better formatting of cellsrenderer fields. Added When field to the fermentables list. Attempts to calculate the fermentables.
Michiel Broek <mbroek@mbse.eu>
parents:
72
diff
changeset
|
1392 | } |
454fc4558609
Added style selector in recipe editer. Better formatting of cellsrenderer fields. Added When field to the fermentables list. Attempts to calculate the fermentables.
Michiel Broek <mbroek@mbse.eu>
parents:
72
diff
changeset
|
1393 | }); |
454fc4558609
Added style selector in recipe editer. Better formatting of cellsrenderer fields. Added When field to the fermentables list. Attempts to calculate the fermentables.
Michiel Broek <mbroek@mbse.eu>
parents:
72
diff
changeset
|
1394 | $("#styleSelect").on('select', function (event) { |
454fc4558609
Added style selector in recipe editer. Better formatting of cellsrenderer fields. Added When field to the fermentables list. Attempts to calculate the fermentables.
Michiel Broek <mbroek@mbse.eu>
parents:
72
diff
changeset
|
1395 | if (event.args) { |
454fc4558609
Added style selector in recipe editer. Better formatting of cellsrenderer fields. Added When field to the fermentables list. Attempts to calculate the fermentables.
Michiel Broek <mbroek@mbse.eu>
parents:
72
diff
changeset
|
1396 | var index = event.args.index; |
454fc4558609
Added style selector in recipe editer. Better formatting of cellsrenderer fields. Added When field to the fermentables list. Attempts to calculate the fermentables.
Michiel Broek <mbroek@mbse.eu>
parents:
72
diff
changeset
|
1397 | var datarecord = styleslist.records[index]; |
454fc4558609
Added style selector in recipe editer. Better formatting of cellsrenderer fields. Added When field to the fermentables list. Attempts to calculate the fermentables.
Michiel Broek <mbroek@mbse.eu>
parents:
72
diff
changeset
|
1398 | $("#st_name").val(datarecord.name); |
454fc4558609
Added style selector in recipe editer. Better formatting of cellsrenderer fields. Added When field to the fermentables list. Attempts to calculate the fermentables.
Michiel Broek <mbroek@mbse.eu>
parents:
72
diff
changeset
|
1399 | $("#st_category").val(datarecord.category); |
454fc4558609
Added style selector in recipe editer. Better formatting of cellsrenderer fields. Added When field to the fermentables list. Attempts to calculate the fermentables.
Michiel Broek <mbroek@mbse.eu>
parents:
72
diff
changeset
|
1400 | $("#st_category_number").val(datarecord.category_number); |
454fc4558609
Added style selector in recipe editer. Better formatting of cellsrenderer fields. Added When field to the fermentables list. Attempts to calculate the fermentables.
Michiel Broek <mbroek@mbse.eu>
parents:
72
diff
changeset
|
1401 | $("#st_letter").val(datarecord.style_letter); |
454fc4558609
Added style selector in recipe editer. Better formatting of cellsrenderer fields. Added When field to the fermentables list. Attempts to calculate the fermentables.
Michiel Broek <mbroek@mbse.eu>
parents:
72
diff
changeset
|
1402 | $("#st_guide").val(datarecord.style_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:
175
diff
changeset
|
1403 | $("#st_type").val(StyleTypeData[datarecord.type].nl); |
73
454fc4558609
Added style selector in recipe editer. Better formatting of cellsrenderer fields. Added When field to the fermentables list. Attempts to calculate the fermentables.
Michiel Broek <mbroek@mbse.eu>
parents:
72
diff
changeset
|
1404 | $("#st_og_min").val(datarecord.og_min); |
454fc4558609
Added style selector in recipe editer. Better formatting of cellsrenderer fields. Added When field to the fermentables list. Attempts to calculate the fermentables.
Michiel Broek <mbroek@mbse.eu>
parents:
72
diff
changeset
|
1405 | $("#st_og_max").val(datarecord.og_max); |
454fc4558609
Added style selector in recipe editer. Better formatting of cellsrenderer fields. Added When field to the fermentables list. Attempts to calculate the fermentables.
Michiel Broek <mbroek@mbse.eu>
parents:
72
diff
changeset
|
1406 | $("#st_fg_min").val(datarecord.fg_min); |
454fc4558609
Added style selector in recipe editer. Better formatting of cellsrenderer fields. Added When field to the fermentables list. Attempts to calculate the fermentables.
Michiel Broek <mbroek@mbse.eu>
parents:
72
diff
changeset
|
1407 | $("#st_fg_max").val(datarecord.fg_max); |
454fc4558609
Added style selector in recipe editer. Better formatting of cellsrenderer fields. Added When field to the fermentables list. Attempts to calculate the fermentables.
Michiel Broek <mbroek@mbse.eu>
parents:
72
diff
changeset
|
1408 | $("#st_ibu_min").val(datarecord.ibu_min); |
454fc4558609
Added style selector in recipe editer. Better formatting of cellsrenderer fields. Added When field to the fermentables list. Attempts to calculate the fermentables.
Michiel Broek <mbroek@mbse.eu>
parents:
72
diff
changeset
|
1409 | $("#st_ibu_max").val(datarecord.ibu_max); |
454fc4558609
Added style selector in recipe editer. Better formatting of cellsrenderer fields. Added When field to the fermentables list. Attempts to calculate the fermentables.
Michiel Broek <mbroek@mbse.eu>
parents:
72
diff
changeset
|
1410 | $("#st_color_min").val(datarecord.color_min); |
454fc4558609
Added style selector in recipe editer. Better formatting of cellsrenderer fields. Added When field to the fermentables list. Attempts to calculate the fermentables.
Michiel Broek <mbroek@mbse.eu>
parents:
72
diff
changeset
|
1411 | $("#st_color_max").val(datarecord.color_max); |
454fc4558609
Added style selector in recipe editer. Better formatting of cellsrenderer fields. Added When field to the fermentables list. Attempts to calculate the fermentables.
Michiel Broek <mbroek@mbse.eu>
parents:
72
diff
changeset
|
1412 | $("#st_carb_min").val(datarecord.carb_min); |
454fc4558609
Added style selector in recipe editer. Better formatting of cellsrenderer fields. Added When field to the fermentables list. Attempts to calculate the fermentables.
Michiel Broek <mbroek@mbse.eu>
parents:
72
diff
changeset
|
1413 | $("#st_carb_max").val(datarecord.carb_max); |
454fc4558609
Added style selector in recipe editer. Better formatting of cellsrenderer fields. Added When field to the fermentables list. Attempts to calculate the fermentables.
Michiel Broek <mbroek@mbse.eu>
parents:
72
diff
changeset
|
1414 | $("#st_abv_min").val(datarecord.abv_min); |
454fc4558609
Added style selector in recipe editer. Better formatting of cellsrenderer fields. Added When field to the fermentables list. Attempts to calculate the fermentables.
Michiel Broek <mbroek@mbse.eu>
parents:
72
diff
changeset
|
1415 | $("#st_abv_max").val(datarecord.abv_max); |
454fc4558609
Added style selector in recipe editer. Better formatting of cellsrenderer fields. Added When field to the fermentables list. Attempts to calculate the fermentables.
Michiel Broek <mbroek@mbse.eu>
parents:
72
diff
changeset
|
1416 | } |
454fc4558609
Added style selector in recipe editer. Better formatting of cellsrenderer fields. Added When field to the fermentables list. Attempts to calculate the fermentables.
Michiel Broek <mbroek@mbse.eu>
parents:
72
diff
changeset
|
1417 | }); |
454fc4558609
Added style selector in recipe editer. Better formatting of cellsrenderer fields. Added When field to the fermentables list. Attempts to calculate the fermentables.
Michiel Broek <mbroek@mbse.eu>
parents:
72
diff
changeset
|
1418 | |
271
af0270694d1e
Save data before printing or export to beerxml
Michiel Broek <mbroek@mbse.eu>
parents:
267
diff
changeset
|
1419 | function saveRecord() { |
af0270694d1e
Save data before printing or export to beerxml
Michiel Broek <mbroek@mbse.eu>
parents:
267
diff
changeset
|
1420 | var fermentablerow = $('#fermentableGrid').jqxGrid('getrows'); |
af0270694d1e
Save data before printing or export to beerxml
Michiel Broek <mbroek@mbse.eu>
parents:
267
diff
changeset
|
1421 | var hoprow = $('#hopGrid').jqxGrid('getrows'); |
af0270694d1e
Save data before printing or export to beerxml
Michiel Broek <mbroek@mbse.eu>
parents:
267
diff
changeset
|
1422 | var miscrow = $('#miscGrid').jqxGrid('getrows'); |
af0270694d1e
Save data before printing or export to beerxml
Michiel Broek <mbroek@mbse.eu>
parents:
267
diff
changeset
|
1423 | var yeastrow = $('#yeastGrid').jqxGrid('getrows'); |
af0270694d1e
Save data before printing or export to beerxml
Michiel Broek <mbroek@mbse.eu>
parents:
267
diff
changeset
|
1424 | var mashrow = $('#mashGrid').jqxGrid('getrows'); |
af0270694d1e
Save data before printing or export to beerxml
Michiel Broek <mbroek@mbse.eu>
parents:
267
diff
changeset
|
1425 | var row = { |
af0270694d1e
Save data before printing or export to beerxml
Michiel Broek <mbroek@mbse.eu>
parents:
267
diff
changeset
|
1426 | record: my_record, |
af0270694d1e
Save data before printing or export to beerxml
Michiel Broek <mbroek@mbse.eu>
parents:
267
diff
changeset
|
1427 | uuid: dataRecord.uuid, |
af0270694d1e
Save data before printing or export to beerxml
Michiel Broek <mbroek@mbse.eu>
parents:
267
diff
changeset
|
1428 | name: $("#name").val(), |
af0270694d1e
Save data before printing or export to beerxml
Michiel Broek <mbroek@mbse.eu>
parents:
267
diff
changeset
|
1429 | locked: $("#locked").val(), |
af0270694d1e
Save data before printing or export to beerxml
Michiel Broek <mbroek@mbse.eu>
parents:
267
diff
changeset
|
1430 | notes: $("#notes").val(), |
af0270694d1e
Save data before printing or export to beerxml
Michiel Broek <mbroek@mbse.eu>
parents:
267
diff
changeset
|
1431 | st_name: $('#st_name').val(), |
af0270694d1e
Save data before printing or export to beerxml
Michiel Broek <mbroek@mbse.eu>
parents:
267
diff
changeset
|
1432 | st_letter: $('#st_letter').val(), |
af0270694d1e
Save data before printing or export to beerxml
Michiel Broek <mbroek@mbse.eu>
parents:
267
diff
changeset
|
1433 | st_guide: $('#st_guide').val(), |
af0270694d1e
Save data before printing or export to beerxml
Michiel Broek <mbroek@mbse.eu>
parents:
267
diff
changeset
|
1434 | st_type: dataRecord.st_type, |
af0270694d1e
Save data before printing or export to beerxml
Michiel Broek <mbroek@mbse.eu>
parents:
267
diff
changeset
|
1435 | st_category: $('#st_category').val(), |
af0270694d1e
Save data before printing or export to beerxml
Michiel Broek <mbroek@mbse.eu>
parents:
267
diff
changeset
|
1436 | st_category_number: parseFloat($("#st_category_number").jqxNumberInput('decimal')), |
af0270694d1e
Save data before printing or export to beerxml
Michiel Broek <mbroek@mbse.eu>
parents:
267
diff
changeset
|
1437 | st_og_min: parseFloat($("#st_og_min").jqxNumberInput('decimal')), |
af0270694d1e
Save data before printing or export to beerxml
Michiel Broek <mbroek@mbse.eu>
parents:
267
diff
changeset
|
1438 | st_og_max: parseFloat($("#st_og_max").jqxNumberInput('decimal')), |
af0270694d1e
Save data before printing or export to beerxml
Michiel Broek <mbroek@mbse.eu>
parents:
267
diff
changeset
|
1439 | st_fg_min: parseFloat($("#st_fg_min").jqxNumberInput('decimal')), |
af0270694d1e
Save data before printing or export to beerxml
Michiel Broek <mbroek@mbse.eu>
parents:
267
diff
changeset
|
1440 | st_fg_max: parseFloat($("#st_fg_max").jqxNumberInput('decimal')), |
af0270694d1e
Save data before printing or export to beerxml
Michiel Broek <mbroek@mbse.eu>
parents:
267
diff
changeset
|
1441 | st_ibu_min: parseFloat($("#st_ibu_min").jqxNumberInput('decimal')), |
af0270694d1e
Save data before printing or export to beerxml
Michiel Broek <mbroek@mbse.eu>
parents:
267
diff
changeset
|
1442 | st_ibu_max: parseFloat($("#st_ibu_max").jqxNumberInput('decimal')), |
af0270694d1e
Save data before printing or export to beerxml
Michiel Broek <mbroek@mbse.eu>
parents:
267
diff
changeset
|
1443 | st_color_min: parseFloat($("#st_color_min").jqxNumberInput('decimal')), |
af0270694d1e
Save data before printing or export to beerxml
Michiel Broek <mbroek@mbse.eu>
parents:
267
diff
changeset
|
1444 | st_color_max: parseFloat($("#st_color_max").jqxNumberInput('decimal')), |
af0270694d1e
Save data before printing or export to beerxml
Michiel Broek <mbroek@mbse.eu>
parents:
267
diff
changeset
|
1445 | st_carb_min: parseFloat($("#st_carb_min").jqxNumberInput('decimal')), |
af0270694d1e
Save data before printing or export to beerxml
Michiel Broek <mbroek@mbse.eu>
parents:
267
diff
changeset
|
1446 | st_carb_max: parseFloat($("#st_carb_max").jqxNumberInput('decimal')), |
af0270694d1e
Save data before printing or export to beerxml
Michiel Broek <mbroek@mbse.eu>
parents:
267
diff
changeset
|
1447 | st_abv_min: parseFloat($("#st_abv_min").jqxNumberInput('decimal')), |
af0270694d1e
Save data before printing or export to beerxml
Michiel Broek <mbroek@mbse.eu>
parents:
267
diff
changeset
|
1448 | st_abv_max: parseFloat($("#st_abv_max").jqxNumberInput('decimal')), |
af0270694d1e
Save data before printing or export to beerxml
Michiel Broek <mbroek@mbse.eu>
parents:
267
diff
changeset
|
1449 | type: $("#type").val(), |
af0270694d1e
Save data before printing or export to beerxml
Michiel Broek <mbroek@mbse.eu>
parents:
267
diff
changeset
|
1450 | batch_size: parseFloat($("#batch_size").jqxNumberInput('decimal')), |
af0270694d1e
Save data before printing or export to beerxml
Michiel Broek <mbroek@mbse.eu>
parents:
267
diff
changeset
|
1451 | boil_size: parseFloat($("#boil_size").jqxNumberInput('decimal')), |
af0270694d1e
Save data before printing or export to beerxml
Michiel Broek <mbroek@mbse.eu>
parents:
267
diff
changeset
|
1452 | boil_time: parseFloat($("#boil_time").jqxNumberInput('decimal')), |
af0270694d1e
Save data before printing or export to beerxml
Michiel Broek <mbroek@mbse.eu>
parents:
267
diff
changeset
|
1453 | efficiency: parseFloat($("#efficiency").jqxNumberInput('decimal')), |
af0270694d1e
Save data before printing or export to beerxml
Michiel Broek <mbroek@mbse.eu>
parents:
267
diff
changeset
|
1454 | est_og: parseFloat($("#est_og").jqxNumberInput('decimal')), |
af0270694d1e
Save data before printing or export to beerxml
Michiel Broek <mbroek@mbse.eu>
parents:
267
diff
changeset
|
1455 | est_fg: parseFloat($("#est_fg").jqxNumberInput('decimal')), |
af0270694d1e
Save data before printing or export to beerxml
Michiel Broek <mbroek@mbse.eu>
parents:
267
diff
changeset
|
1456 | est_abv: parseFloat($("#est_abv").jqxNumberInput('decimal')), |
af0270694d1e
Save data before printing or export to beerxml
Michiel Broek <mbroek@mbse.eu>
parents:
267
diff
changeset
|
1457 | est_color: parseFloat($("#est_color").jqxNumberInput('decimal')), |
af0270694d1e
Save data before printing or export to beerxml
Michiel Broek <mbroek@mbse.eu>
parents:
267
diff
changeset
|
1458 | color_method: $("#color_method").val(), |
af0270694d1e
Save data before printing or export to beerxml
Michiel Broek <mbroek@mbse.eu>
parents:
267
diff
changeset
|
1459 | est_ibu: parseFloat($("#est_ibu").jqxNumberInput('decimal')), |
af0270694d1e
Save data before printing or export to beerxml
Michiel Broek <mbroek@mbse.eu>
parents:
267
diff
changeset
|
1460 | ibu_method: $("#ibu_method").val(), |
af0270694d1e
Save data before printing or export to beerxml
Michiel Broek <mbroek@mbse.eu>
parents:
267
diff
changeset
|
1461 | est_carb: parseFloat($("#est_carb").jqxNumberInput('decimal')), |
af0270694d1e
Save data before printing or export to beerxml
Michiel Broek <mbroek@mbse.eu>
parents:
267
diff
changeset
|
1462 | mash_name: $("#mash_name").val(), |
af0270694d1e
Save data before printing or export to beerxml
Michiel Broek <mbroek@mbse.eu>
parents:
267
diff
changeset
|
1463 | mash_ph: parseFloat($("#mash_ph").jqxNumberInput('decimal')), |
af0270694d1e
Save data before printing or export to beerxml
Michiel Broek <mbroek@mbse.eu>
parents:
267
diff
changeset
|
1464 | sparge_temp: parseFloat($("#sparge_temp").jqxNumberInput('decimal')), |
af0270694d1e
Save data before printing or export to beerxml
Michiel Broek <mbroek@mbse.eu>
parents:
267
diff
changeset
|
1465 | sparge_ph: parseFloat($("#sparge_ph").jqxNumberInput('decimal')), |
af0270694d1e
Save data before printing or export to beerxml
Michiel Broek <mbroek@mbse.eu>
parents:
267
diff
changeset
|
1466 | sparge_volume: parseFloat($("#sparge_volume").jqxNumberInput('decimal')), |
af0270694d1e
Save data before printing or export to beerxml
Michiel Broek <mbroek@mbse.eu>
parents:
267
diff
changeset
|
1467 | sparge_source: $("#sparge_source").val(), |
af0270694d1e
Save data before printing or export to beerxml
Michiel Broek <mbroek@mbse.eu>
parents:
267
diff
changeset
|
1468 | sparge_acid_type: $("#sparge_acid_type").val(), |
af0270694d1e
Save data before printing or export to beerxml
Michiel Broek <mbroek@mbse.eu>
parents:
267
diff
changeset
|
1469 | sparge_acid_perc: parseFloat($("#sparge_acid_perc").jqxNumberInput('decimal')), |
af0270694d1e
Save data before printing or export to beerxml
Michiel Broek <mbroek@mbse.eu>
parents:
267
diff
changeset
|
1470 | sparge_acid_amount: dataRecord.sparge_acid_amount, |
af0270694d1e
Save data before printing or export to beerxml
Michiel Broek <mbroek@mbse.eu>
parents:
267
diff
changeset
|
1471 | calc_acid: $("#calc_acid").val(), |
af0270694d1e
Save data before printing or export to beerxml
Michiel Broek <mbroek@mbse.eu>
parents:
267
diff
changeset
|
1472 | w1_name: $("#w1_name").val(), |
af0270694d1e
Save data before printing or export to beerxml
Michiel Broek <mbroek@mbse.eu>
parents:
267
diff
changeset
|
1473 | w1_amount: parseFloat($("#w1_amount").jqxNumberInput('decimal')), |
af0270694d1e
Save data before printing or export to beerxml
Michiel Broek <mbroek@mbse.eu>
parents:
267
diff
changeset
|
1474 | w1_calcium: parseFloat($("#w1_calcium").jqxNumberInput('decimal')), |
af0270694d1e
Save data before printing or export to beerxml
Michiel Broek <mbroek@mbse.eu>
parents:
267
diff
changeset
|
1475 | w1_sulfate: parseFloat($("#w1_sulfate").jqxNumberInput('decimal')), |
af0270694d1e
Save data before printing or export to beerxml
Michiel Broek <mbroek@mbse.eu>
parents:
267
diff
changeset
|
1476 | w1_chloride: parseFloat($("#w1_chloride").jqxNumberInput('decimal')), |
af0270694d1e
Save data before printing or export to beerxml
Michiel Broek <mbroek@mbse.eu>
parents:
267
diff
changeset
|
1477 | w1_sodium: parseFloat($("#w1_sodium").jqxNumberInput('decimal')), |
af0270694d1e
Save data before printing or export to beerxml
Michiel Broek <mbroek@mbse.eu>
parents:
267
diff
changeset
|
1478 | w1_magnesium: parseFloat($("#w1_magnesium").jqxNumberInput('decimal')), |
af0270694d1e
Save data before printing or export to beerxml
Michiel Broek <mbroek@mbse.eu>
parents:
267
diff
changeset
|
1479 | w1_total_alkalinity: parseFloat($("#w1_total_alkalinity").jqxNumberInput('decimal')), |
af0270694d1e
Save data before printing or export to beerxml
Michiel Broek <mbroek@mbse.eu>
parents:
267
diff
changeset
|
1480 | w1_ph: parseFloat($("#w1_ph").jqxNumberInput('decimal')), |
af0270694d1e
Save data before printing or export to beerxml
Michiel Broek <mbroek@mbse.eu>
parents:
267
diff
changeset
|
1481 | w1_cost: dataRecord.w1_cost, |
af0270694d1e
Save data before printing or export to beerxml
Michiel Broek <mbroek@mbse.eu>
parents:
267
diff
changeset
|
1482 | w2_name: $("#w2_name").val(), |
af0270694d1e
Save data before printing or export to beerxml
Michiel Broek <mbroek@mbse.eu>
parents:
267
diff
changeset
|
1483 | w2_amount: parseFloat($("#w2_amount").jqxNumberInput('decimal')), |
af0270694d1e
Save data before printing or export to beerxml
Michiel Broek <mbroek@mbse.eu>
parents:
267
diff
changeset
|
1484 | w2_calcium: parseFloat($("#w2_calcium").jqxNumberInput('decimal')), |
af0270694d1e
Save data before printing or export to beerxml
Michiel Broek <mbroek@mbse.eu>
parents:
267
diff
changeset
|
1485 | w2_sulfate: parseFloat($("#w2_sulfate").jqxNumberInput('decimal')), |
af0270694d1e
Save data before printing or export to beerxml
Michiel Broek <mbroek@mbse.eu>
parents:
267
diff
changeset
|
1486 | w2_chloride: parseFloat($("#w2_chloride").jqxNumberInput('decimal')), |
af0270694d1e
Save data before printing or export to beerxml
Michiel Broek <mbroek@mbse.eu>
parents:
267
diff
changeset
|
1487 | w2_sodium: parseFloat($("#w2_sodium").jqxNumberInput('decimal')), |
af0270694d1e
Save data before printing or export to beerxml
Michiel Broek <mbroek@mbse.eu>
parents:
267
diff
changeset
|
1488 | w2_magnesium: parseFloat($("#w2_magnesium").jqxNumberInput('decimal')), |
af0270694d1e
Save data before printing or export to beerxml
Michiel Broek <mbroek@mbse.eu>
parents:
267
diff
changeset
|
1489 | w2_total_alkalinity: parseFloat($("#w2_total_alkalinity").jqxNumberInput('decimal')), |
af0270694d1e
Save data before printing or export to beerxml
Michiel Broek <mbroek@mbse.eu>
parents:
267
diff
changeset
|
1490 | w2_ph: parseFloat($("#w2_ph").jqxNumberInput('decimal')), |
af0270694d1e
Save data before printing or export to beerxml
Michiel Broek <mbroek@mbse.eu>
parents:
267
diff
changeset
|
1491 | w2_cost: dataRecord.w2_cost, |
af0270694d1e
Save data before printing or export to beerxml
Michiel Broek <mbroek@mbse.eu>
parents:
267
diff
changeset
|
1492 | wa_acid_name: $("#wa_acid_name").val(), |
af0270694d1e
Save data before printing or export to beerxml
Michiel Broek <mbroek@mbse.eu>
parents:
267
diff
changeset
|
1493 | wa_acid_perc: parseFloat($("#wa_acid_perc").jqxNumberInput('decimal')), |
af0270694d1e
Save data before printing or export to beerxml
Michiel Broek <mbroek@mbse.eu>
parents:
267
diff
changeset
|
1494 | wa_base_name: $("#wa_base_name").val(), |
af0270694d1e
Save data before printing or export to beerxml
Michiel Broek <mbroek@mbse.eu>
parents:
267
diff
changeset
|
1495 | fermentables: fermentablerow, |
af0270694d1e
Save data before printing or export to beerxml
Michiel Broek <mbroek@mbse.eu>
parents:
267
diff
changeset
|
1496 | hops: hoprow, |
af0270694d1e
Save data before printing or export to beerxml
Michiel Broek <mbroek@mbse.eu>
parents:
267
diff
changeset
|
1497 | miscs: miscrow, |
af0270694d1e
Save data before printing or export to beerxml
Michiel Broek <mbroek@mbse.eu>
parents:
267
diff
changeset
|
1498 | yeasts: yeastrow, |
af0270694d1e
Save data before printing or export to beerxml
Michiel Broek <mbroek@mbse.eu>
parents:
267
diff
changeset
|
1499 | mashs: mashrow |
af0270694d1e
Save data before printing or export to beerxml
Michiel Broek <mbroek@mbse.eu>
parents:
267
diff
changeset
|
1500 | }; |
af0270694d1e
Save data before printing or export to beerxml
Michiel Broek <mbroek@mbse.eu>
parents:
267
diff
changeset
|
1501 | var data = "update=true&" + $.param(row); |
af0270694d1e
Save data before printing or export to beerxml
Michiel Broek <mbroek@mbse.eu>
parents:
267
diff
changeset
|
1502 | $.ajax({ |
af0270694d1e
Save data before printing or export to beerxml
Michiel Broek <mbroek@mbse.eu>
parents:
267
diff
changeset
|
1503 | dataType: 'json', |
af0270694d1e
Save data before printing or export to beerxml
Michiel Broek <mbroek@mbse.eu>
parents:
267
diff
changeset
|
1504 | url: url, |
af0270694d1e
Save data before printing or export to beerxml
Michiel Broek <mbroek@mbse.eu>
parents:
267
diff
changeset
|
1505 | cache: false, |
af0270694d1e
Save data before printing or export to beerxml
Michiel Broek <mbroek@mbse.eu>
parents:
267
diff
changeset
|
1506 | data: data, |
af0270694d1e
Save data before printing or export to beerxml
Michiel Broek <mbroek@mbse.eu>
parents:
267
diff
changeset
|
1507 | type: "POST", |
af0270694d1e
Save data before printing or export to beerxml
Michiel Broek <mbroek@mbse.eu>
parents:
267
diff
changeset
|
1508 | success: function (data, status, xhr) { |
af0270694d1e
Save data before printing or export to beerxml
Michiel Broek <mbroek@mbse.eu>
parents:
267
diff
changeset
|
1509 | }, |
af0270694d1e
Save data before printing or export to beerxml
Michiel Broek <mbroek@mbse.eu>
parents:
267
diff
changeset
|
1510 | error: function(jqXHR, textStatus, errorThrown) { |
af0270694d1e
Save data before printing or export to beerxml
Michiel Broek <mbroek@mbse.eu>
parents:
267
diff
changeset
|
1511 | } |
af0270694d1e
Save data before printing or export to beerxml
Michiel Broek <mbroek@mbse.eu>
parents:
267
diff
changeset
|
1512 | }); |
af0270694d1e
Save data before printing or export to beerxml
Michiel Broek <mbroek@mbse.eu>
parents:
267
diff
changeset
|
1513 | }; |
af0270694d1e
Save data before printing or export to beerxml
Michiel Broek <mbroek@mbse.eu>
parents:
267
diff
changeset
|
1514 | |
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
|
1515 | var dataRecord = {}; |
68 | 1516 | var url = "includes/db_recipes.php"; |
150
159d7a89fcef
Better stage detection during product import from brouwhulp. Added tooltips for treated water.
Michiel Broek <mbroek@mbse.eu>
parents:
149
diff
changeset
|
1517 | |
68 | 1518 | // prepare the data |
1519 | var source = { | |
1520 | datatype: "json", | |
1521 | cache: false, | |
1522 | datafields: [ | |
1523 | { name: 'record', type: 'number' }, | |
166
635033a29c48
Fixed new recipes uuid generation and saving missing new fields.
Michiel Broek <mbroek@mbse.eu>
parents:
159
diff
changeset
|
1524 | { name: 'uuid', type: 'string' }, |
635033a29c48
Fixed new recipes uuid generation and saving missing new fields.
Michiel Broek <mbroek@mbse.eu>
parents:
159
diff
changeset
|
1525 | { name: 'locked', type: 'bool' }, |
68 | 1526 | { name: 'st_name', type: 'string' }, |
1527 | { name: 'st_letter', type: 'string' }, | |
1528 | { name: 'st_guide', type: 'string' }, | |
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:
175
diff
changeset
|
1529 | { name: 'st_type', type: 'int' }, |
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
|
1530 | { name: 'st_category', type: 'string' }, |
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
|
1531 | { name: 'st_category_number', type: 'float' }, |
68 | 1532 | { name: 'st_og_min', type: 'float' }, |
1533 | { name: 'st_og_max', type: 'float' }, | |
1534 | { name: 'st_fg_min', type: 'float' }, | |
1535 | { name: 'st_fg_max', type: 'float' }, | |
1536 | { name: 'st_ibu_min', type: 'float' }, | |
1537 | { name: 'st_ibu_max', type: 'float' }, | |
1538 | { name: 'st_color_min', type: 'float' }, | |
1539 | { name: 'st_color_max', type: 'float' }, | |
1540 | { name: 'st_carb_min', type: 'float' }, | |
1541 | { name: 'st_carb_max', type: 'float' }, | |
1542 | { name: 'st_abv_min', type: 'float' }, | |
1543 | { name: 'st_abv_max', type: 'float' }, | |
1544 | { name: 'name', type: 'string' }, | |
1545 | { name: 'notes', type: 'string' }, | |
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:
175
diff
changeset
|
1546 | { name: 'type', type: 'int' }, |
68 | 1547 | { name: 'batch_size', type: 'float' }, |
95 | 1548 | { name: 'boil_size', type: 'float' }, |
68 | 1549 | { name: 'boil_time', type: 'float' }, |
1550 | { name: 'efficiency', type: 'float' }, | |
1551 | { name: 'est_og', type: 'float' }, | |
1552 | { name: 'est_fg', type: 'float' }, | |
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
|
1553 | { name: 'est_abv', type: 'float' }, |
68 | 1554 | { name: 'est_color', type: 'float' }, |
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:
175
diff
changeset
|
1555 | { name: 'color_method', type: 'int' }, |
68 | 1556 | { name: 'est_ibu', type: 'float' }, |
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:
175
diff
changeset
|
1557 | { name: 'ibu_method', type: 'int' }, |
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
|
1558 | { name: 'est_carb', type: 'float' }, |
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:
146
diff
changeset
|
1559 | { name: 'sparge_temp', type: 'float' }, |
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:
146
diff
changeset
|
1560 | { name: 'sparge_ph', type: 'float' }, |
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:
146
diff
changeset
|
1561 | { name: 'sparge_volume', type: 'float' }, |
230
8edca0488e65
Finished the water treatment in the recipes editor. It seems that the recipes editor is ready.
Michiel Broek <mbroek@mbse.eu>
parents:
229
diff
changeset
|
1562 | { name: 'sparge_source', type: 'int' }, |
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:
175
diff
changeset
|
1563 | { name: 'sparge_acid_type', type: 'int' }, |
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:
146
diff
changeset
|
1564 | { name: 'sparge_acid_perc', type: 'float' }, |
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:
146
diff
changeset
|
1565 | { name: 'sparge_acid_amount', type: 'float' }, |
68 | 1566 | { name: 'mash_ph', type: 'float' }, |
1567 | { name: 'mash_name', type: 'string' }, | |
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:
146
diff
changeset
|
1568 | { name: 'calc_acid', type: 'bool' }, |
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
|
1569 | { name: 'w1_name', type: 'string' }, |
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
|
1570 | { name: 'w1_amount', type: 'float' }, |
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
|
1571 | { name: 'w1_calcium', type: 'float' }, |
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
|
1572 | { name: 'w1_sulfate', type: 'float' }, |
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
|
1573 | { name: 'w1_chloride', type: 'float' }, |
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
|
1574 | { name: 'w1_sodium', type: 'float' }, |
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
|
1575 | { name: 'w1_magnesium', type: 'float' }, |
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
|
1576 | { name: 'w1_total_alkalinity', type: 'float' }, |
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
|
1577 | { name: 'w1_ph', type: 'float' }, |
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
|
1578 | { name: 'w1_cost', type: 'float' }, |
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
|
1579 | { name: 'w2_name', type: 'string' }, |
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
|
1580 | { name: 'w2_amount', type: 'float' }, |
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
|
1581 | { name: 'w2_calcium', type: 'float' }, |
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
|
1582 | { name: 'w2_sulfate', type: 'float' }, |
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
|
1583 | { name: 'w2_chloride', type: 'float' }, |
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
|
1584 | { name: 'w2_sodium', type: 'float' }, |
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
|
1585 | { name: 'w2_magnesium', type: 'float' }, |
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
|
1586 | { name: 'w2_total_alkalinity', type: 'float' }, |
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
|
1587 | { name: 'w2_ph', type: 'float' }, |
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
|
1588 | { name: 'w2_cost', type: 'float' }, |
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:
175
diff
changeset
|
1589 | { name: 'wa_acid_name', type: 'int' }, |
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:
175
diff
changeset
|
1590 | { name: 'wa_acid_perc', type: 'int' }, |
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:
175
diff
changeset
|
1591 | { name: 'wa_base_name', type: 'int' }, |
96
107c12c3e49d
Renamed estimate_og() to estimate_sg() formula. Updated the formulas in javascript. The calcFermenter() function now only calculates the gravities. The colors still need to be added. When a recept is loaded in the editor, all tabs are selected once to load all subgrid data. Ugly and slow but it at least it works.
Michiel Broek <mbroek@mbse.eu>
parents:
95
diff
changeset
|
1592 | { name: 'fermentables', type: 'array' }, |
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:
175
diff
changeset
|
1593 | { name: 'hops', type: 'array' }, |
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:
175
diff
changeset
|
1594 | { name: 'miscs', type: 'array' }, |
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:
175
diff
changeset
|
1595 | { name: 'yeasts', type: 'array' }, |
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:
175
diff
changeset
|
1596 | { name: 'mashs', type: 'array' } |
68 | 1597 | ], |
1598 | id: 'record', | |
130
601920b902e5
Load a single recipe from the database instead of client side select.
Michiel Broek <mbroek@mbse.eu>
parents:
129
diff
changeset
|
1599 | url: url + '?record=' + my_record |
68 | 1600 | }; |
1601 | // Load data and select one record. | |
1602 | var dataAdapter = new $.jqx.dataAdapter(source, { | |
1603 | loadComplete: function () { | |
1604 | var records = dataAdapter.records; | |
1605 | dataRecord = records[0]; | |
166
635033a29c48
Fixed new recipes uuid generation and saving missing new fields.
Michiel Broek <mbroek@mbse.eu>
parents:
159
diff
changeset
|
1606 | // Hidden record uuid |
68 | 1607 | $("#name").val(dataRecord.name); |
1608 | $("#notes").val(dataRecord.notes); | |
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
|
1609 | $("#locked").val(dataRecord.locked); |
68 | 1610 | $("#st_name").val(dataRecord.st_name); |
1611 | $("#st_letter").val(dataRecord.st_letter); | |
1612 | $("#st_guide").val(dataRecord.st_guide); | |
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
|
1613 | $("#st_category").val(dataRecord.st_category); |
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
|
1614 | $("#st_category_number").val(dataRecord.st_category_number); |
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:
175
diff
changeset
|
1615 | $("#st_type").val(StyleTypeData[dataRecord.st_type].nl); |
68 | 1616 | $("#type").val(dataRecord.type); |
1617 | $("#batch_size").val(dataRecord.batch_size); | |
95 | 1618 | $("#boil_size").val(dataRecord.boil_size); |
68 | 1619 | $("#boil_time").val(dataRecord.boil_time); |
1620 | $("#efficiency").val(dataRecord.efficiency); | |
1621 | $("#est_og").val(dataRecord.est_og); | |
139
eb1ac7487710
Added EBC color examples. Added simple progessbars for hop flavour and aroma contribution. We need something better. In the fermentables tab, above the grid display the malt color and OG estimates. Display supplier as well in the fermentables grid.
Michiel Broek <mbroek@mbse.eu>
parents:
138
diff
changeset
|
1622 | $("#est_og2").val(dataRecord.est_og); |
68 | 1623 | $("#st_og_min").val(dataRecord.st_og_min); |
1624 | $("#st_og_max").val(dataRecord.st_og_max); | |
1625 | $("#est_fg").val(dataRecord.est_fg); | |
227
fd6d87d1c9ed
Recalculate FG, SVG and ABV when changing the primary yeast.
Michiel Broek <mbroek@mbse.eu>
parents:
226
diff
changeset
|
1626 | $("#est_fg2").val(dataRecord.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
|
1627 | $("#st_fg_min").val(dataRecord.st_fg_min); |
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
|
1628 | $("#st_fg_max").val(dataRecord.st_fg_max); |
68 | 1629 | $("#est_color").val(dataRecord.est_color); |
139
eb1ac7487710
Added EBC color examples. Added simple progessbars for hop flavour and aroma contribution. We need something better. In the fermentables tab, above the grid display the malt color and OG estimates. Display supplier as well in the fermentables grid.
Michiel Broek <mbroek@mbse.eu>
parents:
138
diff
changeset
|
1630 | $("#est_color2").val(dataRecord.est_color); |
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
|
1631 | $("#est_abv").val(dataRecord.est_abv); |
227
fd6d87d1c9ed
Recalculate FG, SVG and ABV when changing the primary yeast.
Michiel Broek <mbroek@mbse.eu>
parents:
226
diff
changeset
|
1632 | $("#est_abv2").val(dataRecord.est_abv); |
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
|
1633 | $("#st_abv_min").val(dataRecord.st_abv_min); |
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
|
1634 | $("#st_abv_max").val(dataRecord.st_abv_max); |
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
|
1635 | $("#st_color_min").val(dataRecord.st_color_min); |
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
|
1636 | $("#st_color_max").val(dataRecord.st_color_max); |
68 | 1637 | $("#color_method").val(dataRecord.color_method); |
1638 | $("#est_ibu").val(dataRecord.est_ibu); | |
138
59874681fc13
Hop flavour and aroma sets global values. On the hop tab, show IBU and make room for the flavour and aroma presentation.
Michiel Broek <mbroek@mbse.eu>
parents:
137
diff
changeset
|
1639 | $("#est_ibu2").val(dataRecord.est_ibu); |
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
|
1640 | $("#st_ibu_min").val(dataRecord.st_ibu_min); |
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
|
1641 | $("#st_ibu_max").val(dataRecord.st_ibu_max); |
68 | 1642 | $("#ibu_method").val(dataRecord.ibu_method); |
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
|
1643 | $("#est_carb").val(dataRecord.est_carb); |
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
|
1644 | $("#st_carb_min").val(dataRecord.st_carb_min); |
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
|
1645 | $("#st_carb_max").val(dataRecord.st_carb_max); |
68 | 1646 | $("#mash_name").val(dataRecord.mash_name); |
1647 | $("#mash_ph").val(dataRecord.mash_ph); | |
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:
146
diff
changeset
|
1648 | $("#sparge_temp").val(dataRecord.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:
146
diff
changeset
|
1649 | $("#sparge_ph").val(dataRecord.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:
146
diff
changeset
|
1650 | $("#sparge_volume").val(dataRecord.sparge_volume); |
156
35860890224c
Added sparge water acid calculation. Added residual alkalinity calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
155
diff
changeset
|
1651 | $("#sparge_source").val(dataRecord.sparge_source); |
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:
146
diff
changeset
|
1652 | $("#sparge_acid_type").val(dataRecord.sparge_acid_type); |
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:
146
diff
changeset
|
1653 | $("#sparge_acid_perc").val(dataRecord.sparge_acid_perc); |
156
35860890224c
Added sparge water acid calculation. Added residual alkalinity calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
155
diff
changeset
|
1654 | $("#sparge_acid_amount").val(dataRecord.sparge_acid_amount * 1000); |
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:
146
diff
changeset
|
1655 | $("#calc_acid").val(dataRecord.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
|
1656 | $("#w1_name").val(dataRecord.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
|
1657 | $("#w1_amount").val(dataRecord.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
|
1658 | $("#w1_calcium").val(dataRecord.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
|
1659 | $("#w1_sulfate").val(dataRecord.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
|
1660 | $("#w1_chloride").val(dataRecord.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
|
1661 | $("#w1_sodium").val(dataRecord.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
|
1662 | $("#w1_magnesium").val(dataRecord.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
|
1663 | $("#w1_total_alkalinity").val(dataRecord.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
|
1664 | $("#w1_ph").val(dataRecord.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
|
1665 | $("#w1_cost").val(dataRecord.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
|
1666 | $("#w2_name").val(dataRecord.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
|
1667 | $("#w2_amount").val(dataRecord.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
|
1668 | $("#w2_calcium").val(dataRecord.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
|
1669 | $("#w2_sulfate").val(dataRecord.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
|
1670 | $("#w2_chloride").val(dataRecord.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
|
1671 | $("#w2_sodium").val(dataRecord.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
|
1672 | $("#w2_magnesium").val(dataRecord.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
|
1673 | $("#w2_total_alkalinity").val(dataRecord.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
|
1674 | $("#w2_ph").val(dataRecord.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
|
1675 | $("#w2_cost").val(dataRecord.w2_cost); |
220
14e349ff2a10
Recipes import uses indexes instead of strings. Started rebuilding the recipes editor using indexes and standard formats. Rebuild the fermentable editor from grid editing to popup editing. Most calculations are using indexes for dropdown values.
Michiel Broek <mbroek@mbse.eu>
parents:
175
diff
changeset
|
1676 | $("#wa_acid_name").val(dataRecord.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:
175
diff
changeset
|
1677 | $("#wa_acid_perc").val(dataRecord.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:
175
diff
changeset
|
1678 | $("#wa_base_name").val(dataRecord.wa_base_name); |
68 | 1679 | editFermentable(dataRecord); |
1680 | editHop(dataRecord); | |
1681 | editMisc(dataRecord); | |
1682 | editYeast(dataRecord); | |
1683 | editMash(dataRecord); | |
96
107c12c3e49d
Renamed estimate_og() to estimate_sg() formula. Updated the formulas in javascript. The calcFermenter() function now only calculates the gravities. The colors still need to be added. When a recept is loaded in the editor, all tabs are selected once to load all subgrid data. Ugly and slow but it at least it works.
Michiel Broek <mbroek@mbse.eu>
parents:
95
diff
changeset
|
1684 | $('#jqxTabs').jqxTabs('next'); |
68 | 1685 | }, |
1686 | loadError: function (jqXHR, status, error) { | |
1687 | }, | |
1688 | beforeLoadComplete: function (records) { | |
129
7f41b61c3faf
Added a loader during recipe load. Recalculate percentages if a fermentable row is deleted. Don't edit amounts if using weight percentages. Update grid percentages if a fermentable amount is changed. Recalculate IBU's after changes with fermentables.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
1689 | $('#jqxLoader').jqxLoader('open'); |
68 | 1690 | } |
1691 | }); | |
1692 | dataAdapter.dataBind(); | |
1693 | ||
1694 | // Inline fermentables editor | |
1695 | var editFermentable = function (data) { | |
1696 | var fermentableSource = { | |
1697 | localdata: data.fermentables, | |
1698 | datatype: "local", | |
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
|
1699 | cache: false, |
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
|
1700 | async: false, |
68 | 1701 | datafields: [ |
1702 | { name: 'f_name', type: 'string' }, | |
1703 | { name: 'f_origin', type: 'string' }, | |
1704 | { name: 'f_supplier', type: 'string' }, | |
1705 | { name: 'f_amount', type: 'float' }, | |
1706 | { name: 'f_cost', type: 'float' }, | |
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:
175
diff
changeset
|
1707 | { name: 'f_type', type: 'int' }, |
68 | 1708 | { name: 'f_yield', type: 'float' }, |
1709 | { name: 'f_color', type: 'float' }, | |
1710 | { name: 'f_coarse_fine_diff', type: 'float' }, | |
1711 | { name: 'f_moisture', type: 'float' }, | |
1712 | { name: 'f_diastatic_power', type: 'float' }, | |
1713 | { name: 'f_protein', type: 'float' }, | |
1714 | { name: 'f_max_in_batch', type: 'float' }, | |
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:
175
diff
changeset
|
1715 | { name: 'f_graintype', type: 'int' }, |
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:
175
diff
changeset
|
1716 | { name: 'f_added', type: 'int' }, |
68 | 1717 | { name: 'f_dissolved_protein', type: 'float' }, |
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:
175
diff
changeset
|
1718 | { name: 'f_recommend_mash', type: 'int' }, |
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:
175
diff
changeset
|
1719 | { name: 'f_add_after_boil', type: 'int' }, |
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:
175
diff
changeset
|
1720 | { name: 'f_adjust_to_total_100', type: 'int' }, |
68 | 1721 | { name: 'f_percentage', type: 'float' }, |
154
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
1722 | { name: 'f_di_ph', type: 'float' }, |
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:
175
diff
changeset
|
1723 | { name: 'f_acid_to_ph_57', type: 'float' }, |
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
|
1724 | { name: 'f_inventory', type: 'float' }, |
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
|
1725 | { name: 'f_avail', type: 'int' } |
68 | 1726 | ], |
1727 | addrow: function (rowid, rowdata, position, commit) { | |
1728 | commit(true); | |
1729 | }, | |
1730 | deleterow: function (rowid, commit) { | |
1731 | commit(true); | |
1732 | } | |
1733 | }; | |
1734 | var fermentableAdapter = new $.jqx.dataAdapter(fermentableSource); | |
1735 | $("#fermentableGrid").jqxGrid({ | |
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:
175
diff
changeset
|
1736 | width: 1240, |
286
124af734af68
Version 0.1.0. Removed localization because it was messy, parts were localized and others not. In production and recipes ingredients not in stock are marked in red.
Michiel Broek <mbroek@mbse.eu>
parents:
283
diff
changeset
|
1737 | height: 500, |
68 | 1738 | source: fermentableAdapter, |
1739 | theme: theme, | |
1740 | selectionmode: 'singlerow', | |
1741 | showtoolbar: true, | |
1742 | rendertoolbar: function (toolbar) { | |
1743 | var me = this; | |
1744 | var container = $("<div style='overflow: hidden; position: relative; margin: 5px;'></div>"); | |
1745 | toolbar.append(container); | |
1746 | container.append('<div style="float: left; margin-left: 165px;" id="faddrowbutton"></div>'); | |
146
2a6c00d325b2
In dropdown inventory lists you can now choose to display only ingredients that rae on stock or all. Fix the hops amount editor that loses the decimal digits.
Michiel Broek <mbroek@mbse.eu>
parents:
145
diff
changeset
|
1747 | container.append('<div style="float: left; margin-left: 10px; margin-top: 5px;">In voorraad:</div>'); |
2a6c00d325b2
In dropdown inventory lists you can now choose to display only ingredients that rae on stock or all. Fix the hops amount editor that loses the decimal digits.
Michiel Broek <mbroek@mbse.eu>
parents:
145
diff
changeset
|
1748 | container.append('<div style="float: left; margin-left: 10px;" id="finstockbutton"></div>'); |
2a6c00d325b2
In dropdown inventory lists you can now choose to display only ingredients that rae on stock or all. Fix the hops amount editor that loses the decimal digits.
Michiel Broek <mbroek@mbse.eu>
parents:
145
diff
changeset
|
1749 | container.append('<input style="float: left; margin-left: 400px;" id="fdeleterowbutton" type="button" value="Verwijder mout" />'); |
68 | 1750 | // add fermentable from dropdownlist. |
1751 | $("#faddrowbutton").jqxDropDownList({ | |
1752 | placeHolder: "Kies mout:", | |
1753 | theme: theme, | |
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
|
1754 | template: "primary", |
68 | 1755 | source: fermentablelist, |
1756 | displayMember: "name", | |
1757 | width: 150, | |
1758 | height: 27, | |
1759 | dropDownWidth: 500, | |
1760 | dropDownHeight: 500, | |
1761 | renderer: function (index, label, value) { | |
1762 | var datarecord = fermentablelist.records[index]; | |
1763 | return datarecord.supplier+ " / " + datarecord.name + " (" + datarecord.color + " EBC)"; | |
1764 | } | |
1765 | }); | |
1766 | $("#faddrowbutton").on('select', function (event) { | |
1767 | if (event.args) { | |
1768 | var rowscount = $("#fermentableGrid").jqxGrid('getdatainformation').rowscount; | |
1769 | var index = event.args.index; | |
1770 | var datarecord = fermentablelist.records[index]; | |
1771 | var row = {}; | |
1772 | row["f_name"] = datarecord.name; | |
1773 | row["f_origin"] = datarecord.origin; | |
1774 | row["f_supplier"] = datarecord.supplier; | |
1775 | row["f_amount"] = 0; | |
1776 | row["f_cost"] = datarecord.cost; | |
1777 | row["f_type"] = datarecord.type; | |
1778 | row["f_yield"] = datarecord.yield; | |
1779 | row["f_color"] = datarecord.color; | |
1780 | row["f_coarse_fine_diff"] = datarecord.coarse_fine_diff; | |
1781 | row["f_moisture"] = datarecord.moisture; | |
1782 | row["f_diastatic_power"] = datarecord.diastatic_power; | |
1783 | row["f_protein"] = datarecord.protein; | |
1784 | row["f_max_in_batch"] = datarecord.max_in_batch; | |
1785 | row["f_graintype"] = datarecord.graintype; | |
73
454fc4558609
Added style selector in recipe editer. Better formatting of cellsrenderer fields. Added When field to the fermentables list. Attempts to calculate the fermentables.
Michiel Broek <mbroek@mbse.eu>
parents:
72
diff
changeset
|
1786 | if (datarecord.add_after_boil) { |
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:
175
diff
changeset
|
1787 | row["f_added"] = 2; // Fermentation |
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:
175
diff
changeset
|
1788 | } else if ((datarecord.type == 1) || (datarecord.type == 4)) { // Sugar or Adjunct |
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:
175
diff
changeset
|
1789 | row["f_added"] = 1; // Boil |
68 | 1790 | } else { |
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:
175
diff
changeset
|
1791 | row["f_added"] = 0; // Mash |
68 | 1792 | } |
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:
175
diff
changeset
|
1793 | row["f_dissolved_protein"] = datarecord.dissolved_protein; |
68 | 1794 | row["f_recommend_mash"] = datarecord.recommend_mash; |
1795 | row["f_add_after_boil"] = datarecord.add_after_boil; | |
1796 | if (rowscount == 0) { | |
1797 | // The first fermentable | |
1798 | row["f_adjust_to_total_100"] = 1; | |
1799 | row["f_percentage"] = 100; | |
1800 | } else { | |
1801 | row["f_adjust_to_total_100"] = 0; | |
1802 | row["f_percentage"] = 0; | |
1803 | } | |
1804 | row["f_di_ph"] = datarecord.di_ph; | |
154
ef298b5aa994
Added f_acid_to_ph_57 to the fermentables json in the recipes. The protonDeficit now processes the grist. Water pH calculations are partly in place. Added simple BU and Cl/So4 indicators. Redesign of the water screen.
Michiel Broek <mbroek@mbse.eu>
parents:
150
diff
changeset
|
1805 | row["f_acid_to_ph_57"] = datarecord.acid_to_ph_57; |
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
|
1806 | row["f_inventory"] = datarecord.inventory; |
68 | 1807 | var commit = $("#fermentableGrid").jqxGrid('addrow', null, row); |
1808 | } | |
1809 | }); | |
1810 | ||
146
2a6c00d325b2
In dropdown inventory lists you can now choose to display only ingredients that rae on stock or all. Fix the hops amount editor that loses the decimal digits.
Michiel Broek <mbroek@mbse.eu>
parents:
145
diff
changeset
|
1811 | $("#finstockbutton").jqxCheckBox({ theme: theme, height: 27 }); |
2a6c00d325b2
In dropdown inventory lists you can now choose to display only ingredients that rae on stock or all. Fix the hops amount editor that loses the decimal digits.
Michiel Broek <mbroek@mbse.eu>
parents:
145
diff
changeset
|
1812 | $("#finstockbutton").on('change', function (event) { |
2a6c00d325b2
In dropdown inventory lists you can now choose to display only ingredients that rae on stock or all. Fix the hops amount editor that loses the decimal digits.
Michiel Broek <mbroek@mbse.eu>
parents:
145
diff
changeset
|
1813 | fermentableinstock = event.args.checked; |
2a6c00d325b2
In dropdown inventory lists you can now choose to display only ingredients that rae on stock or all. Fix the hops amount editor that loses the decimal digits.
Michiel Broek <mbroek@mbse.eu>
parents:
145
diff
changeset
|
1814 | fermentablelist.dataBind(); |
2a6c00d325b2
In dropdown inventory lists you can now choose to display only ingredients that rae on stock or all. Fix the hops amount editor that loses the decimal digits.
Michiel Broek <mbroek@mbse.eu>
parents:
145
diff
changeset
|
1815 | }); |
2a6c00d325b2
In dropdown inventory lists you can now choose to display only ingredients that rae on stock or all. Fix the hops amount editor that loses the decimal digits.
Michiel Broek <mbroek@mbse.eu>
parents:
145
diff
changeset
|
1816 | |
68 | 1817 | // delete selected fermentable. |
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
|
1818 | $("#fdeleterowbutton").jqxButton({ template: "danger", theme: theme, height: 27, width: 150 }); |
68 | 1819 | $("#fdeleterowbutton").on('click', function () { |
1820 | var selectedrowindex = $("#fermentableGrid").jqxGrid('getselectedrowindex'); | |
1821 | var rowscount = $("#fermentableGrid").jqxGrid('getdatainformation').rowscount; | |
1822 | if (selectedrowindex >= 0 && selectedrowindex < rowscount) { | |
1823 | var id = $("#fermentableGrid").jqxGrid('getrowid', selectedrowindex); | |
129
7f41b61c3faf
Added a loader during recipe load. Recalculate percentages if a fermentable row is deleted. Don't edit amounts if using weight percentages. Update grid percentages if a fermentable amount is changed. Recalculate IBU's after changes with fermentables.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
1824 | var percent = $('#fermentableGrid').jqxGrid('getcellvalue', id, "f_percentage"); |
7f41b61c3faf
Added a loader during recipe load. Recalculate percentages if a fermentable row is deleted. Don't edit amounts if using weight percentages. Update grid percentages if a fermentable amount is changed. Recalculate IBU's after changes with fermentables.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
1825 | var amount = $('#fermentableGrid').jqxGrid('getcellvalue', id, "f_amount"); |
68 | 1826 | var commit = $("#fermentableGrid").jqxGrid('deleterow', id); |
1827 | } | |
129
7f41b61c3faf
Added a loader during recipe load. Recalculate percentages if a fermentable row is deleted. Don't edit amounts if using weight percentages. Update grid percentages if a fermentable amount is changed. Recalculate IBU's after changes with fermentables.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
1828 | rowscount = $("#fermentableGrid").jqxGrid('getdatainformation').rowscount; |
7f41b61c3faf
Added a loader during recipe load. Recalculate percentages if a fermentable row is deleted. Don't edit amounts if using weight percentages. Update grid percentages if a fermentable amount is changed. Recalculate IBU's after changes with fermentables.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
1829 | if (rowscount > 1) { |
7f41b61c3faf
Added a loader during recipe load. Recalculate percentages if a fermentable row is deleted. Don't edit amounts if using weight percentages. Update grid percentages if a fermentable amount is changed. Recalculate IBU's after changes with fermentables.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
1830 | if (to_100) { |
7f41b61c3faf
Added a loader during recipe load. Recalculate percentages if a fermentable row is deleted. Don't edit amounts if using weight percentages. Update grid percentages if a fermentable amount is changed. Recalculate IBU's after changes with fermentables.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
1831 | for (var i = 0; i < rowscount; i++) { |
7f41b61c3faf
Added a loader during recipe load. Recalculate percentages if a fermentable row is deleted. Don't edit amounts if using weight percentages. Update grid percentages if a fermentable amount is changed. Recalculate IBU's after changes with fermentables.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
1832 | var rowdata = $("#fermentableGrid").jqxGrid('getrowdata', i); |
7f41b61c3faf
Added a loader during recipe load. Recalculate percentages if a fermentable row is deleted. Don't edit amounts if using weight percentages. Update grid percentages if a fermentable amount is changed. Recalculate IBU's after changes with fermentables.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
1833 | if (rowdata.f_adjust_to_total_100) { |
7f41b61c3faf
Added a loader during recipe load. Recalculate percentages if a fermentable row is deleted. Don't edit amounts if using weight percentages. Update grid percentages if a fermentable amount is changed. Recalculate IBU's after changes with fermentables.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
1834 | rowdata.f_percentage += percent; |
7f41b61c3faf
Added a loader during recipe load. Recalculate percentages if a fermentable row is deleted. Don't edit amounts if using weight percentages. Update grid percentages if a fermentable amount is changed. Recalculate IBU's after changes with fermentables.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
1835 | rowdata.f_amount += amount; |
7f41b61c3faf
Added a loader during recipe load. Recalculate percentages if a fermentable row is deleted. Don't edit amounts if using weight percentages. Update grid percentages if a fermentable amount is changed. Recalculate IBU's after changes with fermentables.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
1836 | } |
7f41b61c3faf
Added a loader during recipe load. Recalculate percentages if a fermentable row is deleted. Don't edit amounts if using weight percentages. Update grid percentages if a fermentable amount is changed. Recalculate IBU's after changes with fermentables.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
1837 | } |
7f41b61c3faf
Added a loader during recipe load. Recalculate percentages if a fermentable row is deleted. Don't edit amounts if using weight percentages. Update grid percentages if a fermentable amount is changed. Recalculate IBU's after changes with fermentables.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
1838 | } else { |
7f41b61c3faf
Added a loader during recipe load. Recalculate percentages if a fermentable row is deleted. Don't edit amounts if using weight percentages. Update grid percentages if a fermentable amount is changed. Recalculate IBU's after changes with fermentables.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
1839 | var tw = 0; |
7f41b61c3faf
Added a loader during recipe load. Recalculate percentages if a fermentable row is deleted. Don't edit amounts if using weight percentages. Update grid percentages if a fermentable amount is changed. Recalculate IBU's after changes with fermentables.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
1840 | for (i = 0; i < rowscount; i++) { |
7f41b61c3faf
Added a loader during recipe load. Recalculate percentages if a fermentable row is deleted. Don't edit amounts if using weight percentages. Update grid percentages if a fermentable amount is changed. Recalculate IBU's after changes with fermentables.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
1841 | var rowdata = $("#fermentableGrid").jqxGrid('getrowdata', i); |
7f41b61c3faf
Added a loader during recipe load. Recalculate percentages if a fermentable row is deleted. Don't edit amounts if using weight percentages. Update grid percentages if a fermentable amount is changed. Recalculate IBU's after changes with fermentables.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
1842 | tw += rowdata.f_amount; |
7f41b61c3faf
Added a loader during recipe load. Recalculate percentages if a fermentable row is deleted. Don't edit amounts if using weight percentages. Update grid percentages if a fermentable amount is changed. Recalculate IBU's after changes with fermentables.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
1843 | }; |
7f41b61c3faf
Added a loader during recipe load. Recalculate percentages if a fermentable row is deleted. Don't edit amounts if using weight percentages. Update grid percentages if a fermentable amount is changed. Recalculate IBU's after changes with fermentables.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
1844 | for (i = 0; i < rowscount; i++) { |
7f41b61c3faf
Added a loader during recipe load. Recalculate percentages if a fermentable row is deleted. Don't edit amounts if using weight percentages. Update grid percentages if a fermentable amount is changed. Recalculate IBU's after changes with fermentables.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
1845 | var rowdata = $("#fermentableGrid").jqxGrid('getrowdata', i); |
7f41b61c3faf
Added a loader during recipe load. Recalculate percentages if a fermentable row is deleted. Don't edit amounts if using weight percentages. Update grid percentages if a fermentable amount is changed. Recalculate IBU's after changes with fermentables.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
1846 | var percentage = Math.round(rowdata.f_amount / tw * 1000) / 10.0; |
7f41b61c3faf
Added a loader during recipe load. Recalculate percentages if a fermentable row is deleted. Don't edit amounts if using weight percentages. Update grid percentages if a fermentable amount is changed. Recalculate IBU's after changes with fermentables.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
1847 | $("#fermentableGrid").jqxGrid('setcellvalue', i, "f_percentage", percentage); |
7f41b61c3faf
Added a loader during recipe load. Recalculate percentages if a fermentable row is deleted. Don't edit amounts if using weight percentages. Update grid percentages if a fermentable amount is changed. Recalculate IBU's after changes with fermentables.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
1848 | }; |
7f41b61c3faf
Added a loader during recipe load. Recalculate percentages if a fermentable row is deleted. Don't edit amounts if using weight percentages. Update grid percentages if a fermentable amount is changed. Recalculate IBU's after changes with fermentables.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
1849 | } |
7f41b61c3faf
Added a loader during recipe load. Recalculate percentages if a fermentable row is deleted. Don't edit amounts if using weight percentages. Update grid percentages if a fermentable amount is changed. Recalculate IBU's after changes with fermentables.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
1850 | } else { |
7f41b61c3faf
Added a loader during recipe load. Recalculate percentages if a fermentable row is deleted. Don't edit amounts if using weight percentages. Update grid percentages if a fermentable amount is changed. Recalculate IBU's after changes with fermentables.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
1851 | $("#fermentableGrid").jqxGrid('setcellvalue', 0, "f_percentage", 100); |
7f41b61c3faf
Added a loader during recipe load. Recalculate percentages if a fermentable row is deleted. Don't edit amounts if using weight percentages. Update grid percentages if a fermentable amount is changed. Recalculate IBU's after changes with fermentables.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
1852 | } |
7f41b61c3faf
Added a loader during recipe load. Recalculate percentages if a fermentable row is deleted. Don't edit amounts if using weight percentages. Update grid percentages if a fermentable amount is changed. Recalculate IBU's after changes with fermentables.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
1853 | calcFermentables(); |
7f41b61c3faf
Added a loader during recipe load. Recalculate percentages if a fermentable row is deleted. Don't edit amounts if using weight percentages. Update grid percentages if a fermentable amount is changed. Recalculate IBU's after changes with fermentables.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
1854 | calcIBUs(); |
68 | 1855 | }); |
1856 | }, | |
96
107c12c3e49d
Renamed estimate_og() to estimate_sg() formula. Updated the formulas in javascript. The calcFermenter() function now only calculates the gravities. The colors still need to be added. When a recept is loaded in the editor, all tabs are selected once to load all subgrid data. Ugly and slow but it at least it works.
Michiel Broek <mbroek@mbse.eu>
parents:
95
diff
changeset
|
1857 | ready: function() { |
107c12c3e49d
Renamed estimate_og() to estimate_sg() formula. Updated the formulas in javascript. The calcFermenter() function now only calculates the gravities. The colors still need to be added. When a recept is loaded in the editor, all tabs are selected once to load all subgrid data. Ugly and slow but it at least it works.
Michiel Broek <mbroek@mbse.eu>
parents:
95
diff
changeset
|
1858 | calcFermentables(); |
107c12c3e49d
Renamed estimate_og() to estimate_sg() formula. Updated the formulas in javascript. The calcFermenter() function now only calculates the gravities. The colors still need to be added. When a recept is loaded in the editor, all tabs are selected once to load all subgrid data. Ugly and slow but it at least it works.
Michiel Broek <mbroek@mbse.eu>
parents:
95
diff
changeset
|
1859 | $('#jqxTabs').jqxTabs('next'); |
107c12c3e49d
Renamed estimate_og() to estimate_sg() formula. Updated the formulas in javascript. The calcFermenter() function now only calculates the gravities. The colors still need to be added. When a recept is loaded in the editor, all tabs are selected once to load all subgrid data. Ugly and slow but it at least it works.
Michiel Broek <mbroek@mbse.eu>
parents:
95
diff
changeset
|
1860 | }, |
68 | 1861 | columns: [ |
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:
175
diff
changeset
|
1862 | { text: 'Vergistbaar ingrediënt', datafield: 'f_name', |
286
124af734af68
Version 0.1.0. Removed localization because it was messy, parts were localized and others not. In production and recipes ingredients not in stock are marked in red.
Michiel Broek <mbroek@mbse.eu>
parents:
283
diff
changeset
|
1863 | cellsrenderer: function (index, datafield, value, defaulvalue, column, rowdata) { |
124af734af68
Version 0.1.0. Removed localization because it was messy, parts were localized and others not. In production and recipes ingredients not in stock are marked in red.
Michiel Broek <mbroek@mbse.eu>
parents:
283
diff
changeset
|
1864 | return "<span style='margin: 3px; margin-top: 6px; float: left;'>" + |
124af734af68
Version 0.1.0. Removed localization because it was messy, parts were localized and others not. In production and recipes ingredients not in stock are marked in red.
Michiel Broek <mbroek@mbse.eu>
parents:
283
diff
changeset
|
1865 | rowdata.f_supplier+" / "+rowdata.f_name+" ("+rowdata.f_color+" EBC)</span>"; |
68 | 1866 | } |
1867 | }, | |
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:
175
diff
changeset
|
1868 | { text: 'Type', width: 100, datafield: '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:
175
diff
changeset
|
1869 | cellsrenderer: function (index, datafield, value, defaultvalue, column, rowdata) { |
286
124af734af68
Version 0.1.0. Removed localization because it was messy, parts were localized and others not. In production and recipes ingredients not in stock are marked in red.
Michiel Broek <mbroek@mbse.eu>
parents:
283
diff
changeset
|
1870 | return "<span style='margin: 3px; margin-top: 6px; float: left;'>" + FermentableTypeData[value].nl + "</span>"; |
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:
175
diff
changeset
|
1871 | } |
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:
175
diff
changeset
|
1872 | }, |
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:
175
diff
changeset
|
1873 | { text: 'Moment', width: 110, datafield: '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:
175
diff
changeset
|
1874 | cellsrenderer: function (index, datafield, value, defaultvalue, column, rowdata) { |
286
124af734af68
Version 0.1.0. Removed localization because it was messy, parts were localized and others not. In production and recipes ingredients not in stock are marked in red.
Michiel Broek <mbroek@mbse.eu>
parents:
283
diff
changeset
|
1875 | return "<span style='margin: 3px; margin-top: 6px; float: left;'>" + AddedData[value].nl + "</span>"; |
127
6d5e215d77d2
Added fermentables Moment dropdown list. Added fermentables adjust to 100% logic.
Michiel Broek <mbroek@mbse.eu>
parents:
126
diff
changeset
|
1876 | } |
6d5e215d77d2
Added fermentables Moment dropdown list. Added fermentables adjust to 100% logic.
Michiel Broek <mbroek@mbse.eu>
parents:
126
diff
changeset
|
1877 | }, |
128
4d188d216c88
Layout changes in fermentables editor.
Michiel Broek <mbroek@mbse.eu>
parents:
127
diff
changeset
|
1878 | { text: 'Opbrengst', editable: false, datafield: 'f_yield', width: 90, align: 'right', cellsalign: 'right', cellsformat: 'p1' }, |
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:
175
diff
changeset
|
1879 | { text: 'Gewicht Kg', datafield: 'f_amount', width: 120, align: 'right', cellsalign: 'right', cellsformat: 'f3' }, |
286
124af734af68
Version 0.1.0. Removed localization because it was messy, parts were localized and others not. In production and recipes ingredients not in stock are marked in red.
Michiel Broek <mbroek@mbse.eu>
parents:
283
diff
changeset
|
1880 | { text: 'Voorr. Kg', datafield: 'f_inventory', width: 120, align: 'right', |
124af734af68
Version 0.1.0. Removed localization because it was messy, parts were localized and others not. In production and recipes ingredients not in stock are marked in red.
Michiel Broek <mbroek@mbse.eu>
parents:
283
diff
changeset
|
1881 | cellsrenderer: function (row, columnfield, value, defaulthtml, columnproperties, rowdata) { |
124af734af68
Version 0.1.0. Removed localization because it was messy, parts were localized and others not. In production and recipes ingredients not in stock are marked in red.
Michiel Broek <mbroek@mbse.eu>
parents:
283
diff
changeset
|
1882 | var color = '#ffffff'; |
124af734af68
Version 0.1.0. Removed localization because it was messy, parts were localized and others not. In production and recipes ingredients not in stock are marked in red.
Michiel Broek <mbroek@mbse.eu>
parents:
283
diff
changeset
|
1883 | if (value < rowdata.f_amount) |
124af734af68
Version 0.1.0. Removed localization because it was messy, parts were localized and others not. In production and recipes ingredients not in stock are marked in red.
Michiel Broek <mbroek@mbse.eu>
parents:
283
diff
changeset
|
1884 | color = '#ff4040'; |
124af734af68
Version 0.1.0. Removed localization because it was messy, parts were localized and others not. In production and recipes ingredients not in stock are marked in red.
Michiel Broek <mbroek@mbse.eu>
parents:
283
diff
changeset
|
1885 | return '<span style="margin: 4px; margin-top: 6px; float: right; color: ' + |
124af734af68
Version 0.1.0. Removed localization because it was messy, parts were localized and others not. In production and recipes ingredients not in stock are marked in red.
Michiel Broek <mbroek@mbse.eu>
parents:
283
diff
changeset
|
1886 | color + ';">' +fermentableAdapter.formatNumber(value, "f3") + '</span>'; |
124af734af68
Version 0.1.0. Removed localization because it was messy, parts were localized and others not. In production and recipes ingredients not in stock are marked in red.
Michiel Broek <mbroek@mbse.eu>
parents:
283
diff
changeset
|
1887 | } |
124af734af68
Version 0.1.0. Removed localization because it was messy, parts were localized and others not. In production and recipes ingredients not in stock are marked in red.
Michiel Broek <mbroek@mbse.eu>
parents:
283
diff
changeset
|
1888 | }, |
124af734af68
Version 0.1.0. Removed localization because it was messy, parts were localized and others not. In production and recipes ingredients not in stock are marked in red.
Michiel Broek <mbroek@mbse.eu>
parents:
283
diff
changeset
|
1889 | { text: 'Procent', datafield: 'f_percentage', width: 90, align: 'right', cellsalign: 'right', cellsformat: 'p1' }, |
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:
175
diff
changeset
|
1890 | { text: '100%', align: 'center', datafield: 'f_adjust_to_total_100', columntype: 'checkbox', width: 70 }, |
286
124af734af68
Version 0.1.0. Removed localization because it was messy, parts were localized and others not. In production and recipes ingredients not in stock are marked in red.
Michiel Broek <mbroek@mbse.eu>
parents:
283
diff
changeset
|
1891 | { text: '', datafield: 'Edit', columntype: 'button', width: 100, align: 'center', cellsrenderer: function () { |
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:
175
diff
changeset
|
1892 | return "Wijzig"; |
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:
175
diff
changeset
|
1893 | }, buttonclick: function (row) { |
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:
175
diff
changeset
|
1894 | fermentableRow = row; |
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:
175
diff
changeset
|
1895 | fermentableData = $("#fermentableGrid").jqxGrid('getrowdata', fermentableRow); |
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:
175
diff
changeset
|
1896 | $("#wf_name").val(fermentableData.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:
175
diff
changeset
|
1897 | $("#wf_amount").val(fermentableData.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:
175
diff
changeset
|
1898 | $("#wf_percentage").val(fermentableData.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:
175
diff
changeset
|
1899 | $("#wf_adjust_to_total_100").val(fermentableData.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:
175
diff
changeset
|
1900 | $("#wf_added").val(fermentableData.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:
175
diff
changeset
|
1901 | // show the popup window. |
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:
175
diff
changeset
|
1902 | $("#popupFermentable").jqxWindow('open'); |
68 | 1903 | } |
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:
175
diff
changeset
|
1904 | } |
68 | 1905 | ] |
1906 | }); | |
1907 | }; | |
1908 | ||
1909 | // Inline hops editor | |
1910 | var editHop = function (data) { | |
1911 | var hopSource = { | |
1912 | localdata: data.hops, | |
1913 | datatype: "local", | |
1914 | cache: false, | |
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
|
1915 | async: false, |
68 | 1916 | datafields: [ |
1917 | { name: 'h_name', type: 'string' }, | |
1918 | { name: 'h_origin', type: 'string' }, | |
1919 | { name: 'h_amount', type: 'float' }, | |
1920 | { name: 'h_cost', type: 'float' }, | |
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:
175
diff
changeset
|
1921 | { name: 'h_type', type: 'int' }, |
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:
175
diff
changeset
|
1922 | { name: 'h_form', type: 'int' }, |
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:
175
diff
changeset
|
1923 | { name: 'h_useat', type: 'int' }, |
68 | 1924 | { name: 'h_time', type: 'float' }, |
1925 | { name: 'h_alpha', type: 'float' }, | |
1926 | { name: 'h_beta', type: 'float' }, | |
1927 | { name: 'h_hsi', type: 'float' }, | |
1928 | { name: 'h_humulene', type: 'float' }, | |
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:
221
diff
changeset
|
1929 | { name: 'h_caryophyllene', type: 'float' }, |
68 | 1930 | { name: 'h_cohumulone', type: 'float' }, |
1931 | { name: 'h_myrcene', type: 'float' }, | |
142
793af7691a5e
During hops load an extra weight in grams field is generated for the grid. Edit the amount is done on the weight field and the amount field is updated too. During save to the database the extra field is removed.
Michiel Broek <mbroek@mbse.eu>
parents:
141
diff
changeset
|
1932 | { name: 'h_total_oil', type: 'float' }, |
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:
221
diff
changeset
|
1933 | { name: 'h_inventory', type: 'float' }, |
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:
221
diff
changeset
|
1934 | { name: 'h_avail', type: 'int' } |
68 | 1935 | ], |
1936 | addrow: function (rowid, rowdata, position, commit) { | |
1937 | commit(true); | |
1938 | }, | |
1939 | deleterow: function (rowid, commit) { | |
1940 | commit(true); | |
1941 | } | |
1942 | }; | |
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:
221
diff
changeset
|
1943 | var hopAdapter = new $.jqx.dataAdapter(hopSource); |
68 | 1944 | $("#hopGrid").jqxGrid({ |
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:
221
diff
changeset
|
1945 | width: 1240, |
286
124af734af68
Version 0.1.0. Removed localization because it was messy, parts were localized and others not. In production and recipes ingredients not in stock are marked in red.
Michiel Broek <mbroek@mbse.eu>
parents:
283
diff
changeset
|
1946 | height: 560, |
68 | 1947 | source: hopAdapter, |
1948 | theme: theme, | |
1949 | selectionmode: 'singlerow', | |
1950 | showtoolbar: true, | |
1951 | rendertoolbar: function (toolbar) { | |
1952 | var me = this; | |
1953 | var container = $("<div style='overflow: hidden; position: relative; margin: 5px;'></div>"); | |
1954 | toolbar.append(container); | |
1955 | container.append('<div style="float: left; margin-left: 165px;" id="haddrowbutton"></div>'); | |
146
2a6c00d325b2
In dropdown inventory lists you can now choose to display only ingredients that rae on stock or all. Fix the hops amount editor that loses the decimal digits.
Michiel Broek <mbroek@mbse.eu>
parents:
145
diff
changeset
|
1956 | container.append('<div style="float: left; margin-left: 10px; margin-top: 5px;">In voorraad:</div>'); |
2a6c00d325b2
In dropdown inventory lists you can now choose to display only ingredients that rae on stock or all. Fix the hops amount editor that loses the decimal digits.
Michiel Broek <mbroek@mbse.eu>
parents:
145
diff
changeset
|
1957 | container.append('<div style="float: left; margin-left: 10px;" id="hinstockbutton"></div>'); |
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:
221
diff
changeset
|
1958 | container.append('<input style="float: left; margin-left: 400px;" id="hdeleterowbutton" type="button" value="Verwijder hop" />'); |
68 | 1959 | // add hop from dropdownlist. |
1960 | $("#haddrowbutton").jqxDropDownList({ | |
1961 | placeHolder: "Kies hop:", | |
1962 | theme: theme, | |
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:
221
diff
changeset
|
1963 | template: "primary", |
68 | 1964 | source: hoplist, |
1965 | displayMember: "name", | |
1966 | width: 150, | |
1967 | height: 27, | |
69
ca25fdce3b85
Improved hop selection dropdown
Michiel Broek <mbroek@mbse.eu>
parents:
68
diff
changeset
|
1968 | dropDownWidth: 500, |
ca25fdce3b85
Improved hop selection dropdown
Michiel Broek <mbroek@mbse.eu>
parents:
68
diff
changeset
|
1969 | dropDownHeight: 500, |
ca25fdce3b85
Improved hop selection dropdown
Michiel Broek <mbroek@mbse.eu>
parents:
68
diff
changeset
|
1970 | renderer: function (index, label, value) { |
ca25fdce3b85
Improved hop selection dropdown
Michiel Broek <mbroek@mbse.eu>
parents:
68
diff
changeset
|
1971 | var datarecord = hoplist.records[index]; |
ca25fdce3b85
Improved hop selection dropdown
Michiel Broek <mbroek@mbse.eu>
parents:
68
diff
changeset
|
1972 | return datarecord.origin+ " / " + datarecord.name + " (" + datarecord.alpha + "% α)"; |
ca25fdce3b85
Improved hop selection dropdown
Michiel Broek <mbroek@mbse.eu>
parents:
68
diff
changeset
|
1973 | } |
68 | 1974 | }); |
1975 | $("#haddrowbutton").on('select', function (event) { | |
1976 | if (event.args) { | |
1977 | var index = event.args.index; | |
1978 | var datarecord = hoplist.records[index]; | |
1979 | var row = {}; | |
1980 | row["h_name"] = datarecord.name; | |
1981 | row["h_origin"] = datarecord.origin; | |
1982 | row["h_amount"] = 0; | |
1983 | row["h_cost"] = datarecord.cost; | |
1984 | row["h_type"] = datarecord.type; | |
1985 | row["h_form"] = datarecord.form; | |
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:
221
diff
changeset
|
1986 | row["h_useat"] = 2; // Boil |
68 | 1987 | row["h_time"] = 0; |
1988 | row["h_alpha"] = datarecord.alpha; | |
1989 | row["h_beta"] = datarecord.beta; | |
1990 | row["h_hsi"] = datarecord.hsi; | |
1991 | row["h_humulene"] = datarecord.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:
221
diff
changeset
|
1992 | row["h_caryophyllene"] = datarecord.caryophyllene; |
68 | 1993 | row["h_cohumulone"] = datarecord.cohumulone; |
1994 | row["h_myrcene"] = datarecord.myrcene; | |
1995 | row["h_total_oil"] = datarecord.total_oil; | |
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:
221
diff
changeset
|
1996 | row["h_inventory"] = datarecord.inventory; |
68 | 1997 | var commit = $("#hopGrid").jqxGrid('addrow', null, row); |
1998 | } | |
267
dafc9ff806a4
Allow the same hops and yeasts to be added multiple times.
Michiel Broek <mbroek@mbse.eu>
parents:
265
diff
changeset
|
1999 | $("#haddrowbutton").jqxDropDownList('clearSelection'); |
68 | 2000 | }); |
2001 | ||
146
2a6c00d325b2
In dropdown inventory lists you can now choose to display only ingredients that rae on stock or all. Fix the hops amount editor that loses the decimal digits.
Michiel Broek <mbroek@mbse.eu>
parents:
145
diff
changeset
|
2002 | $("#hinstockbutton").jqxCheckBox({ theme: theme, height: 27 }); |
2a6c00d325b2
In dropdown inventory lists you can now choose to display only ingredients that rae on stock or all. Fix the hops amount editor that loses the decimal digits.
Michiel Broek <mbroek@mbse.eu>
parents:
145
diff
changeset
|
2003 | $("#hinstockbutton").on('change', function (event) { |
2a6c00d325b2
In dropdown inventory lists you can now choose to display only ingredients that rae on stock or all. Fix the hops amount editor that loses the decimal digits.
Michiel Broek <mbroek@mbse.eu>
parents:
145
diff
changeset
|
2004 | hopinstock = event.args.checked; |
2a6c00d325b2
In dropdown inventory lists you can now choose to display only ingredients that rae on stock or all. Fix the hops amount editor that loses the decimal digits.
Michiel Broek <mbroek@mbse.eu>
parents:
145
diff
changeset
|
2005 | hoplist.dataBind(); |
2a6c00d325b2
In dropdown inventory lists you can now choose to display only ingredients that rae on stock or all. Fix the hops amount editor that loses the decimal digits.
Michiel Broek <mbroek@mbse.eu>
parents:
145
diff
changeset
|
2006 | }); |
2a6c00d325b2
In dropdown inventory lists you can now choose to display only ingredients that rae on stock or all. Fix the hops amount editor that loses the decimal digits.
Michiel Broek <mbroek@mbse.eu>
parents:
145
diff
changeset
|
2007 | |
68 | 2008 | // delete selected hop. |
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:
221
diff
changeset
|
2009 | $("#hdeleterowbutton").jqxButton({ template: "danger", theme: theme, height: 27, width: 150 }); |
68 | 2010 | $("#hdeleterowbutton").on('click', function () { |
2011 | var selectedrowindex = $("#hopGrid").jqxGrid('getselectedrowindex'); | |
2012 | var rowscount = $("#hopGrid").jqxGrid('getdatainformation').rowscount; | |
2013 | if (selectedrowindex >= 0 && selectedrowindex < rowscount) { | |
2014 | var id = $("#hopGrid").jqxGrid('getrowid', selectedrowindex); | |
2015 | var commit = $("#hopGrid").jqxGrid('deleterow', id); | |
2016 | } | |
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:
221
diff
changeset
|
2017 | calcIBUs(); |
68 | 2018 | }); |
2019 | }, | |
96
107c12c3e49d
Renamed estimate_og() to estimate_sg() formula. Updated the formulas in javascript. The calcFermenter() function now only calculates the gravities. The colors still need to be added. When a recept is loaded in the editor, all tabs are selected once to load all subgrid data. Ugly and slow but it at least it works.
Michiel Broek <mbroek@mbse.eu>
parents:
95
diff
changeset
|
2020 | ready: function() { |
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:
221
diff
changeset
|
2021 | calcIBUs(); |
96
107c12c3e49d
Renamed estimate_og() to estimate_sg() formula. Updated the formulas in javascript. The calcFermenter() function now only calculates the gravities. The colors still need to be added. When a recept is loaded in the editor, all tabs are selected once to load all subgrid data. Ugly and slow but it at least it works.
Michiel Broek <mbroek@mbse.eu>
parents:
95
diff
changeset
|
2022 | $('#jqxTabs').jqxTabs('next'); |
107c12c3e49d
Renamed estimate_og() to estimate_sg() formula. Updated the formulas in javascript. The calcFermenter() function now only calculates the gravities. The colors still need to be added. When a recept is loaded in the editor, all tabs are selected once to load all subgrid data. Ugly and slow but it at least it works.
Michiel Broek <mbroek@mbse.eu>
parents:
95
diff
changeset
|
2023 | }, |
68 | 2024 | columns: [ |
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:
221
diff
changeset
|
2025 | { text: 'Hop', datafield: 'h_name', |
286
124af734af68
Version 0.1.0. Removed localization because it was messy, parts were localized and others not. In production and recipes ingredients not in stock are marked in red.
Michiel Broek <mbroek@mbse.eu>
parents:
283
diff
changeset
|
2026 | cellsrenderer: function (index, datafield, value, defaultvalue, column, rowdata) { |
124af734af68
Version 0.1.0. Removed localization because it was messy, parts were localized and others not. In production and recipes ingredients not in stock are marked in red.
Michiel Broek <mbroek@mbse.eu>
parents:
283
diff
changeset
|
2027 | return "<span style='margin: 3px; margin-top: 6px; float: left;'>" +rowdata.h_origin+" / "+rowdata.h_name+"</span>"; |
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
|
2028 | }, |
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
|
2029 | }, |
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:
221
diff
changeset
|
2030 | { text: 'Type', width: 90, datafield: 'h_type', |
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:
221
diff
changeset
|
2031 | cellsrenderer: function (index, datafield, value, defaultvalue, column, rowdata) { |
286
124af734af68
Version 0.1.0. Removed localization because it was messy, parts were localized and others not. In production and recipes ingredients not in stock are marked in red.
Michiel Broek <mbroek@mbse.eu>
parents:
283
diff
changeset
|
2032 | return '<span style="margin: 4px; margin-top: 6px; float: left;">' + HopTypeData[value].nl + '</span>'; |
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:
221
diff
changeset
|
2033 | } |
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:
221
diff
changeset
|
2034 | }, |
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:
221
diff
changeset
|
2035 | { text: 'Vorm', width: 90, datafield: 'h_form', |
140
93c64d7ac79c
Hops grid editor amount is now in grams.
Michiel Broek <mbroek@mbse.eu>
parents:
139
diff
changeset
|
2036 | cellsrenderer: function (index, datafield, value, defaultvalue, column, rowdata) { |
286
124af734af68
Version 0.1.0. Removed localization because it was messy, parts were localized and others not. In production and recipes ingredients not in stock are marked in red.
Michiel Broek <mbroek@mbse.eu>
parents:
283
diff
changeset
|
2037 | return '<span style="margin: 4px; margin-top: 6px; float: left;">' + HopFormData[value].nl + '</span>'; |
140
93c64d7ac79c
Hops grid editor amount is now in grams.
Michiel Broek <mbroek@mbse.eu>
parents:
139
diff
changeset
|
2038 | } |
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:
221
diff
changeset
|
2039 | }, |
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:
221
diff
changeset
|
2040 | { text: 'Alpha', datafield: 'h_alpha', width: 80, align: 'right', cellsalign: 'right', cellsformat: 'p1' }, |
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:
221
diff
changeset
|
2041 | { text: 'Gebruik', width: 110, datafield: 'h_useat', |
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:
221
diff
changeset
|
2042 | cellsrenderer: function (index, datafield, value, defaultvalue, column, rowdata) { |
286
124af734af68
Version 0.1.0. Removed localization because it was messy, parts were localized and others not. In production and recipes ingredients not in stock are marked in red.
Michiel Broek <mbroek@mbse.eu>
parents:
283
diff
changeset
|
2043 | return '<span style="margin: 4px; margin-top: 6px; float: left;">' + HopUseData[value].nl + '</span>'; |
126
9999b3ce98cb
Row editors are now per cell. Added fermentable percentages editor.
Michiel Broek <mbroek@mbse.eu>
parents:
125
diff
changeset
|
2044 | } |
9999b3ce98cb
Row editors are now per cell. Added fermentable percentages editor.
Michiel Broek <mbroek@mbse.eu>
parents:
125
diff
changeset
|
2045 | }, |
224
d3cdcfac81cb
In hop grid friendly show duration. Finished hops popup editor. Made the IBU display readonly.
Michiel Broek <mbroek@mbse.eu>
parents:
223
diff
changeset
|
2046 | { text: 'Tijdsduur', datafield: 'h_time', width: 90, align: 'right', |
142
793af7691a5e
During hops load an extra weight in grams field is generated for the grid. Edit the amount is done on the weight field and the amount field is updated too. During save to the database the extra field is removed.
Michiel Broek <mbroek@mbse.eu>
parents:
141
diff
changeset
|
2047 | cellsrenderer: function (index, datafield, value, defaultvalue, column, rowdata) { |
286
124af734af68
Version 0.1.0. Removed localization because it was messy, parts were localized and others not. In production and recipes ingredients not in stock are marked in red.
Michiel Broek <mbroek@mbse.eu>
parents:
283
diff
changeset
|
2048 | var duration = ''; |
124af734af68
Version 0.1.0. Removed localization because it was messy, parts were localized and others not. In production and recipes ingredients not in stock are marked in red.
Michiel Broek <mbroek@mbse.eu>
parents:
283
diff
changeset
|
2049 | if ((rowdata.h_useat == 2) || (rowdata.h_useat == 4)) // Boil, Whirlpool |
124af734af68
Version 0.1.0. Removed localization because it was messy, parts were localized and others not. In production and recipes ingredients not in stock are marked in red.
Michiel Broek <mbroek@mbse.eu>
parents:
283
diff
changeset
|
2050 | duration = dataAdapter.formatNumber(value, "f0")+" min."; |
124af734af68
Version 0.1.0. Removed localization because it was messy, parts were localized and others not. In production and recipes ingredients not in stock are marked in red.
Michiel Broek <mbroek@mbse.eu>
parents:
283
diff
changeset
|
2051 | else if (rowdata.h_useat == 5) // Dry hop |
124af734af68
Version 0.1.0. Removed localization because it was messy, parts were localized and others not. In production and recipes ingredients not in stock are marked in red.
Michiel Broek <mbroek@mbse.eu>
parents:
283
diff
changeset
|
2052 | duration = dataAdapter.formatNumber(value/1440, "f0")+" dagen"; |
124af734af68
Version 0.1.0. Removed localization because it was messy, parts were localized and others not. In production and recipes ingredients not in stock are marked in red.
Michiel Broek <mbroek@mbse.eu>
parents:
283
diff
changeset
|
2053 | return '<span style="margin: 4px; margin-top: 6px; float: right;">' + duration + '</span>'; |
132 | 2054 | } |
68 | 2055 | }, |
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:
221
diff
changeset
|
2056 | { text: 'IBU', datafield: 'ibu', width: 80, align: 'right', |
68 | 2057 | cellsrenderer: function (index, datafield, value, defaultvalue, column, rowdata) { |
286
124af734af68
Version 0.1.0. Removed localization because it was messy, parts were localized and others not. In production and recipes ingredients not in stock are marked in red.
Michiel Broek <mbroek@mbse.eu>
parents:
283
diff
changeset
|
2058 | var ibu = toIBU(rowdata.h_useat, rowdata.h_form, preboil_sg, parseFloat($("#batch_size").jqxNumberInput('decimal')), |
124af734af68
Version 0.1.0. Removed localization because it was messy, parts were localized and others not. In production and recipes ingredients not in stock are marked in red.
Michiel Broek <mbroek@mbse.eu>
parents:
283
diff
changeset
|
2059 | parseFloat(rowdata.h_amount), parseFloat(rowdata.h_time), |
124af734af68
Version 0.1.0. Removed localization because it was messy, parts were localized and others not. In production and recipes ingredients not in stock are marked in red.
Michiel Broek <mbroek@mbse.eu>
parents:
283
diff
changeset
|
2060 | parseFloat(rowdata.h_alpha), $("#ibu_method").val()); |
124af734af68
Version 0.1.0. Removed localization because it was messy, parts were localized and others not. In production and recipes ingredients not in stock are marked in red.
Michiel Broek <mbroek@mbse.eu>
parents:
283
diff
changeset
|
2061 | return '<span style="margin: 4px; margin-top: 6px; float: right;">' + dataAdapter.formatNumber(ibu, "f1") + '</span>'; |
68 | 2062 | } |
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:
221
diff
changeset
|
2063 | }, |
286
124af734af68
Version 0.1.0. Removed localization because it was messy, parts were localized and others not. In production and recipes ingredients not in stock are marked in red.
Michiel Broek <mbroek@mbse.eu>
parents:
283
diff
changeset
|
2064 | { text: 'Gewicht', datafield: 'h_amount', width: 110, align: 'right', |
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:
221
diff
changeset
|
2065 | cellsrenderer: function (index, datafield, value, defaultvalue, column, rowdata) { |
286
124af734af68
Version 0.1.0. Removed localization because it was messy, parts were localized and others not. In production and recipes ingredients not in stock are marked in red.
Michiel Broek <mbroek@mbse.eu>
parents:
283
diff
changeset
|
2066 | var amount = dataAdapter.formatNumber(value, "f1") + ' kg'; |
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:
221
diff
changeset
|
2067 | if (value < 1) |
286
124af734af68
Version 0.1.0. Removed localization because it was messy, parts were localized and others not. In production and recipes ingredients not in stock are marked in red.
Michiel Broek <mbroek@mbse.eu>
parents:
283
diff
changeset
|
2068 | amount = dataAdapter.formatNumber(value * 1000, "f1") + ' gr'; |
124af734af68
Version 0.1.0. Removed localization because it was messy, parts were localized and others not. In production and recipes ingredients not in stock are marked in red.
Michiel Broek <mbroek@mbse.eu>
parents:
283
diff
changeset
|
2069 | return '<span style="margin: 4px; margin-top: 6px; float: right;">' + amount + '</span>'; |
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:
221
diff
changeset
|
2070 | } |
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:
221
diff
changeset
|
2071 | }, |
286
124af734af68
Version 0.1.0. Removed localization because it was messy, parts were localized and others not. In production and recipes ingredients not in stock are marked in red.
Michiel Broek <mbroek@mbse.eu>
parents:
283
diff
changeset
|
2072 | { text: 'Voorraad', datafield: 'h_inventory', width: 110, align: 'right', |
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:
221
diff
changeset
|
2073 | cellsrenderer: function (index, datafield, value, defaultvalue, column, rowdata) { |
286
124af734af68
Version 0.1.0. Removed localization because it was messy, parts were localized and others not. In production and recipes ingredients not in stock are marked in red.
Michiel Broek <mbroek@mbse.eu>
parents:
283
diff
changeset
|
2074 | var color = '#ffffff'; |
124af734af68
Version 0.1.0. Removed localization because it was messy, parts were localized and others not. In production and recipes ingredients not in stock are marked in red.
Michiel Broek <mbroek@mbse.eu>
parents:
283
diff
changeset
|
2075 | if (value < rowdata.h_amount) |
124af734af68
Version 0.1.0. Removed localization because it was messy, parts were localized and others not. In production and recipes ingredients not in stock are marked in red.
Michiel Broek <mbroek@mbse.eu>
parents:
283
diff
changeset
|
2076 | color = '#ff4040'; |
124af734af68
Version 0.1.0. Removed localization because it was messy, parts were localized and others not. In production and recipes ingredients not in stock are marked in red.
Michiel Broek <mbroek@mbse.eu>
parents:
283
diff
changeset
|
2077 | var amount = dataAdapter.formatNumber(value, "f1") + ' kg'; |
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:
221
diff
changeset
|
2078 | if (value < 1) |
286
124af734af68
Version 0.1.0. Removed localization because it was messy, parts were localized and others not. In production and recipes ingredients not in stock are marked in red.
Michiel Broek <mbroek@mbse.eu>
parents:
283
diff
changeset
|
2079 | amount = dataAdapter.formatNumber(value * 1000, "f1") + ' gr'; |
124af734af68
Version 0.1.0. Removed localization because it was messy, parts were localized and others not. In production and recipes ingredients not in stock are marked in red.
Michiel Broek <mbroek@mbse.eu>
parents:
283
diff
changeset
|
2080 | return '<span style="margin: 4px; margin-top: 6px; float: right; color: ' + color + ';">' + amount + '</span>'; |
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:
221
diff
changeset
|
2081 | } |
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:
221
diff
changeset
|
2082 | }, |
286
124af734af68
Version 0.1.0. Removed localization because it was messy, parts were localized and others not. In production and recipes ingredients not in stock are marked in red.
Michiel Broek <mbroek@mbse.eu>
parents:
283
diff
changeset
|
2083 | { text: '', datafield: 'Edit', columntype: 'button', width: 100, align: 'center', cellsrenderer: function () { |
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:
221
diff
changeset
|
2084 | return "Wijzig"; |
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:
221
diff
changeset
|
2085 | }, buttonclick: function (row) { |
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:
221
diff
changeset
|
2086 | hopRow = row; |
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:
221
diff
changeset
|
2087 | hopData = $("#hopGrid").jqxGrid('getrowdata', hopRow); |
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:
221
diff
changeset
|
2088 | $("#wh_name").val(hopData.h_name); |
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:
221
diff
changeset
|
2089 | $("#wh_amount").val(hopData.h_amount * 1000); |
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:
221
diff
changeset
|
2090 | var ibu = toIBU(hopData.h_useat, hopData.h_form, preboil_sg, |
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:
221
diff
changeset
|
2091 | parseFloat($("#batch_size").jqxNumberInput('decimal')), |
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:
221
diff
changeset
|
2092 | parseFloat(hopData.h_amount), parseFloat(hopData.h_time), |
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:
221
diff
changeset
|
2093 | parseFloat(hopData.h_alpha), $("#ibu_method").val() |
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:
221
diff
changeset
|
2094 | ); |
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:
221
diff
changeset
|
2095 | $("#wh_ibu").val(ibu); |
224
d3cdcfac81cb
In hop grid friendly show duration. Finished hops popup editor. Made the IBU display readonly.
Michiel Broek <mbroek@mbse.eu>
parents:
223
diff
changeset
|
2096 | if (hopData.h_useat == 5) // Dry hop |
d3cdcfac81cb
In hop grid friendly show duration. Finished hops popup editor. Made the IBU display readonly.
Michiel Broek <mbroek@mbse.eu>
parents:
223
diff
changeset
|
2097 | $("#wh_time").val(hopData.h_time / 1440); |
d3cdcfac81cb
In hop grid friendly show duration. Finished hops popup editor. Made the IBU display readonly.
Michiel Broek <mbroek@mbse.eu>
parents:
223
diff
changeset
|
2098 | else |
d3cdcfac81cb
In hop grid friendly show duration. Finished hops popup editor. Made the IBU display readonly.
Michiel Broek <mbroek@mbse.eu>
parents:
223
diff
changeset
|
2099 | $("#wh_time").val(hopData.h_time); |
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:
221
diff
changeset
|
2100 | $("#wh_useat").val(hopData.h_useat); |
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:
221
diff
changeset
|
2101 | // show the popup window. |
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:
221
diff
changeset
|
2102 | $("#popupHop").jqxWindow('open'); |
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:
221
diff
changeset
|
2103 | } |
68 | 2104 | } |
2105 | ] | |
98
92d6bc8a4cdd
Added javascript formulas for color calculations. Added IBU total calculation. Better IBI calculation for the hop entries. Blocked selection of IBU calculation for Garetz, Mosher and Noonan. Better sg calculation in the recipe print.
Michiel Broek <mbroek@mbse.eu>
parents:
97
diff
changeset
|
2106 | }); |
68 | 2107 | }; |
2108 | ||
2109 | // Inline miscs editor | |
2110 | var editMisc = function (data) { | |
2111 | var miscSource = { | |
2112 | localdata: data.miscs, | |
2113 | datatype: "local", | |
2114 | cache: false, | |
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
|
2115 | async: false, |
68 | 2116 | datafields: [ |
2117 | { name: 'm_name', type: 'string' }, | |
2118 | { name: 'm_amount', type: 'float' }, | |
2119 | { name: 'm_cost', type: 'float' }, | |
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:
175
diff
changeset
|
2120 | { name: 'm_type', type: 'int' }, |
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:
175
diff
changeset
|
2121 | { name: 'm_use_use', type: 'int' }, |
68 | 2122 | { name: 'm_time', type: 'float' }, |
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:
175
diff
changeset
|
2123 | { name: 'm_amount_is_weight', type: 'int' }, |
225
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
224
diff
changeset
|
2124 | { name: 'm_inventory', type: 'float' }, |
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
224
diff
changeset
|
2125 | { name: 'm_avail', type: 'int' } |
68 | 2126 | ], |
2127 | addrow: function (rowid, rowdata, position, commit) { | |
2128 | commit(true); | |
2129 | }, | |
2130 | deleterow: function (rowid, commit) { | |
2131 | commit(true); | |
2132 | } | |
2133 | }; | |
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
|
2134 | var miscAdapter = new $.jqx.dataAdapter(miscSource, { |
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
|
2135 | beforeLoadComplete: function (records) { |
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
|
2136 | var data = new Array(); |
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
|
2137 | for (var i = 0; i < records.length; i++) { |
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
|
2138 | var row = records[i]; |
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
|
2139 | data.push(row); |
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:
146
diff
changeset
|
2140 | // Initial set water agent values. |
149
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
2141 | switch (row.m_name) { |
230
8edca0488e65
Finished the water treatment in the recipes editor. It seems that the recipes editor is ready.
Michiel Broek <mbroek@mbse.eu>
parents:
229
diff
changeset
|
2142 | case 'CaCl2': $("#wa_cacl2").val(row.m_amount * 1000); |
149
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
2143 | break; |
230
8edca0488e65
Finished the water treatment in the recipes editor. It seems that the recipes editor is ready.
Michiel Broek <mbroek@mbse.eu>
parents:
229
diff
changeset
|
2144 | case 'CaSO4': $("#wa_caso4").val(row.m_amount * 1000); |
149
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
2145 | break; |
230
8edca0488e65
Finished the water treatment in the recipes editor. It seems that the recipes editor is ready.
Michiel Broek <mbroek@mbse.eu>
parents:
229
diff
changeset
|
2146 | case 'MgSO4': $("#wa_mgso4").val(row.m_amount * 1000); |
149
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
2147 | break; |
230
8edca0488e65
Finished the water treatment in the recipes editor. It seems that the recipes editor is ready.
Michiel Broek <mbroek@mbse.eu>
parents:
229
diff
changeset
|
2148 | case 'NaCl': $("#wa_nacl").val(row.m_amount * 1000); |
149
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
2149 | break; |
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:
175
diff
changeset
|
2150 | case 'Melkzuur': $("#wa_acid_name").val(0); |
230
8edca0488e65
Finished the water treatment in the recipes editor. It seems that the recipes editor is ready.
Michiel Broek <mbroek@mbse.eu>
parents:
229
diff
changeset
|
2151 | $("#wa_acid").val(row.m_amount * 1000); |
149
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
2152 | $("#wa_acid_perc").val(80); |
230
8edca0488e65
Finished the water treatment in the recipes editor. It seems that the recipes editor is ready.
Michiel Broek <mbroek@mbse.eu>
parents:
229
diff
changeset
|
2153 | last_acid = 'Melkzuur'; |
149
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
2154 | break; |
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:
175
diff
changeset
|
2155 | case 'Zoutzuur': $("#wa_acid_name").val(1); |
230
8edca0488e65
Finished the water treatment in the recipes editor. It seems that the recipes editor is ready.
Michiel Broek <mbroek@mbse.eu>
parents:
229
diff
changeset
|
2156 | $("#wa_acid").val(row.m_amount * 1000); |
149
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
2157 | $("#wa_acid_perc").val(80); |
230
8edca0488e65
Finished the water treatment in the recipes editor. It seems that the recipes editor is ready.
Michiel Broek <mbroek@mbse.eu>
parents:
229
diff
changeset
|
2158 | last_acid = 'Zoutzuur'; |
149
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
2159 | break; |
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:
175
diff
changeset
|
2160 | case 'Fosforzuur': $("#wa_acid_name").val(2); |
230
8edca0488e65
Finished the water treatment in the recipes editor. It seems that the recipes editor is ready.
Michiel Broek <mbroek@mbse.eu>
parents:
229
diff
changeset
|
2161 | $("#wa_acid").val(row.m_amount * 1000); |
149
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
2162 | $("#wa_acid_perc").val(80); |
230
8edca0488e65
Finished the water treatment in the recipes editor. It seems that the recipes editor is ready.
Michiel Broek <mbroek@mbse.eu>
parents:
229
diff
changeset
|
2163 | last_acid = 'Fosforzuur'; |
149
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
2164 | break; |
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:
175
diff
changeset
|
2165 | case 'Zwavelzuur': $("#wa_acid_name").val(3); |
230
8edca0488e65
Finished the water treatment in the recipes editor. It seems that the recipes editor is ready.
Michiel Broek <mbroek@mbse.eu>
parents:
229
diff
changeset
|
2166 | $("#wa_acid").val(row.m_amount * 1000); |
149
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
2167 | $("#wa_acid_perc").val(80); |
230
8edca0488e65
Finished the water treatment in the recipes editor. It seems that the recipes editor is ready.
Michiel Broek <mbroek@mbse.eu>
parents:
229
diff
changeset
|
2168 | last_acid = 'Zwavelzuur'; |
149
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
2169 | break; |
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:
175
diff
changeset
|
2170 | case 'NaHCO3': $("#wa_base_name").val(0); |
230
8edca0488e65
Finished the water treatment in the recipes editor. It seems that the recipes editor is ready.
Michiel Broek <mbroek@mbse.eu>
parents:
229
diff
changeset
|
2171 | $("#wa_base").val(row.m_amount * 1000); |
8edca0488e65
Finished the water treatment in the recipes editor. It seems that the recipes editor is ready.
Michiel Broek <mbroek@mbse.eu>
parents:
229
diff
changeset
|
2172 | last_base = 'NaHCO3'; |
149
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
2173 | break; |
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:
175
diff
changeset
|
2174 | case 'Na2CO3': $("#wa_base_name").val(1); |
230
8edca0488e65
Finished the water treatment in the recipes editor. It seems that the recipes editor is ready.
Michiel Broek <mbroek@mbse.eu>
parents:
229
diff
changeset
|
2175 | $("#wa_base").val(row.m_amount * 1000); |
8edca0488e65
Finished the water treatment in the recipes editor. It seems that the recipes editor is ready.
Michiel Broek <mbroek@mbse.eu>
parents:
229
diff
changeset
|
2176 | last_base = 'Na2CO3'; |
149
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
2177 | break; |
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:
175
diff
changeset
|
2178 | case 'CaCO3': $("#wa_base_name").val(2); |
230
8edca0488e65
Finished the water treatment in the recipes editor. It seems that the recipes editor is ready.
Michiel Broek <mbroek@mbse.eu>
parents:
229
diff
changeset
|
2179 | $("#wa_base").val(row.m_amount * 1000); |
8edca0488e65
Finished the water treatment in the recipes editor. It seems that the recipes editor is ready.
Michiel Broek <mbroek@mbse.eu>
parents:
229
diff
changeset
|
2180 | last_base = 'CaCO3'; |
149
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
2181 | break; |
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:
175
diff
changeset
|
2182 | case 'Ca(OH)2': $("#wa_base_name").val(3); |
230
8edca0488e65
Finished the water treatment in the recipes editor. It seems that the recipes editor is ready.
Michiel Broek <mbroek@mbse.eu>
parents:
229
diff
changeset
|
2183 | $("#wa_base").val(row.m_amount * 1000); |
8edca0488e65
Finished the water treatment in the recipes editor. It seems that the recipes editor is ready.
Michiel Broek <mbroek@mbse.eu>
parents:
229
diff
changeset
|
2184 | last_base = 'Ca(OH)2'; |
149
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
2185 | break; |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
2186 | } |
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
|
2187 | } |
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
|
2188 | return data; |
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
|
2189 | }, |
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
|
2190 | loadError: function(jqXHR, status, error) { |
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
|
2191 | $('#err').text(status + ' ' + error); |
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
|
2192 | }, |
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
|
2193 | }); |
68 | 2194 | $("#miscGrid").jqxGrid({ |
225
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
224
diff
changeset
|
2195 | width: 1240, |
286
124af734af68
Version 0.1.0. Removed localization because it was messy, parts were localized and others not. In production and recipes ingredients not in stock are marked in red.
Michiel Broek <mbroek@mbse.eu>
parents:
283
diff
changeset
|
2196 | height: 575, |
68 | 2197 | source: miscAdapter, |
2198 | theme: theme, | |
2199 | selectionmode: 'singlerow', | |
2200 | showtoolbar: true, | |
2201 | rendertoolbar: function (toolbar) { | |
2202 | var me = this; | |
2203 | var container = $("<div style='overflow: hidden; position: relative; margin: 5px;'></div>"); | |
2204 | toolbar.append(container); | |
2205 | container.append('<div style="float: left; margin-left: 165px;" id="maddrowbutton"></div>'); | |
146
2a6c00d325b2
In dropdown inventory lists you can now choose to display only ingredients that rae on stock or all. Fix the hops amount editor that loses the decimal digits.
Michiel Broek <mbroek@mbse.eu>
parents:
145
diff
changeset
|
2206 | container.append('<div style="float: left; margin-left: 10px; margin-top: 5px;">In voorraad:</div>'); |
2a6c00d325b2
In dropdown inventory lists you can now choose to display only ingredients that rae on stock or all. Fix the hops amount editor that loses the decimal digits.
Michiel Broek <mbroek@mbse.eu>
parents:
145
diff
changeset
|
2207 | container.append('<div style="float: left; margin-left: 10px;" id="minstockbutton"></div>'); |
225
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
224
diff
changeset
|
2208 | container.append('<input style="float: left; margin-left: 400px;" id="mdeleterowbutton" type="button" value="Verwijder ingrediënt" />'); |
68 | 2209 | // add misc from dropdownlist. |
2210 | $("#maddrowbutton").jqxDropDownList({ | |
225
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
224
diff
changeset
|
2211 | placeHolder: "Kies ingrediënt:", |
68 | 2212 | theme: theme, |
225
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
224
diff
changeset
|
2213 | template: "primary", |
68 | 2214 | source: misclist, |
2215 | displayMember: "name", | |
2216 | width: 150, | |
2217 | height: 27, | |
146
2a6c00d325b2
In dropdown inventory lists you can now choose to display only ingredients that rae on stock or all. Fix the hops amount editor that loses the decimal digits.
Michiel Broek <mbroek@mbse.eu>
parents:
145
diff
changeset
|
2218 | dropDownWidth: 500, |
2a6c00d325b2
In dropdown inventory lists you can now choose to display only ingredients that rae on stock or all. Fix the hops amount editor that loses the decimal digits.
Michiel Broek <mbroek@mbse.eu>
parents:
145
diff
changeset
|
2219 | dropDownHeight: 500 |
68 | 2220 | }); |
2221 | $("#maddrowbutton").on('select', function (event) { | |
2222 | if (event.args) { | |
2223 | var index = event.args.index; | |
2224 | var datarecord = misclist.records[index]; | |
2225 | var row = {}; | |
2226 | row["m_name"] = datarecord.name; | |
2227 | row["m_amount"] = 0; | |
2228 | row["m_cost"] = datarecord.cost; | |
2229 | row["m_type"] = datarecord.type; | |
2230 | row["m_use_use"] = datarecord.use_use; | |
2231 | row["m_time"] = 0; | |
2232 | row["m_amount_is_weight"] = datarecord.amount_is_weight; | |
225
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
224
diff
changeset
|
2233 | row["m_inventory"] = datarecord.inventory; |
68 | 2234 | var commit = $("#miscGrid").jqxGrid('addrow', null, row); |
2235 | } | |
2236 | }); | |
146
2a6c00d325b2
In dropdown inventory lists you can now choose to display only ingredients that rae on stock or all. Fix the hops amount editor that loses the decimal digits.
Michiel Broek <mbroek@mbse.eu>
parents:
145
diff
changeset
|
2237 | $("#minstockbutton").jqxCheckBox({ theme: theme, height: 27 }); |
2a6c00d325b2
In dropdown inventory lists you can now choose to display only ingredients that rae on stock or all. Fix the hops amount editor that loses the decimal digits.
Michiel Broek <mbroek@mbse.eu>
parents:
145
diff
changeset
|
2238 | $("#minstockbutton").on('change', function (event) { |
2a6c00d325b2
In dropdown inventory lists you can now choose to display only ingredients that rae on stock or all. Fix the hops amount editor that loses the decimal digits.
Michiel Broek <mbroek@mbse.eu>
parents:
145
diff
changeset
|
2239 | miscinstock = event.args.checked; |
2a6c00d325b2
In dropdown inventory lists you can now choose to display only ingredients that rae on stock or all. Fix the hops amount editor that loses the decimal digits.
Michiel Broek <mbroek@mbse.eu>
parents:
145
diff
changeset
|
2240 | misclist.dataBind(); |
2a6c00d325b2
In dropdown inventory lists you can now choose to display only ingredients that rae on stock or all. Fix the hops amount editor that loses the decimal digits.
Michiel Broek <mbroek@mbse.eu>
parents:
145
diff
changeset
|
2241 | }); |
68 | 2242 | // delete selected misc. |
225
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
224
diff
changeset
|
2243 | $("#mdeleterowbutton").jqxButton({ template: "danger", theme: theme, height: 27, width: 150 }); |
68 | 2244 | $("#mdeleterowbutton").on('click', function () { |
2245 | var selectedrowindex = $("#miscGrid").jqxGrid('getselectedrowindex'); | |
2246 | var rowscount = $("#miscGrid").jqxGrid('getdatainformation').rowscount; | |
145
2662720e1949
Protect misc Water agent ingredients against delete and changing from the miscs editor.
Michiel Broek <mbroek@mbse.eu>
parents:
144
diff
changeset
|
2247 | var type = $("#miscGrid").jqxGrid('getcellvalue', selectedrowindex, "m_type"); |
225
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
224
diff
changeset
|
2248 | if (selectedrowindex >= 0 && selectedrowindex < rowscount && type != 4) { // Water agent |
68 | 2249 | var id = $("#miscGrid").jqxGrid('getrowid', selectedrowindex); |
2250 | var commit = $("#miscGrid").jqxGrid('deleterow', id); | |
2251 | } | |
2252 | }); | |
2253 | }, | |
96
107c12c3e49d
Renamed estimate_og() to estimate_sg() formula. Updated the formulas in javascript. The calcFermenter() function now only calculates the gravities. The colors still need to be added. When a recept is loaded in the editor, all tabs are selected once to load all subgrid data. Ugly and slow but it at least it works.
Michiel Broek <mbroek@mbse.eu>
parents:
95
diff
changeset
|
2254 | ready: function() { |
107c12c3e49d
Renamed estimate_og() to estimate_sg() formula. Updated the formulas in javascript. The calcFermenter() function now only calculates the gravities. The colors still need to be added. When a recept is loaded in the editor, all tabs are selected once to load all subgrid data. Ugly and slow but it at least it works.
Michiel Broek <mbroek@mbse.eu>
parents:
95
diff
changeset
|
2255 | $('#jqxTabs').jqxTabs('next'); |
107c12c3e49d
Renamed estimate_og() to estimate_sg() formula. Updated the formulas in javascript. The calcFermenter() function now only calculates the gravities. The colors still need to be added. When a recept is loaded in the editor, all tabs are selected once to load all subgrid data. Ugly and slow but it at least it works.
Michiel Broek <mbroek@mbse.eu>
parents:
95
diff
changeset
|
2256 | }, |
68 | 2257 | columns: [ |
225
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
224
diff
changeset
|
2258 | { text: 'Ingredient', datafield: 'm_name' }, |
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
224
diff
changeset
|
2259 | { text: 'Type', width: 140, datafield: 'm_type', |
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
224
diff
changeset
|
2260 | cellsrenderer: function (index, datafield, value, defaultvalue, column, rowdata) { |
286
124af734af68
Version 0.1.0. Removed localization because it was messy, parts were localized and others not. In production and recipes ingredients not in stock are marked in red.
Michiel Broek <mbroek@mbse.eu>
parents:
283
diff
changeset
|
2261 | return "<span style='margin: 3px; margin-top: 6px; float: left;'>" + MiscTypeData[value].nl + "</span>"; |
225
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
224
diff
changeset
|
2262 | } |
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
224
diff
changeset
|
2263 | }, |
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
224
diff
changeset
|
2264 | { text: 'Gebruik', width: 140, datafield: 'm_use_use', |
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
224
diff
changeset
|
2265 | cellsrenderer: function (index, datafield, value, defaultvalue, column, rowdata) { |
286
124af734af68
Version 0.1.0. Removed localization because it was messy, parts were localized and others not. In production and recipes ingredients not in stock are marked in red.
Michiel Broek <mbroek@mbse.eu>
parents:
283
diff
changeset
|
2266 | return "<span style='margin: 3px; margin-top: 6px; float: left;'>" + MiscUseData[value].nl + "</span>"; |
141
fe9e2a677611
The yeast droplist sorting order changed. Misc ingredients time editor uses minutes or days depending on the use of the ingredient. The yeast editor can now use grams, ml or packs.
Michiel Broek <mbroek@mbse.eu>
parents:
140
diff
changeset
|
2267 | } |
fe9e2a677611
The yeast droplist sorting order changed. Misc ingredients time editor uses minutes or days depending on the use of the ingredient. The yeast editor can now use grams, ml or packs.
Michiel Broek <mbroek@mbse.eu>
parents:
140
diff
changeset
|
2268 | }, |
225
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
224
diff
changeset
|
2269 | { text: 'Tijd', datafield: 'm_time', width: 90, align: 'right', |
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
224
diff
changeset
|
2270 | cellsrenderer: function (index, datafield, value, defaultvalue, column, rowdata) { |
286
124af734af68
Version 0.1.0. Removed localization because it was messy, parts were localized and others not. In production and recipes ingredients not in stock are marked in red.
Michiel Broek <mbroek@mbse.eu>
parents:
283
diff
changeset
|
2271 | var duration = ''; |
124af734af68
Version 0.1.0. Removed localization because it was messy, parts were localized and others not. In production and recipes ingredients not in stock are marked in red.
Michiel Broek <mbroek@mbse.eu>
parents:
283
diff
changeset
|
2272 | if (rowdata.m_use_use == 2) // Boil |
124af734af68
Version 0.1.0. Removed localization because it was messy, parts were localized and others not. In production and recipes ingredients not in stock are marked in red.
Michiel Broek <mbroek@mbse.eu>
parents:
283
diff
changeset
|
2273 | duration = dataAdapter.formatNumber(value, "f0")+" min."; |
124af734af68
Version 0.1.0. Removed localization because it was messy, parts were localized and others not. In production and recipes ingredients not in stock are marked in red.
Michiel Broek <mbroek@mbse.eu>
parents:
283
diff
changeset
|
2274 | else if ((rowdata.m_use_use == 3) || (rowdata.m_use_use == 4)) // Primary or Secondary |
124af734af68
Version 0.1.0. Removed localization because it was messy, parts were localized and others not. In production and recipes ingredients not in stock are marked in red.
Michiel Broek <mbroek@mbse.eu>
parents:
283
diff
changeset
|
2275 | duration = dataAdapter.formatNumber(value/1440, "f0")+" dagen"; |
124af734af68
Version 0.1.0. Removed localization because it was messy, parts were localized and others not. In production and recipes ingredients not in stock are marked in red.
Michiel Broek <mbroek@mbse.eu>
parents:
283
diff
changeset
|
2276 | return '<span style="margin: 4px; margin-top: 6px; float: right;">' + duration + '</span>'; |
225
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
224
diff
changeset
|
2277 | }, |
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
224
diff
changeset
|
2278 | }, |
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
224
diff
changeset
|
2279 | { text: 'Hoeveel', datafield: 'm_amount', width: 110, align: 'right', |
141
fe9e2a677611
The yeast droplist sorting order changed. Misc ingredients time editor uses minutes or days depending on the use of the ingredient. The yeast editor can now use grams, ml or packs.
Michiel Broek <mbroek@mbse.eu>
parents:
140
diff
changeset
|
2280 | cellsrenderer: function (index, datafield, value, defaultvalue, column, rowdata) { |
fe9e2a677611
The yeast droplist sorting order changed. Misc ingredients time editor uses minutes or days depending on the use of the ingredient. The yeast editor can now use grams, ml or packs.
Michiel Broek <mbroek@mbse.eu>
parents:
140
diff
changeset
|
2281 | var vstr = rowdata.m_amount_is_weight ? "gr":"ml"; |
286
124af734af68
Version 0.1.0. Removed localization because it was messy, parts were localized and others not. In production and recipes ingredients not in stock are marked in red.
Michiel Broek <mbroek@mbse.eu>
parents:
283
diff
changeset
|
2282 | return '<span style="margin: 4px; margin-top: 6px; float: right;">' + |
124af734af68
Version 0.1.0. Removed localization because it was messy, parts were localized and others not. In production and recipes ingredients not in stock are marked in red.
Michiel Broek <mbroek@mbse.eu>
parents:
283
diff
changeset
|
2283 | dataAdapter.formatNumber(value * 1000,"f2")+" "+vstr + '</span>'; |
141
fe9e2a677611
The yeast droplist sorting order changed. Misc ingredients time editor uses minutes or days depending on the use of the ingredient. The yeast editor can now use grams, ml or packs.
Michiel Broek <mbroek@mbse.eu>
parents:
140
diff
changeset
|
2284 | }, |
225
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
224
diff
changeset
|
2285 | }, |
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
224
diff
changeset
|
2286 | { text: 'Voorraad', datafield: 'm_inventory', width: 110, align: 'right', |
141
fe9e2a677611
The yeast droplist sorting order changed. Misc ingredients time editor uses minutes or days depending on the use of the ingredient. The yeast editor can now use grams, ml or packs.
Michiel Broek <mbroek@mbse.eu>
parents:
140
diff
changeset
|
2287 | cellsrenderer: function (index, datafield, value, defaultvalue, column, rowdata) { |
225
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
224
diff
changeset
|
2288 | var vstr = rowdata.m_amount_is_weight ? "gr":"ml"; |
286
124af734af68
Version 0.1.0. Removed localization because it was messy, parts were localized and others not. In production and recipes ingredients not in stock are marked in red.
Michiel Broek <mbroek@mbse.eu>
parents:
283
diff
changeset
|
2289 | var color = '#ffffff'; |
124af734af68
Version 0.1.0. Removed localization because it was messy, parts were localized and others not. In production and recipes ingredients not in stock are marked in red.
Michiel Broek <mbroek@mbse.eu>
parents:
283
diff
changeset
|
2290 | if (value < rowdata.m_amount) |
124af734af68
Version 0.1.0. Removed localization because it was messy, parts were localized and others not. In production and recipes ingredients not in stock are marked in red.
Michiel Broek <mbroek@mbse.eu>
parents:
283
diff
changeset
|
2291 | color = '#ff4040'; |
124af734af68
Version 0.1.0. Removed localization because it was messy, parts were localized and others not. In production and recipes ingredients not in stock are marked in red.
Michiel Broek <mbroek@mbse.eu>
parents:
283
diff
changeset
|
2292 | var amount = dataAdapter.formatNumber(value * 1000,"f2")+" "+vstr; |
124af734af68
Version 0.1.0. Removed localization because it was messy, parts were localized and others not. In production and recipes ingredients not in stock are marked in red.
Michiel Broek <mbroek@mbse.eu>
parents:
283
diff
changeset
|
2293 | return '<span style="margin: 4px; margin-top: 6px; float: right; color: ' + color + ';">' + amount + '</span>'; |
141
fe9e2a677611
The yeast droplist sorting order changed. Misc ingredients time editor uses minutes or days depending on the use of the ingredient. The yeast editor can now use grams, ml or packs.
Michiel Broek <mbroek@mbse.eu>
parents:
140
diff
changeset
|
2294 | }, |
225
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
224
diff
changeset
|
2295 | }, |
286
124af734af68
Version 0.1.0. Removed localization because it was messy, parts were localized and others not. In production and recipes ingredients not in stock are marked in red.
Michiel Broek <mbroek@mbse.eu>
parents:
283
diff
changeset
|
2296 | { text: '', datafield: 'Edit', columntype: 'button', width: 100, align: 'center', cellsrenderer: function () { |
225
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
224
diff
changeset
|
2297 | return "Wijzig"; |
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
224
diff
changeset
|
2298 | }, buttonclick: function (row) { |
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
224
diff
changeset
|
2299 | miscRow = row; |
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
224
diff
changeset
|
2300 | miscData = $("#miscGrid").jqxGrid('getrowdata', miscRow); |
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
224
diff
changeset
|
2301 | if (miscData.m_amount_is_weight) |
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
224
diff
changeset
|
2302 | $("#wm_pmpt_amount").html("Gewicht gram:"); |
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
224
diff
changeset
|
2303 | else |
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
224
diff
changeset
|
2304 | $("#wm_pmpt_amount").html("Volume ml:"); |
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
224
diff
changeset
|
2305 | $("#wm_name").val(miscData.m_name); |
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
224
diff
changeset
|
2306 | $("#wm_amount").val(miscData.m_amount * 1000); |
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
224
diff
changeset
|
2307 | if ((miscData.m_use_use == 3) || (miscData.m_use_use == 4)) // Primary or Secondary |
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
224
diff
changeset
|
2308 | $("#wm_time").val(miscData.m_time / 1440); |
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
224
diff
changeset
|
2309 | else |
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
224
diff
changeset
|
2310 | $("#wm_time").val(miscData.m_time); |
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
224
diff
changeset
|
2311 | $("#wm_use_use").val(miscData.m_use_use); |
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
224
diff
changeset
|
2312 | // show the popup window. |
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
224
diff
changeset
|
2313 | if (miscData.m_type != 4) |
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
224
diff
changeset
|
2314 | $("#popupMisc").jqxWindow('open'); |
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
224
diff
changeset
|
2315 | } |
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
224
diff
changeset
|
2316 | } |
68 | 2317 | ] |
141
fe9e2a677611
The yeast droplist sorting order changed. Misc ingredients time editor uses minutes or days depending on the use of the ingredient. The yeast editor can now use grams, ml or packs.
Michiel Broek <mbroek@mbse.eu>
parents:
140
diff
changeset
|
2318 | }); |
68 | 2319 | }; |
2320 | ||
2321 | // Inline yeasts editor | |
2322 | var editYeast = function (data) { | |
2323 | var yeastSource = { | |
2324 | localdata: data.yeasts, | |
2325 | datatype: "local", | |
2326 | cache: false, | |
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
|
2327 | async: false, |
68 | 2328 | datafields: [ |
2329 | { name: 'y_name', type: 'string' }, | |
2330 | { name: 'y_laboratory', type: 'string' }, | |
2331 | { name: 'y_product_id', type: 'string' }, | |
2332 | { name: 'y_amount', type: 'float' }, | |
2333 | { name: 'y_cost', type: 'float' }, | |
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:
175
diff
changeset
|
2334 | { name: 'y_type', type: 'int' }, |
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:
175
diff
changeset
|
2335 | { name: 'y_form', type: 'int' }, |
226
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
2336 | { name: 'y_flocculation', type: 'int' }, |
68 | 2337 | { name: 'y_min_temperature', type: 'float' }, |
2338 | { name: 'y_max_temperature', type: 'float' }, | |
2339 | { name: 'y_attenuation', type: 'float' }, | |
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:
175
diff
changeset
|
2340 | { name: 'y_use', type: 'int' }, |
226
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
2341 | { name: 'y_cells', type: 'float' }, |
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
2342 | { name: 'y_inventory', type: 'float' }, |
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
2343 | { name: 'y_avail', type: 'int' } |
68 | 2344 | ], |
2345 | addrow: function (rowid, rowdata, position, commit) { | |
2346 | commit(true); | |
2347 | }, | |
2348 | deleterow: function (rowid, commit) { | |
2349 | commit(true); | |
2350 | } | |
2351 | }; | |
226
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
2352 | var yeastAdapter = new $.jqx.dataAdapter(yeastSource); |
68 | 2353 | $("#yeastGrid").jqxGrid({ |
226
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
2354 | width: 1240, |
286
124af734af68
Version 0.1.0. Removed localization because it was messy, parts were localized and others not. In production and recipes ingredients not in stock are marked in red.
Michiel Broek <mbroek@mbse.eu>
parents:
283
diff
changeset
|
2355 | height: 350, |
68 | 2356 | source: yeastAdapter, |
2357 | theme: theme, | |
2358 | selectionmode: 'singlerow', | |
2359 | showtoolbar: true, | |
2360 | rendertoolbar: function (toolbar) { | |
2361 | var me = this; | |
2362 | var container = $("<div style='overflow: hidden; position: relative; margin: 5px;'></div>"); | |
2363 | toolbar.append(container); | |
2364 | container.append('<div style="float: left; margin-left: 165px;" id="yaddrowbutton"></div>'); | |
146
2a6c00d325b2
In dropdown inventory lists you can now choose to display only ingredients that rae on stock or all. Fix the hops amount editor that loses the decimal digits.
Michiel Broek <mbroek@mbse.eu>
parents:
145
diff
changeset
|
2365 | container.append('<div style="float: left; margin-left: 10px; margin-top: 5px;">In voorraad:</div>'); |
2a6c00d325b2
In dropdown inventory lists you can now choose to display only ingredients that rae on stock or all. Fix the hops amount editor that loses the decimal digits.
Michiel Broek <mbroek@mbse.eu>
parents:
145
diff
changeset
|
2366 | container.append('<div style="float: left; margin-left: 10px;" id="yinstockbutton"></div>'); |
226
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
2367 | container.append('<input style="float: left; margin-left: 400px;" id="ydeleterowbutton" type="button" value="Verwijder gist" />'); |
68 | 2368 | // add yeast from dropdownlist. |
2369 | $("#yaddrowbutton").jqxDropDownList({ | |
2370 | placeHolder: "Kies gist:", | |
2371 | theme: theme, | |
226
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
2372 | template: "primary", |
68 | 2373 | source: yeastlist, |
2374 | displayMember: "name", | |
2375 | width: 150, | |
2376 | height: 27, | |
141
fe9e2a677611
The yeast droplist sorting order changed. Misc ingredients time editor uses minutes or days depending on the use of the ingredient. The yeast editor can now use grams, ml or packs.
Michiel Broek <mbroek@mbse.eu>
parents:
140
diff
changeset
|
2377 | dropDownWidth: 500, |
fe9e2a677611
The yeast droplist sorting order changed. Misc ingredients time editor uses minutes or days depending on the use of the ingredient. The yeast editor can now use grams, ml or packs.
Michiel Broek <mbroek@mbse.eu>
parents:
140
diff
changeset
|
2378 | dropDownHeight: 500, |
fe9e2a677611
The yeast droplist sorting order changed. Misc ingredients time editor uses minutes or days depending on the use of the ingredient. The yeast editor can now use grams, ml or packs.
Michiel Broek <mbroek@mbse.eu>
parents:
140
diff
changeset
|
2379 | renderer: function (index, label, value) { |
fe9e2a677611
The yeast droplist sorting order changed. Misc ingredients time editor uses minutes or days depending on the use of the ingredient. The yeast editor can now use grams, ml or packs.
Michiel Broek <mbroek@mbse.eu>
parents:
140
diff
changeset
|
2380 | var datarecord = yeastlist.records[index]; |
fe9e2a677611
The yeast droplist sorting order changed. Misc ingredients time editor uses minutes or days depending on the use of the ingredient. The yeast editor can now use grams, ml or packs.
Michiel Broek <mbroek@mbse.eu>
parents:
140
diff
changeset
|
2381 | return datarecord.laboratory+" "+datarecord.product_id+" "+datarecord.name; |
fe9e2a677611
The yeast droplist sorting order changed. Misc ingredients time editor uses minutes or days depending on the use of the ingredient. The yeast editor can now use grams, ml or packs.
Michiel Broek <mbroek@mbse.eu>
parents:
140
diff
changeset
|
2382 | } |
68 | 2383 | }); |
2384 | $("#yaddrowbutton").on('select', function (event) { | |
2385 | if (event.args) { | |
2386 | var index = event.args.index; | |
2387 | var datarecord = yeastlist.records[index]; | |
2388 | var row = {}; | |
2389 | row["y_name"] = datarecord.name; | |
2390 | row["y_laboratory"] = datarecord.laboratory; | |
2391 | row["y_product_id"] = datarecord.product_id; | |
2392 | row["y_type"] = datarecord.type; | |
2393 | row["y_form"] = datarecord.form; | |
2394 | row["y_amount"] = 0; | |
2395 | row["y_cost"] = datarecord.cost; | |
220
14e349ff2a10
Recipes import uses indexes instead of strings. Started rebuilding the recipes editor using indexes and standard formats. Rebuild the fermentable editor from grid editing to popup editing. Most calculations are using indexes for dropdown values.
Michiel Broek <mbroek@mbse.eu>
parents:
175
diff
changeset
|
2396 | row["y_use"] = 0; |
68 | 2397 | row["y_min_temperature"] = datarecord.min_temperature; |
2398 | row["y_max_temperature"] = datarecord.max_temperature; | |
2399 | row["y_attenuation"] = datarecord.attenuation; | |
226
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
2400 | row["y_flocculation"] = datarecord.flocculation; |
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
2401 | row["y_cells"] = datarecord.cells; |
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
2402 | row["y_inventory"] = datarecord.inventory; |
68 | 2403 | var commit = $("#yeastGrid").jqxGrid('addrow', null, row); |
2404 | } | |
267
dafc9ff806a4
Allow the same hops and yeasts to be added multiple times.
Michiel Broek <mbroek@mbse.eu>
parents:
265
diff
changeset
|
2405 | $("#yaddrowbutton").jqxDropDownList('clearSelection'); |
68 | 2406 | }); |
146
2a6c00d325b2
In dropdown inventory lists you can now choose to display only ingredients that rae on stock or all. Fix the hops amount editor that loses the decimal digits.
Michiel Broek <mbroek@mbse.eu>
parents:
145
diff
changeset
|
2407 | $("#yinstockbutton").jqxCheckBox({ theme: theme, height: 27 }); |
2a6c00d325b2
In dropdown inventory lists you can now choose to display only ingredients that rae on stock or all. Fix the hops amount editor that loses the decimal digits.
Michiel Broek <mbroek@mbse.eu>
parents:
145
diff
changeset
|
2408 | $("#yinstockbutton").on('change', function (event) { |
2a6c00d325b2
In dropdown inventory lists you can now choose to display only ingredients that rae on stock or all. Fix the hops amount editor that loses the decimal digits.
Michiel Broek <mbroek@mbse.eu>
parents:
145
diff
changeset
|
2409 | yeastinstock = event.args.checked; |
2a6c00d325b2
In dropdown inventory lists you can now choose to display only ingredients that rae on stock or all. Fix the hops amount editor that loses the decimal digits.
Michiel Broek <mbroek@mbse.eu>
parents:
145
diff
changeset
|
2410 | yeastlist.dataBind(); |
2a6c00d325b2
In dropdown inventory lists you can now choose to display only ingredients that rae on stock or all. Fix the hops amount editor that loses the decimal digits.
Michiel Broek <mbroek@mbse.eu>
parents:
145
diff
changeset
|
2411 | }); |
68 | 2412 | // delete selected yeast. |
226
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
2413 | $("#ydeleterowbutton").jqxButton({ template: "danger", theme: theme, height: 27, width: 150 }); |
68 | 2414 | $("#ydeleterowbutton").on('click', function () { |
2415 | var selectedrowindex = $("#yeastGrid").jqxGrid('getselectedrowindex'); | |
2416 | var rowscount = $("#yeastGrid").jqxGrid('getdatainformation').rowscount; | |
2417 | if (selectedrowindex >= 0 && selectedrowindex < rowscount) { | |
2418 | var id = $("#yeastGrid").jqxGrid('getrowid', selectedrowindex); | |
2419 | var commit = $("#yeastGrid").jqxGrid('deleterow', id); | |
2420 | } | |
2421 | }); | |
2422 | }, | |
96
107c12c3e49d
Renamed estimate_og() to estimate_sg() formula. Updated the formulas in javascript. The calcFermenter() function now only calculates the gravities. The colors still need to be added. When a recept is loaded in the editor, all tabs are selected once to load all subgrid data. Ugly and slow but it at least it works.
Michiel Broek <mbroek@mbse.eu>
parents:
95
diff
changeset
|
2423 | ready: function() { |
261
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
2424 | calcFermentables(); |
96
107c12c3e49d
Renamed estimate_og() to estimate_sg() formula. Updated the formulas in javascript. The calcFermenter() function now only calculates the gravities. The colors still need to be added. When a recept is loaded in the editor, all tabs are selected once to load all subgrid data. Ugly and slow but it at least it works.
Michiel Broek <mbroek@mbse.eu>
parents:
95
diff
changeset
|
2425 | $('#jqxTabs').jqxTabs('next'); |
107c12c3e49d
Renamed estimate_og() to estimate_sg() formula. Updated the formulas in javascript. The calcFermenter() function now only calculates the gravities. The colors still need to be added. When a recept is loaded in the editor, all tabs are selected once to load all subgrid data. Ugly and slow but it at least it works.
Michiel Broek <mbroek@mbse.eu>
parents:
95
diff
changeset
|
2426 | }, |
68 | 2427 | columns: [ |
226
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
2428 | { text: 'Gist', datafield: 'y_name' }, |
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
2429 | { text: 'Laboratorium', width: 150, datafield: 'y_laboratory' }, |
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
2430 | { text: 'Code', width: 90, datafield: 'y_product_id' }, |
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
2431 | { text: 'Soort', width: 100, datafield: 'y_form', |
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
2432 | cellsrenderer: function (index, datafield, value, defaultvalue, column, rowdata) { |
286
124af734af68
Version 0.1.0. Removed localization because it was messy, parts were localized and others not. In production and recipes ingredients not in stock are marked in red.
Michiel Broek <mbroek@mbse.eu>
parents:
283
diff
changeset
|
2433 | return '<span style="margin: 4px; margin-top: 6px; float: left;">' + YeastFormData[value].nl + '</span>'; |
226
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
2434 | } |
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
2435 | }, |
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
2436 | { text: 'Min. °C', width: 70, align: 'right', cellsalign: 'right', datafield: 'y_min_temperature' }, |
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
2437 | { text: 'Max. °C', width: 70, align: 'right', cellsalign: 'right', datafield: 'y_max_temperature' }, |
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
2438 | { text: 'Attn. %', width: 70, align: 'right', cellsalign: 'right', datafield: 'y_attenuation', cellsformat: 'f1' }, |
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
2439 | { text: 'Voor', width: 120, datafield: 'y_use', |
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
2440 | cellsrenderer: function (index, datafield, value, defaultvalue, column, rowdata) { |
286
124af734af68
Version 0.1.0. Removed localization because it was messy, parts were localized and others not. In production and recipes ingredients not in stock are marked in red.
Michiel Broek <mbroek@mbse.eu>
parents:
283
diff
changeset
|
2441 | return '<span style="margin: 4px; margin-top: 6px; float: left;">' + YeastUseData[value].nl + '</span>'; |
141
fe9e2a677611
The yeast droplist sorting order changed. Misc ingredients time editor uses minutes or days depending on the use of the ingredient. The yeast editor can now use grams, ml or packs.
Michiel Broek <mbroek@mbse.eu>
parents:
140
diff
changeset
|
2442 | } |
fe9e2a677611
The yeast droplist sorting order changed. Misc ingredients time editor uses minutes or days depending on the use of the ingredient. The yeast editor can now use grams, ml or packs.
Michiel Broek <mbroek@mbse.eu>
parents:
140
diff
changeset
|
2443 | }, |
226
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
2444 | { text: 'Hoeveel', datafield: 'y_amount', width: 100, align: 'right', |
141
fe9e2a677611
The yeast droplist sorting order changed. Misc ingredients time editor uses minutes or days depending on the use of the ingredient. The yeast editor can now use grams, ml or packs.
Michiel Broek <mbroek@mbse.eu>
parents:
140
diff
changeset
|
2445 | cellsrenderer: function (index, datafield, value, defaultvalue, column, rowdata) { |
286
124af734af68
Version 0.1.0. Removed localization because it was messy, parts were localized and others not. In production and recipes ingredients not in stock are marked in red.
Michiel Broek <mbroek@mbse.eu>
parents:
283
diff
changeset
|
2446 | var amount = dataAdapter.formatNumber(value*1000, "f0")+" ml"; |
124af734af68
Version 0.1.0. Removed localization because it was messy, parts were localized and others not. In production and recipes ingredients not in stock are marked in red.
Michiel Broek <mbroek@mbse.eu>
parents:
283
diff
changeset
|
2447 | if (rowdata.y_form == 0) // Liquid |
124af734af68
Version 0.1.0. Removed localization because it was messy, parts were localized and others not. In production and recipes ingredients not in stock are marked in red.
Michiel Broek <mbroek@mbse.eu>
parents:
283
diff
changeset
|
2448 | amount = dataAdapter.formatNumber(value, "f0")+" pk"; |
124af734af68
Version 0.1.0. Removed localization because it was messy, parts were localized and others not. In production and recipes ingredients not in stock are marked in red.
Michiel Broek <mbroek@mbse.eu>
parents:
283
diff
changeset
|
2449 | else if (rowdata.y_form == 1) // Dry |
124af734af68
Version 0.1.0. Removed localization because it was messy, parts were localized and others not. In production and recipes ingredients not in stock are marked in red.
Michiel Broek <mbroek@mbse.eu>
parents:
283
diff
changeset
|
2450 | amount = dataAdapter.formatNumber(value*1000, "f1")+" gr"; |
124af734af68
Version 0.1.0. Removed localization because it was messy, parts were localized and others not. In production and recipes ingredients not in stock are marked in red.
Michiel Broek <mbroek@mbse.eu>
parents:
283
diff
changeset
|
2451 | return '<span style="margin: 4px; margin-top: 6px; float: right;">' + amount + '</span>'; |
226
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
2452 | } |
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
2453 | }, |
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
2454 | { text: 'Voorraad', datafield: 'y_inventory', width: 100, align: 'right', |
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
2455 | cellsrenderer: function (index, datafield, value, defaultvalue, column, rowdata) { |
286
124af734af68
Version 0.1.0. Removed localization because it was messy, parts were localized and others not. In production and recipes ingredients not in stock are marked in red.
Michiel Broek <mbroek@mbse.eu>
parents:
283
diff
changeset
|
2456 | var color = '#ffffff'; |
124af734af68
Version 0.1.0. Removed localization because it was messy, parts were localized and others not. In production and recipes ingredients not in stock are marked in red.
Michiel Broek <mbroek@mbse.eu>
parents:
283
diff
changeset
|
2457 | if (value < rowdata.y_amount) |
124af734af68
Version 0.1.0. Removed localization because it was messy, parts were localized and others not. In production and recipes ingredients not in stock are marked in red.
Michiel Broek <mbroek@mbse.eu>
parents:
283
diff
changeset
|
2458 | color = '#ff4040'; |
124af734af68
Version 0.1.0. Removed localization because it was messy, parts were localized and others not. In production and recipes ingredients not in stock are marked in red.
Michiel Broek <mbroek@mbse.eu>
parents:
283
diff
changeset
|
2459 | var amount = dataAdapter.formatNumber(value*1000, "f0")+" ml"; |
124af734af68
Version 0.1.0. Removed localization because it was messy, parts were localized and others not. In production and recipes ingredients not in stock are marked in red.
Michiel Broek <mbroek@mbse.eu>
parents:
283
diff
changeset
|
2460 | if (rowdata.y_form == 0) // Liquid |
124af734af68
Version 0.1.0. Removed localization because it was messy, parts were localized and others not. In production and recipes ingredients not in stock are marked in red.
Michiel Broek <mbroek@mbse.eu>
parents:
283
diff
changeset
|
2461 | amount = dataAdapter.formatNumber(value, "f0")+" pk"; |
124af734af68
Version 0.1.0. Removed localization because it was messy, parts were localized and others not. In production and recipes ingredients not in stock are marked in red.
Michiel Broek <mbroek@mbse.eu>
parents:
283
diff
changeset
|
2462 | else if (rowdata.y_form == 1) // Dry |
124af734af68
Version 0.1.0. Removed localization because it was messy, parts were localized and others not. In production and recipes ingredients not in stock are marked in red.
Michiel Broek <mbroek@mbse.eu>
parents:
283
diff
changeset
|
2463 | amount = dataAdapter.formatNumber(value*1000, "f1")+" gr"; |
124af734af68
Version 0.1.0. Removed localization because it was messy, parts were localized and others not. In production and recipes ingredients not in stock are marked in red.
Michiel Broek <mbroek@mbse.eu>
parents:
283
diff
changeset
|
2464 | return '<span style="margin: 4px; margin-top: 6px; float: right; color: ' + color + ';">' + amount + '</span>'; |
226
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
2465 | } |
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
2466 | }, |
286
124af734af68
Version 0.1.0. Removed localization because it was messy, parts were localized and others not. In production and recipes ingredients not in stock are marked in red.
Michiel Broek <mbroek@mbse.eu>
parents:
283
diff
changeset
|
2467 | { text: '', datafield: 'Edit', columntype: 'button', width: 100, align: 'center', cellsrenderer: function () { |
226
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
2468 | return "Wijzig"; |
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
2469 | }, buttonclick: function (row) { |
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
2470 | yeastRow = row; |
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
2471 | yeastData = $("#yeastGrid").jqxGrid('getrowdata', yeastRow); |
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
2472 | if (yeastData.y_form == 0) { |
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
2473 | $("#wy_pmpt_amount").html("Pak(ken):"); |
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
2474 | $("#wy_amount").val(yeastData.y_amount); |
265
05f9a0c9ed2d
Fixed yeast amount editing using spinbuttons.
Michiel Broek <mbroek@mbse.eu>
parents:
264
diff
changeset
|
2475 | $("#wy_amount").jqxNumberInput({ decimalDigits: 0 }); |
226
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
2476 | } else if (yeastData.y_form == 1) { |
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
2477 | $("#wy_pmpt_amount").html("Gewicht gram:"); |
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
2478 | $("#wy_amount").val(yeastData.y_amount * 1000); |
265
05f9a0c9ed2d
Fixed yeast amount editing using spinbuttons.
Michiel Broek <mbroek@mbse.eu>
parents:
264
diff
changeset
|
2479 | $("#wy_amount").jqxNumberInput({ decimalDigits: 1 }); |
226
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
2480 | } else { |
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
2481 | $("#wy_pmpt_amount").html("Volume ml:"); |
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
2482 | $("#wy_amount").val(yeastData.y_amount * 1000); |
265
05f9a0c9ed2d
Fixed yeast amount editing using spinbuttons.
Michiel Broek <mbroek@mbse.eu>
parents:
264
diff
changeset
|
2483 | $("#wy_amount").jqxNumberInput({ decimalDigits: 0 }); |
226
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
2484 | } |
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
2485 | $("#wy_name").val(yeastData.y_name); |
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
2486 | $("#wy_laboratory").val(yeastData.y_laboratory); |
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
2487 | $("#wy_product_id").val(yeastData.y_product_id); |
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
2488 | $("#wy_use").val(yeastData.y_use); |
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
2489 | // show the popup window. |
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
2490 | $("#popupYeast").jqxWindow('open'); |
141
fe9e2a677611
The yeast droplist sorting order changed. Misc ingredients time editor uses minutes or days depending on the use of the ingredient. The yeast editor can now use grams, ml or packs.
Michiel Broek <mbroek@mbse.eu>
parents:
140
diff
changeset
|
2491 | } |
226
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
2492 | } |
68 | 2493 | ] |
141
fe9e2a677611
The yeast droplist sorting order changed. Misc ingredients time editor uses minutes or days depending on the use of the ingredient. The yeast editor can now use grams, ml or packs.
Michiel Broek <mbroek@mbse.eu>
parents:
140
diff
changeset
|
2494 | }); |
68 | 2495 | }; |
2496 | ||
2497 | // inline mash editor | |
2498 | var editMash = function (data) { | |
2499 | var generaterow = function () { | |
2500 | var row = {}; | |
2501 | row["step_name"] = "Stap 1"; | |
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:
175
diff
changeset
|
2502 | row["step_type"] = 0; |
68 | 2503 | row["step_infuse_amount"] = 15; |
2504 | row["step_temp"] = 62.0; | |
2505 | row['step_time'] = 20.0; | |
2506 | row['ramp_time'] = 1.0; | |
2507 | row['end_temp'] = 62.0; | |
2508 | return row; | |
2509 | } | |
2510 | var mashSource = { | |
2511 | localdata: data.mashs, | |
2512 | datatype: "local", | |
2513 | cache: false, | |
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
|
2514 | async: false, |
68 | 2515 | datafields: [ |
2516 | { name: 'step_name', type: 'string' }, | |
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:
175
diff
changeset
|
2517 | { name: 'step_type', type: 'int' }, |
68 | 2518 | { name: 'step_infuse_amount', type: 'float' }, |
2519 | { name: 'step_temp', type: 'float' }, | |
2520 | { name: 'step_time', type: 'float' }, | |
2521 | { name: 'ramp_time', type: 'float' }, | |
2522 | { name: 'end_temp', type: 'float' } | |
2523 | ], | |
2524 | addrow: function (rowid, rowdata, position, commit) { | |
2525 | commit(true); | |
2526 | }, | |
2527 | deleterow: function (rowid, commit) { | |
2528 | commit(true); | |
2529 | } | |
2530 | }; | |
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
|
2531 | var mashAdapter = new $.jqx.dataAdapter(mashSource, { |
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
|
2532 | beforeLoadComplete: function (records) { |
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
|
2533 | mash_infuse = 0; |
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
|
2534 | var data = new Array(); |
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
|
2535 | for (var i = 0; i < records.length; i++) { |
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
|
2536 | var row = records[i]; |
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:
175
diff
changeset
|
2537 | if (row.step_type == 0) // Infusion |
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
|
2538 | mash_infuse += parseFloat(row.step_infuse_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
|
2539 | } |
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
|
2540 | }, |
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
|
2541 | }); |
68 | 2542 | $("#mashGrid").jqxGrid({ |
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:
227
diff
changeset
|
2543 | width: 1240, |
68 | 2544 | height: 400, |
2545 | source: mashAdapter, | |
2546 | theme: theme, | |
2547 | selectionmode: 'singlerow', | |
2548 | showtoolbar: true, | |
2549 | rendertoolbar: function (toolbar) { | |
2550 | var me = this; | |
2551 | var container = $("<div style='overflow: hidden; position: relative; margin: 5px;'></div>"); | |
2552 | toolbar.append(container); | |
2553 | container.append('<input style="float: left; margin-left: 165px;" id="saddrowbutton" type="button" value="Nieuwe stap" />'); | |
229
cfd87d51a33c
Reset infuse amount if not an infusion step
Michiel Broek <mbroek@mbse.eu>
parents:
228
diff
changeset
|
2554 | container.append('<input style="float: left; margin-left: 565px;" id="sdeleterowbutton" type="button" value="Verwijder stap" />'); |
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:
227
diff
changeset
|
2555 | $("#saddrowbutton").jqxButton({ template: "primary", theme: theme, height: 27, width: 150 }); |
68 | 2556 | $("#saddrowbutton").on('click', function () { |
2557 | var datarow = generaterow(); | |
2558 | var commit = $("#mashGrid").jqxGrid('addrow', null, datarow); | |
2559 | }); | |
2560 | // delete selected yeast. | |
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:
227
diff
changeset
|
2561 | $("#sdeleterowbutton").jqxButton({ template: "danger", theme: theme, height: 27, width: 150 }); |
68 | 2562 | $("#sdeleterowbutton").on('click', function () { |
2563 | var selectedrowindex = $("#mashGrid").jqxGrid('getselectedrowindex'); | |
2564 | var rowscount = $("#mashGrid").jqxGrid('getdatainformation').rowscount; | |
2565 | if (selectedrowindex >= 0 && selectedrowindex < rowscount) { | |
2566 | var id = $("#mashGrid").jqxGrid('getrowid', selectedrowindex); | |
2567 | var commit = $("#mashGrid").jqxGrid('deleterow', id); | |
2568 | } | |
2569 | }); | |
2570 | }, | |
96
107c12c3e49d
Renamed estimate_og() to estimate_sg() formula. Updated the formulas in javascript. The calcFermenter() function now only calculates the gravities. The colors still need to be added. When a recept is loaded in the editor, all tabs are selected once to load all subgrid data. Ugly and slow but it at least it works.
Michiel Broek <mbroek@mbse.eu>
parents:
95
diff
changeset
|
2571 | ready: function() { |
261
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
2572 | calcFermentables(); |
98
92d6bc8a4cdd
Added javascript formulas for color calculations. Added IBU total calculation. Better IBI calculation for the hop entries. Blocked selection of IBU calculation for Garetz, Mosher and Noonan. Better sg calculation in the recipe print.
Michiel Broek <mbroek@mbse.eu>
parents:
97
diff
changeset
|
2573 | calcInit(); |
129
7f41b61c3faf
Added a loader during recipe load. Recalculate percentages if a fermentable row is deleted. Don't edit amounts if using weight percentages. Update grid percentages if a fermentable amount is changed. Recalculate IBU's after changes with fermentables.
Michiel Broek <mbroek@mbse.eu>
parents:
128
diff
changeset
|
2574 | $('#jqxLoader').jqxLoader('close'); |
96
107c12c3e49d
Renamed estimate_og() to estimate_sg() formula. Updated the formulas in javascript. The calcFermenter() function now only calculates the gravities. The colors still need to be added. When a recept is loaded in the editor, all tabs are selected once to load all subgrid data. Ugly and slow but it at least it works.
Michiel Broek <mbroek@mbse.eu>
parents:
95
diff
changeset
|
2575 | $('#jqxTabs').jqxTabs('first'); |
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
|
2576 | // setReadonly(dataRecord.locked); |
96
107c12c3e49d
Renamed estimate_og() to estimate_sg() formula. Updated the formulas in javascript. The calcFermenter() function now only calculates the gravities. The colors still need to be added. When a recept is loaded in the editor, all tabs are selected once to load all subgrid data. Ugly and slow but it at least it works.
Michiel Broek <mbroek@mbse.eu>
parents:
95
diff
changeset
|
2577 | }, |
68 | 2578 | columns: [ |
2579 | { text: 'Stap naam', datafield: 'step_name' }, | |
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:
227
diff
changeset
|
2580 | { text: 'Stap type', datafield: 'step_type', width: 175, |
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:
227
diff
changeset
|
2581 | cellsrenderer: function (index, datafield, value, defaultvalue, column, rowdata) { |
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:
227
diff
changeset
|
2582 | return "<div style='margin: 4px;'>" + MashStepTypeData[value].nl + "</div>"; |
68 | 2583 | } |
2584 | }, | |
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:
227
diff
changeset
|
2585 | { text: 'Start °C', datafield: 'step_temp', width: 90, align: 'right', cellsalign: 'right', cellsformat: 'f1' }, |
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:
227
diff
changeset
|
2586 | { text: 'Eind °C', datafield: 'end_temp', width: 90, align: 'right', cellsalign: 'right', cellsformat: 'f1' }, |
286
124af734af68
Version 0.1.0. Removed localization because it was messy, parts were localized and others not. In production and recipes ingredients not in stock are marked in red.
Michiel Broek <mbroek@mbse.eu>
parents:
283
diff
changeset
|
2587 | { text: 'Rust min.', datafield: 'step_time', width: 90, align: 'right', cellsalign: 'right' }, |
124af734af68
Version 0.1.0. Removed localization because it was messy, parts were localized and others not. In production and recipes ingredients not in stock are marked in red.
Michiel Broek <mbroek@mbse.eu>
parents:
283
diff
changeset
|
2588 | { text: 'Stap min.', datafield: 'ramp_time', width: 90, align: 'right', cellsalign: 'right' }, |
124af734af68
Version 0.1.0. Removed localization because it was messy, parts were localized and others not. In production and recipes ingredients not in stock are marked in red.
Michiel Broek <mbroek@mbse.eu>
parents:
283
diff
changeset
|
2589 | { text: 'Infuse L.', datafield: 'step_infuse_amount', width: 90, align: 'right', cellsalign: 'right', cellsformat: 'f1' }, |
124af734af68
Version 0.1.0. Removed localization because it was messy, parts were localized and others not. In production and recipes ingredients not in stock are marked in red.
Michiel Broek <mbroek@mbse.eu>
parents:
283
diff
changeset
|
2590 | { text: '', datafield: 'Edit', columntype: 'button', width: 100, align: 'center', cellsrenderer: function () { |
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:
227
diff
changeset
|
2591 | return "Wijzig"; |
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:
227
diff
changeset
|
2592 | }, buttonclick: function (row) { |
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:
227
diff
changeset
|
2593 | mashRow = row; |
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:
227
diff
changeset
|
2594 | mashData = $("#mashGrid").jqxGrid('getrowdata', mashRow); |
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:
227
diff
changeset
|
2595 | $("#wstep_name").val(mashData.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:
227
diff
changeset
|
2596 | $("#wstep_type").val(mashData.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:
227
diff
changeset
|
2597 | $("#wstep_infuse_amount").val(mashData.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:
227
diff
changeset
|
2598 | $("#wstep_temp").val(mashData.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:
227
diff
changeset
|
2599 | $("#wend_temp").val(mashData.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:
227
diff
changeset
|
2600 | $("#wstep_time").val(mashData.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:
227
diff
changeset
|
2601 | $("#wramp_time").val(mashData.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:
227
diff
changeset
|
2602 | if (mashData.step_type == 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:
227
diff
changeset
|
2603 | $("#wstep_infuse_amount").show(); |
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:
227
diff
changeset
|
2604 | $("#wstep_pmpt").show(); |
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:
227
diff
changeset
|
2605 | } 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:
227
diff
changeset
|
2606 | $("#wstep_infuse_amount").hide(); |
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:
227
diff
changeset
|
2607 | $("#wstep_pmpt").hide(); |
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:
227
diff
changeset
|
2608 | } |
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:
227
diff
changeset
|
2609 | // show the popup window. |
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:
227
diff
changeset
|
2610 | $("#popupMash").jqxWindow('open'); |
68 | 2611 | } |
2612 | } | |
2613 | ] | |
2614 | }); | |
2615 | }; | |
2616 | ||
2617 | // initialize the input fields. | |
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:
175
diff
changeset
|
2618 | // Tab 1, Algemeen |
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:
175
diff
changeset
|
2619 | $("#name").jqxTooltip({ content: 'De naam voor dit recept.' }); |
68 | 2620 | $("#name").jqxInput({ theme: theme, width: 640, height: 23 }); |
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
|
2621 | $("#locked").jqxCheckBox({ theme: theme, width: 120, height: 23 }); |
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:
175
diff
changeset
|
2622 | $("#notes").jqxTooltip({ content: 'De uitgebreide opmerkingen over dit recept.' }); |
68 | 2623 | $("#notes").jqxInput({ theme: theme, width: 960, height: 200 }); |
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:
175
diff
changeset
|
2624 | $("#type").jqxTooltip({ content: 'Het brouw type van dit recept.' }); |
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:
175
diff
changeset
|
2625 | $("#type").jqxDropDownList({ |
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:
175
diff
changeset
|
2626 | theme: theme, |
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:
175
diff
changeset
|
2627 | source: RecipeTypeAdapter, |
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:
175
diff
changeset
|
2628 | valueMember: 'id', |
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:
175
diff
changeset
|
2629 | displayMember: 'nl', |
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:
175
diff
changeset
|
2630 | width: 180, |
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:
175
diff
changeset
|
2631 | height: 23, |
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:
175
diff
changeset
|
2632 | autoDropDownHeight: 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:
175
diff
changeset
|
2633 | }); |
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:
175
diff
changeset
|
2634 | $("#efficiency").jqxTooltip({ content: 'Het rendement van maischen en koken.' }); |
245
3649c3d31d15
Fixed the mousewheel, spinner buttons to use the full min/max ranges. The 1.002 SG block to be precise.
Michiel Broek <mbroek@mbse.eu>
parents:
241
diff
changeset
|
2635 | $("#efficiency").jqxNumberInput( Perc1dec ); |
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:
175
diff
changeset
|
2636 | $("#batch_size").jqxTooltip({ content: 'Het volume van het gekoelde wort na het koken.' }); |
245
3649c3d31d15
Fixed the mousewheel, spinner buttons to use the full min/max ranges. The 1.002 SG block to be precise.
Michiel Broek <mbroek@mbse.eu>
parents:
241
diff
changeset
|
2637 | $("#batch_size").jqxNumberInput( Spin1dec ); |
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:
175
diff
changeset
|
2638 | $("#batch_size").jqxNumberInput({ min: 4 }); |
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:
175
diff
changeset
|
2639 | $("#boil_size").jqxTooltip({ content: 'Het volume van het wort voor het koken.' }); |
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:
175
diff
changeset
|
2640 | $("#boil_size").jqxNumberInput({ inputMode: 'simple', theme: theme, width: 90, height: 23, decimalDigits: 2, readOnly: 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:
175
diff
changeset
|
2641 | $("#boil_time").jqxTooltip({ content: 'De kooktijd in minuten.' }); |
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:
175
diff
changeset
|
2642 | $("#boil_time").jqxNumberInput( PosInt ); |
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:
175
diff
changeset
|
2643 | $("#boil_time").jqxNumberInput({ min: 4, max: 360 }); |
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:
175
diff
changeset
|
2644 | |
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:
175
diff
changeset
|
2645 | $("#st_name").jqxTooltip({ content: 'De bierstijl naam voor dit recept.'}); |
68 | 2646 | $("#st_name").jqxInput({ theme: theme, width: 250, height: 23 }); |
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:
175
diff
changeset
|
2647 | $("#st_letter").jqxTooltip({ content: 'De bierstijl letter voor dit recept.'}); |
68 | 2648 | $("#st_letter").jqxInput({ theme: theme, width: 100, height: 23 }); |
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:
175
diff
changeset
|
2649 | $("#st_guide").jqxTooltip({ content: 'De bierstijl gids voor dit recept.'}); |
68 | 2650 | $("#st_guide").jqxInput({ theme: theme, width: 250, height: 23 }); |
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:
175
diff
changeset
|
2651 | $("#st_category").jqxTooltip({ content: 'De Amerikaanse bierstijl categorie.'}); |
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
|
2652 | $("#st_category").jqxInput({ theme: theme, width: 250, height: 23 }); |
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:
175
diff
changeset
|
2653 | $("#st_category_number").jqxTooltip({ content: 'De Amerikaanse bierstijl categorie sub nummer.'}); |
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
|
2654 | $("#st_category_number").jqxNumberInput({ inputMode: 'simple', theme: theme, width: 50, height: 23, decimalDigits: 0, readOnly: true }); |
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:
175
diff
changeset
|
2655 | $("#st_type").jqxTooltip({ content: 'Het bierstijl type.'}); |
261
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
2656 | $("#st_type").jqxInput({ theme: theme, width: 250, height: 23 }); |
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:
175
diff
changeset
|
2657 | |
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:
175
diff
changeset
|
2658 | $("#est_og").jqxTooltip({ content: 'Het begin SG wat je wilt bereiken. De moutstort wordt automatisch herberekend.' }); |
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:
175
diff
changeset
|
2659 | $("#est_og").jqxNumberInput( SGopts ); |
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:
175
diff
changeset
|
2660 | $("#st_og_min").jqxTooltip({ content: 'Het minimum begin SG voor deze bierstijl.'}); |
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
|
2661 | $("#st_og_min").jqxNumberInput({ inputMode: 'simple', theme: theme, width: 50, height: 23, decimalDigits: 3, readOnly: true }); |
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:
175
diff
changeset
|
2662 | $("#st_og_max").jqxTooltip({ content: 'Het maximum begin SG voor deze bierstijl.'}); |
68 | 2663 | $("#st_og_max").jqxNumberInput({ inputMode: 'simple', theme: theme, width: 50, height: 23, decimalDigits: 3, readOnly: true }); |
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
|
2664 | |
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:
175
diff
changeset
|
2665 | $("#est_fg").jqxTooltip({ content: 'Het eind SG. Dit wordt automatisch berekend.' }); |
261
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
2666 | $("#est_fg").jqxNumberInput( Show3dec ); |
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:
175
diff
changeset
|
2667 | $("#st_fg_min").jqxTooltip({ content: 'Het minimum eind SG voor deze bierstijl.'}); |
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
|
2668 | $("#st_fg_min").jqxNumberInput({ inputMode: 'simple', theme: theme, width: 50, height: 23, decimalDigits: 3, readOnly: true }); |
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:
175
diff
changeset
|
2669 | $("#st_fg_max").jqxTooltip({ content: 'Het maximum eind SG voor deze bierstijl.'}); |
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
|
2670 | $("#st_fg_max").jqxNumberInput({ inputMode: 'simple', theme: theme, width: 50, height: 23, decimalDigits: 3, readOnly: true }); |
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
|
2671 | |
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:
175
diff
changeset
|
2672 | $("#est_abv").jqxTooltip({ content: 'Alcohol volume %. Dit wordt automatisch berekend.' }); |
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
|
2673 | $("#est_abv").jqxNumberInput({ inputMode: 'simple', theme: theme, width: 50, height: 23, decimalDigits: 1, readOnly: true }); |
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:
175
diff
changeset
|
2674 | $("#st_abv_min").jqxTooltip({ content: 'Het minimum alcohol volume % voor deze bierstijl.'}); |
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
|
2675 | $("#st_abv_min").jqxNumberInput({ inputMode: 'simple', theme: theme, width: 50, height: 23, decimalDigits: 1, readOnly: true }); |
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:
175
diff
changeset
|
2676 | $("#st_abv_max").jqxTooltip({ content: 'Het maximum alcohol volume % voor deze bierstijl.'}); |
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
|
2677 | $("#st_abv_max").jqxNumberInput({ inputMode: 'simple', theme: theme, width: 50, height: 23, decimalDigits: 1, readOnly: true }); |
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
|
2678 | |
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:
175
diff
changeset
|
2679 | $("#est_color").jqxTooltip({ content: 'De kleur in EBC. Dit wordt automatisch berekend.' }); |
261
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
2680 | $("#est_color").jqxNumberInput( Show0dec ); |
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:
175
diff
changeset
|
2681 | $("#st_color_min").jqxTooltip({ content: 'De minimum kleur voor deze bierstijl.'}); |
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
|
2682 | $("#st_color_min").jqxNumberInput({ inputMode: 'simple', theme: theme, width: 50, height: 23, decimalDigits: 0, readOnly: true }); |
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:
175
diff
changeset
|
2683 | $("#st_color_max").jqxTooltip({ content: 'De maximum kleur voor deze bierstijl.'}); |
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
|
2684 | $("#st_color_max").jqxNumberInput({ inputMode: 'simple', theme: theme, width: 50, height: 23, decimalDigits: 0, readOnly: true }); |
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:
175
diff
changeset
|
2685 | $("#color_method").jqxDropDownList({ |
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:
175
diff
changeset
|
2686 | theme: theme, |
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:
175
diff
changeset
|
2687 | source: ColorMethodAdapter, |
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:
175
diff
changeset
|
2688 | valueMember: 'id', |
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:
175
diff
changeset
|
2689 | displayMember: 'nl', |
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:
175
diff
changeset
|
2690 | width: 180, |
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:
175
diff
changeset
|
2691 | height: 23, |
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:
175
diff
changeset
|
2692 | autoDropDownHeight: 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:
175
diff
changeset
|
2693 | }); |
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
|
2694 | |
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:
175
diff
changeset
|
2695 | $("#est_ibu").jqxTooltip({ content: 'De bitterheid in IBU. Dit wordt automatisch berekend.' }); |
261
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
2696 | $("#est_ibu").jqxNumberInput( Show0dec ); |
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:
175
diff
changeset
|
2697 | $("#st_ibu_min").jqxTooltip({ content: 'De minimum bitterheid voor deze bierstijl.'}); |
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
|
2698 | $("#st_ibu_min").jqxNumberInput({ inputMode: 'simple', theme: theme, width: 50, height: 23, decimalDigits: 0, readOnly: true }); |
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:
175
diff
changeset
|
2699 | $("#st_ibu_max").jqxTooltip({ content: 'De maximum bitterheid voor deze bierstijl.'}); |
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
|
2700 | $("#st_ibu_max").jqxNumberInput({ inputMode: 'simple', theme: theme, width: 50, height: 23, decimalDigits: 0, readOnly: true }); |
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:
175
diff
changeset
|
2701 | $("#ibu_method").jqxDropDownList({ |
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:
175
diff
changeset
|
2702 | theme: theme, |
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:
175
diff
changeset
|
2703 | source: IBUmethodAdapter, |
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:
175
diff
changeset
|
2704 | valueMember: 'id', |
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:
175
diff
changeset
|
2705 | displayMember: 'nl', |
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:
175
diff
changeset
|
2706 | width: 180, |
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:
175
diff
changeset
|
2707 | height: 23, |
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:
175
diff
changeset
|
2708 | autoDropDownHeight: 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:
175
diff
changeset
|
2709 | dropDownVerticalAlignment: 'top' |
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:
175
diff
changeset
|
2710 | }); |
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
|
2711 | |
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:
175
diff
changeset
|
2712 | $("#est_carb").jqxTooltip({ content: 'Koolzuur volume. Dit wordt automatisch berekend.' }); |
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
|
2713 | $("#est_carb").jqxNumberInput({ inputMode: 'simple', theme: theme, width: 50, height: 23, decimalDigits: 1, readOnly: true }); |
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:
175
diff
changeset
|
2714 | $("#st_carb_min").jqxTooltip({ content: 'Het minimum koolzuur volume voor deze bierstijl.'}); |
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
|
2715 | $("#st_carb_min").jqxNumberInput({ inputMode: 'simple', theme: theme, width: 50, height: 23, decimalDigits: 1, readOnly: true }); |
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:
175
diff
changeset
|
2716 | $("#st_carb_max").jqxTooltip({ content: 'Het maximum koolzuur volume voor deze bierstijl.'}); |
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
|
2717 | $("#st_carb_max").jqxNumberInput({ inputMode: 'simple', theme: theme, width: 50, height: 23, decimalDigits: 1, readOnly: true }); |
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
|
2718 | |
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:
175
diff
changeset
|
2719 | // Tab 2, Vergistbaar |
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:
175
diff
changeset
|
2720 | $("#est_color2").jqxTooltip({ content: 'De kleur in EBC. Dit wordt automatisch berekend.' }); |
261
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
2721 | $("#est_color2").jqxNumberInput( Show0dec ); |
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:
175
diff
changeset
|
2722 | $("#est_og2").jqxTooltip({ content: 'Het begin SG wat je wilt bereiken. De moutstort wordt automatisch herberekend.' }); |
261
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
2723 | $("#est_og2").jqxNumberInput( Show3dec ); |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
2724 | $("#perc_malts").jqxProgressBar({ |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
2725 | width: 300, |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
2726 | height: 23, |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
2727 | theme: theme, |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
2728 | showText: true, |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
2729 | animationDuration: 0, |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
2730 | colorRanges: [ |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
2731 | { stop: 90, color: '#008C00' }, |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
2732 | { stop: 95, color: '#EB7331' }, |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
2733 | { stop: 100, color: '#FF0000' } |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
2734 | ] |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
2735 | }); |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
2736 | $("#perc_sugars").jqxProgressBar({ |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
2737 | width: 300, |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
2738 | height: 23, |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
2739 | theme: theme, |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
2740 | showText: true, |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
2741 | animationDuration: 0, |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
2742 | colorRanges: [ |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
2743 | { stop: 20, color: '#008C00' }, |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
2744 | { stop: 100, color: '#FF0000' } |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
2745 | ] |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
2746 | }); |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
2747 | $("#perc_cara").jqxProgressBar({ |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
2748 | width: 300, |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
2749 | height: 23, |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
2750 | theme: theme, |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
2751 | showText: true, |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
2752 | animationDuration: 0, |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
2753 | colorRanges: [ |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
2754 | { stop: 25, color: '#008C00' }, |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
2755 | { stop: 100, color: '#FF0000' } |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
2756 | ] |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
2757 | }); |
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:
175
diff
changeset
|
2758 | $("#popupFermentable").jqxWindow({ |
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:
175
diff
changeset
|
2759 | width: 800, |
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:
175
diff
changeset
|
2760 | height: 300, |
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:
175
diff
changeset
|
2761 | position: { x: 230, y: 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:
175
diff
changeset
|
2762 | resizable: false, |
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:
175
diff
changeset
|
2763 | theme: theme, |
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:
175
diff
changeset
|
2764 | isModal: 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:
175
diff
changeset
|
2765 | autoOpen: false, |
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:
175
diff
changeset
|
2766 | cancelButton: $("#FermentableReady"), |
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:
175
diff
changeset
|
2767 | modalOpacity: 0.40 |
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:
175
diff
changeset
|
2768 | }); |
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:
175
diff
changeset
|
2769 | $("#FermentableReady").jqxButton({ template: "success", width: '90px', theme: theme }); |
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:
175
diff
changeset
|
2770 | $("#FermentableReady").click(function () { |
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
|
2771 | $("#fermentableGrid").jqxGrid('sortby', 'f_amount', 'desc'); |
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:
175
diff
changeset
|
2772 | // Recalc percentages |
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
|
2773 | calcFermentables(); |
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
|
2774 | calcIBUs(); |
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:
175
diff
changeset
|
2775 | // Waters: yes there is impact. |
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:
175
diff
changeset
|
2776 | }); |
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:
175
diff
changeset
|
2777 | $("#wf_name").jqxInput({ theme: theme, width: 320, height: 23 }); |
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
|
2778 | $("#wf_instock").jqxCheckBox({ theme: theme, height: 23 }); |
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
|
2779 | $("#wf_instock").on('change', function (event) { |
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
|
2780 | fermentableinstock = event.args.checked; |
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
|
2781 | fermentablelist.dataBind(); |
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
|
2782 | }); |
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
|
2783 | $("#wf_select").jqxDropDownList({ |
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
|
2784 | placeHolder: "Kies mout:", |
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
|
2785 | theme: theme, |
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
|
2786 | source: fermentablelist, |
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
|
2787 | displayMember: "name", |
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
|
2788 | width: 150, |
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
|
2789 | height: 23, |
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
|
2790 | dropDownWidth: 500, |
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
|
2791 | dropDownHeight: 500, |
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
|
2792 | renderer: function (index, label, value) { |
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
|
2793 | var datarecord = fermentablelist.records[index]; |
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
|
2794 | return datarecord.supplier+ " / " + datarecord.name + " (" + datarecord.color + " EBC)"; |
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
|
2795 | } |
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
|
2796 | }); |
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
|
2797 | $("#wf_select").on('select', function (event) { |
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
|
2798 | if (event.args) { |
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
|
2799 | var index = event.args.index; |
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
|
2800 | var datarecord = fermentablelist.records[index]; |
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
|
2801 | var rowdata = $("#fermentableGrid").jqxGrid('getrowdata', fermentableRow); |
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
|
2802 | $("#wf_name").val(datarecord.name); |
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
|
2803 | rowdata.f_name = datarecord.name; |
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
|
2804 | rowdata.f_origin = datarecord.origin; |
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
|
2805 | rowdata.f_supplier = datarecord.supplier; |
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
|
2806 | rowdata.f_type = datarecord.type; |
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
|
2807 | rowdata.f_cost = datarecord.cost; |
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
|
2808 | rowdata.f_yield = datarecord.yield; |
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
|
2809 | rowdata.f_color = datarecord.color; |
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
|
2810 | rowdata.f_coarse_fine_diff = datarecord.coarse_fine_diff; |
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
|
2811 | rowdata.f_moisture = datarecord.moisture; |
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
|
2812 | rowdata.f_diastatic_power = datarecord.diastatic_power; |
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
|
2813 | rowdata.f_protein = datarecord.protein; |
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
|
2814 | rowdata.f_max_in_batch = datarecord.max_in_batch; |
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
|
2815 | rowdata.f_graintype = datarecord.graintype; |
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
|
2816 | rowdata.f_dissolved_protein = datarecord.dissolved_protein; |
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
|
2817 | rowdata.f_recommend_mash = datarecord.recommend_mash; |
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
|
2818 | rowdata.f_add_after_boil = datarecord.add_after_boil; |
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
|
2819 | rowdata.f_di_ph = datarecord.di_ph; |
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
|
2820 | rowdata.f_acid_to_ph_57 = datarecord.acid_to_ph_57; |
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
|
2821 | rowdata.f_inventory = datarecord.inventory; |
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
|
2822 | } |
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
|
2823 | }); |
245
3649c3d31d15
Fixed the mousewheel, spinner buttons to use the full min/max ranges. The 1.002 SG block to be precise.
Michiel Broek <mbroek@mbse.eu>
parents:
241
diff
changeset
|
2824 | $("#wf_amount").jqxNumberInput( Spin3dec ); |
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:
175
diff
changeset
|
2825 | $('#wf_amount').on('change', function (event) { |
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:
175
diff
changeset
|
2826 | console.log("amount changed: "+event.args.value); |
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:
175
diff
changeset
|
2827 | $("#fermentableGrid").jqxGrid('setcellvalue', fermentableRow, 'f_amount', event.args.value); |
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:
175
diff
changeset
|
2828 | if (! to_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:
175
diff
changeset
|
2829 | // Recalculate percentages |
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:
175
diff
changeset
|
2830 | console.log("adjust percentages"); |
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:
175
diff
changeset
|
2831 | var rowscount = $("#fermentableGrid").jqxGrid('getdatainformation').rowscount; |
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:
175
diff
changeset
|
2832 | if (rowscount > 1) { |
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:
175
diff
changeset
|
2833 | var tw = 0; |
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:
175
diff
changeset
|
2834 | for (i = 0; i < rowscount; i++) { |
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:
175
diff
changeset
|
2835 | var rowdata = $("#fermentableGrid").jqxGrid('getrowdata', i); |
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:
175
diff
changeset
|
2836 | tw += rowdata.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:
175
diff
changeset
|
2837 | }; |
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:
175
diff
changeset
|
2838 | for (i = 0; i < rowscount; i++) { |
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:
175
diff
changeset
|
2839 | var rowdata = $("#fermentableGrid").jqxGrid('getrowdata', i); |
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:
175
diff
changeset
|
2840 | var percentage = Math.round(rowdata.f_amount / tw * 1000) / 10.0; |
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:
175
diff
changeset
|
2841 | $("#fermentableGrid").jqxGrid('setcellvalue', i, "f_percentage", 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:
175
diff
changeset
|
2842 | // if (i == fermentableRow) // Will crash the script. |
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:
175
diff
changeset
|
2843 | // $("#wf_percentage").val(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:
175
diff
changeset
|
2844 | }; |
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:
175
diff
changeset
|
2845 | } else { |
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:
175
diff
changeset
|
2846 | $("#fermentableGrid").jqxGrid('setcellvalue', 0, "f_percentage", 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:
175
diff
changeset
|
2847 | } |
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:
175
diff
changeset
|
2848 | calcFermentables(); |
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:
175
diff
changeset
|
2849 | }; |
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:
175
diff
changeset
|
2850 | }); |
245
3649c3d31d15
Fixed the mousewheel, spinner buttons to use the full min/max ranges. The 1.002 SG block to be precise.
Michiel Broek <mbroek@mbse.eu>
parents:
241
diff
changeset
|
2851 | $("#wf_percentage").jqxNumberInput( Perc1dec ); |
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:
175
diff
changeset
|
2852 | $("#wf_percentage").on('change', function (event) { |
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:
175
diff
changeset
|
2853 | var oldvalue = Math.round(fermentableData.f_percentage * 10) / 10.0; |
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:
175
diff
changeset
|
2854 | var newvalue = event.args.value; |
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:
175
diff
changeset
|
2855 | console.log("percentage changed: "+newvalue+" old: "+oldvalue); |
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:
175
diff
changeset
|
2856 | var rowscount = $("#fermentableGrid").jqxGrid('getdatainformation').rowscount; |
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:
175
diff
changeset
|
2857 | if ((oldvalue != newvalue) && (rowscount > 1)) { |
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:
175
diff
changeset
|
2858 | var rowdata = $("#fermentableGrid").jqxGrid('getrowdata', fermentableRow); |
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:
175
diff
changeset
|
2859 | if (rowdata.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:
175
diff
changeset
|
2860 | $("#wf_percentage").val(oldvalue); |
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:
175
diff
changeset
|
2861 | } else { |
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:
175
diff
changeset
|
2862 | var diff = newvalue - oldvalue; |
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:
175
diff
changeset
|
2863 | var tw = 0; // total weight |
14e349ff2a10
Recipes import uses indexes instead of strings. Started rebuilding the recipes editor using indexes and standard formats. Rebuild the fermentable editor from grid editing to popup editing. Most calculations are using indexes for dropdown values.
Michiel Broek <mbroek@mbse.eu>
parents:
175
diff
changeset
|
2864 | for (i = 0; i < rowscount; i++) { |
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:
175
diff
changeset
|
2865 | var rowdata = $("#fermentableGrid").jqxGrid('getrowdata', i); |
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:
175
diff
changeset
|
2866 | tw += rowdata.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:
175
diff
changeset
|
2867 | } |
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:
175
diff
changeset
|
2868 | if (to_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:
175
diff
changeset
|
2869 | // Adjust this row and the 100% row. |
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:
175
diff
changeset
|
2870 | var damount = tw * diff / 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:
175
diff
changeset
|
2871 | var rowdata = $("#fermentableGrid").jqxGrid('getrowdata', fermentableRow); |
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:
175
diff
changeset
|
2872 | var namount = rowdata.f_amount + damount; |
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:
175
diff
changeset
|
2873 | $("#fermentableGrid").jqxGrid('setcellvalue', fermentableRow, 'f_amount', namount); |
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:
175
diff
changeset
|
2874 | $("#wf_amount").val(namount); |
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:
175
diff
changeset
|
2875 | $("#fermentableGrid").jqxGrid('setcellvalue', fermentableRow, 'f_percentage', rowdata.f_percentage + 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:
175
diff
changeset
|
2876 | for (i = 0; i < rowscount; i++) { |
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:
175
diff
changeset
|
2877 | var rowdata = $("#fermentableGrid").jqxGrid('getrowdata', i); |
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:
175
diff
changeset
|
2878 | if (rowdata.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:
175
diff
changeset
|
2879 | namount = rowdata.f_amount - damount; |
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:
175
diff
changeset
|
2880 | $("#fermentableGrid").jqxGrid('setcellvalue', i, 'f_percentage', rowdata.f_percentage - 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:
175
diff
changeset
|
2881 | $("#fermentableGrid").jqxGrid('setcellvalue', i, 'f_amount', namount); |
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:
175
diff
changeset
|
2882 | } |
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:
175
diff
changeset
|
2883 | } |
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:
175
diff
changeset
|
2884 | calcFermentables(); |
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:
175
diff
changeset
|
2885 | } else { |
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:
175
diff
changeset
|
2886 | // Adjust all the rows. |
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:
175
diff
changeset
|
2887 | var nw = tw * diff / 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:
175
diff
changeset
|
2888 | for (i = 0; i < rowscount; i++) { |
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:
175
diff
changeset
|
2889 | var rowdata = $("#fermentableGrid").jqxGrid('getrowdata', i); |
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:
175
diff
changeset
|
2890 | if (i == fermentableRow) { |
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:
175
diff
changeset
|
2891 | var namount = rowdata.f_amount + nw; |
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:
175
diff
changeset
|
2892 | $("#fermentableGrid").jqxGrid('setcellvalue', i, 'f_amount', namount); |
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:
175
diff
changeset
|
2893 | // $("#wf_amount").val(namount); // Will crash the script. |
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:
175
diff
changeset
|
2894 | $("#fermentableGrid").jqxGrid('setcellvalue', i, 'f_percentage', newvalue); |
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:
175
diff
changeset
|
2895 | } else { |
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:
175
diff
changeset
|
2896 | var namount = rowdata.f_amount - (nw / (rowscount - 1)); |
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:
175
diff
changeset
|
2897 | var newperc = Math.round((namount / tw) * 1000) / 10.0; |
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:
175
diff
changeset
|
2898 | $("#fermentableGrid").jqxGrid('setcellvalue', i, 'f_amount', namount); |
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:
175
diff
changeset
|
2899 | $("#fermentableGrid").jqxGrid('setcellvalue', i, 'f_percentage', newperc); |
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:
175
diff
changeset
|
2900 | } |
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:
175
diff
changeset
|
2901 | } |
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:
175
diff
changeset
|
2902 | calcFermentables(); |
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:
175
diff
changeset
|
2903 | } |
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:
175
diff
changeset
|
2904 | } |
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:
175
diff
changeset
|
2905 | } |
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:
175
diff
changeset
|
2906 | |
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:
175
diff
changeset
|
2907 | }); |
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:
175
diff
changeset
|
2908 | $("#wf_adjust_to_total_100").jqxCheckBox({ theme: theme, width: 120, height: 23 }); |
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:
175
diff
changeset
|
2909 | $("#wf_adjust_to_total_100").on('checked', function (event) { |
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:
175
diff
changeset
|
2910 | if (fermentableData.f_adjust_to_total_100 == 0) { |
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:
175
diff
changeset
|
2911 | if (to_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:
175
diff
changeset
|
2912 | // Reset other flag first. |
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:
175
diff
changeset
|
2913 | var rowscount = $("#fermentableGrid").jqxGrid('getdatainformation').rowscount; |
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:
175
diff
changeset
|
2914 | for (var i = 0; i < rowscount; i++) { |
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:
175
diff
changeset
|
2915 | if (i != fermentableRow) { |
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:
175
diff
changeset
|
2916 | $("#fermentableGrid").jqxGrid('setcellvalue', i, 'f_adjust_to_total_100', 0); |
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:
175
diff
changeset
|
2917 | } |
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:
175
diff
changeset
|
2918 | } |
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:
175
diff
changeset
|
2919 | } |
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:
175
diff
changeset
|
2920 | $("#fermentableGrid").jqxGrid('setcellvalue', fermentableRow, 'f_adjust_to_total_100', 1); |
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:
175
diff
changeset
|
2921 | calcFermentables(); |
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:
175
diff
changeset
|
2922 | } |
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:
175
diff
changeset
|
2923 | }); |
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:
175
diff
changeset
|
2924 | $("#wf_adjust_to_total_100").on('unchecked', function (event) { |
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:
175
diff
changeset
|
2925 | if (fermentableData.f_adjust_to_total_100 != 0) { |
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:
175
diff
changeset
|
2926 | $("#fermentableGrid").jqxGrid('setcellvalue', fermentableRow, 'f_adjust_to_total_100', 0); |
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:
175
diff
changeset
|
2927 | calcFermentables(); |
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:
175
diff
changeset
|
2928 | } |
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:
175
diff
changeset
|
2929 | }); |
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:
175
diff
changeset
|
2930 | $("#wf_added").jqxDropDownList({ |
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:
175
diff
changeset
|
2931 | theme: theme, |
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:
175
diff
changeset
|
2932 | source: AddedAdapter, |
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:
175
diff
changeset
|
2933 | valueMember: 'id', |
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:
175
diff
changeset
|
2934 | displayMember: 'nl', |
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:
175
diff
changeset
|
2935 | width: 180, |
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:
175
diff
changeset
|
2936 | height: 23, |
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:
175
diff
changeset
|
2937 | autoDropDownHeight: 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:
175
diff
changeset
|
2938 | dropDownVerticalAlignment: 'top' |
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:
175
diff
changeset
|
2939 | }); |
261
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
2940 | $("#wf_added").on('select', function (event) { |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
2941 | if (event.args) { |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
2942 | var index = event.args.index; |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
2943 | $("#fermentableGrid").jqxGrid('setcellvalue', fermentableRow, 'f_added', index); |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
2944 | calcFermentables(); |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
2945 | calcIBUs(); |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
2946 | } |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
2947 | }); |
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:
175
diff
changeset
|
2948 | |
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:
175
diff
changeset
|
2949 | // Tab 3, Hoppen |
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:
175
diff
changeset
|
2950 | $("#est_ibu2").jqxTooltip({ content: 'De bitterheid in IBU. Dit wordt automatisch berekend.' }); |
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:
175
diff
changeset
|
2951 | $("#est_ibu2").jqxNumberInput({ inputMode: 'simple', theme: theme, width: 50, height: 23, decimalDigits: 0, readOnly: true }); |
261
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
2952 | $("#hop_flavour").jqxProgressBar({ |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
2953 | width: 300, |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
2954 | height: 23, |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
2955 | theme: theme, |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
2956 | showText: true, |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
2957 | animationDuration: 0, |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
2958 | colorRanges: [ |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
2959 | { stop: 20, color: '#004D00' }, |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
2960 | { stop: 40, color: '#008C00' }, |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
2961 | { stop: 60, color: '#00BF00' }, |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
2962 | { stop: 80, color: '#00FF00' }, |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
2963 | { stop: 100, color: '#80FF80' } |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
2964 | ] |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
2965 | }); |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
2966 | $("#hop_aroma").jqxProgressBar({ |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
2967 | width: 300, |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
2968 | height: 23, |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
2969 | theme: theme, |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
2970 | showText: true, |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
2971 | animationDuration: 0, |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
2972 | colorRanges: [ |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
2973 | { stop: 20, color: '#004D00' }, |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
2974 | { stop: 40, color: '#008C00' }, |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
2975 | { stop: 60, color: '#00BF00' }, |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
2976 | { stop: 80, color: '#00FF00' }, |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
2977 | { stop: 100, color: '#80FF80' } |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
2978 | ] |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
2979 | }); |
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:
221
diff
changeset
|
2980 | $("#popupHop").jqxWindow({ |
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:
221
diff
changeset
|
2981 | width: 800, |
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:
221
diff
changeset
|
2982 | height: 300, |
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:
221
diff
changeset
|
2983 | position: { x: 230, y: 100 }, |
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:
221
diff
changeset
|
2984 | resizable: false, |
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:
221
diff
changeset
|
2985 | theme: theme, |
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:
221
diff
changeset
|
2986 | isModal: true, |
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:
221
diff
changeset
|
2987 | autoOpen: false, |
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:
221
diff
changeset
|
2988 | cancelButton: $("#HopReady"), |
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:
221
diff
changeset
|
2989 | modalOpacity: 0.40 |
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:
221
diff
changeset
|
2990 | }); |
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:
221
diff
changeset
|
2991 | $("#HopReady").jqxButton({ template: "success", width: '90px', theme: theme }); |
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:
221
diff
changeset
|
2992 | $("#HopReady").click(function () { |
224
d3cdcfac81cb
In hop grid friendly show duration. Finished hops popup editor. Made the IBU display readonly.
Michiel Broek <mbroek@mbse.eu>
parents:
223
diff
changeset
|
2993 | $("#hopGrid").jqxGrid('sortby', 'h_amount', 'asc'); |
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:
221
diff
changeset
|
2994 | calcIBUs(); |
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:
221
diff
changeset
|
2995 | }); |
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:
221
diff
changeset
|
2996 | $("#wh_name").jqxInput({ theme: theme, width: 320, height: 23 }); |
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:
221
diff
changeset
|
2997 | $("#wh_instock").jqxCheckBox({ theme: theme, height: 23 }); |
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:
221
diff
changeset
|
2998 | $("#wh_instock").on('change', function (event) { |
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:
221
diff
changeset
|
2999 | hopinstock = event.args.checked; |
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:
221
diff
changeset
|
3000 | hoplist.dataBind(); |
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:
221
diff
changeset
|
3001 | }); |
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:
221
diff
changeset
|
3002 | $("#wh_select").jqxDropDownList({ |
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:
221
diff
changeset
|
3003 | placeHolder: "Kies hop:", |
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:
221
diff
changeset
|
3004 | theme: theme, |
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:
221
diff
changeset
|
3005 | source: hoplist, |
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:
221
diff
changeset
|
3006 | displayMember: "name", |
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:
221
diff
changeset
|
3007 | width: 150, |
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:
221
diff
changeset
|
3008 | height: 23, |
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:
221
diff
changeset
|
3009 | dropDownWidth: 500, |
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:
221
diff
changeset
|
3010 | dropDownHeight: 500, |
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:
221
diff
changeset
|
3011 | renderer: function (index, label, value) { |
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:
221
diff
changeset
|
3012 | var datarecord = hoplist.records[index]; |
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:
221
diff
changeset
|
3013 | return datarecord.origin+ " / " + datarecord.name + " (" + datarecord.alpha + " % α)"; |
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:
221
diff
changeset
|
3014 | } |
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:
221
diff
changeset
|
3015 | }); |
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:
221
diff
changeset
|
3016 | $("#wh_select").on('select', function (event) { |
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:
221
diff
changeset
|
3017 | if (event.args) { |
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:
221
diff
changeset
|
3018 | var index = event.args.index; |
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:
221
diff
changeset
|
3019 | var datarecord = hoplist.records[index]; |
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:
221
diff
changeset
|
3020 | var rowdata = $("#hopGrid").jqxGrid('getrowdata', hopRow); |
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:
221
diff
changeset
|
3021 | $("#wh_name").val(datarecord.name); |
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:
221
diff
changeset
|
3022 | rowdata.h_name = datarecord.name; |
224
d3cdcfac81cb
In hop grid friendly show duration. Finished hops popup editor. Made the IBU display readonly.
Michiel Broek <mbroek@mbse.eu>
parents:
223
diff
changeset
|
3023 | rowdata.h_origin = datarecord.origin; |
d3cdcfac81cb
In hop grid friendly show duration. Finished hops popup editor. Made the IBU display readonly.
Michiel Broek <mbroek@mbse.eu>
parents:
223
diff
changeset
|
3024 | rowdata.h_cost = datarecord.cost; |
d3cdcfac81cb
In hop grid friendly show duration. Finished hops popup editor. Made the IBU display readonly.
Michiel Broek <mbroek@mbse.eu>
parents:
223
diff
changeset
|
3025 | rowdata.h_type = datarecord.type; |
d3cdcfac81cb
In hop grid friendly show duration. Finished hops popup editor. Made the IBU display readonly.
Michiel Broek <mbroek@mbse.eu>
parents:
223
diff
changeset
|
3026 | rowdata.h_form = datarecord.form; |
d3cdcfac81cb
In hop grid friendly show duration. Finished hops popup editor. Made the IBU display readonly.
Michiel Broek <mbroek@mbse.eu>
parents:
223
diff
changeset
|
3027 | rowdata.h_alpha = datarecord.alpha; |
d3cdcfac81cb
In hop grid friendly show duration. Finished hops popup editor. Made the IBU display readonly.
Michiel Broek <mbroek@mbse.eu>
parents:
223
diff
changeset
|
3028 | rowdata.h_beta = datarecord.beta; |
d3cdcfac81cb
In hop grid friendly show duration. Finished hops popup editor. Made the IBU display readonly.
Michiel Broek <mbroek@mbse.eu>
parents:
223
diff
changeset
|
3029 | rowdata.h_hsi = datarecord.hsi; |
d3cdcfac81cb
In hop grid friendly show duration. Finished hops popup editor. Made the IBU display readonly.
Michiel Broek <mbroek@mbse.eu>
parents:
223
diff
changeset
|
3030 | rowdata.h_humulene = datarecord.humulene; |
d3cdcfac81cb
In hop grid friendly show duration. Finished hops popup editor. Made the IBU display readonly.
Michiel Broek <mbroek@mbse.eu>
parents:
223
diff
changeset
|
3031 | rowdata.h_caryophyllene = datarecord.caryophyllene; |
d3cdcfac81cb
In hop grid friendly show duration. Finished hops popup editor. Made the IBU display readonly.
Michiel Broek <mbroek@mbse.eu>
parents:
223
diff
changeset
|
3032 | rowdata.h_cohumulone = datarecord.cohumulone; |
d3cdcfac81cb
In hop grid friendly show duration. Finished hops popup editor. Made the IBU display readonly.
Michiel Broek <mbroek@mbse.eu>
parents:
223
diff
changeset
|
3033 | rowdata.h_myrcene = datarecord.myrcene; |
d3cdcfac81cb
In hop grid friendly show duration. Finished hops popup editor. Made the IBU display readonly.
Michiel Broek <mbroek@mbse.eu>
parents:
223
diff
changeset
|
3034 | rowdata.h_total_oil = datarecord.total_oil; |
d3cdcfac81cb
In hop grid friendly show duration. Finished hops popup editor. Made the IBU display readonly.
Michiel Broek <mbroek@mbse.eu>
parents:
223
diff
changeset
|
3035 | rowdata.h_inventory = datarecord.inventory; |
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:
221
diff
changeset
|
3036 | } |
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:
221
diff
changeset
|
3037 | }); |
245
3649c3d31d15
Fixed the mousewheel, spinner buttons to use the full min/max ranges. The 1.002 SG block to be precise.
Michiel Broek <mbroek@mbse.eu>
parents:
241
diff
changeset
|
3038 | $("#wh_amount").jqxNumberInput( Spin1dec ); |
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:
221
diff
changeset
|
3039 | $('#wh_amount').on('change', function (event) { |
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:
221
diff
changeset
|
3040 | console.log("amount changed: "+event.args.value); |
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:
221
diff
changeset
|
3041 | var amount = parseFloat(event.args.value) / 1000; |
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:
221
diff
changeset
|
3042 | var rowdata = $("#hopGrid").jqxGrid('getrowdata', hopRow); |
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:
221
diff
changeset
|
3043 | |
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:
221
diff
changeset
|
3044 | var ibu = toIBU(rowdata.h_useat, rowdata.h_form, preboil_sg, |
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:
221
diff
changeset
|
3045 | parseFloat($("#batch_size").jqxNumberInput('decimal')), |
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:
221
diff
changeset
|
3046 | amount, parseFloat(rowdata.h_time), |
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:
221
diff
changeset
|
3047 | parseFloat(rowdata.h_alpha), $("#ibu_method").val() |
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:
221
diff
changeset
|
3048 | ); |
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:
221
diff
changeset
|
3049 | rowdata.h_amount = amount; |
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:
221
diff
changeset
|
3050 | calcIBUs(); |
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:
221
diff
changeset
|
3051 | }); |
261
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
3052 | $("#wh_ibu").jqxNumberInput( Show1dec ); |
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:
221
diff
changeset
|
3053 | $("#wh_time").jqxNumberInput( PosInt ); |
224
d3cdcfac81cb
In hop grid friendly show duration. Finished hops popup editor. Made the IBU display readonly.
Michiel Broek <mbroek@mbse.eu>
parents:
223
diff
changeset
|
3054 | $("#wh_time").on('change', function (event) { |
d3cdcfac81cb
In hop grid friendly show duration. Finished hops popup editor. Made the IBU display readonly.
Michiel Broek <mbroek@mbse.eu>
parents:
223
diff
changeset
|
3055 | console.log("time changed: "+event.args.value); |
d3cdcfac81cb
In hop grid friendly show duration. Finished hops popup editor. Made the IBU display readonly.
Michiel Broek <mbroek@mbse.eu>
parents:
223
diff
changeset
|
3056 | var rowdata = $("#hopGrid").jqxGrid('getrowdata', hopRow); |
d3cdcfac81cb
In hop grid friendly show duration. Finished hops popup editor. Made the IBU display readonly.
Michiel Broek <mbroek@mbse.eu>
parents:
223
diff
changeset
|
3057 | var newtime = parseFloat(event.args.value); |
d3cdcfac81cb
In hop grid friendly show duration. Finished hops popup editor. Made the IBU display readonly.
Michiel Broek <mbroek@mbse.eu>
parents:
223
diff
changeset
|
3058 | // Check limits and correct |
d3cdcfac81cb
In hop grid friendly show duration. Finished hops popup editor. Made the IBU display readonly.
Michiel Broek <mbroek@mbse.eu>
parents:
223
diff
changeset
|
3059 | if (rowdata.h_useat == 2) { // Boil |
d3cdcfac81cb
In hop grid friendly show duration. Finished hops popup editor. Made the IBU display readonly.
Michiel Broek <mbroek@mbse.eu>
parents:
223
diff
changeset
|
3060 | if (newtime > parseFloat($("#boil_time").jqxNumberInput('decimal'))) { |
d3cdcfac81cb
In hop grid friendly show duration. Finished hops popup editor. Made the IBU display readonly.
Michiel Broek <mbroek@mbse.eu>
parents:
223
diff
changeset
|
3061 | newtime = parseFloat($("#boil_time").jqxNumberInput('decimal')); |
d3cdcfac81cb
In hop grid friendly show duration. Finished hops popup editor. Made the IBU display readonly.
Michiel Broek <mbroek@mbse.eu>
parents:
223
diff
changeset
|
3062 | $("#wh_time").val(newtime); |
d3cdcfac81cb
In hop grid friendly show duration. Finished hops popup editor. Made the IBU display readonly.
Michiel Broek <mbroek@mbse.eu>
parents:
223
diff
changeset
|
3063 | } |
d3cdcfac81cb
In hop grid friendly show duration. Finished hops popup editor. Made the IBU display readonly.
Michiel Broek <mbroek@mbse.eu>
parents:
223
diff
changeset
|
3064 | rowdata.h_time = newtime; |
d3cdcfac81cb
In hop grid friendly show duration. Finished hops popup editor. Made the IBU display readonly.
Michiel Broek <mbroek@mbse.eu>
parents:
223
diff
changeset
|
3065 | } else if (rowdata.h_useat == 4) { // Whirlpool |
d3cdcfac81cb
In hop grid friendly show duration. Finished hops popup editor. Made the IBU display readonly.
Michiel Broek <mbroek@mbse.eu>
parents:
223
diff
changeset
|
3066 | if (newtime > 120) { |
d3cdcfac81cb
In hop grid friendly show duration. Finished hops popup editor. Made the IBU display readonly.
Michiel Broek <mbroek@mbse.eu>
parents:
223
diff
changeset
|
3067 | newtime = 120; |
d3cdcfac81cb
In hop grid friendly show duration. Finished hops popup editor. Made the IBU display readonly.
Michiel Broek <mbroek@mbse.eu>
parents:
223
diff
changeset
|
3068 | $("#wh_time").val(newtime); |
d3cdcfac81cb
In hop grid friendly show duration. Finished hops popup editor. Made the IBU display readonly.
Michiel Broek <mbroek@mbse.eu>
parents:
223
diff
changeset
|
3069 | } |
d3cdcfac81cb
In hop grid friendly show duration. Finished hops popup editor. Made the IBU display readonly.
Michiel Broek <mbroek@mbse.eu>
parents:
223
diff
changeset
|
3070 | rowdata.h_time = newtime; |
d3cdcfac81cb
In hop grid friendly show duration. Finished hops popup editor. Made the IBU display readonly.
Michiel Broek <mbroek@mbse.eu>
parents:
223
diff
changeset
|
3071 | } else if (rowdata.h_useat == 5) { // Dry hop |
d3cdcfac81cb
In hop grid friendly show duration. Finished hops popup editor. Made the IBU display readonly.
Michiel Broek <mbroek@mbse.eu>
parents:
223
diff
changeset
|
3072 | if (newtime > 21) { |
d3cdcfac81cb
In hop grid friendly show duration. Finished hops popup editor. Made the IBU display readonly.
Michiel Broek <mbroek@mbse.eu>
parents:
223
diff
changeset
|
3073 | newtime = 21; |
d3cdcfac81cb
In hop grid friendly show duration. Finished hops popup editor. Made the IBU display readonly.
Michiel Broek <mbroek@mbse.eu>
parents:
223
diff
changeset
|
3074 | $("#wh_time").val(newtime); |
d3cdcfac81cb
In hop grid friendly show duration. Finished hops popup editor. Made the IBU display readonly.
Michiel Broek <mbroek@mbse.eu>
parents:
223
diff
changeset
|
3075 | } |
d3cdcfac81cb
In hop grid friendly show duration. Finished hops popup editor. Made the IBU display readonly.
Michiel Broek <mbroek@mbse.eu>
parents:
223
diff
changeset
|
3076 | rowdata.h_time = newtime * 1440; |
d3cdcfac81cb
In hop grid friendly show duration. Finished hops popup editor. Made the IBU display readonly.
Michiel Broek <mbroek@mbse.eu>
parents:
223
diff
changeset
|
3077 | } |
d3cdcfac81cb
In hop grid friendly show duration. Finished hops popup editor. Made the IBU display readonly.
Michiel Broek <mbroek@mbse.eu>
parents:
223
diff
changeset
|
3078 | var ibu = toIBU(rowdata.h_useat, rowdata.h_form, preboil_sg, parseFloat($("#batch_size").jqxNumberInput('decimal')), |
d3cdcfac81cb
In hop grid friendly show duration. Finished hops popup editor. Made the IBU display readonly.
Michiel Broek <mbroek@mbse.eu>
parents:
223
diff
changeset
|
3079 | parseFloat(rowdata.h_amount), parseFloat(rowdata.h_time), parseFloat(rowdata.h_alpha), $("#ibu_method").val()); |
d3cdcfac81cb
In hop grid friendly show duration. Finished hops popup editor. Made the IBU display readonly.
Michiel Broek <mbroek@mbse.eu>
parents:
223
diff
changeset
|
3080 | $("#wh_ibu").val(ibu); |
d3cdcfac81cb
In hop grid friendly show duration. Finished hops popup editor. Made the IBU display readonly.
Michiel Broek <mbroek@mbse.eu>
parents:
223
diff
changeset
|
3081 | calcIBUs(); |
d3cdcfac81cb
In hop grid friendly show duration. Finished hops popup editor. Made the IBU display readonly.
Michiel Broek <mbroek@mbse.eu>
parents:
223
diff
changeset
|
3082 | }); |
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:
221
diff
changeset
|
3083 | $("#wh_useat").jqxDropDownList({ |
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:
221
diff
changeset
|
3084 | theme: theme, |
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:
221
diff
changeset
|
3085 | source: HopUseAdapter, |
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:
221
diff
changeset
|
3086 | valueMember: 'id', |
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:
221
diff
changeset
|
3087 | displayMember: 'nl', |
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:
221
diff
changeset
|
3088 | width: 180, |
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:
221
diff
changeset
|
3089 | height: 23, |
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:
221
diff
changeset
|
3090 | autoDropDownHeight: true, |
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:
221
diff
changeset
|
3091 | dropDownVerticalAlignment: 'top' |
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:
221
diff
changeset
|
3092 | }); |
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:
221
diff
changeset
|
3093 | $("#wh_useat").on('select', function (event) { |
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:
221
diff
changeset
|
3094 | if (event.args) { |
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:
221
diff
changeset
|
3095 | var index = event.args.index; |
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:
221
diff
changeset
|
3096 | var rowdata = $("#hopGrid").jqxGrid('getrowdata', hopRow); |
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:
221
diff
changeset
|
3097 | rowdata.h_useat = index; |
224
d3cdcfac81cb
In hop grid friendly show duration. Finished hops popup editor. Made the IBU display readonly.
Michiel Broek <mbroek@mbse.eu>
parents:
223
diff
changeset
|
3098 | if ((index == 0) || (index == 1)) { // Mashhop or First wort hop |
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:
221
diff
changeset
|
3099 | rowdata.h_time = parseFloat(dataRecord.boil_time); |
224
d3cdcfac81cb
In hop grid friendly show duration. Finished hops popup editor. Made the IBU display readonly.
Michiel Broek <mbroek@mbse.eu>
parents:
223
diff
changeset
|
3100 | $("#wh_time").jqxNumberInput({ spinButtons: false, readOnly: true, width: 90 }); |
d3cdcfac81cb
In hop grid friendly show duration. Finished hops popup editor. Made the IBU display readonly.
Michiel Broek <mbroek@mbse.eu>
parents:
223
diff
changeset
|
3101 | $("#wh_time").val(rowdata.h_time); |
d3cdcfac81cb
In hop grid friendly show duration. Finished hops popup editor. Made the IBU display readonly.
Michiel Broek <mbroek@mbse.eu>
parents:
223
diff
changeset
|
3102 | } else if (index == 3) { // Aroma |
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:
221
diff
changeset
|
3103 | rowdata.h_time = 0; |
224
d3cdcfac81cb
In hop grid friendly show duration. Finished hops popup editor. Made the IBU display readonly.
Michiel Broek <mbroek@mbse.eu>
parents:
223
diff
changeset
|
3104 | $("#wh_time").jqxNumberInput({ spinButtons: false, readOnly: true, width: 90 }); |
d3cdcfac81cb
In hop grid friendly show duration. Finished hops popup editor. Made the IBU display readonly.
Michiel Broek <mbroek@mbse.eu>
parents:
223
diff
changeset
|
3105 | $("#wh_time").val(0); |
d3cdcfac81cb
In hop grid friendly show duration. Finished hops popup editor. Made the IBU display readonly.
Michiel Broek <mbroek@mbse.eu>
parents:
223
diff
changeset
|
3106 | } else { // Boil, Whirlpool or Dry hop |
d3cdcfac81cb
In hop grid friendly show duration. Finished hops popup editor. Made the IBU display readonly.
Michiel Broek <mbroek@mbse.eu>
parents:
223
diff
changeset
|
3107 | $("#wh_time").jqxNumberInput({ spinButtons: true, readOnly: false, width: 110 }); |
d3cdcfac81cb
In hop grid friendly show duration. Finished hops popup editor. Made the IBU display readonly.
Michiel Broek <mbroek@mbse.eu>
parents:
223
diff
changeset
|
3108 | } |
d3cdcfac81cb
In hop grid friendly show duration. Finished hops popup editor. Made the IBU display readonly.
Michiel Broek <mbroek@mbse.eu>
parents:
223
diff
changeset
|
3109 | if (index == 5) // Dry hop |
d3cdcfac81cb
In hop grid friendly show duration. Finished hops popup editor. Made the IBU display readonly.
Michiel Broek <mbroek@mbse.eu>
parents:
223
diff
changeset
|
3110 | $("#wh_pmpt_time").html("Tijd in dagen"); |
d3cdcfac81cb
In hop grid friendly show duration. Finished hops popup editor. Made the IBU display readonly.
Michiel Broek <mbroek@mbse.eu>
parents:
223
diff
changeset
|
3111 | else |
d3cdcfac81cb
In hop grid friendly show duration. Finished hops popup editor. Made the IBU display readonly.
Michiel Broek <mbroek@mbse.eu>
parents:
223
diff
changeset
|
3112 | $("#wh_pmpt_time").html("Tijd in minuten"); |
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:
221
diff
changeset
|
3113 | } |
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:
221
diff
changeset
|
3114 | }); |
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:
175
diff
changeset
|
3115 | |
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:
175
diff
changeset
|
3116 | // Tab 4, Diversen |
225
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
224
diff
changeset
|
3117 | $("#popupMisc").jqxWindow({ |
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
224
diff
changeset
|
3118 | width: 800, |
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
224
diff
changeset
|
3119 | height: 275, |
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
224
diff
changeset
|
3120 | position: { x: 230, y: 100 }, |
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
224
diff
changeset
|
3121 | resizable: false, |
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
224
diff
changeset
|
3122 | theme: theme, |
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
224
diff
changeset
|
3123 | isModal: true, |
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
224
diff
changeset
|
3124 | autoOpen: false, |
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
224
diff
changeset
|
3125 | cancelButton: $("#MiscReady"), |
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
224
diff
changeset
|
3126 | modalOpacity: 0.40 |
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
224
diff
changeset
|
3127 | }); |
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
224
diff
changeset
|
3128 | $("#MiscReady").jqxButton({ template: "success", width: '90px', theme: theme }); |
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
224
diff
changeset
|
3129 | $("#MiscReady").click(function () { |
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
224
diff
changeset
|
3130 | $("#miscGrid").jqxGrid('sortby', 'm_use_use', 'asc'); |
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
224
diff
changeset
|
3131 | }); |
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
224
diff
changeset
|
3132 | $("#wm_name").jqxInput({ theme: theme, width: 320, height: 23 }); |
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
224
diff
changeset
|
3133 | $("#wm_instock").jqxCheckBox({ theme: theme, height: 23 }); |
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
224
diff
changeset
|
3134 | $("#wm_instock").on('change', function (event) { |
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
224
diff
changeset
|
3135 | miscinstock = event.args.checked; |
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
224
diff
changeset
|
3136 | misclist.dataBind(); |
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
224
diff
changeset
|
3137 | }); |
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
224
diff
changeset
|
3138 | $("#wm_select").jqxDropDownList({ |
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
224
diff
changeset
|
3139 | placeHolder: "Kies ingrediënt:", |
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
224
diff
changeset
|
3140 | theme: theme, |
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
224
diff
changeset
|
3141 | source: misclist, |
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
224
diff
changeset
|
3142 | displayMember: "name", |
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
224
diff
changeset
|
3143 | width: 150, |
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
224
diff
changeset
|
3144 | height: 23, |
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
224
diff
changeset
|
3145 | dropDownWidth: 500, |
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
224
diff
changeset
|
3146 | dropDownHeight: 500 |
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
224
diff
changeset
|
3147 | }); |
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
224
diff
changeset
|
3148 | $("#wm_select").on('select', function (event) { |
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
224
diff
changeset
|
3149 | if (event.args) { |
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
224
diff
changeset
|
3150 | var index = event.args.index; |
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
224
diff
changeset
|
3151 | var datarecord = misclist.records[index]; |
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
224
diff
changeset
|
3152 | var rowdata = $("#miscGrid").jqxGrid('getrowdata', miscRow); |
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
224
diff
changeset
|
3153 | $("#wm_name").val(datarecord.name); |
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
224
diff
changeset
|
3154 | rowdata.m_name = datarecord.name; |
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
224
diff
changeset
|
3155 | rowdata.m_cost = datarecord.cost; |
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
224
diff
changeset
|
3156 | rowdata.m_type = datarecord.type; |
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
224
diff
changeset
|
3157 | rowdata.m_use_use = datarecord.use_use; |
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
224
diff
changeset
|
3158 | rowdata.m_amount_is_weight = datarecord.amount_is_weight; |
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
224
diff
changeset
|
3159 | rowdata.m_inventory = datarecord.inventory; |
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
224
diff
changeset
|
3160 | } |
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
224
diff
changeset
|
3161 | }); |
245
3649c3d31d15
Fixed the mousewheel, spinner buttons to use the full min/max ranges. The 1.002 SG block to be precise.
Michiel Broek <mbroek@mbse.eu>
parents:
241
diff
changeset
|
3162 | $("#wm_amount").jqxNumberInput( Spin1dec ); |
225
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
224
diff
changeset
|
3163 | $('#wm_amount').on('change', function (event) { |
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
224
diff
changeset
|
3164 | console.log("amount changed: "+event.args.value); |
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
224
diff
changeset
|
3165 | var amount = parseFloat(event.args.value) / 1000; |
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
224
diff
changeset
|
3166 | var rowdata = $("#miscGrid").jqxGrid('getrowdata', miscRow); |
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
224
diff
changeset
|
3167 | rowdata.m_amount = amount; |
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
224
diff
changeset
|
3168 | }); |
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
224
diff
changeset
|
3169 | $("#wm_time").jqxNumberInput( PosInt ); |
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
224
diff
changeset
|
3170 | $("#wm_time").on('change', function (event) { |
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
224
diff
changeset
|
3171 | console.log("time changed: "+event.args.value); |
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
224
diff
changeset
|
3172 | var rowdata = $("#miscGrid").jqxGrid('getrowdata', miscRow); |
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
224
diff
changeset
|
3173 | var newtime = parseFloat(event.args.value); |
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
224
diff
changeset
|
3174 | |
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
224
diff
changeset
|
3175 | if (rowdata.m_use_use == 2) { // Boil |
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
224
diff
changeset
|
3176 | if (newtime > parseFloat($("#boil_time").jqxNumberInput('decimal'))) { |
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
224
diff
changeset
|
3177 | newtime = parseFloat($("#boil_time").jqxNumberInput('decimal')); |
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
224
diff
changeset
|
3178 | $("#wm_time").val(newtime); |
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
224
diff
changeset
|
3179 | } |
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
224
diff
changeset
|
3180 | rowdata.m_time = newtime; |
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
224
diff
changeset
|
3181 | } else if ((rowdata.m_use_use == 3) || (rowdata.m_use_use == 4)) { // Primary or Secondary |
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
224
diff
changeset
|
3182 | if (newtime > 21) { |
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
224
diff
changeset
|
3183 | newtime = 21; |
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
224
diff
changeset
|
3184 | $("#wm_time").val(newtime); |
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
224
diff
changeset
|
3185 | } |
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
224
diff
changeset
|
3186 | rowdata.m_time = newtime * 1440; |
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
224
diff
changeset
|
3187 | } |
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
224
diff
changeset
|
3188 | }); |
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
224
diff
changeset
|
3189 | $("#wm_use_use").jqxDropDownList({ |
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
224
diff
changeset
|
3190 | theme: theme, |
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
224
diff
changeset
|
3191 | source: MiscUseAdapter, |
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
224
diff
changeset
|
3192 | valueMember: 'id', |
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
224
diff
changeset
|
3193 | displayMember: 'nl', |
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
224
diff
changeset
|
3194 | width: 180, |
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
224
diff
changeset
|
3195 | height: 23, |
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
224
diff
changeset
|
3196 | autoDropDownHeight: true, |
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
224
diff
changeset
|
3197 | dropDownVerticalAlignment: 'top' |
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
224
diff
changeset
|
3198 | }); |
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
224
diff
changeset
|
3199 | $("#wm_use_use").on('select', function (event) { |
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
224
diff
changeset
|
3200 | if (event.args) { |
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
224
diff
changeset
|
3201 | var index = event.args.index; |
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
224
diff
changeset
|
3202 | var rowdata = $("#miscGrid").jqxGrid('getrowdata', miscRow); |
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
224
diff
changeset
|
3203 | rowdata.m_use_use = index; |
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
224
diff
changeset
|
3204 | if ((index == 2) || (index == 3) || (index == 4)) { // Boil, Primary or Secondary |
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
224
diff
changeset
|
3205 | $("#wm_time").jqxNumberInput({ spinButtons: true, readOnly: false, width: 110 }); |
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
224
diff
changeset
|
3206 | } else { |
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
224
diff
changeset
|
3207 | rowdata.m_time = 0; |
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
224
diff
changeset
|
3208 | $("#wm_time").jqxNumberInput({ spinButtons: false, readOnly: true, width: 90 }); |
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
224
diff
changeset
|
3209 | $("#wm_time").val(0); |
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
224
diff
changeset
|
3210 | } |
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
224
diff
changeset
|
3211 | } |
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
224
diff
changeset
|
3212 | }); |
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:
175
diff
changeset
|
3213 | |
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:
175
diff
changeset
|
3214 | // Tab 5, Gist |
227
fd6d87d1c9ed
Recalculate FG, SVG and ABV when changing the primary yeast.
Michiel Broek <mbroek@mbse.eu>
parents:
226
diff
changeset
|
3215 | $("#est_fg2").jqxTooltip({ content: 'Het eind SG. Dit wordt automatisch berekend.' }); |
261
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
3216 | $("#est_fg2").jqxNumberInput( Show3dec ); |
227
fd6d87d1c9ed
Recalculate FG, SVG and ABV when changing the primary yeast.
Michiel Broek <mbroek@mbse.eu>
parents:
226
diff
changeset
|
3217 | $("#est_abv2").jqxTooltip({ content: 'Alcohol volume %. Dit wordt automatisch berekend.' }); |
fd6d87d1c9ed
Recalculate FG, SVG and ABV when changing the primary yeast.
Michiel Broek <mbroek@mbse.eu>
parents:
226
diff
changeset
|
3218 | $("#est_abv2").jqxNumberInput({ inputMode: 'simple', theme: theme, width: 50, height: 23, decimalDigits: 1, readOnly: true }); |
226
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
3219 | $("#popupYeast").jqxWindow({ |
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
3220 | width: 800, |
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
3221 | height: 300, |
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
3222 | position: { x: 230, y: 100 }, |
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
3223 | resizable: false, |
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
3224 | theme: theme, |
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
3225 | isModal: true, |
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
3226 | autoOpen: false, |
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
3227 | cancelButton: $("#YeastReady"), |
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
3228 | modalOpacity: 0.40 |
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
3229 | }); |
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
3230 | $("#YeastReady").jqxButton({ template: "success", width: '90px', theme: theme }); |
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
3231 | $("#YeastReady").click(function () { |
261
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
3232 | calcFermentables(); |
226
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
3233 | $("#yeastGrid").jqxGrid('sortby', 'y_use', 'asc'); |
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
3234 | }); |
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
3235 | $("#wy_name").jqxInput({ theme: theme, width: 320, height: 23 }); |
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
3236 | $("#wy_laboratory").jqxInput({ theme: theme, width: 320, height: 23 }); |
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
3237 | $("#wy_product_id").jqxInput({ theme: theme, width: 320, height: 23 }); |
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
3238 | $("#wy_instock").jqxCheckBox({ theme: theme, height: 23 }); |
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
3239 | $("#wy_instock").on('change', function (event) { |
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
3240 | yeastinstock = event.args.checked; |
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
3241 | yeastlist.dataBind(); |
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
3242 | }); |
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
3243 | $("#wy_select").jqxDropDownList({ |
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
3244 | placeHolder: "Kies gist:", |
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
3245 | theme: theme, |
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
3246 | source: yeastlist, |
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
3247 | displayMember: "name", |
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
3248 | width: 150, |
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
3249 | height: 23, |
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
3250 | dropDownWidth: 500, |
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
3251 | dropDownHeight: 500, |
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
3252 | renderer: function (index, label, value) { |
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
3253 | var datarecord = yeastlist.records[index]; |
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
3254 | return datarecord.laboratory+" "+datarecord.product_id+" "+datarecord.name; |
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
3255 | } |
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
3256 | }); |
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
3257 | $("#wy_select").on('select', function (event) { |
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
3258 | if (event.args) { |
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
3259 | var index = event.args.index; |
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
3260 | var datarecord = yeastlist.records[index]; |
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
3261 | var rowdata = $("#yeastGrid").jqxGrid('getrowdata', yeastRow); |
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
3262 | $("#wy_name").val(datarecord.name); |
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
3263 | $("#wy_laboratory").val(datarecord.laboratory); |
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
3264 | $("#wy_product_id").val(datarecord.product_id); |
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
3265 | rowdata.y_name = datarecord.name; |
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
3266 | rowdata.y_cost = datarecord.cost; |
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
3267 | rowdata.y_type = datarecord.type; |
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
3268 | rowdata.y_form = datarecord.form; |
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
3269 | rowdata.y_laboratory = datarecord.laboratory; |
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
3270 | rowdata.y_product_id = datarecord.product_id; |
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
3271 | rowdata.y_min_temperature = datarecord.min_temperature; |
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
3272 | rowdata.y_max_temperature = datarecord.max_temperature; |
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
3273 | rowdata.y_flocculation = datarecord.flocculation; |
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
3274 | rowdata.y_attenuation = datarecord.attenuation; |
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
3275 | rowdata.y_cells = datarecord.cells; |
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
3276 | rowdata.y_inventory = datarecord.inventory; |
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
3277 | if (rowdata.y_form == 0) { |
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
3278 | $("#wy_pmpt_amount").html("Pak(ken):"); |
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
3279 | } else if (rowdata.y_form == 1) { |
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
3280 | $("#wy_pmpt_amount").html("Gewicht gram:"); |
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
3281 | } else { |
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
3282 | $("#wy_pmpt_amount").html("Volume ml:"); |
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
3283 | } |
261
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
3284 | calcFermentables(); |
226
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
3285 | } |
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
3286 | }); |
245
3649c3d31d15
Fixed the mousewheel, spinner buttons to use the full min/max ranges. The 1.002 SG block to be precise.
Michiel Broek <mbroek@mbse.eu>
parents:
241
diff
changeset
|
3287 | $("#wy_amount").jqxNumberInput( Spin1dec ); |
226
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
3288 | $('#wy_amount').on('change', function (event) { |
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
3289 | console.log("amount changed: "+event.args.value); |
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
3290 | var rowdata = $("#yeastGrid").jqxGrid('getrowdata', yeastRow); |
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
3291 | if (rowdata.y_form == 0) // Liquid |
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
3292 | var amount = parseFloat(event.args.value); |
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
3293 | else |
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
3294 | var amount = parseFloat(event.args.value) / 1000; |
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
3295 | rowdata.y_amount = amount; |
261
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
3296 | calcFermentables(); |
226
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
3297 | }); |
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
3298 | $("#wy_use").jqxDropDownList({ |
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
3299 | theme: theme, |
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
3300 | source: YeastUseAdapter, |
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
3301 | valueMember: 'id', |
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
3302 | displayMember: 'nl', |
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
3303 | width: 180, |
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
3304 | height: 23, |
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
3305 | autoDropDownHeight: true, |
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
3306 | dropDownVerticalAlignment: 'top' |
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
3307 | }); |
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
3308 | $("#wy_use").on('select', function (event) { |
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
3309 | if (event.args) { |
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
3310 | var index = event.args.index; |
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
3311 | var rowdata = $("#yeastGrid").jqxGrid('getrowdata', yeastRow); |
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
3312 | rowdata.y_use = index; |
261
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
3313 | calcFermentabes(); |
226
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
3314 | } |
40e68b18b50d
The recipes yeast grid now uses a popup editor.
Michiel Broek <mbroek@mbse.eu>
parents:
225
diff
changeset
|
3315 | }); |
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:
175
diff
changeset
|
3316 | |
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:
175
diff
changeset
|
3317 | // Tab 6, Maischen |
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:
175
diff
changeset
|
3318 | $("#mash_name").jqxInput({ theme: theme, width: 320, height: 23 }); |
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:
227
diff
changeset
|
3319 | $("#mash_select").jqxDropDownList({ |
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:
227
diff
changeset
|
3320 | placeHolder: "Kies schema:", |
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:
227
diff
changeset
|
3321 | theme: theme, |
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:
227
diff
changeset
|
3322 | source: mashlist, |
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:
227
diff
changeset
|
3323 | displayMember: "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:
227
diff
changeset
|
3324 | width: 250, |
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:
227
diff
changeset
|
3325 | height: 23, |
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:
227
diff
changeset
|
3326 | dropDownWidth: 500, |
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:
227
diff
changeset
|
3327 | dropDownHeight: 500, |
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:
227
diff
changeset
|
3328 | dropDownHorizontalAlignment: 'right' |
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:
227
diff
changeset
|
3329 | }); |
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:
227
diff
changeset
|
3330 | $("#mash_select").on('select', function (event) { |
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:
227
diff
changeset
|
3331 | if (event.args) { |
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:
227
diff
changeset
|
3332 | var index = event.args.index; |
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:
227
diff
changeset
|
3333 | // First delete all current steps |
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:
227
diff
changeset
|
3334 | var rowIDs = new Array(); |
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:
227
diff
changeset
|
3335 | var rows = $("#mashGrid").jqxGrid('getdisplayrows'); |
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:
227
diff
changeset
|
3336 | for (var i = 0; i < rows.length; i++) { |
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:
227
diff
changeset
|
3337 | var row = rows[i]; |
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:
227
diff
changeset
|
3338 | rowIDs.push(row.uid); |
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:
227
diff
changeset
|
3339 | } |
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:
227
diff
changeset
|
3340 | $("#mashGrid").jqxGrid('deleterow', rowIDs); |
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:
227
diff
changeset
|
3341 | // Then add the new steps |
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:
227
diff
changeset
|
3342 | var datarecord = mashlist.records[index]; |
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:
227
diff
changeset
|
3343 | $("#mash_name").val(datarecord.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:
227
diff
changeset
|
3344 | for (var i = 0; i < datarecord.steps.length; i++) { |
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:
227
diff
changeset
|
3345 | var data = datarecord.steps[i]; |
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:
227
diff
changeset
|
3346 | var row = {}; |
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:
227
diff
changeset
|
3347 | row["step_name"] = data.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:
227
diff
changeset
|
3348 | row["step_type"] = data.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:
227
diff
changeset
|
3349 | // For now, but this must be smarter. |
232
daf2d9d6fa18
When adding yeast the flocculation and cells fields were not added. Possible fix for double water agents in the miscs grid. Better efforts to set the initial water infuse amount. The new recipe wizzard now uses indexed fields. In recipe print fixed the yeast amount and cost.
Michiel Broek <mbroek@mbse.eu>
parents:
230
diff
changeset
|
3350 | if (mash_infuse == 0 && dataRecord.w1_amount > 0) |
daf2d9d6fa18
When adding yeast the flocculation and cells fields were not added. Possible fix for double water agents in the miscs grid. Better efforts to set the initial water infuse amount. The new recipe wizzard now uses indexed fields. In recipe print fixed the yeast amount and cost.
Michiel Broek <mbroek@mbse.eu>
parents:
230
diff
changeset
|
3351 | mash_infuse = dataRecord.w1_amount; |
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:
227
diff
changeset
|
3352 | if (i == 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:
227
diff
changeset
|
3353 | row["step_infuse_amount"] = mash_infuse; |
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:
227
diff
changeset
|
3354 | 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:
227
diff
changeset
|
3355 | row["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:
227
diff
changeset
|
3356 | row["step_temp"] = data.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:
227
diff
changeset
|
3357 | row["end_temp"] = data.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:
227
diff
changeset
|
3358 | row["step_time"] = data.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:
227
diff
changeset
|
3359 | row["ramp_time"] = data.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:
227
diff
changeset
|
3360 | var commit = $("#mashGrid").jqxGrid('addrow', null, row); |
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:
227
diff
changeset
|
3361 | } |
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:
227
diff
changeset
|
3362 | } |
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:
227
diff
changeset
|
3363 | }); |
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:
227
diff
changeset
|
3364 | $("#popupMash").jqxWindow({ |
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:
227
diff
changeset
|
3365 | width: 800, |
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:
227
diff
changeset
|
3366 | height: 350, |
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:
227
diff
changeset
|
3367 | position: { x: 230, y: 100 }, |
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:
227
diff
changeset
|
3368 | resizable: false, |
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:
227
diff
changeset
|
3369 | theme: theme, |
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:
227
diff
changeset
|
3370 | isModal: 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:
227
diff
changeset
|
3371 | autoOpen: false, |
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:
227
diff
changeset
|
3372 | cancelButton: $("#MashReady"), |
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:
227
diff
changeset
|
3373 | modalOpacity: 0.40 |
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:
227
diff
changeset
|
3374 | }); |
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:
227
diff
changeset
|
3375 | $("#MashReady").jqxButton({ template: "success", width: '90px', theme: theme }); |
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:
227
diff
changeset
|
3376 | $("#MashReady").click(function () { |
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:
227
diff
changeset
|
3377 | $("#mashGrid").jqxGrid('sortby', 'step_temp', 'asc'); |
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:
227
diff
changeset
|
3378 | }); |
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:
227
diff
changeset
|
3379 | $("#wstep_name").jqxInput({ theme: theme, width: 320, height: 23 }); |
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:
227
diff
changeset
|
3380 | $("#wstep_type").jqxDropDownList({ |
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:
227
diff
changeset
|
3381 | theme: theme, |
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:
227
diff
changeset
|
3382 | source: MashStepTypeAdapter, |
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:
227
diff
changeset
|
3383 | valueMember: 'id', |
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:
227
diff
changeset
|
3384 | displayMember: 'nl', |
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:
227
diff
changeset
|
3385 | width: 180, |
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:
227
diff
changeset
|
3386 | height: 23, |
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:
227
diff
changeset
|
3387 | autoDropDownHeight: 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:
227
diff
changeset
|
3388 | }); |
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:
227
diff
changeset
|
3389 | $("#wstep_type").on('select', function (event) { |
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:
227
diff
changeset
|
3390 | if (event.args) { |
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:
227
diff
changeset
|
3391 | var index = event.args.index; |
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:
227
diff
changeset
|
3392 | var rowdata = $("#mashGrid").jqxGrid('getrowdata', mashRow); |
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:
227
diff
changeset
|
3393 | rowdata.step_type = index; |
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:
227
diff
changeset
|
3394 | if (index == 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:
227
diff
changeset
|
3395 | $("#wstep_infuse_amount").show(); |
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:
227
diff
changeset
|
3396 | $("#wstep_pmpt").show(); |
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:
227
diff
changeset
|
3397 | } else { |
229
cfd87d51a33c
Reset infuse amount if not an infusion step
Michiel Broek <mbroek@mbse.eu>
parents:
228
diff
changeset
|
3398 | rowdata.step_infuse_amount = 0; |
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:
227
diff
changeset
|
3399 | $("#wstep_infuse_amount").hide(); |
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:
227
diff
changeset
|
3400 | $("#wstep_pmpt").hide(); |
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:
227
diff
changeset
|
3401 | } |
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:
227
diff
changeset
|
3402 | mash_infuse = 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:
227
diff
changeset
|
3403 | var rows = $('#mashGrid').jqxGrid('getrows'); |
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:
227
diff
changeset
|
3404 | for (var i = 0; i < rows.length; i++) { |
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:
227
diff
changeset
|
3405 | var row = rows[i]; |
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:
227
diff
changeset
|
3406 | if (row.step_type == 0) // Infusion |
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:
227
diff
changeset
|
3407 | mash_infuse += parseFloat(row.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:
227
diff
changeset
|
3408 | } |
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:
227
diff
changeset
|
3409 | } |
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:
227
diff
changeset
|
3410 | }); |
245
3649c3d31d15
Fixed the mousewheel, spinner buttons to use the full min/max ranges. The 1.002 SG block to be precise.
Michiel Broek <mbroek@mbse.eu>
parents:
241
diff
changeset
|
3411 | $("#wstep_temp").jqxNumberInput( Spin1dec ); |
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:
227
diff
changeset
|
3412 | $('#wstep_temp').on('change', function (event) { |
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:
227
diff
changeset
|
3413 | var rowdata = $("#mashGrid").jqxGrid('getrowdata', mashRow); |
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:
227
diff
changeset
|
3414 | rowdata.step_temp = parseFloat(event.args.value); |
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:
227
diff
changeset
|
3415 | }); |
245
3649c3d31d15
Fixed the mousewheel, spinner buttons to use the full min/max ranges. The 1.002 SG block to be precise.
Michiel Broek <mbroek@mbse.eu>
parents:
241
diff
changeset
|
3416 | $("#wend_temp").jqxNumberInput( Spin1dec ); |
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:
227
diff
changeset
|
3417 | $('#wend_temp').on('change', function (event) { |
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:
227
diff
changeset
|
3418 | var rowdata = $("#mashGrid").jqxGrid('getrowdata', mashRow); |
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:
227
diff
changeset
|
3419 | rowdata.end_temp = parseFloat(event.args.value); |
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:
227
diff
changeset
|
3420 | }); |
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:
227
diff
changeset
|
3421 | $("#wstep_time").jqxNumberInput( PosInt ); |
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:
227
diff
changeset
|
3422 | $('#wstep_time').on('change', function (event) { |
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:
227
diff
changeset
|
3423 | var rowdata = $("#mashGrid").jqxGrid('getrowdata', mashRow); |
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:
227
diff
changeset
|
3424 | rowdata.step_time = parseFloat(event.args.value); |
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:
227
diff
changeset
|
3425 | }); |
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:
227
diff
changeset
|
3426 | $("#wramp_time").jqxNumberInput( PosInt ); |
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:
227
diff
changeset
|
3427 | $('#wramp_time').on('change', function (event) { |
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:
227
diff
changeset
|
3428 | var rowdata = $("#mashGrid").jqxGrid('getrowdata', mashRow); |
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:
227
diff
changeset
|
3429 | rowdata.ramp_time = parseFloat(event.args.value); |
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:
227
diff
changeset
|
3430 | }); |
245
3649c3d31d15
Fixed the mousewheel, spinner buttons to use the full min/max ranges. The 1.002 SG block to be precise.
Michiel Broek <mbroek@mbse.eu>
parents:
241
diff
changeset
|
3431 | $("#wstep_infuse_amount").jqxNumberInput( Spin1dec ); |
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:
227
diff
changeset
|
3432 | $('#wstep_infuse_amount').on('change', function (event) { |
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:
227
diff
changeset
|
3433 | var rowdata = $("#mashGrid").jqxGrid('getrowdata', mashRow); |
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:
227
diff
changeset
|
3434 | rowdata.step_infuse_amount = parseFloat(event.args.value); |
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:
227
diff
changeset
|
3435 | mash_infuse = 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:
227
diff
changeset
|
3436 | var rows = $('#mashGrid').jqxGrid('getrows'); |
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:
227
diff
changeset
|
3437 | for (var i = 0; i < rows.length; i++) { |
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:
227
diff
changeset
|
3438 | var row = rows[i]; |
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:
227
diff
changeset
|
3439 | if (row.step_type == 0) // Infusion |
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:
227
diff
changeset
|
3440 | mash_infuse += parseFloat(row.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:
227
diff
changeset
|
3441 | } |
264
24139883b9fa
Adjust water volumes if mash infusion amount is changed.
Michiel Broek <mbroek@mbse.eu>
parents:
263
diff
changeset
|
3442 | if (dataRecord.w2_amount == 0) { |
24139883b9fa
Adjust water volumes if mash infusion amount is changed.
Michiel Broek <mbroek@mbse.eu>
parents:
263
diff
changeset
|
3443 | dataRecord.w1_amount = mash_infuse; |
24139883b9fa
Adjust water volumes if mash infusion amount is changed.
Michiel Broek <mbroek@mbse.eu>
parents:
263
diff
changeset
|
3444 | $("#w1_amount").val(mash_infuse); |
24139883b9fa
Adjust water volumes if mash infusion amount is changed.
Michiel Broek <mbroek@mbse.eu>
parents:
263
diff
changeset
|
3445 | } else { |
24139883b9fa
Adjust water volumes if mash infusion amount is changed.
Michiel Broek <mbroek@mbse.eu>
parents:
263
diff
changeset
|
3446 | dataRecord.w1_amount = (dataRecord.w1_amount / (dataRecord.w1_amount + dataRecord.w2_amount)) * mash_infuse; |
24139883b9fa
Adjust water volumes if mash infusion amount is changed.
Michiel Broek <mbroek@mbse.eu>
parents:
263
diff
changeset
|
3447 | dataRecord.w2_amount = (dataRecord.w2_amount / (dataRecord.w1_amount + dataRecord.w2_amount)) * mash_infuse; |
24139883b9fa
Adjust water volumes if mash infusion amount is changed.
Michiel Broek <mbroek@mbse.eu>
parents:
263
diff
changeset
|
3448 | $("#w1_amount").val(dataRecord.w1_amount); |
24139883b9fa
Adjust water volumes if mash infusion amount is changed.
Michiel Broek <mbroek@mbse.eu>
parents:
263
diff
changeset
|
3449 | $("#w2_amount").val(dataRecord.w2_amount); |
24139883b9fa
Adjust water volumes if mash infusion amount is changed.
Michiel Broek <mbroek@mbse.eu>
parents:
263
diff
changeset
|
3450 | } |
24139883b9fa
Adjust water volumes if mash infusion amount is changed.
Michiel Broek <mbroek@mbse.eu>
parents:
263
diff
changeset
|
3451 | $('#wg_amount').val(mash_infuse); |
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:
227
diff
changeset
|
3452 | }); |
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:
175
diff
changeset
|
3453 | |
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:
175
diff
changeset
|
3454 | // Tab 7, Water |
261
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
3455 | $("#tgt_bu").jqxNumberInput( Show2wat ); |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
3456 | $("#tgt_cl_so4").jqxNumberInput( Show1wat ); |
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:
175
diff
changeset
|
3457 | |
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:
175
diff
changeset
|
3458 | // Water source 1 |
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
|
3459 | $("#w1_name").jqxDropDownList({ |
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
|
3460 | placeHolder: "Kies hoofd water:", |
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
|
3461 | theme: theme, |
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
|
3462 | source: waterlist, |
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
|
3463 | displayMember: "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
|
3464 | width: 250, |
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
|
3465 | height: 27, |
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
|
3466 | dropDownWidth: 400, |
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
|
3467 | dropDownHeight: 400 |
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
|
3468 | }); |
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
|
3469 | $("#w1_name").on('select', function (event) { |
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
|
3470 | if (event.args) { |
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
|
3471 | var index = event.args.index; |
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
|
3472 | var datarecord = waterlist.records[index]; |
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
|
3473 | dataRecord.w1_name = datarecord.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
|
3474 | $("#w1_calcium").val(datarecord.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
|
3475 | dataRecord.w1_calcium = datarecord.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
|
3476 | $("#w1_sulfate").val(datarecord.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
|
3477 | dataRecord.w1_sulfate = datarecord.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
|
3478 | $("#w1_chloride").val(datarecord.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
|
3479 | dataRecord.w1_chloride = datarecord.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
|
3480 | $("#w1_sodium").val(datarecord.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
|
3481 | dataRecord.w1_sodium = datarecord.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
|
3482 | $("#w1_magnesium").val(datarecord.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
|
3483 | dataRecord.w1_magnesium = datarecord.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
|
3484 | $("#w1_total_alkalinity").val(datarecord.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
|
3485 | dataRecord.w1_total_alkalinity = datarecord.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
|
3486 | $("#w1_ph").val(datarecord.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
|
3487 | dataRecord.w1_ph = datarecord.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
|
3488 | $("#w1_cost").val(datarecord.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
|
3489 | dataRecord.w1_cost = datarecord.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
|
3490 | calcWater(); |
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
|
3491 | } |
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
|
3492 | }); |
261
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
3493 | $("#w1_amount").jqxNumberInput( Show1wat ); |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
3494 | $("#w1_calcium").jqxNumberInput( Show1wat ); |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
3495 | $("#w1_magnesium").jqxNumberInput( Show1wat ); |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
3496 | $("#w1_sodium").jqxNumberInput( Show1wat ); |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
3497 | $("#w1_total_alkalinity").jqxNumberInput( Show1wat ); |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
3498 | $("#w1_chloride").jqxNumberInput( Show1wat ); |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
3499 | $("#w1_sulfate").jqxNumberInput( Show1wat ); |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
3500 | $("#w1_ph").jqxNumberInput( Show1wat ); |
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:
175
diff
changeset
|
3501 | // Water source 2 |
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
|
3502 | $("#w2_name").jqxDropDownList({ |
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
|
3503 | placeHolder: "Kies meng water:", |
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
|
3504 | theme: theme, |
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
|
3505 | source: waterlist, |
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
|
3506 | displayMember: "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
|
3507 | width: 250, |
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
|
3508 | height: 27, |
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
|
3509 | dropDownWidth: 400, |
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
|
3510 | dropDownHeight: 400 |
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
|
3511 | }); |
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
|
3512 | $("#w2_name").on('select', function (event) { |
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
|
3513 | if (event.args) { |
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
|
3514 | var index = event.args.index; |
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
|
3515 | var datarecord = waterlist.records[index]; |
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
|
3516 | dataRecord.w2_name = datarecord.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
|
3517 | $("#w2_calcium").val(datarecord.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
|
3518 | dataRecord.w2_calcium = datarecord.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
|
3519 | $("#w2_sulfate").val(datarecord.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
|
3520 | dataRecord.w2_sulfate = datarecord.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
|
3521 | $("#w2_chloride").val(datarecord.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
|
3522 | dataRecord.w2_chloride = datarecord.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
|
3523 | $("#w2_sodium").val(datarecord.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
|
3524 | dataRecord.w2_sodium = datarecord.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
|
3525 | $("#w2_magnesium").val(datarecord.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
|
3526 | dataRecord.w2_magnesium = datarecord.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
|
3527 | $("#w2_total_alkalinity").val(datarecord.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
|
3528 | dataRecord.w2_total_alkalinity = datarecord.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
|
3529 | $("#w2_ph").val(datarecord.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
|
3530 | dataRecord.w2_ph = datarecord.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
|
3531 | $("#w2_cost").val(datarecord.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
|
3532 | dataRecord.w2_cost = datarecord.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
|
3533 | $("#w2_amount").jqxNumberInput({ max: 100000, readOnly: false }); // Set high max to enable the spinbuttons. |
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
|
3534 | calcWater(); |
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
|
3535 | } |
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
|
3536 | }); |
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:
175
diff
changeset
|
3537 | $("#w2_amount").jqxTooltip({ content: 'De verdeling van het hoofd en meng water. Het totale maisch water volume blijft gelijk.'}); |
261
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
3538 | $("#w2_amount").jqxNumberInput({ inputMode: 'simple', theme: theme, width: 94, height: 23, min: 0, max: 0, decimalDigits: 1, spinButtons: true, readOnly: true }); |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
3539 | $("#w2_calcium").jqxNumberInput( Show1wat ); |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
3540 | $("#w2_magnesium").jqxNumberInput( Show1wat ); |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
3541 | $("#w2_sodium").jqxNumberInput( Show1wat ); |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
3542 | $("#w2_total_alkalinity").jqxNumberInput( Show1wat ); |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
3543 | $("#w2_chloride").jqxNumberInput( Show1wat ); |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
3544 | $("#w2_sulfate").jqxNumberInput( Show1wat ); |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
3545 | $("#w2_ph").jqxNumberInput( Show1wat ); |
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:
175
diff
changeset
|
3546 | // Water mixed |
261
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
3547 | $("#wg_amount").jqxNumberInput( Show1wat ); |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
3548 | $("#wg_calcium").jqxNumberInput( Show1wat ); |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
3549 | $("#wg_magnesium").jqxNumberInput( Show1wat ); |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
3550 | $("#wg_sodium").jqxNumberInput( Show1wat ); |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
3551 | $("#wg_total_alkalinity").jqxNumberInput( Show1wat ); |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
3552 | $("#wg_chloride").jqxNumberInput( Show1wat ); |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
3553 | $("#wg_sulfate").jqxNumberInput( Show1wat ); |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
3554 | $("#wg_ph").jqxNumberInput( Show1wat ); |
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:
175
diff
changeset
|
3555 | // Water treated |
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:
175
diff
changeset
|
3556 | $("#wb_calcium").jqxTooltip({ content: 'De ideale hoeveelheid Calcium is tussen 40 en 150.'}); |
261
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
3557 | $("#wb_calcium").jqxNumberInput( Show1wat ); |
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:
175
diff
changeset
|
3558 | $("#wb_magnesium").jqxTooltip({ content: 'De ideale hoeveelheid Magnesium is lager dan 30.'}); |
261
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
3559 | $("#wb_magnesium").jqxNumberInput( Show1wat ); |
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:
175
diff
changeset
|
3560 | $("#wb_sodium").jqxTooltip({ content: 'De ideale hoeveelheid Natrium is lager dan 150.'}); |
261
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
3561 | $("#wb_sodium").jqxNumberInput( Show1wat ); |
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:
175
diff
changeset
|
3562 | $("#wb_chloride").jqxTooltip({ content: 'De ideale hoeveelheid Chloride is lager dan 100.'}); |
261
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
3563 | $("#wb_chloride").jqxNumberInput( Show1wat ); |
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:
175
diff
changeset
|
3564 | $("#wb_sulfate").jqxTooltip({ content: 'De ideale hoeveelheid Sulfaat is lager dan 350.'}); |
261
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
3565 | $("#wb_sulfate").jqxNumberInput( Show1wat ); |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
3566 | $("#wb_total_alkalinity").jqxNumberInput( Show1wat ); |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
3567 | $("#wb_ph").jqxNumberInput( Show1wat ); |
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:
175
diff
changeset
|
3568 | // Water target profile |
149
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
3569 | $("#pr_name").jqxDropDownList({ |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
3570 | placeHolder: "Kies doel profiel:", |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
3571 | theme: theme, |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
3572 | source: waterprofiles, |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
3573 | displayMember: "name", |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
3574 | width: 250, |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
3575 | height: 27, |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
3576 | dropDownWidth: 400, |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
3577 | dropDownHeight: 300 |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
3578 | }); |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
3579 | $("#pr_name").on('select', function (event) { |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
3580 | if (event.args) { |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
3581 | var index = event.args.index; |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
3582 | var datarecord = waterprofiles.records[index]; |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
3583 | $("#pr_calcium").val(datarecord.calcium); |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
3584 | $("#pr_sulfate").val(datarecord.sulfate); |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
3585 | $("#pr_chloride").val(datarecord.chloride); |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
3586 | $("#pr_sodium").val(datarecord.sodium); |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
3587 | $("#pr_magnesium").val(datarecord.magnesium); |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
3588 | $("#pr_total_alkalinity").val(datarecord.total_alkalinity); |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
3589 | } |
ff45488d480e
Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents:
148
diff
changeset
|
3590 | }); |
261
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
3591 | $("#pr_calcium").jqxNumberInput( Show1wat ); |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
3592 | $("#pr_magnesium").jqxNumberInput( Show1wat ); |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
3593 | $("#pr_sodium").jqxNumberInput( Show1wat ); |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
3594 | $("#pr_total_alkalinity").jqxNumberInput( Show1wat ); |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
3595 | $("#pr_chloride").jqxNumberInput( Show1wat ); |
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
3596 | $("#pr_sulfate").jqxNumberInput( Show1wat ); |
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:
146
diff
changeset
|
3597 | |
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:
175
diff
changeset
|
3598 | // Water agents |
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:
175
diff
changeset
|
3599 | $("#wa_cacl2").jqxTooltip({ content: 'Voor het maken van een ander waterprofiel. Voegt calcium en chloride toe. Voor het verbeteren van zoetere bieren.'}); |
245
3649c3d31d15
Fixed the mousewheel, spinner buttons to use the full min/max ranges. The 1.002 SG block to be precise.
Michiel Broek <mbroek@mbse.eu>
parents:
241
diff
changeset
|
3600 | $("#wa_cacl2").jqxNumberInput( Spin1dec ); |
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:
175
diff
changeset
|
3601 | $("#wa_caso4").jqxTooltip({ content: 'Gips. Voor het maken van een ander waterprofiel. Voegt calcium en sulfaat toe. Voor het verbeteren van bittere bieren.'}); |
245
3649c3d31d15
Fixed the mousewheel, spinner buttons to use the full min/max ranges. The 1.002 SG block to be precise.
Michiel Broek <mbroek@mbse.eu>
parents:
241
diff
changeset
|
3602 | $("#wa_caso4").jqxNumberInput( Spin1dec ); |
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:
175
diff
changeset
|
3603 | $("#wa_mgso4").jqxTooltip({ content: 'Epsom zout. Voor het maken van een ander waterprofiel. Voegt magnesium en sulfaat toe. Gebruik spaarzaam!'}); |
245
3649c3d31d15
Fixed the mousewheel, spinner buttons to use the full min/max ranges. The 1.002 SG block to be precise.
Michiel Broek <mbroek@mbse.eu>
parents:
241
diff
changeset
|
3604 | $("#wa_mgso4").jqxNumberInput( Spin1dec ); |
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:
175
diff
changeset
|
3605 | $("#wa_nacl").jqxTooltip({ content: 'Keukenzout. Voor het maken van een ander waterprofiel. Voegt natrium en chloride toe. Voor het accentueren van zoetheid. Bij hoge dosering wordt het bier ziltig.'}); |
245
3649c3d31d15
Fixed the mousewheel, spinner buttons to use the full min/max ranges. The 1.002 SG block to be precise.
Michiel Broek <mbroek@mbse.eu>
parents:
241
diff
changeset
|
3606 | $("#wa_nacl").jqxNumberInput( Spin1dec ); |
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:
175
diff
changeset
|
3607 | $("#mash_ph").jqxTooltip({ content: 'Maisch pH tussen 5.2 en 5.6. Gebruik 5.2 voor lichte en 5.5 voor donkere bieren.'}); |
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:
175
diff
changeset
|
3608 | $("#mash_ph").jqxNumberInput( SpinpH ); |
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:
146
diff
changeset
|
3609 | $("#calc_acid").jqxCheckBox({ theme: theme, width: 120, height: 23 }); |
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:
175
diff
changeset
|
3610 | $("#wa_base_name").jqxDropDownList({ |
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:
175
diff
changeset
|
3611 | theme: theme, |
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:
175
diff
changeset
|
3612 | source: BaseTypeAdapter, |
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:
175
diff
changeset
|
3613 | valueMember: 'id', |
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:
175
diff
changeset
|
3614 | displayMember: 'nl', |
230
8edca0488e65
Finished the water treatment in the recipes editor. It seems that the recipes editor is ready.
Michiel Broek <mbroek@mbse.eu>
parents:
229
diff
changeset
|
3615 | width: 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:
175
diff
changeset
|
3616 | height: 23, |
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:
175
diff
changeset
|
3617 | autoDropDownHeight: 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:
175
diff
changeset
|
3618 | }); |
245
3649c3d31d15
Fixed the mousewheel, spinner buttons to use the full min/max ranges. The 1.002 SG block to be precise.
Michiel Broek <mbroek@mbse.eu>
parents:
241
diff
changeset
|
3619 | $("#wa_base").jqxNumberInput( Spin2dec ); |
230
8edca0488e65
Finished the water treatment in the recipes editor. It seems that the recipes editor is ready.
Michiel Broek <mbroek@mbse.eu>
parents:
229
diff
changeset
|
3620 | $("#wa_base").jqxNumberInput({ symbol: ' gr', symbolPosition: 'right' }); |
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:
175
diff
changeset
|
3621 | $("#wa_acid_name").jqxDropDownList({ |
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:
175
diff
changeset
|
3622 | theme: theme, |
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:
175
diff
changeset
|
3623 | source: AcidTypeAdapter, |
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:
175
diff
changeset
|
3624 | valueMember: 'id', |
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:
175
diff
changeset
|
3625 | displayMember: 'nl', |
230
8edca0488e65
Finished the water treatment in the recipes editor. It seems that the recipes editor is ready.
Michiel Broek <mbroek@mbse.eu>
parents:
229
diff
changeset
|
3626 | width: 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:
175
diff
changeset
|
3627 | height: 23, |
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:
175
diff
changeset
|
3628 | autoDropDownHeight: 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:
175
diff
changeset
|
3629 | }); |
245
3649c3d31d15
Fixed the mousewheel, spinner buttons to use the full min/max ranges. The 1.002 SG block to be precise.
Michiel Broek <mbroek@mbse.eu>
parents:
241
diff
changeset
|
3630 | $("#wa_acid").jqxNumberInput( Spin2dec ); |
230
8edca0488e65
Finished the water treatment in the recipes editor. It seems that the recipes editor is ready.
Michiel Broek <mbroek@mbse.eu>
parents:
229
diff
changeset
|
3631 | $("#wa_acid").jqxNumberInput({ symbol: ' ml', symbolPosition: 'right' }); |
8edca0488e65
Finished the water treatment in the recipes editor. It seems that the recipes editor is ready.
Michiel Broek <mbroek@mbse.eu>
parents:
229
diff
changeset
|
3632 | $("#wa_acid_perc").jqxNumberInput( Perc0 ); |
8edca0488e65
Finished the water treatment in the recipes editor. It seems that the recipes editor is ready.
Michiel Broek <mbroek@mbse.eu>
parents:
229
diff
changeset
|
3633 | $("#wa_acid_perc").jqxNumberInput({ width: 70, symbol: '%', symbolPosition: 'right' }); |
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:
175
diff
changeset
|
3634 | // Sparge water |
245
3649c3d31d15
Fixed the mousewheel, spinner buttons to use the full min/max ranges. The 1.002 SG block to be precise.
Michiel Broek <mbroek@mbse.eu>
parents:
241
diff
changeset
|
3635 | $("#sparge_temp").jqxNumberInput( Spin1dec ); |
3649c3d31d15
Fixed the mousewheel, spinner buttons to use the full min/max ranges. The 1.002 SG block to be precise.
Michiel Broek <mbroek@mbse.eu>
parents:
241
diff
changeset
|
3636 | $("#sparge_volume").jqxNumberInput( Spin1dec ); |
230
8edca0488e65
Finished the water treatment in the recipes editor. It seems that the recipes editor is ready.
Michiel Broek <mbroek@mbse.eu>
parents:
229
diff
changeset
|
3637 | $("#sparge_ph").jqxNumberInput( SpinpH ); |
8edca0488e65
Finished the water treatment in the recipes editor. It seems that the recipes editor is ready.
Michiel Broek <mbroek@mbse.eu>
parents:
229
diff
changeset
|
3638 | $("#sparge_source").jqxDropDownList({ |
8edca0488e65
Finished the water treatment in the recipes editor. It seems that the recipes editor is ready.
Michiel Broek <mbroek@mbse.eu>
parents:
229
diff
changeset
|
3639 | theme: theme, |
8edca0488e65
Finished the water treatment in the recipes editor. It seems that the recipes editor is ready.
Michiel Broek <mbroek@mbse.eu>
parents:
229
diff
changeset
|
3640 | source: SpargeSourceAdapter, |
8edca0488e65
Finished the water treatment in the recipes editor. It seems that the recipes editor is ready.
Michiel Broek <mbroek@mbse.eu>
parents:
229
diff
changeset
|
3641 | valueMember: 'id', |
8edca0488e65
Finished the water treatment in the recipes editor. It seems that the recipes editor is ready.
Michiel Broek <mbroek@mbse.eu>
parents:
229
diff
changeset
|
3642 | displayMember: 'nl', |
8edca0488e65
Finished the water treatment in the recipes editor. It seems that the recipes editor is ready.
Michiel Broek <mbroek@mbse.eu>
parents:
229
diff
changeset
|
3643 | width: 110, |
8edca0488e65
Finished the water treatment in the recipes editor. It seems that the recipes editor is ready.
Michiel Broek <mbroek@mbse.eu>
parents:
229
diff
changeset
|
3644 | height: 23, |
8edca0488e65
Finished the water treatment in the recipes editor. It seems that the recipes editor is ready.
Michiel Broek <mbroek@mbse.eu>
parents:
229
diff
changeset
|
3645 | autoDropDownHeight: true |
8edca0488e65
Finished the water treatment in the recipes editor. It seems that the recipes editor is ready.
Michiel Broek <mbroek@mbse.eu>
parents:
229
diff
changeset
|
3646 | }); |
245
3649c3d31d15
Fixed the mousewheel, spinner buttons to use the full min/max ranges. The 1.002 SG block to be precise.
Michiel Broek <mbroek@mbse.eu>
parents:
241
diff
changeset
|
3647 | $("#sparge_acid_amount").jqxNumberInput( Spin2dec ); |
230
8edca0488e65
Finished the water treatment in the recipes editor. It seems that the recipes editor is ready.
Michiel Broek <mbroek@mbse.eu>
parents:
229
diff
changeset
|
3648 | $("#sparge_acid_amount").jqxNumberInput({ spinButtons: false, readOnly: true, symbol: ' ml', symbolPosition: 'right' }); |
8edca0488e65
Finished the water treatment in the recipes editor. It seems that the recipes editor is ready.
Michiel Broek <mbroek@mbse.eu>
parents:
229
diff
changeset
|
3649 | $("#sparge_acid_type").jqxDropDownList({ |
8edca0488e65
Finished the water treatment in the recipes editor. It seems that the recipes editor is ready.
Michiel Broek <mbroek@mbse.eu>
parents:
229
diff
changeset
|
3650 | theme: theme, |
8edca0488e65
Finished the water treatment in the recipes editor. It seems that the recipes editor is ready.
Michiel Broek <mbroek@mbse.eu>
parents:
229
diff
changeset
|
3651 | source: AcidTypeAdapter, |
8edca0488e65
Finished the water treatment in the recipes editor. It seems that the recipes editor is ready.
Michiel Broek <mbroek@mbse.eu>
parents:
229
diff
changeset
|
3652 | valueMember: 'id', |
8edca0488e65
Finished the water treatment in the recipes editor. It seems that the recipes editor is ready.
Michiel Broek <mbroek@mbse.eu>
parents:
229
diff
changeset
|
3653 | displayMember: 'nl', |
8edca0488e65
Finished the water treatment in the recipes editor. It seems that the recipes editor is ready.
Michiel Broek <mbroek@mbse.eu>
parents:
229
diff
changeset
|
3654 | width: 110, |
8edca0488e65
Finished the water treatment in the recipes editor. It seems that the recipes editor is ready.
Michiel Broek <mbroek@mbse.eu>
parents:
229
diff
changeset
|
3655 | height: 23, |
8edca0488e65
Finished the water treatment in the recipes editor. It seems that the recipes editor is ready.
Michiel Broek <mbroek@mbse.eu>
parents:
229
diff
changeset
|
3656 | autoDropDownHeight: true |
8edca0488e65
Finished the water treatment in the recipes editor. It seems that the recipes editor is ready.
Michiel Broek <mbroek@mbse.eu>
parents:
229
diff
changeset
|
3657 | }); |
8edca0488e65
Finished the water treatment in the recipes editor. It seems that the recipes editor is ready.
Michiel Broek <mbroek@mbse.eu>
parents:
229
diff
changeset
|
3658 | $("#sparge_acid_perc").jqxNumberInput( Perc0 ); |
8edca0488e65
Finished the water treatment in the recipes editor. It seems that the recipes editor is ready.
Michiel Broek <mbroek@mbse.eu>
parents:
229
diff
changeset
|
3659 | $("#sparge_acid_perc").jqxNumberInput({ symbol: '%', symbolPosition: 'right' }); |
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:
146
diff
changeset
|
3660 | |
68 | 3661 | // Tabs inside the popup window. |
3662 | $('#jqxTabs').jqxTabs({ | |
3663 | theme: theme, | |
3664 | width: 1280, | |
283
879b81864e4e
The product and recipe editors disable the top menu so the user is forced to exit using the buttons on the first tab.
Michiel Broek <mbroek@mbse.eu>
parents:
271
diff
changeset
|
3665 | height: 660, |
68 | 3666 | autoHeight: false, |
3667 | position: 'top' | |
3668 | }); | |
3669 | ||
79 | 3670 | $("#Print").jqxButton({ template: "info", width: '80px', theme: theme }); |
3671 | $("#Print").click(function () { | |
271
af0270694d1e
Save data before printing or export to beerxml
Michiel Broek <mbroek@mbse.eu>
parents:
267
diff
changeset
|
3672 | saveRecord(); |
79 | 3673 | // Open print in a new tab. |
3674 | var url="rec_print.php?record=" + my_record; | |
3675 | window.open(url); | |
3676 | }); | |
3677 | ||
175
da16371538c3
When importing from brouwhulp use 0 and 1 instead of false and true for boolean variables. Added Export button to the recipe editor. Added beerxml recipe export.
Michiel Broek <mbroek@mbse.eu>
parents:
168
diff
changeset
|
3678 | $("#Export").jqxButton({ template: "info", width: '80px', theme: theme }); |
da16371538c3
When importing from brouwhulp use 0 and 1 instead of false and true for boolean variables. Added Export button to the recipe editor. Added beerxml recipe export.
Michiel Broek <mbroek@mbse.eu>
parents:
168
diff
changeset
|
3679 | $("#Export").click(function () { |
271
af0270694d1e
Save data before printing or export to beerxml
Michiel Broek <mbroek@mbse.eu>
parents:
267
diff
changeset
|
3680 | saveRecord(); |
303 | 3681 | var url="rec_export.php?record=" + my_record + "&return=" + my_return + "&name=" + dataRecord.name; |
3682 | window.location.href = url; | |
175
da16371538c3
When importing from brouwhulp use 0 and 1 instead of false and true for boolean variables. Added Export button to the recipe editor. Added beerxml recipe export.
Michiel Broek <mbroek@mbse.eu>
parents:
168
diff
changeset
|
3683 | }); |
da16371538c3
When importing from brouwhulp use 0 and 1 instead of false and true for boolean variables. Added Export button to the recipe editor. Added beerxml recipe export.
Michiel Broek <mbroek@mbse.eu>
parents:
168
diff
changeset
|
3684 | |
68 | 3685 | $("#Delete").jqxButton({ template: "danger", width: '80px', theme: theme }); |
3686 | $("#Delete").click(function () { | |
3687 | // Open a popup to confirm this action. | |
3688 | $('#eventWindow').jqxWindow('open'); | |
3689 | $("#delOk").click(function () { | |
3690 | var data = "delete=true&" + $.param({ record: my_record }); | |
3691 | $.ajax({ | |
3692 | dataType: 'json', | |
3693 | url: url, | |
3694 | cache: false, | |
3695 | data: data, | |
3696 | type: "POST", | |
3697 | success: function (data, status, xhr) { | |
3698 | // delete command is executed. | |
3699 | window.location.href = my_return; | |
3700 | }, | |
3701 | error: function (jqXHR, textStatus, errorThrown) { | |
3702 | } | |
3703 | }); | |
3704 | }); | |
3705 | }); | |
3706 | ||
3707 | $("#Cancel").jqxButton({ template: "primary", width: '80px', theme: theme }); | |
3708 | $("#Cancel").click(function () { | |
3709 | window.location.href = my_return; | |
3710 | }); | |
3711 | ||
271
af0270694d1e
Save data before printing or export to beerxml
Michiel Broek <mbroek@mbse.eu>
parents:
267
diff
changeset
|
3712 | $("#Save").jqxButton({ template: "success", width: '80px', theme: theme }); |
68 | 3713 | $("#Save").click(function () { |
271
af0270694d1e
Save data before printing or export to beerxml
Michiel Broek <mbroek@mbse.eu>
parents:
267
diff
changeset
|
3714 | saveRecord(); |
af0270694d1e
Save data before printing or export to beerxml
Michiel Broek <mbroek@mbse.eu>
parents:
267
diff
changeset
|
3715 | window.location.href = my_return; |
68 | 3716 | }); |
3717 | createDelElements(); | |
3718 | }); | |
3719 |