Fri, 22 Jul 2022 12:15:05 +0200
Version 0.3.41. Use INSERT IGNORE .. for insert log messages from fermenters, co2meters and ispindels. Connect to MySQL servers with MYSQL_OPT_RECONNECT instead of manual working around the connection lost problem if a mysql server is restarted. Removed unused bms_mysql_ping function.
68 | 1 | /***************************************************************************** |
756
b702c25661e7
Removed unnecesary code. Use existing array data instead of grid calls where possible.
Michiel Broek <mbroek@mbse.eu>
parents:
735
diff
changeset
|
2 | * Copyright (C) 2018-2021 |
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 | ||
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
23 | var psugar = 0, // Percentage real sugars |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
24 | pcara = 0, // Percentage cara/crystal malts |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
25 | svg = 77, // Default attenuation |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
26 | mashkg = 0, // Malt in mash weight |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
27 | mash_infuse = 0, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
28 | dataRecord = {}, // Main recipe record |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
29 | hop_flavour = 0, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
30 | hop_aroma = 0, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
31 | preboil_sg = 0, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
32 | last_base = '', |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
33 | last_acid = '', |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
34 | Ka1 = 0.0000004445, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
35 | Ka2 = 0.0000000000468, |
662
4bb005694ce7
Version 0.3.32 Inventory water and profile water edit screens updated and added ion balance fields. Moved acid specs to global.js. In prod_edit and rec_edit changed the water calculations, eliminated the double percentage calculation. The pH values in the water tab have now 2 decimal digits. The mash pH field is only shown in auto calculate mode. The calculated acid addition results are now a bit better and compare with several famous spreadsheets.
Michiel Broek <mbroek@mbse.eu>
parents:
660
diff
changeset
|
36 | error_count = 0, |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
37 | MMCa = 40.048, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
38 | MMMg = 24.305, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
39 | MMNa = 22.98976928, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
40 | MMCl = 35.453, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
41 | MMSO4 = 96.0626, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
42 | MMCO3 = 60.01684, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
43 | MMHCO3 = 61.01684, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
44 | MMCaSO4 = 172.171, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
45 | MMCaCl2 = 147.015, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
46 | MMCaCO3 = 100.087, |
772
f9d266eb0ec6
In product editor calculate fermentables before the first IBU calculation. In recipe editor changed to the new water calculations like in the product editor.
Michiel Broek <mbroek@mbse.eu>
parents:
756
diff
changeset
|
47 | MMMgCl2 = 95.211, /* Since 27-06-2021 */ |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
48 | MMMgSO4 = 246.475, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
49 | MMNaHCO3 = 84.007, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
50 | MMNa2CO3 = 105.996, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
51 | MMNaCl = 58.443, |
667
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
52 | MMCaOH2 = 74.06268, |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
53 | SpecificHeatWater = 1.0, |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
54 | SpecificHeatMalt = 0.399, //cal/g.°C |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
55 | SlakingHeat = 10.318, //cal/g.°C |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
56 | eq_tun_weight = 2.0, // 2 Kg pot |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
57 | eq_tun_specific_heat = 0.110, // Stainless Steel |
643
9ac2fb6b1311
Added failsave starting calcWater() when the main data is not yet loaded.
Michiel Broek <mbroek@mbse.eu>
parents:
642
diff
changeset
|
58 | data_loaded = 0; |
68 | 59 | |
60 | function createDelElements() { | |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
61 | $('#eventWindow').jqxWindow({ |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
62 | theme: theme, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
63 | position: { x: 490, y: 210 }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
64 | width: 300, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
65 | height: 175, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
66 | resizable: false, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
67 | isModal: true, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
68 | modalOpacity: 0.4, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
69 | okButton: $('#delOk'), |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
70 | cancelButton: $('#delCancel'), |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
71 | initContent: function() { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
72 | $('#delOk').jqxButton({ template: 'danger', width: '65px', theme: theme }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
73 | $('#delCancel').jqxButton({ template: 'success', width: '65px', theme: theme }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
74 | $('#delCancel').focus(); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
75 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
76 | }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
77 | $('#eventWindow').jqxWindow('hide'); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
78 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
79 | |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
80 | |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
81 | function hopFlavourContribution(bt, vol, use, amount) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
82 | var result; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
83 | |
540
756fe9afe72b
Recipes editor handles whirlpool hop IBUs.
Michiel Broek <mbroek@mbse.eu>
parents:
524
diff
changeset
|
84 | if (use == 4 || use == 5) // Whirlpool or Dry-hop |
756fe9afe72b
Recipes editor handles whirlpool hop IBUs.
Michiel Broek <mbroek@mbse.eu>
parents:
524
diff
changeset
|
85 | return 0; |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
86 | if (use == 1) { // First wort |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
87 | result = 0.15; // assume 15% flavourcontribution for fwh |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
88 | } else if (bt > 50) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
89 | result = 0.10; // assume 10% flavourcontribution as a minimum |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
90 | } else { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
91 | result = 15.25 / (6 * Math.sqrt(2 * Math.PI)) * Math.exp(-0.5 * Math.pow((bt - 21) / 6, 2)); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
92 | if (result < 0.10) |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
93 | result = 0.10; // assume 10% flavourcontribution as a minimum |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
94 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
95 | return (result * amount * 1000) / vol; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
96 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
97 | |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
98 | |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
99 | function hopAromaContribution(bt, vol, use, amount) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
100 | var result = 0; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
101 | |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
102 | if (use == 5) { // Dry hop |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
103 | result = 1.33; |
540
756fe9afe72b
Recipes editor handles whirlpool hop IBUs.
Michiel Broek <mbroek@mbse.eu>
parents:
524
diff
changeset
|
104 | } else if (use == 4) { // Whirlpool |
756fe9afe72b
Recipes editor handles whirlpool hop IBUs.
Michiel Broek <mbroek@mbse.eu>
parents:
524
diff
changeset
|
105 | if (bt > 30) |
756fe9afe72b
Recipes editor handles whirlpool hop IBUs.
Michiel Broek <mbroek@mbse.eu>
parents:
524
diff
changeset
|
106 | bt = 30; // Max 30 minutes |
756fe9afe72b
Recipes editor handles whirlpool hop IBUs.
Michiel Broek <mbroek@mbse.eu>
parents:
524
diff
changeset
|
107 | result = 0.62 * bt / 30; |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
108 | } else if (bt > 20) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
109 | result = 0; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
110 | } else if (bt > 7.5) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
111 | result = 10.03 / (4 * Math.sqrt(2 * Math.PI)) * Math.exp(-0.5 * Math.pow((bt - 7.5) / 4, 2)); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
112 | } else if (use == 2) { // Boil |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
113 | result = 1; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
114 | } else if (use == 3) { // Aroma |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
115 | result = 1.2; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
116 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
117 | return (result * amount * 1000) / vol; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
118 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
119 | |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
120 | |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
121 | function setReadonly(ro) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
122 | var rw = ! ro, w100 = 110, w80 = 80; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
123 | if (ro) { // jqxNumberInput width -20 for no spinbuttons |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
124 | w100 = 90; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
125 | w80 = 60; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
126 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
127 | $('#batch_size').jqxNumberInput({ spinButtons: rw, readOnly: ro, width: w100 }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
128 | $('#boil_size').jqxNumberInput({ spinButtons: rw, readOnly: ro, width: w100 }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
129 | $('#boil_time').jqxNumberInput({ spinButtons: rw, readOnly: ro, width: w100 }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
130 | $('#efficiency').jqxNumberInput({ spinButtons: rw, readOnly: ro, width: w100 }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
131 | $('#est_og').jqxNumberInput({ spinButtons: rw, readOnly: ro, width: w100 }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
132 | // id="st_fg_min" margin-left 15/35 maken |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
133 | $('#type').jqxDropDownList({ disabled: ro }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
134 | $('#styleSelect').jqxDropDownList({ disabled: ro }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
135 | $('#color_method').jqxDropDownList({ disabled: ro }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
136 | $('#ibu_method').jqxDropDownList({ disabled: ro }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
137 | $('#Delete').jqxButton({ disabled: ro }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
138 | $('#fermentableGrid').jqxGrid({ editable: rw }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
139 | $('#faddrowbutton').jqxDropDownList({ disabled: ro }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
140 | $('#finstockbutton').jqxCheckBox({ disabled: ro }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
141 | $('#fdeleterowbutton').jqxButton({ disabled: ro }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
142 | $('#hopGrid').jqxGrid({ editable: rw }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
143 | $('#haddrowbutton').jqxDropDownList({ disabled: ro }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
144 | $('#hinstockbutton').jqxCheckBox({ disabled: ro }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
145 | $('#hdeleterowbutton').jqxButton({ disabled: ro }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
146 | $('#miscGrid').jqxGrid({ editable: rw }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
147 | $('#maddrowbutton').jqxDropDownList({ disabled: ro }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
148 | $('#minstockbutton').jqxCheckBox({ disabled: ro }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
149 | $('#mdeleterowbutton').jqxButton({ disabled: ro }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
150 | $('#yeastGrid').jqxGrid({ editable: rw }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
151 | $('#yaddrowbutton').jqxDropDownList({ disabled: ro }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
152 | $('#yinstockbutton').jqxCheckBox({ disabled: ro }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
153 | $('#ydeleterowbutton').jqxButton({ disabled: ro }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
154 | $('#mashGrid').jqxGrid({ editable: rw }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
155 | $('#saddrowbutton').jqxButton({ disabled: ro }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
156 | $('#sdeleterowbutton').jqxButton({ disabled: ro }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
157 | $('#w1_name').jqxDropDownList({ disabled: ro }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
158 | $('#w2_name').jqxDropDownList({ disabled: ro }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
159 | $('#pr_name').jqxDropDownList({ disabled: ro }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
160 | $('#wa_cacl2').jqxNumberInput({ spinButtons: rw, readOnly: ro, width: w100 }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
161 | $('#wa_caso4').jqxNumberInput({ spinButtons: rw, readOnly: ro, width: w100 }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
162 | $('#wa_mgso4').jqxNumberInput({ spinButtons: rw, readOnly: ro, width: w100 }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
163 | $('#wa_nacl').jqxNumberInput({ spinButtons: rw, readOnly: ro, width: w100 }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
164 | $('#mash_ph').jqxNumberInput({ spinButtons: rw, readOnly: ro, width: w100 }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
165 | $('#calc_acid').jqxCheckBox({ disabled: ro }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
166 | $('#wa_acid_name').jqxDropDownList({ disabled: ro }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
167 | $('#wa_acid').jqxNumberInput({ spinButtons: rw, readOnly: ro, width: w100 }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
168 | $('#wa_acid_perc').jqxNumberInput({ spinButtons: rw, readOnly: ro, width: w80 }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
169 | $('#sparge_temp').jqxNumberInput({ spinButtons: rw, readOnly: ro, width: w100 }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
170 | $('#sparge_volume').jqxNumberInput({ spinButtons: rw, readOnly: ro, width: w100 }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
171 | $('#sparge_ph').jqxNumberInput({ spinButtons: rw, readOnly: ro, width: w100 }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
172 | $('#sparge_source').jqxDropDownList({ disabled: ro }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
173 | $('#sparge_acid_type').jqxDropDownList({ disabled: ro }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
174 | $('#sparge_acid_perc').jqxNumberInput({ spinButtons: rw, readOnly: ro, width: w100 }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
175 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
176 | |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
177 | |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
178 | function calcPercentages() { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
179 | |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
180 | console.log('calcPercentages()'); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
181 | var tw, rowdata, percentage, i, rowscount = $('#fermentableGrid').jqxGrid('getdatainformation').rowscount; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
182 | if (rowscount > 1) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
183 | tw = 0; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
184 | for (i = 0; i < rowscount; i++) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
185 | rowdata = $('#fermentableGrid').jqxGrid('getrowdata', i); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
186 | if (rowdata.f_added < 4) |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
187 | tw += Round(rowdata.f_amount, 3); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
188 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
189 | tw = Round(tw, 3); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
190 | |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
191 | for (i = 0; i < rowscount; i++) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
192 | rowdata = $('#fermentableGrid').jqxGrid('getrowdata', i); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
193 | if (rowdata.f_added < 4) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
194 | percentage = Round(rowdata.f_amount / tw * 100, 1); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
195 | $('#fermentableGrid').jqxGrid('setcellvalue', i, 'f_percentage', percentage); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
196 | } else { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
197 | $('#fermentableGrid').jqxGrid('setcellvalue', i, 'f_percentage', 0); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
198 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
199 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
200 | } else { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
201 | $('#fermentableGrid').jqxGrid('setcellvalue', 0, 'f_percentage', 100); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
202 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
203 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
204 | |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
205 | |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
206 | function calcFermentables() { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
207 | console.log('calcFermentables()'); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
208 | var i, row, rows, org, s = 0, d, x, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
209 | sug, alc, cw, color, scolor, fig, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
210 | sugarsf = 0, // fermentable sugars mash + boil |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
211 | sugarsm = 0; // fermentable sugars in mash |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
212 | vol = 0, // Volume sugars after boil |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
213 | addedS = 0, // Added sugars after boil |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
214 | addedmass = 0, // Added mass after boil |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
215 | mvol = 0, // mash volume |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
216 | colort = 0, // Colors srm * vol totals |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
217 | colorh = 0, // Colors ebc * vol * kt |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
218 | colorn = 0, // Colors ebc * pt * pct |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
219 | my_100 = false, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
220 | mashtime = 0, // Total mash time |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
221 | mashtemp = 0, // Average mash temperature |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
222 | bv = 0.925, // Bierverlies rendement |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
223 | sr = 0.95, // Mash en spoel rendement |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
224 | lintner = 0; // Total recipe lintner |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
225 | /* Init global variables */ |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
226 | psugar = 0; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
227 | pcara = 0; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
228 | mashkg = 0; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
229 | |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
230 | if ((rows = $('#mashGrid').jqxGrid('getrows'))) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
231 | for (i = 0; i < rows.length; i++) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
232 | row = rows[i]; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
233 | if (row.step_type == 0) // Infusion |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
234 | mvol += parseFloat(row.step_infuse_amount); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
235 | if (row.step_temp <= 75) { // Ignore mashout |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
236 | mashtime += row.step_time; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
237 | mashtemp += row.step_time * row.step_temp; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
238 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
239 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
240 | mashtemp = mashtemp / mashtime; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
241 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
242 | |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
243 | if (!(rows = $('#fermentableGrid').jqxGrid('getrows'))) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
244 | return; // grid not yet loaded. |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
245 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
246 | |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
247 | for (i = 0; i < rows.length; i++) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
248 | row = rows[i]; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
249 | if (row.f_adjust_to_total_100) |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
250 | my_100 = true; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
251 | if (row.f_type == 1 && row.f_added < 4) // Sugar |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
252 | psugar += row.f_percentage; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
253 | if (row.f_graintype == 2 && row.f_added < 4) // Crystal |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
254 | pcara += row.f_percentage; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
255 | d = row.f_amount * (row.f_yield / 100) * (1 - row.f_moisture / 100); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
256 | if (row.f_added == 0) { // Mash |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
257 | if (mvol > 0) { // Only if mash already known |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
258 | mvol += row.f_amount * row.f_moisture / 100; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
259 | s += d; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
260 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
261 | d = parseFloat(dataRecord.efficiency) / 100 * d; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
262 | sugarsm += d; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
263 | mashkg += row.f_amount; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
264 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
265 | if (row.f_added == 0 || row.f_added == 1) // Mash or Boil |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
266 | sugarsf += d; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
267 | if (row.f_added == 2 || row.f_added == 3) { // Fermentation or lagering |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
268 | x = (row.f_yield / 100) * (1 - row.f_moisture / 100); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
269 | addedS += row.f_amount * x; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
270 | addedmass += row.f_amount; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
271 | vol += (x * sugardensity + (1 - x) * 1) * row.f_amount; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
272 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
273 | if (row.f_added == 0 && (row.f_type == 0 || row.f_type == 4) && row.f_color < 50) { // Mash and Grain/Adjunct and Color < 50 |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
274 | lintner += row.f_diastatic_power * row.f_amount; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
275 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
276 | if (row.f_added < 4) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
277 | colort += row.f_amount * ebc_to_srm(row.f_color); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
278 | colorh += row.f_amount * row.f_color * get_kt(row.f_color); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
279 | colorn += (row.f_percentage / 100) * row.f_color; // For 8.6 Pt wort. |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
280 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
281 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
282 | $('#ferm_lintner').val(Math.round(parseFloat(lintner / mashkg))); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
283 | to_100 = my_100; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
284 | if (to_100) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
285 | $('#wf_amount').jqxNumberInput({ width: 90, readOnly: true, spinButtons: false }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
286 | } else { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
287 | $('#wf_amount').jqxNumberInput({ width: 110, readOnly: false, spinButtons: true }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
288 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
289 | |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
290 | // Estimate total recipe OG. |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
291 | dataRecord.est_og = estimate_sg(sugarsf + addedS, parseFloat(dataRecord.batch_size)); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
292 | $('#est_og').val(dataRecord.est_og); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
293 | $('#est_og2').val(dataRecord.est_og); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
294 | org = dataRecord.est_og; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
295 | |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
296 | // Estimate SG in kettle before boil |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
297 | preboil_sg = estimate_sg(sugarsm, parseFloat(dataRecord.boil_size)); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
298 | |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
299 | // Color of the wort |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
300 | if (dataRecord.color_method == 4) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
301 | color = Math.round(((sg_to_plato(dataRecord.est_og) / 8.6) * colorn) + (dataRecord.boil_time / 60)); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
302 | } else if (dataRecord.color_method == 3) { // Hans Halberstadt |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
303 | color = Math.round((4.46 * bv * sr) / parseFloat(dataRecord.batch_size) * colorh); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
304 | } else { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
305 | cw = colort / parseFloat(dataRecord.batch_size) * 8.34436; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
306 | color = kw_to_ebc(dataRecord.color_method, cw); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
307 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
308 | dataRecord.est_color = color; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
309 | $('#est_color').val(color); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
310 | $('#est_color2').val(color); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
311 | scolor = ebc_to_color(color); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
312 | document.getElementById('bcolor').style.background = scolor; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
313 | document.getElementById('bcolor2').style.background = scolor; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
314 | |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
315 | // Progress bars |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
316 | pmalts = mashkg / (dataRecord.boil_size / 3) * 100; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
317 | $('#perc_malts').jqxProgressBar('val', pmalts); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
318 | $('#perc_sugars').jqxProgressBar('val', psugar); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
319 | $('#perc_cara').jqxProgressBar('val', pcara); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
320 | |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
321 | // Calculate estimated svg. |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
322 | svg = 0; // default. |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
323 | rows = $('#yeastGrid').jqxGrid('getrows'); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
324 | for (i = 0; i < rows.length; i++) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
325 | row = rows[i]; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
326 | if (row.y_use == 0) { // Primary |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
327 | if (parseFloat(row.y_attenuation) > svg) |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
328 | svg = parseFloat(row.y_attenuation); // Take the highest if multiple yeasts. |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
329 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
330 | // TODO: brett in secondary ?? |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
331 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
332 | if (svg == 0) |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
333 | svg = 77; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
334 | |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
335 | if ((mashkg > 0) && (mash_infuse > 0) && (mashtime > 0) && (mashtemp > 0)) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
336 | dataRecord.est_fg = estimate_fg(psugar, pcara, mash_infuse / mashkg, mashtime, mashtemp, svg, dataRecord.est_og); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
337 | } else { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
338 | dataRecord.est_fg = estimate_fg(psugar, pcara, 0, 0, 0, svg, dataRecord.est_og); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
339 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
340 | $('#est_fg').val(dataRecord.est_fg); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
341 | $('#est_fg2').val(dataRecord.est_fg); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
342 | fig = dataRecord.est_fg; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
343 | |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
344 | dataRecord.est_abv = abvol(dataRecord.est_og, dataRecord.est_fg); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
345 | $('#est_abv').val(dataRecord.est_abv); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
346 | $('#est_abv2').val(dataRecord.est_abv); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
347 | |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
348 | // Calculate the calories in kcal/l (from brouwhulp) |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
349 | alc = 1881.22 * fig * (org - fig) / (1.775 - org); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
350 | sug = 3550 * fig * (0.1808 * org + 0.8192 * fig - 1.0004); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
351 | $('#kcal').val(Math.round((alc + sug) / (12 * 0.0295735296))); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
352 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
353 | |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
354 | |
667
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
355 | function swapMash(r1, r2) { |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
356 | |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
357 | console.log('swap mash rows ' + r1 + ' ' + r2); |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
358 | var row1 = $('#mashGrid').jqxGrid('getrowdata', r1); |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
359 | var row2 = $('#mashGrid').jqxGrid('getrowdata', r2); |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
360 | var obj1 = { step_name: row1.step_name, step_type: row1.step_type, step_volume: row1.step_volume, step_infuse_amount: row1.step_infuse_amount, |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
361 | step_infuse_temp: row1.step_infuse_temp, step_temp: row1.step_temp, step_time: row1.step_time, |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
362 | ramp_time: row1.ramp_time, end_temp: row1.end_temp, step_wg_ratio: row1.step_wg_ratio }; |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
363 | var obj2 = { step_name: row2.step_name, step_type: row2.step_type, step_volume: row2.step_volume, step_infuse_amount: row2.step_infuse_amount, |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
364 | step_infuse_temp: row2.step_infuse_temp, step_temp: row2.step_temp, step_time: row2.step_time, |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
365 | ramp_time: row2.ramp_time, end_temp: row2.end_temp, step_wg_ratio: row2.step_wg_ratio }; |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
366 | $("#mashGrid").jqxGrid('updaterow', r1, obj2); |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
367 | $("#mashGrid").jqxGrid('updaterow', r2, obj1); |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
368 | } |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
369 | |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
370 | |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
371 | function infusionVol(step_infused, step_mashkg, infuse_temp, step_temp, last_temp) { |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
372 | var a = last_temp * (eq_tun_weight * eq_tun_specific_heat + step_infused * SpecificHeatWater + step_mashkg * SpecificHeatMalt); |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
373 | var b = step_temp * (eq_tun_weight * eq_tun_specific_heat + step_infused * SpecificHeatWater + step_mashkg * SpecificHeatMalt); |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
374 | var vol = Round(((b - a) / ((infuse_temp - step_temp) * SpecificHeatWater)), 2); |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
375 | console.log('infusionVol(' + step_infused + ', ' + step_mashkg + ', ' + infuse_temp + ', ' + step_temp + ', ' + last_temp + '): ' + vol); |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
376 | return vol; |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
377 | } |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
378 | |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
379 | |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
380 | function decoctionVol(step_volume, step_temp, prev_temp) { |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
381 | var a = (eq_tun_weight * eq_tun_specific_heat + step_volume * SpecificHeatWater) * (step_temp - prev_temp); |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
382 | var b = SpecificHeatWater * (99 - step_temp); |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
383 | var vol = 0; |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
384 | if (b > 0) |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
385 | vol = Round(a / b, 6); |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
386 | console.log('decoctionVol(' + step_volume + ', ' + step_temp + ', ' + prev_temp + '): ' + vol); |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
387 | return vol; |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
388 | } |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
389 | |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
390 | |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
391 | function calcMash() { |
667
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
392 | var infused = 0, vol, i, j, n, a, b, row, rows, temp; |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
393 | var lasttemp = 18.0; |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
394 | var graintemp = 18.0; |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
395 | var tuntemp = 18.0; |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
396 | |
667
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
397 | if ((rows = $('#mashGrid').jqxGrid('getrows')) && (mashkg > 0)) { |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
398 | console.log('calcMash()'); |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
399 | for (i = 0; i < rows.length; i++) { |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
400 | row = $('#mashGrid').jqxGrid('getrowdata', i); |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
401 | if (row.step_type == 0) { // Infusion |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
402 | if (i == 0) { |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
403 | // First mash step, temperature from the mashtun and malt. |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
404 | n = 20; // tun is preheated. |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
405 | tuntemp = row.step_temp; |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
406 | for (j = 0; j < n; j++) { |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
407 | a = mashkg * graintemp * SpecificHeatMalt + eq_tun_weight * tuntemp * eq_tun_specific_heat; |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
408 | b = row.step_temp * (eq_tun_weight * eq_tun_specific_heat + row.step_infuse_amount * SpecificHeatWater + mashkg * SpecificHeatMalt) - SlakingHeat * mashkg; |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
409 | if (row.step_infuse_amount > 0) { |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
410 | temp = (b - a) / (row.step_infuse_amount * SpecificHeatWater); |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
411 | } else { |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
412 | temp = 99; |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
413 | } |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
414 | tuntemp += (temp - tuntemp) / 2; |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
415 | row.step_infuse_temp = Round(temp, 6); |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
416 | } |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
417 | console.log('init infuse temp: ' + row.step_infuse_temp); |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
418 | } else { |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
419 | // Calculate amount of infusion water. |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
420 | row.step_infuse_amount = infusionVol(infused, mashkg, row.step_infuse_temp, row.step_temp, lasttemp); |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
421 | //console.log('vol: ' + row.step_infuse_amount + ' temp: ' + row.step_infuse_temp); |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
422 | } |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
423 | infused += row.step_infuse_amount; |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
424 | } else if (row.step_type == 1) { // Temperature |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
425 | if (i > 0) |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
426 | row.step_infuse_amount = 0; |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
427 | row.step_infuse_temp = 0; |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
428 | } else if (row.step_type == 2) { // Decoction |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
429 | row.step_infuse_amount = decoctionVol(infused, row.step_temp, lasttemp); |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
430 | row.step_infuse_temp = 99; |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
431 | } |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
432 | row.step_volume = infused; |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
433 | //console.log(i + ' type: ' + row.step_type + ' volume: ' + row.step_infuse_amount + ' temp: ' + row.step_infuse_temp); |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
434 | lasttemp = row.step_temp; |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
435 | mashtime += row.step_time + row.ramp_time; |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
436 | row.step_wg_ratio = Round(infused / mashkg, 6); |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
437 | $('#mashGrid').jqxGrid('updaterow', i, row); |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
438 | } |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
439 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
440 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
441 | |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
442 | |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
443 | function calcIBUs() { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
444 | var total_ibus = 0, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
445 | rows = {}, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
446 | i, row; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
447 | |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
448 | hop_aroma = hop_flavour = 0; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
449 | if (!(rows = $('#hopGrid').jqxGrid('getrows'))) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
450 | return; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
451 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
452 | for (i = 0; i < rows.length; i++) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
453 | row = rows[i]; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
454 | total_ibus += toIBU(row.h_useat, row.h_form, preboil_sg, parseFloat(dataRecord.batch_size), |
540
756fe9afe72b
Recipes editor handles whirlpool hop IBUs.
Michiel Broek <mbroek@mbse.eu>
parents:
524
diff
changeset
|
455 | parseFloat(row.h_amount), parseFloat(row.h_time), parseFloat(row.h_alpha), dataRecord.ibu_method, 0, parseFloat(row.h_time), 0); |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
456 | hop_flavour += hopFlavourContribution(parseFloat(row.h_time), parseFloat(dataRecord.batch_size), row.h_useat, parseFloat(row.h_amount)); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
457 | hop_aroma += hopAromaContribution(parseFloat(row.h_time), parseFloat(dataRecord.batch_size), row.h_useat, parseFloat(row.h_amount)); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
458 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
459 | total_ibus = Round(total_ibus, 1); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
460 | hop_flavour = Round(hop_flavour * 100 / 5, 1); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
461 | hop_aroma = Round(hop_aroma * 100 / 6, 1); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
462 | if (hop_flavour > 100) |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
463 | hop_flavour = 100; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
464 | if (hop_aroma > 100) |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
465 | hop_aroma = 100; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
466 | console.log('calcIBUs(): ' + total_ibus + ' flavour: ' + hop_flavour + ' aroma: ' + hop_aroma); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
467 | dataRecord.est_ibu = total_ibus; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
468 | $('#est_ibu').val(total_ibus); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
469 | $('#est_ibu2').val(total_ibus); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
470 | $('#hop_flavour').jqxProgressBar('val', hop_flavour); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
471 | $('#hop_aroma').jqxProgressBar('val', hop_aroma); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
472 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
473 | |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
474 | |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
475 | function adjustHops(factor) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
476 | |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
477 | var i, row, amount, rowscount = $('#hopGrid').jqxGrid('getdatainformation').rowscount; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
478 | if (rowscount == 0) |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
479 | return; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
480 | |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
481 | for (i = 0; i < rowscount; i++) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
482 | row = $('#hopGrid').jqxGrid('getrowdata', i); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
483 | amount = row.h_amount * factor; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
484 | $('#hopGrid').jqxGrid('setcellvalue', i, 'h_amount', amount); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
485 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
486 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
487 | |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
488 | |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
489 | function adjustMiscs(factor) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
490 | |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
491 | var i, row, amount, rowscount = $('#miscGrid').jqxGrid('getdatainformation').rowscount; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
492 | if (rowscount == 0) |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
493 | return; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
494 | |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
495 | for (i = 0; i < rowscount; i++) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
496 | row = $('#miscGrid').jqxGrid('getrowdata', i); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
497 | amount = row.m_amount * factor; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
498 | $('#miscGrid').jqxGrid('setcellvalue', i, 'm_amount', amount); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
499 | switch (row.m_name) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
500 | case 'CaCl2': $('#wa_cacl2').val(row.m_amount * 1000); break; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
501 | case 'CaSO4': $('#wa_caso4').val(row.m_amount * 1000); break; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
502 | case 'MgSO4': $('#wa_mgso4').val(row.m_amount * 1000); break; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
503 | case 'NaCl': $('#wa_nacl').val(row.m_amount * 1000); break; |
772
f9d266eb0ec6
In product editor calculate fermentables before the first IBU calculation. In recipe editor changed to the new water calculations like in the product editor.
Michiel Broek <mbroek@mbse.eu>
parents:
756
diff
changeset
|
504 | case 'MgCl2': $('#wa_mgcl2').val(row.m_amount * 1000); break; |
f9d266eb0ec6
In product editor calculate fermentables before the first IBU calculation. In recipe editor changed to the new water calculations like in the product editor.
Michiel Broek <mbroek@mbse.eu>
parents:
756
diff
changeset
|
505 | case 'NaHCO3': $('#wa_nahco3').val(row.m_amount * 1000); break; |
f9d266eb0ec6
In product editor calculate fermentables before the first IBU calculation. In recipe editor changed to the new water calculations like in the product editor.
Michiel Broek <mbroek@mbse.eu>
parents:
756
diff
changeset
|
506 | case 'CaCO3': $('#wa_caco3').val(row.m_amount * 1000); break; |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
507 | case 'Melkzuur': |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
508 | case 'Zoutzuur': |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
509 | case 'Fosforzuur': |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
510 | case 'Zwavelzuur': $('#wa_acid').val(row.m_amount * 1000); break; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
511 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
512 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
513 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
514 | |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
515 | |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
516 | function adjustYeasts(factor) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
517 | |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
518 | var i, row, amount, rowscount = $('#yeastGrid').jqxGrid('getdatainformation').rowscount; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
519 | if (rowscount == 0) |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
520 | return; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
521 | |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
522 | for (i = 0; i < rowscount; i++) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
523 | row = $('#yeastGrid').jqxGrid('getrowdata', i); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
524 | if (row.y_form == 1) { // Only adjust dry yeast |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
525 | amount = row.y_amount * factor; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
526 | $('#yeastGrid').jqxGrid('setcellvalue', i, 'y_amount', amount); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
527 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
528 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
529 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
530 | |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
531 | |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
532 | function adjustWaters(factor) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
533 | |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
534 | var i, row, amount, rowscount = $('#mashGrid').jqxGrid('getdatainformation').rowscount; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
535 | if (rowscount == 0) |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
536 | return; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
537 | mash_infuse = 0; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
538 | for (i = 0; i < rowscount; i++) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
539 | row = $('#mashGrid').jqxGrid('getrowdata', i); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
540 | if (row.step_type == 0) { // Infusion |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
541 | amount = Round(row.step_infuse_amount * factor, 1); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
542 | $('#mashGrid').jqxGrid('setcellvalue', i, 'step_infuse_amount', amount); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
543 | mash_infuse += amount; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
544 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
545 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
546 | if (dataRecord.w2_amount == 0) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
547 | dataRecord.w1_amount = mash_infuse; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
548 | $('#w1_amount').val(mash_infuse); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
549 | } else { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
550 | dataRecord.w1_amount = (dataRecord.w1_amount / (dataRecord.w1_amount + dataRecord.w2_amount)) * mash_infuse; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
551 | dataRecord.w2_amount = (dataRecord.w2_amount / (dataRecord.w1_amount + dataRecord.w2_amount)) * mash_infuse; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
552 | $('#w1_amount').val(dataRecord.w1_amount); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
553 | $('#w2_amount').val(dataRecord.w2_amount); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
554 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
555 | $('#wg_amount').val(mash_infuse); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
556 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
557 | |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
558 | |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
559 | function GetBUGU() { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
560 | var gu = (dataRecord.est_og - 1) * 1000; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
561 | if (gu > 0) |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
562 | return dataRecord.est_ibu / gu; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
563 | else |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
564 | return 0.5; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
565 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
566 | |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
567 | |
559
10cc2400b5d5
Backported extra yeast fields and the SO4:Cl ratio changes into the recipes editor.
Michiel Broek <mbroek@mbse.eu>
parents:
549
diff
changeset
|
568 | function GetOptSO4Clratio() { |
10cc2400b5d5
Backported extra yeast fields and the SO4:Cl ratio changes into the recipes editor.
Michiel Broek <mbroek@mbse.eu>
parents:
549
diff
changeset
|
569 | if (parseFloat($('#pr_sulfate').jqxNumberInput('decimal')) > 0 && parseFloat($('#pr_chloride').jqxNumberInput('decimal'))) { |
10cc2400b5d5
Backported extra yeast fields and the SO4:Cl ratio changes into the recipes editor.
Michiel Broek <mbroek@mbse.eu>
parents:
549
diff
changeset
|
570 | return (parseFloat($('#pr_sulfate').jqxNumberInput('decimal')) / parseFloat($('#pr_chloride').jqxNumberInput('decimal'))); |
10cc2400b5d5
Backported extra yeast fields and the SO4:Cl ratio changes into the recipes editor.
Michiel Broek <mbroek@mbse.eu>
parents:
549
diff
changeset
|
571 | } else { |
10cc2400b5d5
Backported extra yeast fields and the SO4:Cl ratio changes into the recipes editor.
Michiel Broek <mbroek@mbse.eu>
parents:
549
diff
changeset
|
572 | var BUGU = GetBUGU(); |
10cc2400b5d5
Backported extra yeast fields and the SO4:Cl ratio changes into the recipes editor.
Michiel Broek <mbroek@mbse.eu>
parents:
549
diff
changeset
|
573 | return (-1.2 * BUGU + 1.4); |
10cc2400b5d5
Backported extra yeast fields and the SO4:Cl ratio changes into the recipes editor.
Michiel Broek <mbroek@mbse.eu>
parents:
549
diff
changeset
|
574 | } |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
575 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
576 | |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
577 | |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
578 | |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
579 | function setRangeIndicator(ion, rangeCode) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
580 | if ((rangeCode == 'laag') || (rangeCode == 'hoog')) |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
581 | $('#wr_' + ion).html('<img src="images/dialog-error.png"><span style="vertical-align: top; font-size: 10px; font-style: italic;">' + rangeCode + '</span>'); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
582 | else |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
583 | $('#wr_' + ion).html('<img src="images/dialog-ok-apply.png">'); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
584 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
585 | |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
586 | |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
587 | function mix(v1, v2, c1, c2) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
588 | if ((v1 + v2) > 0) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
589 | return ((v1 * c1) + (v2 * c2)) / (v1 + v2); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
590 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
591 | return 0; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
592 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
593 | |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
594 | |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
595 | // mg/l as CaCO3 |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
596 | function ResidualAlkalinity(total_alkalinity, calcium, magnesium) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
597 | return total_alkalinity - (calcium / 1.4 + magnesium / 1.7); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
598 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
599 | |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
600 | |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
601 | function PartCO3(pH) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
602 | var H = Math.pow(10, -pH); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
603 | return 100 * Ka1 * Ka2 / (H * H + H * Ka1 + Ka1 * Ka2); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
604 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
605 | |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
606 | |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
607 | function PartHCO3(pH) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
608 | var H = Math.pow(10, -pH); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
609 | return 100 * Ka1 * H / (H * H + H * Ka1 + Ka1 * Ka2); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
610 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
611 | |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
612 | |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
613 | function Charge(pH) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
614 | return (-2 * PartCO3(pH) - PartHCO3(pH)); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
615 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
616 | |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
617 | |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
618 | //Z alkalinity is the amount of acid (in mEq/l) needed to bring water to the target pH (Z pH) |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
619 | function ZAlkalinity(pHZ) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
620 | var C43 = Charge(4.3), |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
621 | Cw = Charge(parseFloat($('#wg_ph').jqxNumberInput('decimal'))), |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
622 | Cz = Charge(pHZ), |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
623 | DeltaCNaught = -C43 + Cw, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
624 | CT = parseFloat($('#wg_total_alkalinity').jqxNumberInput('decimal')) / 50 / DeltaCNaught, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
625 | DeltaCZ = -Cz + Cw; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
626 | return CT * DeltaCZ; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
627 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
628 | |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
629 | |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
630 | //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) |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
631 | function ZRA(pHZ) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
632 | var Calc = parseFloat($('#wg_calcium').jqxNumberInput('decimal')) / (MMCa / 2), |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
633 | Magn = parseFloat($('#wg_magnesium').jqxNumberInput('decimal')) / (MMMg / 2), |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
634 | Z = ZAlkalinity(pHZ); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
635 | return Z - (Calc / 3.5 + Magn / 7); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
636 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
637 | |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
638 | |
662
4bb005694ce7
Version 0.3.32 Inventory water and profile water edit screens updated and added ion balance fields. Moved acid specs to global.js. In prod_edit and rec_edit changed the water calculations, eliminated the double percentage calculation. The pH values in the water tab have now 2 decimal digits. The mash pH field is only shown in auto calculate mode. The calculated acid addition results are now a bit better and compare with several famous spreadsheets.
Michiel Broek <mbroek@mbse.eu>
parents:
660
diff
changeset
|
639 | function BufferCapacity(di_ph, acid_to_ph_57, ebc, graintype) { |
4bb005694ce7
Version 0.3.32 Inventory water and profile water edit screens updated and added ion balance fields. Moved acid specs to global.js. In prod_edit and rec_edit changed the water calculations, eliminated the double percentage calculation. The pH values in the water tab have now 2 decimal digits. The mash pH field is only shown in auto calculate mode. The calculated acid addition results are now a bit better and compare with several famous spreadsheets.
Michiel Broek <mbroek@mbse.eu>
parents:
660
diff
changeset
|
640 | C1 = 0; |
4bb005694ce7
Version 0.3.32 Inventory water and profile water edit screens updated and added ion balance fields. Moved acid specs to global.js. In prod_edit and rec_edit changed the water calculations, eliminated the double percentage calculation. The pH values in the water tab have now 2 decimal digits. The mash pH field is only shown in auto calculate mode. The calculated acid addition results are now a bit better and compare with several famous spreadsheets.
Michiel Broek <mbroek@mbse.eu>
parents:
660
diff
changeset
|
641 | if ((di_ph != 5.7) && ((acid_to_ph_57 < - 0.1) || (acid_to_ph_57 > 0.1))) { |
4bb005694ce7
Version 0.3.32 Inventory water and profile water edit screens updated and added ion balance fields. Moved acid specs to global.js. In prod_edit and rec_edit changed the water calculations, eliminated the double percentage calculation. The pH values in the water tab have now 2 decimal digits. The mash pH field is only shown in auto calculate mode. The calculated acid addition results are now a bit better and compare with several famous spreadsheets.
Michiel Broek <mbroek@mbse.eu>
parents:
660
diff
changeset
|
642 | C1 = acid_to_ph_57 / (di_ph - 5.7); |
4bb005694ce7
Version 0.3.32 Inventory water and profile water edit screens updated and added ion balance fields. Moved acid specs to global.js. In prod_edit and rec_edit changed the water calculations, eliminated the double percentage calculation. The pH values in the water tab have now 2 decimal digits. The mash pH field is only shown in auto calculate mode. The calculated acid addition results are now a bit better and compare with several famous spreadsheets.
Michiel Broek <mbroek@mbse.eu>
parents:
660
diff
changeset
|
643 | } else { |
4bb005694ce7
Version 0.3.32 Inventory water and profile water edit screens updated and added ion balance fields. Moved acid specs to global.js. In prod_edit and rec_edit changed the water calculations, eliminated the double percentage calculation. The pH values in the water tab have now 2 decimal digits. The mash pH field is only shown in auto calculate mode. The calculated acid addition results are now a bit better and compare with several famous spreadsheets.
Michiel Broek <mbroek@mbse.eu>
parents:
660
diff
changeset
|
644 | // If the acid_to_ph_5.7 is unknown from the maltster, guess the required acid. |
4bb005694ce7
Version 0.3.32 Inventory water and profile water edit screens updated and added ion balance fields. Moved acid specs to global.js. In prod_edit and rec_edit changed the water calculations, eliminated the double percentage calculation. The pH values in the water tab have now 2 decimal digits. The mash pH field is only shown in auto calculate mode. The calculated acid addition results are now a bit better and compare with several famous spreadsheets.
Michiel Broek <mbroek@mbse.eu>
parents:
660
diff
changeset
|
645 | switch (graintype) { |
4bb005694ce7
Version 0.3.32 Inventory water and profile water edit screens updated and added ion balance fields. Moved acid specs to global.js. In prod_edit and rec_edit changed the water calculations, eliminated the double percentage calculation. The pH values in the water tab have now 2 decimal digits. The mash pH field is only shown in auto calculate mode. The calculated acid addition results are now a bit better and compare with several famous spreadsheets.
Michiel Broek <mbroek@mbse.eu>
parents:
660
diff
changeset
|
646 | case 0: // Base, Special, Kilned |
4bb005694ce7
Version 0.3.32 Inventory water and profile water edit screens updated and added ion balance fields. Moved acid specs to global.js. In prod_edit and rec_edit changed the water calculations, eliminated the double percentage calculation. The pH values in the water tab have now 2 decimal digits. The mash pH field is only shown in auto calculate mode. The calculated acid addition results are now a bit better and compare with several famous spreadsheets.
Michiel Broek <mbroek@mbse.eu>
parents:
660
diff
changeset
|
647 | case 3: |
4bb005694ce7
Version 0.3.32 Inventory water and profile water edit screens updated and added ion balance fields. Moved acid specs to global.js. In prod_edit and rec_edit changed the water calculations, eliminated the double percentage calculation. The pH values in the water tab have now 2 decimal digits. The mash pH field is only shown in auto calculate mode. The calculated acid addition results are now a bit better and compare with several famous spreadsheets.
Michiel Broek <mbroek@mbse.eu>
parents:
660
diff
changeset
|
648 | case 5: C1 = 0.014 * ebc - 34.192; |
4bb005694ce7
Version 0.3.32 Inventory water and profile water edit screens updated and added ion balance fields. Moved acid specs to global.js. In prod_edit and rec_edit changed the water calculations, eliminated the double percentage calculation. The pH values in the water tab have now 2 decimal digits. The mash pH field is only shown in auto calculate mode. The calculated acid addition results are now a bit better and compare with several famous spreadsheets.
Michiel Broek <mbroek@mbse.eu>
parents:
660
diff
changeset
|
649 | break; |
4bb005694ce7
Version 0.3.32 Inventory water and profile water edit screens updated and added ion balance fields. Moved acid specs to global.js. In prod_edit and rec_edit changed the water calculations, eliminated the double percentage calculation. The pH values in the water tab have now 2 decimal digits. The mash pH field is only shown in auto calculate mode. The calculated acid addition results are now a bit better and compare with several famous spreadsheets.
Michiel Broek <mbroek@mbse.eu>
parents:
660
diff
changeset
|
650 | case 2: C1 = -0.0597 * ebc - 32.457; // Crystal |
4bb005694ce7
Version 0.3.32 Inventory water and profile water edit screens updated and added ion balance fields. Moved acid specs to global.js. In prod_edit and rec_edit changed the water calculations, eliminated the double percentage calculation. The pH values in the water tab have now 2 decimal digits. The mash pH field is only shown in auto calculate mode. The calculated acid addition results are now a bit better and compare with several famous spreadsheets.
Michiel Broek <mbroek@mbse.eu>
parents:
660
diff
changeset
|
651 | break; |
4bb005694ce7
Version 0.3.32 Inventory water and profile water edit screens updated and added ion balance fields. Moved acid specs to global.js. In prod_edit and rec_edit changed the water calculations, eliminated the double percentage calculation. The pH values in the water tab have now 2 decimal digits. The mash pH field is only shown in auto calculate mode. The calculated acid addition results are now a bit better and compare with several famous spreadsheets.
Michiel Broek <mbroek@mbse.eu>
parents:
660
diff
changeset
|
652 | case 1: C1 = 0.0107 * ebc - 54.768; // Roast |
4bb005694ce7
Version 0.3.32 Inventory water and profile water edit screens updated and added ion balance fields. Moved acid specs to global.js. In prod_edit and rec_edit changed the water calculations, eliminated the double percentage calculation. The pH values in the water tab have now 2 decimal digits. The mash pH field is only shown in auto calculate mode. The calculated acid addition results are now a bit better and compare with several famous spreadsheets.
Michiel Broek <mbroek@mbse.eu>
parents:
660
diff
changeset
|
653 | break; |
4bb005694ce7
Version 0.3.32 Inventory water and profile water edit screens updated and added ion balance fields. Moved acid specs to global.js. In prod_edit and rec_edit changed the water calculations, eliminated the double percentage calculation. The pH values in the water tab have now 2 decimal digits. The mash pH field is only shown in auto calculate mode. The calculated acid addition results are now a bit better and compare with several famous spreadsheets.
Michiel Broek <mbroek@mbse.eu>
parents:
660
diff
changeset
|
654 | case 4: C1 = -149; // Sour malt |
4bb005694ce7
Version 0.3.32 Inventory water and profile water edit screens updated and added ion balance fields. Moved acid specs to global.js. In prod_edit and rec_edit changed the water calculations, eliminated the double percentage calculation. The pH values in the water tab have now 2 decimal digits. The mash pH field is only shown in auto calculate mode. The calculated acid addition results are now a bit better and compare with several famous spreadsheets.
Michiel Broek <mbroek@mbse.eu>
parents:
660
diff
changeset
|
655 | break; |
4bb005694ce7
Version 0.3.32 Inventory water and profile water edit screens updated and added ion balance fields. Moved acid specs to global.js. In prod_edit and rec_edit changed the water calculations, eliminated the double percentage calculation. The pH values in the water tab have now 2 decimal digits. The mash pH field is only shown in auto calculate mode. The calculated acid addition results are now a bit better and compare with several famous spreadsheets.
Michiel Broek <mbroek@mbse.eu>
parents:
660
diff
changeset
|
656 | } |
4bb005694ce7
Version 0.3.32 Inventory water and profile water edit screens updated and added ion balance fields. Moved acid specs to global.js. In prod_edit and rec_edit changed the water calculations, eliminated the double percentage calculation. The pH values in the water tab have now 2 decimal digits. The mash pH field is only shown in auto calculate mode. The calculated acid addition results are now a bit better and compare with several famous spreadsheets.
Michiel Broek <mbroek@mbse.eu>
parents:
660
diff
changeset
|
657 | } |
4bb005694ce7
Version 0.3.32 Inventory water and profile water edit screens updated and added ion balance fields. Moved acid specs to global.js. In prod_edit and rec_edit changed the water calculations, eliminated the double percentage calculation. The pH values in the water tab have now 2 decimal digits. The mash pH field is only shown in auto calculate mode. The calculated acid addition results are now a bit better and compare with several famous spreadsheets.
Michiel Broek <mbroek@mbse.eu>
parents:
660
diff
changeset
|
658 | return C1; |
4bb005694ce7
Version 0.3.32 Inventory water and profile water edit screens updated and added ion balance fields. Moved acid specs to global.js. In prod_edit and rec_edit changed the water calculations, eliminated the double percentage calculation. The pH values in the water tab have now 2 decimal digits. The mash pH field is only shown in auto calculate mode. The calculated acid addition results are now a bit better and compare with several famous spreadsheets.
Michiel Broek <mbroek@mbse.eu>
parents:
660
diff
changeset
|
659 | } |
4bb005694ce7
Version 0.3.32 Inventory water and profile water edit screens updated and added ion balance fields. Moved acid specs to global.js. In prod_edit and rec_edit changed the water calculations, eliminated the double percentage calculation. The pH values in the water tab have now 2 decimal digits. The mash pH field is only shown in auto calculate mode. The calculated acid addition results are now a bit better and compare with several famous spreadsheets.
Michiel Broek <mbroek@mbse.eu>
parents:
660
diff
changeset
|
660 | |
4bb005694ce7
Version 0.3.32 Inventory water and profile water edit screens updated and added ion balance fields. Moved acid specs to global.js. In prod_edit and rec_edit changed the water calculations, eliminated the double percentage calculation. The pH values in the water tab have now 2 decimal digits. The mash pH field is only shown in auto calculate mode. The calculated acid addition results are now a bit better and compare with several famous spreadsheets.
Michiel Broek <mbroek@mbse.eu>
parents:
660
diff
changeset
|
661 | |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
662 | function ProtonDeficit(pHZ) { |
662
4bb005694ce7
Version 0.3.32 Inventory water and profile water edit screens updated and added ion balance fields. Moved acid specs to global.js. In prod_edit and rec_edit changed the water calculations, eliminated the double percentage calculation. The pH values in the water tab have now 2 decimal digits. The mash pH field is only shown in auto calculate mode. The calculated acid addition results are now a bit better and compare with several famous spreadsheets.
Michiel Broek <mbroek@mbse.eu>
parents:
660
diff
changeset
|
663 | var C1, i, rows, row, Result = ZRA(pHZ) * parseFloat($('#wg_amount').jqxNumberInput('decimal')); |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
664 | // proton deficit for the grist |
662
4bb005694ce7
Version 0.3.32 Inventory water and profile water edit screens updated and added ion balance fields. Moved acid specs to global.js. In prod_edit and rec_edit changed the water calculations, eliminated the double percentage calculation. The pH values in the water tab have now 2 decimal digits. The mash pH field is only shown in auto calculate mode. The calculated acid addition results are now a bit better and compare with several famous spreadsheets.
Michiel Broek <mbroek@mbse.eu>
parents:
660
diff
changeset
|
665 | if ((rows = $('#fermentableGrid').jqxGrid('getrows'))) { |
4bb005694ce7
Version 0.3.32 Inventory water and profile water edit screens updated and added ion balance fields. Moved acid specs to global.js. In prod_edit and rec_edit changed the water calculations, eliminated the double percentage calculation. The pH values in the water tab have now 2 decimal digits. The mash pH field is only shown in auto calculate mode. The calculated acid addition results are now a bit better and compare with several famous spreadsheets.
Michiel Broek <mbroek@mbse.eu>
parents:
660
diff
changeset
|
666 | for (i = 0; i < rows.length; i++) { |
4bb005694ce7
Version 0.3.32 Inventory water and profile water edit screens updated and added ion balance fields. Moved acid specs to global.js. In prod_edit and rec_edit changed the water calculations, eliminated the double percentage calculation. The pH values in the water tab have now 2 decimal digits. The mash pH field is only shown in auto calculate mode. The calculated acid addition results are now a bit better and compare with several famous spreadsheets.
Michiel Broek <mbroek@mbse.eu>
parents:
660
diff
changeset
|
667 | row = rows[i]; |
4bb005694ce7
Version 0.3.32 Inventory water and profile water edit screens updated and added ion balance fields. Moved acid specs to global.js. In prod_edit and rec_edit changed the water calculations, eliminated the double percentage calculation. The pH values in the water tab have now 2 decimal digits. The mash pH field is only shown in auto calculate mode. The calculated acid addition results are now a bit better and compare with several famous spreadsheets.
Michiel Broek <mbroek@mbse.eu>
parents:
660
diff
changeset
|
668 | if (row.f_added == 0 && row.f_graintype != 6) { // Added == Mash && graintype != No Malt |
4bb005694ce7
Version 0.3.32 Inventory water and profile water edit screens updated and added ion balance fields. Moved acid specs to global.js. In prod_edit and rec_edit changed the water calculations, eliminated the double percentage calculation. The pH values in the water tab have now 2 decimal digits. The mash pH field is only shown in auto calculate mode. The calculated acid addition results are now a bit better and compare with several famous spreadsheets.
Michiel Broek <mbroek@mbse.eu>
parents:
660
diff
changeset
|
669 | C1 = BufferCapacity(row.f_di_ph, row.f_acid_to_ph_57, row.f_color, row.f_graintype); |
4bb005694ce7
Version 0.3.32 Inventory water and profile water edit screens updated and added ion balance fields. Moved acid specs to global.js. In prod_edit and rec_edit changed the water calculations, eliminated the double percentage calculation. The pH values in the water tab have now 2 decimal digits. The mash pH field is only shown in auto calculate mode. The calculated acid addition results are now a bit better and compare with several famous spreadsheets.
Michiel Broek <mbroek@mbse.eu>
parents:
660
diff
changeset
|
670 | x = C1 * (pHZ - row.f_di_ph); // AcidRequired(ZpH) |
4bb005694ce7
Version 0.3.32 Inventory water and profile water edit screens updated and added ion balance fields. Moved acid specs to global.js. In prod_edit and rec_edit changed the water calculations, eliminated the double percentage calculation. The pH values in the water tab have now 2 decimal digits. The mash pH field is only shown in auto calculate mode. The calculated acid addition results are now a bit better and compare with several famous spreadsheets.
Michiel Broek <mbroek@mbse.eu>
parents:
660
diff
changeset
|
671 | Result += x * row.f_amount; |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
672 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
673 | } |
662
4bb005694ce7
Version 0.3.32 Inventory water and profile water edit screens updated and added ion balance fields. Moved acid specs to global.js. In prod_edit and rec_edit changed the water calculations, eliminated the double percentage calculation. The pH values in the water tab have now 2 decimal digits. The mash pH field is only shown in auto calculate mode. The calculated acid addition results are now a bit better and compare with several famous spreadsheets.
Michiel Broek <mbroek@mbse.eu>
parents:
660
diff
changeset
|
674 | } else { |
4bb005694ce7
Version 0.3.32 Inventory water and profile water edit screens updated and added ion balance fields. Moved acid specs to global.js. In prod_edit and rec_edit changed the water calculations, eliminated the double percentage calculation. The pH values in the water tab have now 2 decimal digits. The mash pH field is only shown in auto calculate mode. The calculated acid addition results are now a bit better and compare with several famous spreadsheets.
Michiel Broek <mbroek@mbse.eu>
parents:
660
diff
changeset
|
675 | error_count++; |
4bb005694ce7
Version 0.3.32 Inventory water and profile water edit screens updated and added ion balance fields. Moved acid specs to global.js. In prod_edit and rec_edit changed the water calculations, eliminated the double percentage calculation. The pH values in the water tab have now 2 decimal digits. The mash pH field is only shown in auto calculate mode. The calculated acid addition results are now a bit better and compare with several famous spreadsheets.
Michiel Broek <mbroek@mbse.eu>
parents:
660
diff
changeset
|
676 | if (error_count < 5) |
4bb005694ce7
Version 0.3.32 Inventory water and profile water edit screens updated and added ion balance fields. Moved acid specs to global.js. In prod_edit and rec_edit changed the water calculations, eliminated the double percentage calculation. The pH values in the water tab have now 2 decimal digits. The mash pH field is only shown in auto calculate mode. The calculated acid addition results are now a bit better and compare with several famous spreadsheets.
Michiel Broek <mbroek@mbse.eu>
parents:
660
diff
changeset
|
677 | console.log('ProtonDeficit(' + pHZ + ') invalid grist, return ' + Result); |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
678 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
679 | return Result; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
680 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
681 | |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
682 | |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
683 | function MashpH() { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
684 | var n = 0, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
685 | pH = 5.4, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
686 | deltapH = 0.001, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
687 | deltapd = 0.1, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
688 | pd = ProtonDeficit(pH); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
689 | while (((pd < -deltapd) || (pd > deltapd)) && (n < 2000)) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
690 | n++; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
691 | if (pd < -deltapd) |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
692 | pH -= deltapH; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
693 | else if (pd > deltapd) |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
694 | pH += deltapH; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
695 | pd = ProtonDeficit(pH); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
696 | } |
662
4bb005694ce7
Version 0.3.32 Inventory water and profile water edit screens updated and added ion balance fields. Moved acid specs to global.js. In prod_edit and rec_edit changed the water calculations, eliminated the double percentage calculation. The pH values in the water tab have now 2 decimal digits. The mash pH field is only shown in auto calculate mode. The calculated acid addition results are now a bit better and compare with several famous spreadsheets.
Michiel Broek <mbroek@mbse.eu>
parents:
660
diff
changeset
|
697 | pH = Round(pH, 6); |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
698 | //console.log('MashpH() n: ' + n + ' pH: ' + pH); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
699 | return pH; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
700 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
701 | |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
702 | |
68 | 703 | |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
704 | |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
705 | $(document).ready(function() { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
706 | |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
707 | var to_100 = false, // Fermentables adjust to 100% |
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
|
708 | |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
709 | fermentableRow = 0, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
710 | fermentableData = {}, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
711 | hopRow = 0, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
712 | hopData = {}, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
713 | miscRow = 0, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
714 | miscData = {}, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
715 | yeastRow = 0, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
716 | yeastData = {}, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
717 | mashRow = 0, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
718 | mashData = {}, |
261
8d55ca45c29e
Backport changes from prod_edit in rec_edit
Michiel Broek <mbroek@mbse.eu>
parents:
254
diff
changeset
|
719 | |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
720 | url = 'includes/db_recipes.php', |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
721 | // prepare the data |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
722 | source = { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
723 | datatype: 'json', |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
724 | cache: false, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
725 | datafields: [ |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
726 | { name: 'record', type: 'number' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
727 | { name: 'uuid', type: 'string' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
728 | { name: 'locked', type: 'int' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
729 | { name: 'st_name', type: 'string' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
730 | { name: 'st_letter', type: 'string' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
731 | { name: 'st_guide', type: 'string' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
732 | { name: 'st_type', type: 'int' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
733 | { name: 'st_category', type: 'string' }, |
710
9646123ea063
Fixed st_category_namber to be an integer value instead of float. The calc_acid in a new recipe is integer. Added missing wg_ and wb_ fields in a new recipe.
Michiel Broek <mbroek@mbse.eu>
parents:
667
diff
changeset
|
734 | { name: 'st_category_number', type: 'int' }, |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
735 | { name: 'st_og_min', type: 'float' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
736 | { name: 'st_og_max', type: 'float' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
737 | { name: 'st_fg_min', type: 'float' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
738 | { name: 'st_fg_max', type: 'float' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
739 | { name: 'st_ibu_min', type: 'float' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
740 | { name: 'st_ibu_max', type: 'float' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
741 | { name: 'st_color_min', type: 'float' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
742 | { name: 'st_color_max', type: 'float' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
743 | { name: 'st_carb_min', type: 'float' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
744 | { name: 'st_carb_max', type: 'float' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
745 | { name: 'st_abv_min', type: 'float' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
746 | { name: 'st_abv_max', type: 'float' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
747 | { name: 'name', type: 'string' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
748 | { name: 'notes', type: 'string' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
749 | { name: 'type', type: 'int' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
750 | { name: 'batch_size', type: 'float' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
751 | { name: 'boil_size', type: 'float' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
752 | { name: 'boil_time', type: 'float' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
753 | { name: 'efficiency', type: 'float' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
754 | { name: 'est_og', type: 'float' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
755 | { name: 'est_fg', type: 'float' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
756 | { name: 'est_abv', type: 'float' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
757 | { name: 'est_color', type: 'float' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
758 | { name: 'color_method', type: 'int' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
759 | { name: 'est_ibu', type: 'float' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
760 | { name: 'ibu_method', type: 'int' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
761 | { name: 'est_carb', type: 'float' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
762 | { name: 'sparge_temp', type: 'float' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
763 | { name: 'sparge_ph', type: 'float' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
764 | { name: 'sparge_volume', type: 'float' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
765 | { name: 'sparge_source', type: 'int' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
766 | { name: 'sparge_acid_type', type: 'int' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
767 | { name: 'sparge_acid_perc', type: 'float' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
768 | { name: 'sparge_acid_amount', type: 'float' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
769 | { name: 'mash_ph', type: 'float' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
770 | { name: 'mash_name', type: 'string' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
771 | { name: 'calc_acid', type: 'int' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
772 | { name: 'w1_name', type: 'string' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
773 | { name: 'w1_amount', type: 'float' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
774 | { name: 'w1_calcium', type: 'float' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
775 | { name: 'w1_sulfate', type: 'float' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
776 | { name: 'w1_chloride', type: 'float' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
777 | { name: 'w1_sodium', type: 'float' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
778 | { name: 'w1_magnesium', type: 'float' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
779 | { name: 'w1_total_alkalinity', type: 'float' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
780 | { name: 'w1_ph', type: 'float' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
781 | { name: 'w1_cost', type: 'float' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
782 | { name: 'w2_name', type: 'string' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
783 | { name: 'w2_amount', type: 'float' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
784 | { name: 'w2_calcium', type: 'float' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
785 | { name: 'w2_sulfate', type: 'float' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
786 | { name: 'w2_chloride', type: 'float' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
787 | { name: 'w2_sodium', type: 'float' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
788 | { name: 'w2_magnesium', type: 'float' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
789 | { name: 'w2_total_alkalinity', type: 'float' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
790 | { name: 'w2_ph', type: 'float' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
791 | { name: 'w2_cost', type: 'float' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
792 | { name: 'wg_amount', type: 'float' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
793 | { name: 'wg_calcium', type: 'float' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
794 | { name: 'wg_sulfate', type: 'float' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
795 | { name: 'wg_chloride', type: 'float' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
796 | { name: 'wg_sodium', type: 'float' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
797 | { name: 'wg_magnesium', type: 'float' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
798 | { name: 'wg_total_alkalinity', type: 'float' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
799 | { name: 'wg_ph', type: 'float' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
800 | { name: 'wb_calcium', type: 'float' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
801 | { name: 'wb_sulfate', type: 'float' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
802 | { name: 'wb_chloride', type: 'float' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
803 | { name: 'wb_sodium', type: 'float' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
804 | { name: 'wb_magnesium', type: 'float' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
805 | { name: 'wb_total_alkalinity', type: 'float' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
806 | { name: 'wb_ph', type: 'float' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
807 | { name: 'wa_acid_name', type: 'int' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
808 | { name: 'wa_acid_perc', type: 'int' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
809 | { name: 'wa_base_name', type: 'int' }, |
775 | 810 | { name: 'fermentables', type: 'string' }, |
811 | { name: 'hops', type: 'string' }, | |
812 | { name: 'miscs', type: 'string' }, | |
813 | { name: 'yeasts', type: 'string' }, | |
814 | { name: 'mashs', type: 'string' } | |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
815 | ], |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
816 | id: 'record', |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
817 | url: url + '?record=' + my_record |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
818 | }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
819 | // Load data and select one record. |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
820 | dataAdapter = new $.jqx.dataAdapter(source, { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
821 | loadComplete: function() { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
822 | var records = dataAdapter.records; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
823 | dataRecord = records[0]; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
824 | // Hidden record uuid |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
825 | $('#name').val(dataRecord.name); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
826 | $('#notes').val(dataRecord.notes); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
827 | $('#locked').val(dataRecord.locked); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
828 | $('#st_name').val(dataRecord.st_name); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
829 | $('#st_letter').val(dataRecord.st_letter); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
830 | $('#st_guide').val(dataRecord.st_guide); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
831 | $('#st_category').val(dataRecord.st_category); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
832 | $('#st_category_number').val(dataRecord.st_category_number); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
833 | $('#st_type').val(StyleTypeData[dataRecord.st_type].nl); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
834 | $('#type').val(dataRecord.type); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
835 | $('#batch_size').val(dataRecord.batch_size); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
836 | $('#boil_size').val(dataRecord.boil_size); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
837 | $('#boil_time').val(dataRecord.boil_time); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
838 | $('#efficiency').val(dataRecord.efficiency); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
839 | $('#est_og').val(dataRecord.est_og); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
840 | $('#est_og2').val(dataRecord.est_og); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
841 | $('#st_og_min').val(dataRecord.st_og_min); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
842 | $('#st_og_max').val(dataRecord.st_og_max); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
843 | $('#est_fg').val(dataRecord.est_fg); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
844 | $('#est_fg2').val(dataRecord.est_fg); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
845 | $('#st_fg_min').val(dataRecord.st_fg_min); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
846 | $('#st_fg_max').val(dataRecord.st_fg_max); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
847 | $('#est_fg').val(dataRecord.est_fg); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
848 | $('#est_fg2').val(dataRecord.est_fg); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
849 | $('#st_fg_min').val(dataRecord.st_fg_min); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
850 | $('#st_fg_max').val(dataRecord.st_fg_max); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
851 | $('#est_color').val(dataRecord.est_color); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
852 | $('#est_color2').val(dataRecord.est_color); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
853 | $('#est_abv').val(dataRecord.est_abv); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
854 | $('#est_abv2').val(dataRecord.est_abv); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
855 | $('#st_abv_min').val(dataRecord.st_abv_min); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
856 | $('#st_abv_max').val(dataRecord.st_abv_max); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
857 | $('#st_color_min').val(dataRecord.st_color_min); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
858 | $('#st_color_max').val(dataRecord.st_color_max); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
859 | $('#color_method').val(dataRecord.color_method); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
860 | $('#est_ibu').val(dataRecord.est_ibu); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
861 | $('#est_ibu2').val(dataRecord.est_ibu); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
862 | $('#st_ibu_min').val(dataRecord.st_ibu_min); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
863 | $('#st_ibu_max').val(dataRecord.st_ibu_max); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
864 | $('#ibu_method').val(dataRecord.ibu_method); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
865 | $('#est_carb').val(dataRecord.est_carb); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
866 | $('#st_carb_min').val(dataRecord.st_carb_min); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
867 | $('#st_carb_max').val(dataRecord.st_carb_max); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
868 | $('#mash_name').val(dataRecord.mash_name); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
869 | $('#mash_ph').val(dataRecord.mash_ph); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
870 | $('#sparge_temp').val(dataRecord.sparge_temp); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
871 | $('#sparge_ph').val(dataRecord.sparge_ph); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
872 | $('#sparge_volume').val(dataRecord.sparge_volume); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
873 | $('#sparge_source').val(dataRecord.sparge_source); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
874 | $('#sparge_acid_type').val(dataRecord.sparge_acid_type); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
875 | $('#sparge_acid_perc').val(dataRecord.sparge_acid_perc); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
876 | $('#sparge_acid_amount').val(dataRecord.sparge_acid_amount * 1000); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
877 | $('#calc_acid').val(dataRecord.calc_acid); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
878 | $('#w1_name').val(dataRecord.w1_name); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
879 | $('#w1_amount').val(dataRecord.w1_amount); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
880 | $('#w1_calcium').val(dataRecord.w1_calcium); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
881 | $('#w1_sulfate').val(dataRecord.w1_sulfate); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
882 | $('#w1_chloride').val(dataRecord.w1_chloride); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
883 | $('#w1_sodium').val(dataRecord.w1_sodium); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
884 | $('#w1_magnesium').val(dataRecord.w1_magnesium); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
885 | $('#w1_total_alkalinity').val(dataRecord.w1_total_alkalinity); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
886 | $('#w1_ph').val(dataRecord.w1_ph); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
887 | $('#w1_cost').val(dataRecord.w1_cost); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
888 | $('#w2_name').val(dataRecord.w2_name); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
889 | $('#w2_amount').val(dataRecord.w2_amount); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
890 | $('#w2_calcium').val(dataRecord.w2_calcium); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
891 | $('#w2_sulfate').val(dataRecord.w2_sulfate); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
892 | $('#w2_chloride').val(dataRecord.w2_chloride); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
893 | $('#w2_sodium').val(dataRecord.w2_sodium); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
894 | $('#w2_magnesium').val(dataRecord.w2_magnesium); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
895 | $('#w2_total_alkalinity').val(dataRecord.w2_total_alkalinity); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
896 | $('#w2_ph').val(dataRecord.w2_ph); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
897 | $('#w2_cost').val(dataRecord.w2_cost); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
898 | $('#wg_amount').val(dataRecord.wg_amount); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
899 | $('#wg_calcium').val(dataRecord.wg_calcium); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
900 | $('#wg_sulfate').val(dataRecord.wg_sulfate); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
901 | $('#wg_chloride').val(dataRecord.wg_chloride); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
902 | $('#wg_sodium').val(dataRecord.wg_sodium); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
903 | $('#wg_magnesium').val(dataRecord.wg_magnesium); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
904 | $('#wg_total_alkalinity').val(dataRecord.wg_total_alkalinity); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
905 | $('#wg_ph').val(dataRecord.wg_ph); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
906 | $('#wb_calcium').val(dataRecord.wb_calcium); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
907 | $('#wb_sulfate').val(dataRecord.wb_sulfate); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
908 | $('#wb_chloride').val(dataRecord.wb_chloride); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
909 | $('#wb_sodium').val(dataRecord.wb_sodium); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
910 | $('#wb_magnesium').val(dataRecord.wb_magnesium); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
911 | $('#wb_total_alkalinity').val(dataRecord.wb_total_alkalinity); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
912 | $('#wb_ph').val(dataRecord.wb_ph); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
913 | $('#wa_acid_name').val(dataRecord.wa_acid_name); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
914 | $('#wa_acid_perc').val(dataRecord.wa_acid_perc); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
915 | editFermentable(dataRecord); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
916 | editHop(dataRecord); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
917 | editMisc(dataRecord); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
918 | editYeast(dataRecord); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
919 | editMash(dataRecord); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
920 | $('#jqxTabs').jqxTabs('next'); |
643
9ac2fb6b1311
Added failsave starting calcWater() when the main data is not yet loaded.
Michiel Broek <mbroek@mbse.eu>
parents:
642
diff
changeset
|
921 | data_loaded = 1; |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
922 | }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
923 | loadError: function(jqXHR, status, error) {}, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
924 | beforeLoadComplete: function(records) { $('#jqxLoader').jqxLoader('open'); } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
925 | }), |
352
9d2a4703bdac
Version 0.1.2 Calculate mash thickness.
Michiel Broek <mbroek@mbse.eu>
parents:
350
diff
changeset
|
926 | |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
927 | // Inline fermentables editor |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
928 | editFermentable = function(data) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
929 | var fermentableSource = { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
930 | localdata: data.fermentables, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
931 | datafields: [ |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
932 | { name: 'f_name', type: 'string' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
933 | { name: 'f_origin', type: 'string' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
934 | { name: 'f_supplier', type: 'string' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
935 | { name: 'f_amount', type: 'float' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
936 | { name: 'f_cost', type: 'float' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
937 | { name: 'f_type', type: 'int' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
938 | { name: 'f_yield', type: 'float' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
939 | { name: 'f_color', type: 'float' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
940 | { name: 'f_coarse_fine_diff', type: 'float' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
941 | { name: 'f_moisture', type: 'float' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
942 | { name: 'f_diastatic_power', type: 'float' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
943 | { name: 'f_protein', type: 'float' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
944 | { name: 'f_max_in_batch', type: 'float' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
945 | { name: 'f_graintype', type: 'int' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
946 | { name: 'f_added', type: 'int' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
947 | { name: 'f_dissolved_protein', type: 'float' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
948 | { name: 'f_recommend_mash', type: 'int' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
949 | { name: 'f_add_after_boil', type: 'int' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
950 | { name: 'f_adjust_to_total_100', type: 'int' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
951 | { name: 'f_percentage', type: 'float' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
952 | { name: 'f_di_ph', type: 'float' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
953 | { name: 'f_acid_to_ph_57', type: 'float' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
954 | { name: 'f_inventory', type: 'float' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
955 | { name: 'f_avail', type: 'int' } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
956 | ], |
648 | 957 | addrow: function(rowid, rowdata, position, commit) { commit(true); }, |
958 | deleterow: function(rowid, commit) { commit(true); }, | |
959 | updaterow: function(rowid, rowdata, commit) { commit(true); } | |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
960 | }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
961 | fermentableAdapter = new $.jqx.dataAdapter(fermentableSource); |
263
ed22ac46404b
Adjust water, hops, yeasts and miscs when the batch size or equipment changes.
Michiel Broek <mbroek@mbse.eu>
parents:
262
diff
changeset
|
962 | |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
963 | $('#fermentableGrid').jqxGrid({ |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
964 | width: 1240, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
965 | height: 470, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
966 | source: fermentableAdapter, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
967 | theme: theme, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
968 | selectionmode: 'singlerow', |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
969 | showtoolbar: true, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
970 | rendertoolbar: function(toolbar) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
971 | //var me = this; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
972 | var container = $('<div style="overflow: hidden; position: relative; margin: 5px;"></div>'); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
973 | toolbar.append(container); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
974 | container.append('<div style="float: left; margin-left: 165px;" id="faddrowbutton"></div>'); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
975 | container.append('<div style="float: left; margin-left: 10px; margin-top: 5px;">In voorraad:</div>'); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
976 | container.append('<div style="float: left; margin-left: 10px;" id="finstockbutton"></div>'); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
977 | container.append('<input style="float: left; margin-left: 400px;" id="fdeleterowbutton" type="button" value="Verwijder mout" />'); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
978 | // add fermentable from dropdownlist. |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
979 | $('#faddrowbutton').jqxDropDownList({ |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
980 | placeHolder: 'Kies mout:', |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
981 | theme: theme, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
982 | template: 'primary', |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
983 | source: fermentablelist, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
984 | displayMember: 'name', |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
985 | width: 150, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
986 | height: 27, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
987 | dropDownWidth: 500, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
988 | dropDownHeight: 500, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
989 | renderer: function(index, label, value) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
990 | var datarecord = fermentablelist.records[index]; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
991 | return datarecord.supplier + ' / ' + datarecord.name + ' (' + datarecord.color + ' EBC)'; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
992 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
993 | }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
994 | $('#faddrowbutton').on('select', function(event) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
995 | if (event.args) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
996 | var index, datarecord, row = {}, rowscount = $('#fermentableGrid').jqxGrid('getdatainformation').rowscount; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
997 | index = event.args.index; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
998 | datarecord = fermentablelist.records[index]; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
999 | row['f_name'] = datarecord.name; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1000 | row['f_origin'] = datarecord.origin; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1001 | row['f_supplier'] = datarecord.supplier; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1002 | row['f_amount'] = 0; |
549
21705ae9dff2
Fixed fatal bug in recipe fermentables.
Michiel Broek <mbroek@mbse.eu>
parents:
540
diff
changeset
|
1003 | row['f_cost'] = datarecord.cost; |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1004 | row['f_type'] = datarecord.type; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1005 | row['f_yield'] = datarecord.yield; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1006 | row['f_color'] = datarecord.color; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1007 | row['f_coarse_fine_diff'] = datarecord.coarse_fine_diff; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1008 | row['f_moisture'] = datarecord.moisture; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1009 | row['f_diastatic_power'] = datarecord.diastatic_power; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1010 | row['f_protein'] = datarecord.protein; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1011 | row['f_max_in_batch'] = datarecord.max_in_batch; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1012 | row['f_graintype'] = datarecord.graintype; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1013 | if (datarecord.add_after_boil) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1014 | row['f_added'] = 2; // Fermentation |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1015 | } else if ((datarecord.type == 1) || (datarecord.type == 4)) { // Sugar or Adjunct |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1016 | row['f_added'] = 1; // Boil |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1017 | } else { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1018 | row['f_added'] = 0; // Mash |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1019 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1020 | row['f_dissolved_protein'] = datarecord.dissolved_protein; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1021 | row['f_recommend_mash'] = datarecord.recommend_mash; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1022 | row['f_add_after_boil'] = datarecord.add_after_boil; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1023 | if (rowscount == 0) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1024 | // The first fermentable |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1025 | row['f_adjust_to_total_100'] = 1; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1026 | row['f_percentage'] = 100; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1027 | } else { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1028 | row['f_adjust_to_total_100'] = 0; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1029 | row['f_percentage'] = 0; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1030 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1031 | row['f_di_ph'] = datarecord.di_ph; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1032 | row['f_acid_to_ph_57'] = datarecord.acid_to_ph_57; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1033 | row['f_inventory'] = datarecord.inventory; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1034 | $('#fermentableGrid').jqxGrid('addrow', null, row); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1035 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1036 | }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1037 | $('#finstockbutton').jqxCheckBox({ theme: theme, height: 27 }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1038 | $('#finstockbutton').on('change', function(event) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1039 | fermentableinstock = event.args.checked; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1040 | fermentablelist.dataBind(); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1041 | }); |
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
|
1042 | |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1043 | // delete selected fermentable. |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1044 | $('#fdeleterowbutton').jqxButton({ template: 'danger', theme: theme, height: 27, width: 150 }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1045 | $('#fdeleterowbutton').on('click', function() { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1046 | var id, percent, amount, i, rowdata, rowscount, selectedrowindex = $('#fermentableGrid').jqxGrid('getselectedrowindex'); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1047 | rowscount = $('#fermentableGrid').jqxGrid('getdatainformation').rowscount; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1048 | if (selectedrowindex >= 0 && selectedrowindex < rowscount) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1049 | id = $('#fermentableGrid').jqxGrid('getrowid', selectedrowindex); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1050 | percent = $('#fermentableGrid').jqxGrid('getcellvalue', id, 'f_percentage'); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1051 | amount = $('#fermentableGrid').jqxGrid('getcellvalue', id, 'f_amount'); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1052 | $('#fermentableGrid').jqxGrid('deleterow', id); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1053 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1054 | rowscount = $('#fermentableGrid').jqxGrid('getdatainformation').rowscount; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1055 | if (rowscount > 1) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1056 | if (to_100) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1057 | for (i = 0; i < rowscount; i++) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1058 | rowdata = $('#fermentableGrid').jqxGrid('getrowdata', i); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1059 | if (rowdata.f_adjust_to_total_100) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1060 | rowdata.f_percentage += percent; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1061 | rowdata.f_amount += amount; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1062 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1063 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1064 | } else { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1065 | calcPercentages(); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1066 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1067 | } else { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1068 | $('#fermentableGrid').jqxGrid('setcellvalue', 0, 'f_percentage', 100); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1069 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1070 | calcFermentables(); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1071 | calcIBUs(); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1072 | }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1073 | }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1074 | ready: function() { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1075 | calcFermentables(); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1076 | $('#jqxTabs').jqxTabs('next'); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1077 | }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1078 | columns: [ |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1079 | { text: 'Vergistbaar ingrediënt', datafield: 'f_name', |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1080 | cellsrenderer: function(index, datafield, value, defaulvalue, column, rowdata) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1081 | return '<span style="margin: 3px; margin-top: 6px; float: left;">' + |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1082 | rowdata.f_supplier + ' / ' + rowdata.f_name + ' (' + rowdata.f_color + ' EBC)</span>'; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1083 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1084 | }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1085 | { text: 'Type', width: 100, datafield: 'f_type', |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1086 | cellsrenderer: function(index, datafield, value, defaultvalue, column, rowdata) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1087 | return '<span style="margin: 3px; margin-top: 6px; float: left;">' + FermentableTypeData[value].nl + '</span>'; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1088 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1089 | }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1090 | { text: 'Moment', width: 110, datafield: 'f_added', |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1091 | cellsrenderer: function(index, datafield, value, defaultvalue, column, rowdata) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1092 | return '<span style="margin: 3px; margin-top: 6px; float: left;">' + AddedData[value].nl + '</span>'; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1093 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1094 | }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1095 | { text: 'Maxinbatch', datafield: 'f_max_in_batch', hidden: true }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1096 | { text: 'Opbrengst', editable: false, datafield: 'f_yield', width: 90, align: 'right', cellsalign: 'right', cellsformat: 'p1' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1097 | { text: 'Gewicht Kg', datafield: 'f_amount', width: 120, align: 'right', cellsalign: 'right', cellsformat: 'f3' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1098 | { text: 'Voorr. Kg', datafield: 'f_inventory', width: 120, align: 'right', |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1099 | cellsrenderer: function(row, columnfield, value, defaulthtml, columnproperties, rowdata) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1100 | var color = '#ffffff'; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1101 | if (value < rowdata.f_amount) |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1102 | color = '#ff4040'; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1103 | return '<span style="margin: 4px; margin-top: 6px; float: right; color: ' + |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1104 | color + ';">' + fermentableAdapter.formatNumber(value, 'f3') + '</span>'; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1105 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1106 | }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1107 | { text: 'Procent', datafield: 'f_percentage', width: 90, align: 'right', |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1108 | cellsrenderer: function(row, columnfield, value, defaulthtml, columnproperties, rowdata) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1109 | var color = '#ffffff'; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1110 | if (value > rowdata.f_max_in_batch) |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1111 | color = '#ff4040'; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1112 | return '<span style="margin: 4px; margin-top: 6px; float: right; color: ' + |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1113 | color + ';">' + fermentableAdapter.formatNumber(value, 'p1') + '</span>'; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1114 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1115 | }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1116 | { text: '100%', align: 'center', datafield: 'f_adjust_to_total_100', columntype: 'checkbox', width: 70 }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1117 | { text: '', datafield: 'Edit', columntype: 'button', width: 100, align: 'center', cellsrenderer: function() { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1118 | return 'Wijzig'; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1119 | }, buttonclick: function(row) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1120 | fermentableRow = row; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1121 | fermentableData = $('#fermentableGrid').jqxGrid('getrowdata', fermentableRow); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1122 | $('#wf_name').val(fermentableData.f_name); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1123 | $('#wf_amount').val(fermentableData.f_amount); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1124 | $('#wf_percentage').val(fermentableData.f_percentage); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1125 | $('#wf_max_in_batch').val(fermentableData.f_max_in_batch); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1126 | $('#wf_adjust_to_total_100').val(fermentableData.f_adjust_to_total_100); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1127 | $('#wf_added').val(fermentableData.f_added); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1128 | // show the popup window. |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1129 | $('#popupFermentable').jqxWindow('open'); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1130 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1131 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1132 | ] |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1133 | }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1134 | }; |
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
|
1135 | |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1136 | // Inline hops editor |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1137 | var editHop = function(data) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1138 | var hopSource = { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1139 | localdata: data.hops, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1140 | datafields: [ |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1141 | { name: 'h_name', type: 'string' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1142 | { name: 'h_origin', type: 'string' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1143 | { name: 'h_amount', type: 'float' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1144 | { name: 'h_cost', type: 'float' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1145 | { name: 'h_type', type: 'int' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1146 | { name: 'h_form', type: 'int' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1147 | { name: 'h_useat', type: 'int' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1148 | { name: 'h_time', type: 'float' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1149 | { name: 'h_alpha', type: 'float' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1150 | { name: 'h_beta', type: 'float' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1151 | { name: 'h_hsi', type: 'float' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1152 | { name: 'h_humulene', type: 'float' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1153 | { name: 'h_caryophyllene', type: 'float' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1154 | { name: 'h_cohumulone', type: 'float' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1155 | { name: 'h_myrcene', type: 'float' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1156 | { name: 'h_total_oil', type: 'float' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1157 | { name: 'h_inventory', type: 'float' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1158 | { name: 'h_avail', type: 'int' } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1159 | ], |
648 | 1160 | addrow: function(rowid, rowdata, position, commit) { commit(true); }, |
1161 | deleterow: function(rowid, commit) { commit(true); }, | |
1162 | updaterow: function(rowid, rowdata, commit) { commit(true); } | |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1163 | }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1164 | hopAdapter = new $.jqx.dataAdapter(hopSource); |
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
|
1165 | |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1166 | $('#hopGrid').jqxGrid({ |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1167 | width: 1240, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1168 | height: 560, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1169 | source: hopAdapter, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1170 | theme: theme, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1171 | selectionmode: 'singlerow', |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1172 | showtoolbar: true, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1173 | rendertoolbar: function(toolbar) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1174 | var container = $('<div style="overflow: hidden; position: relative; margin: 5px;"></div>'); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1175 | toolbar.append(container); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1176 | container.append('<div style="float: left; margin-left: 165px;" id="haddrowbutton"></div>'); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1177 | container.append('<div style="float: left; margin-left: 10px; margin-top: 5px;">In voorraad:</div>'); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1178 | container.append('<div style="float: left; margin-left: 10px;" id="hinstockbutton"></div>'); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1179 | container.append('<input style="float: left; margin-left: 400px;" id="hdeleterowbutton" type="button" value="Verwijder hop" />'); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1180 | // add hop from dropdownlist. |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1181 | $('#haddrowbutton').jqxDropDownList({ |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1182 | placeHolder: 'Kies hop:', |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1183 | theme: theme, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1184 | template: 'primary', |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1185 | source: hoplist, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1186 | displayMember: 'name', |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1187 | width: 150, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1188 | height: 27, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1189 | dropDownWidth: 500, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1190 | dropDownHeight: 500, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1191 | renderer: function(index, label, value) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1192 | var datarecord = hoplist.records[index]; |
772
f9d266eb0ec6
In product editor calculate fermentables before the first IBU calculation. In recipe editor changed to the new water calculations like in the product editor.
Michiel Broek <mbroek@mbse.eu>
parents:
756
diff
changeset
|
1193 | return datarecord.origin + ' - ' + datarecord.name + ' / ' + HopFormData[datarecord.form].nl + ' (' + datarecord.alpha + '% α)'; |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1194 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1195 | }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1196 | $('#haddrowbutton').on('select', function(event) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1197 | if (event.args) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1198 | var datarecord, row = {}, index = event.args.index; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1199 | datarecord = hoplist.records[index]; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1200 | row['h_name'] = datarecord.name; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1201 | row['h_origin'] = datarecord.origin; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1202 | row['h_amount'] = 0; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1203 | row['h_cost'] = datarecord.cost; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1204 | row['h_type'] = datarecord.type; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1205 | row['h_form'] = datarecord.form; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1206 | row['h_useat'] = 2; // Boil |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1207 | row['h_time'] = 0; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1208 | row['h_alpha'] = datarecord.alpha; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1209 | row['h_beta'] = datarecord.beta; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1210 | row['h_hsi'] = datarecord.hsi; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1211 | row['h_humulene'] = datarecord.humulene; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1212 | row['h_caryophyllene'] = datarecord.caryophyllene; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1213 | row['h_cohumulone'] = datarecord.cohumulone; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1214 | row['h_myrcene'] = datarecord.myrcene; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1215 | row['h_total_oil'] = datarecord.total_oil; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1216 | row['h_inventory'] = datarecord.inventory; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1217 | $('#hopGrid').jqxGrid('addrow', null, row); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1218 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1219 | $('#haddrowbutton').jqxDropDownList('clearSelection'); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1220 | }); |
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
|
1221 | |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1222 | $('#hinstockbutton').jqxCheckBox({ theme: theme, height: 27 }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1223 | $('#hinstockbutton').on('change', function(event) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1224 | hopinstock = event.args.checked; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1225 | hoplist.dataBind(); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1226 | }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1227 | |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1228 | // delete selected hop. |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1229 | $('#hdeleterowbutton').jqxButton({ template: 'danger', theme: theme, height: 27, width: 150 }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1230 | $('#hdeleterowbutton').on('click', function() { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1231 | var rowscount, id, selectedrowindex = $('#hopGrid').jqxGrid('getselectedrowindex'); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1232 | rowscount = $('#hopGrid').jqxGrid('getdatainformation').rowscount; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1233 | if (selectedrowindex >= 0 && selectedrowindex < rowscount) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1234 | id = $('#hopGrid').jqxGrid('getrowid', selectedrowindex); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1235 | $('#hopGrid').jqxGrid('deleterow', id); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1236 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1237 | calcIBUs(); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1238 | }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1239 | }, |
772
f9d266eb0ec6
In product editor calculate fermentables before the first IBU calculation. In recipe editor changed to the new water calculations like in the product editor.
Michiel Broek <mbroek@mbse.eu>
parents:
756
diff
changeset
|
1240 | ready: function() { $('#jqxTabs').jqxTabs('next'); }, |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1241 | columns: [ |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1242 | { text: 'Hop', datafield: 'h_name', |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1243 | cellsrenderer: function(index, datafield, value, defaultvalue, column, rowdata) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1244 | return '<span style="margin: 3px; margin-top: 6px; float: left;">' + rowdata.h_origin + ' / ' + rowdata.h_name + '</span>'; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1245 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1246 | }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1247 | { text: 'Type', width: 90, datafield: 'h_type', |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1248 | cellsrenderer: function(index, datafield, value, defaultvalue, column, rowdata) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1249 | return '<span style="margin: 4px; margin-top: 6px; float: left;">' + HopTypeData[value].nl + '</span>'; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1250 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1251 | }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1252 | { text: 'Vorm', width: 90, datafield: 'h_form', |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1253 | cellsrenderer: function(index, datafield, value, defaultvalue, column, rowdata) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1254 | return '<span style="margin: 4px; margin-top: 6px; float: left;">' + HopFormData[value].nl + '</span>'; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1255 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1256 | }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1257 | { text: 'Alpha', datafield: 'h_alpha', width: 80, align: 'right', cellsalign: 'right', cellsformat: 'p1' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1258 | { text: 'Gebruik', width: 110, datafield: 'h_useat', |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1259 | cellsrenderer: function(index, datafield, value, defaultvalue, column, rowdata) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1260 | return '<span style="margin: 4px; margin-top: 6px; float: left;">' + HopUseData[value].nl + '</span>'; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1261 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1262 | }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1263 | { text: 'Tijdsduur', datafield: 'h_time', width: 90, align: 'right', |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1264 | cellsrenderer: function(index, datafield, value, defaultvalue, column, rowdata) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1265 | var duration = ''; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1266 | if ((rowdata.h_useat == 2) || (rowdata.h_useat == 4)) // Boil, Whirlpool |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1267 | duration = dataAdapter.formatNumber(value, 'f0') + ' min.'; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1268 | else if (rowdata.h_useat == 5) // Dry hop |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1269 | duration = dataAdapter.formatNumber(value / 1440, 'f0') + ' dagen'; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1270 | return '<span style="margin: 4px; margin-top: 6px; float: right;">' + duration + '</span>'; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1271 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1272 | }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1273 | { text: 'IBU', datafield: 'ibu', width: 80, align: 'right', |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1274 | cellsrenderer: function(index, datafield, value, defaultvalue, column, rowdata) { |
772
f9d266eb0ec6
In product editor calculate fermentables before the first IBU calculation. In recipe editor changed to the new water calculations like in the product editor.
Michiel Broek <mbroek@mbse.eu>
parents:
756
diff
changeset
|
1275 | var ibu = toIBU(rowdata.h_useat, rowdata.h_form, preboil_sg, parseFloat(dataRecord.batch_size) /*parseFloat($('#batch_size').jqxNumberInput('decimal'))*/, |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1276 | parseFloat(rowdata.h_amount), parseFloat(rowdata.h_time), |
540
756fe9afe72b
Recipes editor handles whirlpool hop IBUs.
Michiel Broek <mbroek@mbse.eu>
parents:
524
diff
changeset
|
1277 | parseFloat(rowdata.h_alpha), $('#ibu_method').val(), 0, parseFloat(rowdata.h_time), 0); |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1278 | return '<span style="margin: 4px; margin-top: 6px; float: right;">' + dataAdapter.formatNumber(ibu, 'f1') + '</span>'; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1279 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1280 | }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1281 | { text: 'Gewicht', datafield: 'h_amount', width: 110, align: 'right', |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1282 | cellsrenderer: function(index, datafield, value, defaultvalue, column, rowdata) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1283 | var amount = dataAdapter.formatNumber(value, 'f1') + ' kg'; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1284 | if (value < 1) |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1285 | amount = dataAdapter.formatNumber(value * 1000, 'f1') + ' gr'; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1286 | return '<span style="margin: 4px; margin-top: 6px; float: right;">' + amount + '</span>'; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1287 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1288 | }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1289 | { text: 'Voorraad', datafield: 'h_inventory', width: 110, align: 'right', |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1290 | cellsrenderer: function(index, datafield, value, defaultvalue, column, rowdata) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1291 | var amount, color = '#ffffff'; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1292 | if (value < rowdata.h_amount) |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1293 | color = '#ff4040'; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1294 | amount = dataAdapter.formatNumber(value, 'f1') + ' kg'; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1295 | if (value < 1) |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1296 | amount = dataAdapter.formatNumber(value * 1000, 'f1') + ' gr'; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1297 | return '<span style="margin: 4px; margin-top: 6px; float: right; color: ' + color + ';">' + amount + '</span>'; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1298 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1299 | }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1300 | { text: '', datafield: 'Edit', columntype: 'button', width: 100, align: 'center', |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1301 | cellsrenderer: function() { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1302 | return 'Wijzig'; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1303 | }, buttonclick: function(row) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1304 | hopRow = row; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1305 | hopData = $('#hopGrid').jqxGrid('getrowdata', hopRow); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1306 | $('#wh_name').val(hopData.h_name); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1307 | $('#wh_amount').val(hopData.h_amount * 1000); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1308 | var ibu = toIBU(hopData.h_useat, hopData.h_form, preboil_sg, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1309 | parseFloat($('#batch_size').jqxNumberInput('decimal')), |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1310 | parseFloat(hopData.h_amount), parseFloat(hopData.h_time), |
540
756fe9afe72b
Recipes editor handles whirlpool hop IBUs.
Michiel Broek <mbroek@mbse.eu>
parents:
524
diff
changeset
|
1311 | parseFloat(hopData.h_alpha), $('#ibu_method').val(), |
756fe9afe72b
Recipes editor handles whirlpool hop IBUs.
Michiel Broek <mbroek@mbse.eu>
parents:
524
diff
changeset
|
1312 | 0, parseFloat(hopData.h_time), 0 |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1313 | ); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1314 | $('#wh_ibu').val(ibu); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1315 | if (hopData.h_useat == 5) // Dry hop |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1316 | $('#wh_time').val(hopData.h_time / 1440); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1317 | else |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1318 | $('#wh_time').val(hopData.h_time); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1319 | $('#wh_useat').val(hopData.h_useat); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1320 | // show the popup window. |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1321 | $('#popupHop').jqxWindow('open'); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1322 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1323 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1324 | ] |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1325 | }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1326 | }; |
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
|
1327 | |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1328 | // Inline miscs editor |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1329 | var editMisc = function(data) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1330 | var miscSource = { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1331 | localdata: data.miscs, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1332 | datafields: [ |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1333 | { name: 'm_name', type: 'string' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1334 | { name: 'm_amount', type: 'float' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1335 | { name: 'm_cost', type: 'float' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1336 | { name: 'm_type', type: 'int' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1337 | { name: 'm_use_use', type: 'int' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1338 | { name: 'm_time', type: 'float' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1339 | { name: 'm_amount_is_weight', type: 'int' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1340 | { name: 'm_inventory', type: 'float' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1341 | { name: 'm_avail', type: 'int' } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1342 | ], |
648 | 1343 | addrow: function(rowid, rowdata, position, commit) { commit(true); }, |
1344 | deleterow: function(rowid, commit) { commit(true); }, | |
1345 | updaterow: function(rowid, rowdata, commit) { commit(true); } | |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1346 | }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1347 | miscAdapter = new $.jqx.dataAdapter(miscSource, { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1348 | beforeLoadComplete: function(records) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1349 | var i, row, data = new Array(); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1350 | for (i = 0; i < records.length; i++) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1351 | row = records[i]; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1352 | data.push(row); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1353 | // Initial set water agent values. |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1354 | switch (row.m_name) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1355 | case 'CaCl2': |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1356 | $('#wa_cacl2').val(row.m_amount * 1000); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1357 | break; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1358 | case 'CaSO4': |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1359 | $('#wa_caso4').val(row.m_amount * 1000); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1360 | break; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1361 | case 'MgSO4': |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1362 | $('#wa_mgso4').val(row.m_amount * 1000); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1363 | break; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1364 | case 'NaCl': |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1365 | $('#wa_nacl').val(row.m_amount * 1000); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1366 | break; |
772
f9d266eb0ec6
In product editor calculate fermentables before the first IBU calculation. In recipe editor changed to the new water calculations like in the product editor.
Michiel Broek <mbroek@mbse.eu>
parents:
756
diff
changeset
|
1367 | case 'MgCl2': |
f9d266eb0ec6
In product editor calculate fermentables before the first IBU calculation. In recipe editor changed to the new water calculations like in the product editor.
Michiel Broek <mbroek@mbse.eu>
parents:
756
diff
changeset
|
1368 | $('#wa_mgcl2').val(row.m_amount * 1000); |
f9d266eb0ec6
In product editor calculate fermentables before the first IBU calculation. In recipe editor changed to the new water calculations like in the product editor.
Michiel Broek <mbroek@mbse.eu>
parents:
756
diff
changeset
|
1369 | break; |
f9d266eb0ec6
In product editor calculate fermentables before the first IBU calculation. In recipe editor changed to the new water calculations like in the product editor.
Michiel Broek <mbroek@mbse.eu>
parents:
756
diff
changeset
|
1370 | case 'NaHCO3': |
f9d266eb0ec6
In product editor calculate fermentables before the first IBU calculation. In recipe editor changed to the new water calculations like in the product editor.
Michiel Broek <mbroek@mbse.eu>
parents:
756
diff
changeset
|
1371 | $('#wa_nahco3').val(row.m_amount * 1000); |
f9d266eb0ec6
In product editor calculate fermentables before the first IBU calculation. In recipe editor changed to the new water calculations like in the product editor.
Michiel Broek <mbroek@mbse.eu>
parents:
756
diff
changeset
|
1372 | break; |
f9d266eb0ec6
In product editor calculate fermentables before the first IBU calculation. In recipe editor changed to the new water calculations like in the product editor.
Michiel Broek <mbroek@mbse.eu>
parents:
756
diff
changeset
|
1373 | case 'CaCO3': |
f9d266eb0ec6
In product editor calculate fermentables before the first IBU calculation. In recipe editor changed to the new water calculations like in the product editor.
Michiel Broek <mbroek@mbse.eu>
parents:
756
diff
changeset
|
1374 | $('#wa_caco3').val(row.m_amount * 1000); |
f9d266eb0ec6
In product editor calculate fermentables before the first IBU calculation. In recipe editor changed to the new water calculations like in the product editor.
Michiel Broek <mbroek@mbse.eu>
parents:
756
diff
changeset
|
1375 | break; |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1376 | case 'Melkzuur': |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1377 | $('#wa_acid_name').val(0); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1378 | $('#wa_acid').val(row.m_amount * 1000); |
772
f9d266eb0ec6
In product editor calculate fermentables before the first IBU calculation. In recipe editor changed to the new water calculations like in the product editor.
Michiel Broek <mbroek@mbse.eu>
parents:
756
diff
changeset
|
1379 | $('#wa_acid_perc').val(AcidTypeData[0].AcidPrc); // TODO: this ignores changed percentages. |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1380 | last_acid = 'Melkzuur'; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1381 | break; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1382 | case 'Zoutzuur': |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1383 | $('#wa_acid_name').val(1); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1384 | $('#wa_acid').val(row.m_amount * 1000); |
772
f9d266eb0ec6
In product editor calculate fermentables before the first IBU calculation. In recipe editor changed to the new water calculations like in the product editor.
Michiel Broek <mbroek@mbse.eu>
parents:
756
diff
changeset
|
1385 | $('#wa_acid_perc').val(AcidTypeData[1].AcidPrc); |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1386 | last_acid = 'Zoutzuur'; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1387 | break; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1388 | case 'Fosforzuur': |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1389 | $('#wa_acid_name').val(2); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1390 | $('#wa_acid').val(row.m_amount * 1000); |
772
f9d266eb0ec6
In product editor calculate fermentables before the first IBU calculation. In recipe editor changed to the new water calculations like in the product editor.
Michiel Broek <mbroek@mbse.eu>
parents:
756
diff
changeset
|
1391 | $('#wa_acid_perc').val(AcidTypeData[2].AcidPrc); |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1392 | last_acid = 'Fosforzuur'; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1393 | break; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1394 | case 'Zwavelzuur': |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1395 | $('#wa_acid_name').val(3); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1396 | $('#wa_acid').val(row.m_amount * 1000); |
772
f9d266eb0ec6
In product editor calculate fermentables before the first IBU calculation. In recipe editor changed to the new water calculations like in the product editor.
Michiel Broek <mbroek@mbse.eu>
parents:
756
diff
changeset
|
1397 | $('#wa_acid_perc').val(AcidTypeData[3].AcidPrc); |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1398 | last_acid = 'Zwavelzuur'; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1399 | break; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1400 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1401 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1402 | return data; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1403 | }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1404 | loadError: function(jqXHR, status, error) {} |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1405 | }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1406 | $('#miscGrid').jqxGrid({ |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1407 | width: 1240, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1408 | height: 575, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1409 | source: miscAdapter, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1410 | theme: theme, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1411 | selectionmode: 'singlerow', |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1412 | showtoolbar: true, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1413 | rendertoolbar: function(toolbar) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1414 | //var me = this; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1415 | var container = $('<div style="overflow: hidden; position: relative; margin: 5px;"></div>'); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1416 | toolbar.append(container); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1417 | container.append('<div style="float: left; margin-left: 165px;" id="maddrowbutton"></div>'); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1418 | container.append('<div style="float: left; margin-left: 10px; margin-top: 5px;">In voorraad:</div>'); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1419 | container.append('<div style="float: left; margin-left: 10px;" id="minstockbutton"></div>'); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1420 | container.append('<input style="float: left; margin-left: 400px;" id="mdeleterowbutton" type="button" value="Verwijder ingrediënt" />'); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1421 | // add misc from dropdownlist. |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1422 | $('#maddrowbutton').jqxDropDownList({ |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1423 | placeHolder: 'Kies ingrediënt:', |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1424 | theme: theme, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1425 | template: 'primary', |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1426 | source: misclist, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1427 | displayMember: 'name', |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1428 | width: 150, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1429 | height: 27, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1430 | dropDownWidth: 500, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1431 | dropDownHeight: 500 |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1432 | }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1433 | $('#maddrowbutton').on('select', function(event) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1434 | if (event.args) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1435 | var datarecord, row = {}, index = event.args.index; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1436 | datarecord = misclist.records[index]; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1437 | row['m_name'] = datarecord.name; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1438 | row['m_amount'] = 0; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1439 | row['m_cost'] = datarecord.cost; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1440 | row['m_type'] = datarecord.type; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1441 | row['m_use_use'] = datarecord.use_use; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1442 | row['m_time'] = 0; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1443 | row['m_amount_is_weight'] = datarecord.amount_is_weight; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1444 | row['m_inventory'] = datarecord.inventory; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1445 | $('#miscGrid').jqxGrid('addrow', null, row); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1446 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1447 | }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1448 | $('#minstockbutton').jqxCheckBox({ theme: theme, height: 27 }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1449 | $('#minstockbutton').on('change', function(event) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1450 | miscinstock = event.args.checked; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1451 | misclist.dataBind(); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1452 | }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1453 | // delete selected misc. |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1454 | $('#mdeleterowbutton').jqxButton({ template: 'danger', theme: theme, height: 27, width: 150 }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1455 | $('#mdeleterowbutton').on('click', function() { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1456 | var rowscount, type, id, selectedrowindex = $('#miscGrid').jqxGrid('getselectedrowindex'); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1457 | rowscount = $('#miscGrid').jqxGrid('getdatainformation').rowscount; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1458 | type = $('#miscGrid').jqxGrid('getcellvalue', selectedrowindex, 'm_type'); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1459 | if (selectedrowindex >= 0 && selectedrowindex < rowscount && type != 4) { // Water agent |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1460 | id = $('#miscGrid').jqxGrid('getrowid', selectedrowindex); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1461 | $('#miscGrid').jqxGrid('deleterow', id); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1462 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1463 | }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1464 | }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1465 | ready: function() { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1466 | $('#jqxTabs').jqxTabs('next'); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1467 | }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1468 | columns: [ |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1469 | { text: 'Ingredient', datafield: 'm_name' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1470 | { text: 'Type', width: 140, datafield: 'm_type', |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1471 | cellsrenderer: function(index, datafield, value, defaultvalue, column, rowdata) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1472 | return '<span style="margin: 3px; margin-top: 6px; float: left;">' + MiscTypeData[value].nl + '</span>'; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1473 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1474 | }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1475 | { text: 'Gebruik', width: 140, datafield: 'm_use_use', |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1476 | cellsrenderer: function(index, datafield, value, defaultvalue, column, rowdata) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1477 | return '<span style="margin: 3px; margin-top: 6px; float: left;">' + MiscUseData[value].nl + '</span>'; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1478 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1479 | }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1480 | { text: 'Tijd', datafield: 'm_time', width: 90, align: 'right', |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1481 | cellsrenderer: function(index, datafield, value, defaultvalue, column, rowdata) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1482 | var duration = ''; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1483 | if (rowdata.m_use_use == 2) // Boil |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1484 | duration = dataAdapter.formatNumber(value, 'f0') + ' min.'; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1485 | else if ((rowdata.m_use_use == 3) || (rowdata.m_use_use == 4)) // Primary or Secondary |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1486 | duration = dataAdapter.formatNumber(value / 1440, 'f0') + ' dagen'; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1487 | return '<span style="margin: 4px; margin-top: 6px; float: right;">' + duration + '</span>'; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1488 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1489 | }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1490 | { text: 'Hoeveel', datafield: 'm_amount', width: 110, align: 'right', |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1491 | cellsrenderer: function(index, datafield, value, defaultvalue, column, rowdata) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1492 | var vstr = rowdata.m_amount_is_weight ? 'gr' : 'ml'; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1493 | return '<span style="margin: 4px; margin-top: 6px; float: right;">' + |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1494 | dataAdapter.formatNumber(value * 1000, 'f2') + ' ' + vstr + '</span>'; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1495 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1496 | }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1497 | { text: 'Voorraad', datafield: 'm_inventory', width: 110, align: 'right', |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1498 | cellsrenderer: function(index, datafield, value, defaultvalue, column, rowdata) { |
756
b702c25661e7
Removed unnecesary code. Use existing array data instead of grid calls where possible.
Michiel Broek <mbroek@mbse.eu>
parents:
735
diff
changeset
|
1499 | var vstr = rowdata.m_amount_is_weight ? 'gr' : 'ml', |
b702c25661e7
Removed unnecesary code. Use existing array data instead of grid calls where possible.
Michiel Broek <mbroek@mbse.eu>
parents:
735
diff
changeset
|
1500 | color = (value < rowdata.m_amount) ? '#ff4040':'#ffffff', |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1501 | amount = dataAdapter.formatNumber(value * 1000, 'f2') + ' ' + vstr; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1502 | return '<span style="margin: 4px; margin-top: 6px; float: right; color: ' + color + ';">' + amount + '</span>'; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1503 | }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1504 | }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1505 | { text: '', datafield: 'Edit', columntype: 'button', width: 100, align: 'center', |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1506 | cellsrenderer: function() { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1507 | return 'Wijzig'; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1508 | }, buttonclick: function(row) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1509 | miscRow = row; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1510 | miscData = $('#miscGrid').jqxGrid('getrowdata', miscRow); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1511 | if (miscData.m_type == 4) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1512 | alert('Brouwzouten wijzigen in de water tab.'); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1513 | } else { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1514 | if (miscData.m_amount_is_weight) |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1515 | $('#wm_pmpt_amount').html('Gewicht gram:'); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1516 | else |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1517 | $('#wm_pmpt_amount').html('Volume ml:'); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1518 | $('#wm_name').val(miscData.m_name); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1519 | $('#wm_amount').val(miscData.m_amount * 1000); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1520 | if ((miscData.m_use_use == 3) || (miscData.m_use_use == 4)) // Primary or Secondary |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1521 | $('#wm_time').val(miscData.m_time / 1440); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1522 | else |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1523 | $('#wm_time').val(miscData.m_time); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1524 | $('#wm_use_use').val(miscData.m_use_use); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1525 | // show the popup window. |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1526 | $('#popupMisc').jqxWindow('open'); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1527 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1528 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1529 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1530 | ] |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1531 | }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1532 | }; |
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
|
1533 | |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1534 | // Inline yeasts editor |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1535 | var editYeast = function(data) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1536 | var yeastSource = { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1537 | localdata: data.yeasts, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1538 | datafields: [ |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1539 | { name: 'y_name', type: 'string' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1540 | { name: 'y_laboratory', type: 'string' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1541 | { name: 'y_product_id', type: 'string' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1542 | { name: 'y_amount', type: 'float' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1543 | { name: 'y_cost', type: 'float' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1544 | { name: 'y_type', type: 'int' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1545 | { name: 'y_form', type: 'int' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1546 | { name: 'y_flocculation', type: 'int' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1547 | { name: 'y_min_temperature', type: 'float' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1548 | { name: 'y_max_temperature', type: 'float' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1549 | { name: 'y_attenuation', type: 'float' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1550 | { name: 'y_use', type: 'int' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1551 | { name: 'y_cells', type: 'float' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1552 | { name: 'y_tolerance', type: 'float' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1553 | { name: 'y_inventory', type: 'float' }, |
559
10cc2400b5d5
Backported extra yeast fields and the SO4:Cl ratio changes into the recipes editor.
Michiel Broek <mbroek@mbse.eu>
parents:
549
diff
changeset
|
1554 | { name: 'y_sta1', type: 'int' }, |
10cc2400b5d5
Backported extra yeast fields and the SO4:Cl ratio changes into the recipes editor.
Michiel Broek <mbroek@mbse.eu>
parents:
549
diff
changeset
|
1555 | { name: 'y_bacteria', type: 'int' }, |
10cc2400b5d5
Backported extra yeast fields and the SO4:Cl ratio changes into the recipes editor.
Michiel Broek <mbroek@mbse.eu>
parents:
549
diff
changeset
|
1556 | { name: 'y_harvest_top', type: 'int' }, |
10cc2400b5d5
Backported extra yeast fields and the SO4:Cl ratio changes into the recipes editor.
Michiel Broek <mbroek@mbse.eu>
parents:
549
diff
changeset
|
1557 | { name: 'y_harvest_time', type: 'int' }, |
10cc2400b5d5
Backported extra yeast fields and the SO4:Cl ratio changes into the recipes editor.
Michiel Broek <mbroek@mbse.eu>
parents:
549
diff
changeset
|
1558 | { name: 'y_pitch_temperature', type: 'float' }, |
10cc2400b5d5
Backported extra yeast fields and the SO4:Cl ratio changes into the recipes editor.
Michiel Broek <mbroek@mbse.eu>
parents:
549
diff
changeset
|
1559 | { name: 'y_pofpos', type: 'int' }, |
10cc2400b5d5
Backported extra yeast fields and the SO4:Cl ratio changes into the recipes editor.
Michiel Broek <mbroek@mbse.eu>
parents:
549
diff
changeset
|
1560 | { name: 'y_zymocide', type: 'int' }, |
735
23d972f5d784
Added new dry-yeast parameters to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
710
diff
changeset
|
1561 | { name: 'y_gr_hl_lo', type: 'int' }, |
23d972f5d784
Added new dry-yeast parameters to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
710
diff
changeset
|
1562 | { name: 'y_sg_lo', type: 'float' }, |
23d972f5d784
Added new dry-yeast parameters to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
710
diff
changeset
|
1563 | { name: 'y_gr_hl_hi', type: 'int' }, |
23d972f5d784
Added new dry-yeast parameters to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
710
diff
changeset
|
1564 | { name: 'y_sg_hi', type: 'float' }, |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1565 | { name: 'y_avail', type: 'int' } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1566 | ], |
648 | 1567 | addrow: function(rowid, rowdata, position, commit) { commit(true); }, |
1568 | deleterow: function(rowid, commit) { commit(true); }, | |
1569 | updaterow: function(rowid, rowdata, commit) { commit(true); } | |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1570 | }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1571 | yeastAdapter = new $.jqx.dataAdapter(yeastSource); |
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
|
1572 | |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1573 | $('#yeastGrid').jqxGrid({ |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1574 | width: 1240, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1575 | height: 350, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1576 | source: yeastAdapter, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1577 | theme: theme, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1578 | selectionmode: 'singlerow', |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1579 | showtoolbar: true, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1580 | rendertoolbar: function(toolbar) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1581 | var container = $('<div style="overflow: hidden; position: relative; margin: 5px;"></div>'); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1582 | toolbar.append(container); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1583 | container.append('<div style="float: left; margin-left: 165px;" id="yaddrowbutton"></div>'); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1584 | container.append('<div style="float: left; margin-left: 10px; margin-top: 5px;">In voorraad:</div>'); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1585 | container.append('<div style="float: left; margin-left: 10px;" id="yinstockbutton"></div>'); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1586 | container.append('<input style="float: left; margin-left: 400px;" id="ydeleterowbutton" type="button" value="Verwijder gist" />'); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1587 | // add yeast from dropdownlist. |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1588 | $('#yaddrowbutton').jqxDropDownList({ |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1589 | placeHolder: 'Kies gist:', |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1590 | theme: theme, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1591 | source: yeastlist, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1592 | template: 'primary', |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1593 | displayMember: 'name', |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1594 | width: 150, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1595 | height: 27, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1596 | dropDownWidth: 500, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1597 | dropDownHeight: 500, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1598 | renderer: function(index, label, value) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1599 | var datarecord = yeastlist.records[index]; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1600 | return datarecord.laboratory + ' ' + datarecord.product_id + ' ' + datarecord.name; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1601 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1602 | }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1603 | $('#yaddrowbutton').on('select', function(event) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1604 | if (event.args) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1605 | var datarecord, row = {}, index = event.args.index; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1606 | datarecord = yeastlist.records[index]; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1607 | row['y_name'] = datarecord.name; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1608 | row['y_laboratory'] = datarecord.laboratory; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1609 | row['y_product_id'] = datarecord.product_id; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1610 | row['y_type'] = datarecord.type; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1611 | row['y_form'] = datarecord.form; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1612 | row['y_amount'] = 0; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1613 | row['y_cost'] = datarecord.cost; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1614 | row['y_use'] = 0; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1615 | row['y_min_temperature'] = datarecord.min_temperature; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1616 | row['y_max_temperature'] = datarecord.max_temperature; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1617 | row['y_attenuation'] = datarecord.attenuation; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1618 | row['y_flocculation'] = datarecord.flocculation; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1619 | row['y_cells'] = datarecord.cells; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1620 | row['y_tolerance'] = datarecord.tolerance; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1621 | row['y_inventory'] = datarecord.inventory; |
559
10cc2400b5d5
Backported extra yeast fields and the SO4:Cl ratio changes into the recipes editor.
Michiel Broek <mbroek@mbse.eu>
parents:
549
diff
changeset
|
1622 | row['y_sta1'] = datarecord.sta1; |
10cc2400b5d5
Backported extra yeast fields and the SO4:Cl ratio changes into the recipes editor.
Michiel Broek <mbroek@mbse.eu>
parents:
549
diff
changeset
|
1623 | row['y_bacteria'] = datarecord.bacteria; |
10cc2400b5d5
Backported extra yeast fields and the SO4:Cl ratio changes into the recipes editor.
Michiel Broek <mbroek@mbse.eu>
parents:
549
diff
changeset
|
1624 | row['y_harvest_top'] = datarecord.harvest_top; |
10cc2400b5d5
Backported extra yeast fields and the SO4:Cl ratio changes into the recipes editor.
Michiel Broek <mbroek@mbse.eu>
parents:
549
diff
changeset
|
1625 | row['y_harvest_time'] = datarecord.harvest_time; |
10cc2400b5d5
Backported extra yeast fields and the SO4:Cl ratio changes into the recipes editor.
Michiel Broek <mbroek@mbse.eu>
parents:
549
diff
changeset
|
1626 | row['y_pitch_temperature'] = datarecord.pitch_temperature; |
10cc2400b5d5
Backported extra yeast fields and the SO4:Cl ratio changes into the recipes editor.
Michiel Broek <mbroek@mbse.eu>
parents:
549
diff
changeset
|
1627 | row['y_pofpos'] = datarecord.pofpos; |
10cc2400b5d5
Backported extra yeast fields and the SO4:Cl ratio changes into the recipes editor.
Michiel Broek <mbroek@mbse.eu>
parents:
549
diff
changeset
|
1628 | row['y_zymocide'] = datarecord.zymocide; |
735
23d972f5d784
Added new dry-yeast parameters to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
710
diff
changeset
|
1629 | row['y_gr_hl_lo'] = datarecord.gr_hl_lo; |
23d972f5d784
Added new dry-yeast parameters to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
710
diff
changeset
|
1630 | row['y_sg_lo'] = datarecord.sg_lo; |
23d972f5d784
Added new dry-yeast parameters to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
710
diff
changeset
|
1631 | row['y_gr_hl_hi'] = datarecord.gr_hl_hi; |
23d972f5d784
Added new dry-yeast parameters to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
710
diff
changeset
|
1632 | row['y_sg_hi'] = datarecord.sg_hi; |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1633 | $('#yeastGrid').jqxGrid('addrow', null, row); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1634 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1635 | $('#yaddrowbutton').jqxDropDownList('clearSelection'); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1636 | }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1637 | $('#yinstockbutton').jqxCheckBox({ theme: theme, height: 27, disabled: (dataRecord.stage > 3) }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1638 | $('#yinstockbutton').on('change', function(event) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1639 | yeastinstock = event.args.checked; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1640 | yeastlist.dataBind(); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1641 | }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1642 | // delete selected yeast. |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1643 | $('#ydeleterowbutton').jqxButton({ template: 'danger', theme: theme, height: 27, width: 150, disabled: (dataRecord.stage > 3) }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1644 | $('#ydeleterowbutton').on('click', function() { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1645 | var id, rowscount, selectedrowindex = $('#yeastGrid').jqxGrid('getselectedrowindex'); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1646 | rowscount = $('#yeastGrid').jqxGrid('getdatainformation').rowscount; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1647 | if (selectedrowindex >= 0 && selectedrowindex < rowscount) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1648 | id = $('#yeastGrid').jqxGrid('getrowid', selectedrowindex); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1649 | $('#yeastGrid').jqxGrid('deleterow', id); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1650 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1651 | }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1652 | }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1653 | ready: function() { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1654 | calcFermentables(); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1655 | $('#jqxTabs').jqxTabs('next'); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1656 | }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1657 | columns: [ |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1658 | { text: 'Gist', datafield: 'y_name' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1659 | { text: 'Laboratorium', width: 150, datafield: 'y_laboratory' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1660 | { text: 'Code', width: 90, datafield: 'y_product_id' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1661 | { text: 'Soort', width: 100, datafield: 'y_form', |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1662 | cellsrenderer: function(index, datafield, value, defaultvalue, column, rowdata) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1663 | return '<span style="margin: 4px; margin-top: 6px; float: left;">' + YeastFormData[value].nl + '</span>'; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1664 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1665 | }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1666 | { text: 'Min. °C', width: 70, align: 'right', cellsalign: 'right', datafield: 'y_min_temperature' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1667 | { text: 'Max. °C', width: 70, align: 'right', cellsalign: 'right', datafield: 'y_max_temperature' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1668 | { text: 'Tol. %', width: 60, align: 'right', cellsalign: 'right', datafield: 'y_tolerance', |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1669 | cellsrenderer: function(index, datafield, value, defaultvalue, column, rowdata) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1670 | var amount = '', color = '#ffffff'; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1671 | if (value > 0) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1672 | amount = dataAdapter.formatNumber(value, 'f1'); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1673 | if (dataRecord.est_abv > value) |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1674 | color = '#ff4040'; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1675 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1676 | return '<span style="margin: 4px; margin-top: 6px; float: right; color: ' + color + ';">' + amount + '</span>'; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1677 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1678 | }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1679 | { text: 'Attn. %', width: 70, align: 'right', cellsalign: 'right', datafield: 'y_attenuation', cellsformat: 'f1' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1680 | { text: 'Voor', width: 120, datafield: 'y_use', |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1681 | cellsrenderer: function(index, datafield, value, defaultvalue, column, rowdata) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1682 | return '<span style="margin: 4px; margin-top: 6px; float: left;">' + YeastUseData[value].nl + '</span>'; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1683 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1684 | }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1685 | { text: 'Hoeveel', datafield: 'y_amount', width: 90, align: 'right', |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1686 | cellsrenderer: function(index, datafield, value, defaultvalue, column, rowdata) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1687 | var amount = dataAdapter.formatNumber(value * 1000, 'f0') + ' ml'; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1688 | if (rowdata.y_form == 0) // Liquid |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1689 | amount = dataAdapter.formatNumber(value, 'f0') + ' pk'; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1690 | else if (rowdata.y_form == 1) // Dry |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1691 | amount = dataAdapter.formatNumber(value * 1000, 'f1') + ' gr'; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1692 | return '<span style="margin: 4px; margin-top: 6px; float: right;">' + amount + '</span>'; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1693 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1694 | }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1695 | { text: 'Voorraad', datafield: 'y_inventory', width: 90, align: 'right', |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1696 | cellsrenderer: function(index, datafield, value, defaultvalue, column, rowdata) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1697 | var color, amount; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1698 | color = '#ffffff'; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1699 | if (value < rowdata.y_amount) |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1700 | color = '#ff4040'; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1701 | amount = dataAdapter.formatNumber(value * 1000, 'f0') + ' ml'; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1702 | if (rowdata.y_form == 0) // Liquid |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1703 | amount = dataAdapter.formatNumber(value, 'f0') + ' pk'; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1704 | else if (rowdata.y_form == 1) // Dry |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1705 | amount = dataAdapter.formatNumber(value * 1000, 'f1') + ' gr'; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1706 | return '<span style="margin: 4px; margin-top: 6px; float: right; color: ' + color + ';">' + amount + '</span>'; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1707 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1708 | }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1709 | { text: '', datafield: 'Edit', columntype: 'button', width: 90, align: 'center', |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1710 | cellsrenderer: function() { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1711 | return 'Wijzig'; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1712 | }, buttonclick: function(row) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1713 | yeastRow = row; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1714 | yeastData = $('#yeastGrid').jqxGrid('getrowdata', yeastRow); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1715 | if (yeastData.y_form == 0) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1716 | $('#wy_pmpt_amount').html('Pak(ken):'); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1717 | $('#wy_amount').val(yeastData.y_amount); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1718 | $('#wy_amount').jqxNumberInput({ decimalDigits: 0 }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1719 | } else if (yeastData.y_form == 1) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1720 | $('#wy_pmpt_amount').html('Gewicht gram:'); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1721 | $('#wy_amount').val(yeastData.y_amount * 1000); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1722 | $('#wy_amount').jqxNumberInput({ decimalDigits: 1 }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1723 | } else { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1724 | $('#wy_pmpt_amount').html('Volume ml:'); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1725 | $('#wy_amount').val(yeastData.y_amount * 1000); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1726 | $('#wy_amount').jqxNumberInput({ decimalDigits: 0 }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1727 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1728 | $('#wy_name').val(yeastData.y_name); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1729 | $('#wy_laboratory').val(yeastData.y_laboratory); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1730 | $('#wy_product_id').val(yeastData.y_product_id); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1731 | $('#wy_use').val(yeastData.y_use); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1732 | // show the popup window. |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1733 | $('#popupYeast').jqxWindow('open'); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1734 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1735 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1736 | ] |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1737 | }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1738 | }; |
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
|
1739 | |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1740 | // inline mash editor |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1741 | var editMash = function(data) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1742 | var mashSource = { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1743 | localdata: data.mashs, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1744 | datafields: [ |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1745 | { name: 'step_name', type: 'string' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1746 | { name: 'step_type', type: 'int' }, |
667
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
1747 | { name: 'step_volume', type: 'float' }, |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1748 | { name: 'step_infuse_amount', type: 'float' }, |
667
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
1749 | { name: 'step_infuse_temp', type: 'float' }, |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1750 | { name: 'step_temp', type: 'float' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1751 | { name: 'step_time', type: 'float' }, |
667
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
1752 | { name: 'step_wg_ratio', type: 'float' }, |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1753 | { name: 'ramp_time', type: 'float' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1754 | { name: 'end_temp', type: 'float' } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1755 | ], |
667
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
1756 | addrow: function(rowid, rowdata, position, commit) { commit(true); }, |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
1757 | deleterow: function(rowid, commit) { commit(true); } |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1758 | }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1759 | mashAdapter = new $.jqx.dataAdapter(mashSource, { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1760 | beforeLoadComplete: function(records) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1761 | mash_infuse = 0; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1762 | var row, i, data = new Array(); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1763 | for (i = 0; i < records.length; i++) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1764 | row = records[i]; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1765 | if (row.step_type == 0) // Infusion |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1766 | mash_infuse += parseFloat(row.step_infuse_amount); |
667
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
1767 | row.step_wg_ratio = 0; // Init this field. |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1768 | data.push(row); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1769 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1770 | }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1771 | }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1772 | $('#mashGrid').jqxGrid({ |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1773 | width: 1240, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1774 | height: 400, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1775 | source: mashAdapter, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1776 | theme: theme, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1777 | selectionmode: 'singlerow', |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1778 | showtoolbar: true, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1779 | rendertoolbar: function(toolbar) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1780 | //var me = this; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1781 | var container = $('<div style="overflow: hidden; position: relative; margin: 5px;"></div>'); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1782 | toolbar.append(container); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1783 | container.append('<input style="float: left; margin-left: 165px;" id="saddrowbutton" type="button" value="Nieuwe stap" />'); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1784 | container.append('<input style="float: left; margin-left: 565px;" id="sdeleterowbutton" type="button" value="Verwijder stap" />'); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1785 | $('#saddrowbutton').jqxButton({ template: 'primary', theme: theme, height: 27, width: 150 }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1786 | $('#saddrowbutton').on('click', function() { |
667
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
1787 | var row = {}, rowscount = $('#mashGrid').jqxGrid('getdatainformation').rowscount; |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
1788 | row['step_name'] = 'Stap ' + (rowscount + 1); |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
1789 | if (rowscount > 0) { |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
1790 | row['step_type'] = 1; |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
1791 | row['step_infuse_amount'] = 0; |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
1792 | row['step_volume'] = mash_infuse; |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
1793 | } else { |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
1794 | row['step_type'] = 0; |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
1795 | row['step_infuse_amount'] = 15; |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
1796 | row['step_volume'] = 15; |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
1797 | } |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
1798 | row['step_infuse_temp'] = 0; |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
1799 | row['step_temp'] = 62.0; |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
1800 | row['step_time'] = 20.0; |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
1801 | row['step_wg_ratio'] = 0; |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
1802 | row['ramp_time'] = 1.0; |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
1803 | row['end_temp'] = 62.0; |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1804 | $('#mashGrid').jqxGrid('addrow', null, datarow); |
667
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
1805 | calcMash(); |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1806 | }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1807 | // delete selected yeast. |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1808 | $('#sdeleterowbutton').jqxButton({ template: 'danger', theme: theme, height: 27, width: 150 }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1809 | $('#sdeleterowbutton').on('click', function() { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1810 | var id, rowscount, selectedrowindex = $('#mashGrid').jqxGrid('getselectedrowindex'); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1811 | rowscount = $('#mashGrid').jqxGrid('getdatainformation').rowscount; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1812 | if (selectedrowindex >= 0 && selectedrowindex < rowscount) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1813 | id = $('#mashGrid').jqxGrid('getrowid', selectedrowindex); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1814 | $('#mashGrid').jqxGrid('deleterow', id); |
667
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
1815 | calcMash(); |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1816 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1817 | }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1818 | }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1819 | ready: function() { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1820 | calcFermentables(); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1821 | calcInit(); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1822 | calcMash(); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1823 | $('#jqxLoader').jqxLoader('close'); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1824 | $('#jqxTabs').jqxTabs('first'); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1825 | }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1826 | columns: [ |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1827 | { text: 'Stap naam', datafield: 'step_name' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1828 | { text: 'Stap type', datafield: 'step_type', width: 175, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1829 | cellsrenderer: function(index, datafield, value, defaultvalue, column, rowdata) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1830 | return '<div style="margin: 4px;">' + MashStepTypeData[value].nl + '</div>'; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1831 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1832 | }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1833 | { text: 'Start °C', datafield: 'step_temp', width: 90, align: 'right', cellsalign: 'right', cellsformat: 'f1' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1834 | { text: 'Eind °C', datafield: 'end_temp', width: 90, align: 'right', cellsalign: 'right', cellsformat: 'f1' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1835 | { text: 'Rust min.', datafield: 'step_time', width: 90, align: 'right', cellsalign: 'right' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1836 | { text: 'Stap min.', datafield: 'ramp_time', width: 90, align: 'right', cellsalign: 'right' }, |
667
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
1837 | { text: 'Inf/dec L.', datafield: 'step_infuse_amount', width: 90, align: 'right', |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
1838 | cellsrenderer: function(row, columnfield, value, defaulthtml, columnproperties, rowdata) { |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
1839 | if (rowdata.step_type == 1) |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
1840 | return '<span></span>'; |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
1841 | return '<span style="margin: 4px; margin-top: 6px; float: right;">' + dataAdapter.formatNumber(value, 'f1') + '</span>'; |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
1842 | } |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
1843 | }, |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
1844 | { text: 'Inf/dec °C', datafield: 'step_infuse_temp', width: 90, align: 'right', |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
1845 | cellsrenderer: function(row, columnfield, value, defaulthtml, columnproperties, rowdata) { |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
1846 | if (rowdata.step_type == 1) |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
1847 | return '<span></span>'; |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
1848 | return '<span style="margin: 4px; margin-top: 6px; float: right;">' + dataAdapter.formatNumber(value, 'f2') + '</span>'; |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
1849 | } |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
1850 | }, |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
1851 | { text: 'L/Kg.', datafield: 'step_wg_ratio', width: 90, align: 'right', |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
1852 | cellsrenderer: function(row, columnfield, value, defaulthtml, columnproperties, rowdata) { |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
1853 | var color = '#ffffff'; |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
1854 | if (value < 2.0 || value > 6.0) |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
1855 | color = '#ff4040'; |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
1856 | return '<span style="margin: 4px; margin-top: 6px; float: right; color: ' + color + ';">' + dataAdapter.formatNumber(value, 'f2') + '</span>'; |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
1857 | } |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
1858 | }, |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
1859 | { text: '', columntype: 'button', width: 15, align: 'center', |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
1860 | cellsrenderer: function(row) { |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
1861 | if (row < 2) |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
1862 | return ' '; |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
1863 | return '▴'; |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
1864 | }, buttonclick: function(row) { |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
1865 | if (row >= 2) { |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
1866 | swapMash(row, row-1); |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
1867 | } |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
1868 | } |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
1869 | }, |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
1870 | { text: '', columntype: 'button', width: 15, align: 'center', |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
1871 | cellsrenderer: function(row) { |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
1872 | rowscount = $('#mashGrid').jqxGrid('getdatainformation').rowscount; |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
1873 | if (row < 1 || row > (rowscount -2)) |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
1874 | return ' '; |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
1875 | return '▾'; |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
1876 | }, buttonclick: function(row) { |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
1877 | rowscount = $('#mashGrid').jqxGrid('getdatainformation').rowscount; |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
1878 | if (row >= 1 && row <= (rowscount -2)) { |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
1879 | swapMash(row, row+1); |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
1880 | } |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
1881 | } |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
1882 | }, |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
1883 | { text: '', datafield: 'Edit', columntype: 'button', width: 80, align: 'center', |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1884 | cellsrenderer: function() { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1885 | return 'Wijzig'; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1886 | }, buttonclick: function(row) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1887 | mashRow = row; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1888 | mashData = $('#mashGrid').jqxGrid('getrowdata', mashRow); |
667
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
1889 | if (mashRow == 0) |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
1890 | $("#wstep_type").jqxDropDownList('disableAt', 2); |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
1891 | else |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
1892 | $("#wstep_type").jqxDropDownList('enableAt', 2); |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1893 | $('#wstep_name').val(mashData.step_name); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1894 | $('#wstep_type').val(mashData.step_type); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1895 | $('#wstep_infuse_amount').val(mashData.step_infuse_amount); |
667
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
1896 | $('#wstep_infuse_temp').val(mashData.step_infuse_temp); |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1897 | $('#wstep_temp').val(mashData.step_temp); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1898 | $('#wend_temp').val(mashData.end_temp); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1899 | $('#wstep_time').val(mashData.step_time); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1900 | $('#wramp_time').val(mashData.ramp_time); |
667
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
1901 | $('#wstep_infuse_amount').hide(); // Hide all untile we need it. |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
1902 | $('#wstep_infuse_temp').hide(); |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
1903 | $('#wstep_pmpt_amount').hide(); |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
1904 | $('#wstep_pmpt_temp').hide(); |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1905 | if (mashData.step_type == 0) { |
667
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
1906 | if (mashRow == 0) { |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
1907 | $('#wstep_infuse_amount').show(); |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
1908 | $('#wstep_pmpt_amount').show(); |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
1909 | } else { |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
1910 | $('#wstep_infuse_temp').show(); |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
1911 | $('#wstep_pmpt_temp').show(); |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
1912 | } |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1913 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1914 | // show the popup window. |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1915 | $('#popupMash').jqxWindow('open'); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1916 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1917 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1918 | ] |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1919 | }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1920 | }; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1921 | |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1922 | |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1923 | |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1924 | |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1925 | /* |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1926 | * Remove the top menu so that we MUST use the buttons to leave the editor. |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1927 | */ |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1928 | $('#jqxMenu').jqxMenu('destroy'); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1929 | |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1930 | console.log('record:' + my_record + ' return:' + my_return + ' theme:' + theme); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1931 | $('#jqxLoader').jqxLoader({ |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1932 | width: 250, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1933 | height: 150, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1934 | isModal: true, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1935 | text: 'Laden recept ...', |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1936 | theme: theme |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1937 | }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1938 | |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1939 | function setWaterAgent(name, amount) { |
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
|
1940 | |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1941 | var record, records, miscs, i, id, row, found = false, rows = $('#miscGrid').jqxGrid('getrows'); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1942 | if (amount == 0) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1943 | for (i = 0; i < rows.length; i++) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1944 | row = rows[i]; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1945 | if (row.m_name == name) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1946 | id = $('#miscGrid').jqxGrid('getrowid', i); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1947 | $('#miscGrid').jqxGrid('deleterow', id); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1948 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1949 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1950 | } else { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1951 | for (i = 0; i < rows.length; i++) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1952 | row = rows[i]; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1953 | if (row.m_name == name) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1954 | found = true; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1955 | $('#miscGrid').jqxGrid('setcellvalue', i, 'm_amount', amount / 1000); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1956 | break; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1957 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1958 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1959 | if (! found) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1960 | miscs = new $.jqx.dataAdapter(miscInvSource, { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1961 | loadComplete: function() { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1962 | records = miscs.records; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1963 | for (i = 0; i < records.length; i++) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1964 | record = records[i]; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1965 | if (record.name == name) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1966 | row = {}; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1967 | row['m_name'] = record.name; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1968 | row['m_amount'] = amount / 1000; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1969 | row['m_cost'] = record.cost; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1970 | row['m_type'] = record.type; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1971 | row['m_use_use'] = record.use_use; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1972 | row['m_time'] = 0; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1973 | row['m_amount_is_weight'] = record.amount_is_weight; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1974 | row['m_inventory'] = record.inventory; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1975 | row['m_avail'] = 1; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1976 | $('#miscGrid').jqxGrid('addrow', null, row); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1977 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1978 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1979 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1980 | }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1981 | miscs.dataBind(); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1982 | return; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1983 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1984 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1985 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1986 | |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1987 | |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1988 | // Procedure TFrmWaterAdjustment.CalcWater2; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1989 | function calcWater() { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1990 | |
643
9ac2fb6b1311
Added failsave starting calcWater() when the main data is not yet loaded.
Michiel Broek <mbroek@mbse.eu>
parents:
642
diff
changeset
|
1991 | if (! data_loaded) { |
648 | 1992 | console.log('calcWater(): failsave'); |
643
9ac2fb6b1311
Added failsave starting calcWater() when the main data is not yet loaded.
Michiel Broek <mbroek@mbse.eu>
parents:
642
diff
changeset
|
1993 | return; |
9ac2fb6b1311
Added failsave starting calcWater() when the main data is not yet loaded.
Michiel Broek <mbroek@mbse.eu>
parents:
642
diff
changeset
|
1994 | } |
9ac2fb6b1311
Added failsave starting calcWater() when the main data is not yet loaded.
Michiel Broek <mbroek@mbse.eu>
parents:
642
diff
changeset
|
1995 | |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1996 | var liters = 0, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1997 | calcium = 0, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1998 | magnesium = 0, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
1999 | sodium = 0, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2000 | total_alkalinity = 0, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2001 | bicarbonate = 0, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2002 | chloride = 0, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2003 | sulfate = 0, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2004 | ph = 0, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2005 | RA = 0, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2006 | frac = 0, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2007 | TpH = 0, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2008 | protonDeficit = 0, |
662
4bb005694ce7
Version 0.3.32 Inventory water and profile water edit screens updated and added ion balance fields. Moved acid specs to global.js. In prod_edit and rec_edit changed the water calculations, eliminated the double percentage calculation. The pH values in the water tab have now 2 decimal digits. The mash pH field is only shown in auto calculate mode. The calculated acid addition results are now a bit better and compare with several famous spreadsheets.
Michiel Broek <mbroek@mbse.eu>
parents:
660
diff
changeset
|
2009 | AT, BT, |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2010 | r1d, r2d, f1d, f2d, f3d, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2011 | deltapH, deltapd, pd, n, |
662
4bb005694ce7
Version 0.3.32 Inventory water and profile water edit screens updated and added ion balance fields. Moved acid specs to global.js. In prod_edit and rec_edit changed the water calculations, eliminated the double percentage calculation. The pH values in the water tab have now 2 decimal digits. The mash pH field is only shown in auto calculate mode. The calculated acid addition results are now a bit better and compare with several famous spreadsheets.
Michiel Broek <mbroek@mbse.eu>
parents:
660
diff
changeset
|
2012 | Res; |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2013 | |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2014 | if (dataRecord.w1_name == '') { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2015 | return; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2016 | } |
271
af0270694d1e
Save data before printing or export to beerxml
Michiel Broek <mbroek@mbse.eu>
parents:
267
diff
changeset
|
2017 | |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2018 | // If there is a dillute water source, mix the waters. |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2019 | if (dataRecord.w2_name != '') { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2020 | liters = dataRecord.w1_amount + dataRecord.w2_amount; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2021 | calcium = mix(dataRecord.w1_amount, dataRecord.w2_amount, dataRecord.w1_calcium, dataRecord.w2_calcium); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2022 | magnesium = mix(dataRecord.w1_amount, dataRecord.w2_amount, dataRecord.w1_magnesium, dataRecord.w2_magnesium); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2023 | sodium = mix(dataRecord.w1_amount, dataRecord.w2_amount, dataRecord.w1_sodium, dataRecord.w2_sodium); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2024 | chloride = mix(dataRecord.w1_amount, dataRecord.w2_amount, dataRecord.w1_chloride, dataRecord.w2_chloride); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2025 | sulfate = mix(dataRecord.w1_amount, dataRecord.w2_amount, dataRecord.w1_sulfate, dataRecord.w2_sulfate); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2026 | total_alkalinity = mix(dataRecord.w1_amount, dataRecord.w2_amount, dataRecord.w1_total_alkalinity, dataRecord.w2_total_alkalinity); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2027 | ph = -Math.log10(((Math.pow(10, -dataRecord.w1_ph) * dataRecord.w1_amount) + (Math.pow(10, -dataRecord.w2_ph) * dataRecord.w2_amount)) / liters); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2028 | } else { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2029 | liters = dataRecord.w1_amount; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2030 | calcium = dataRecord.w1_calcium; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2031 | magnesium = dataRecord.w1_magnesium; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2032 | sodium = dataRecord.w1_sodium; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2033 | chloride = dataRecord.w1_chloride; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2034 | sulfate = dataRecord.w1_sulfate; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2035 | total_alkalinity = dataRecord.w1_total_alkalinity; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2036 | ph = dataRecord.w1_ph; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2037 | } |
662
4bb005694ce7
Version 0.3.32 Inventory water and profile water edit screens updated and added ion balance fields. Moved acid specs to global.js. In prod_edit and rec_edit changed the water calculations, eliminated the double percentage calculation. The pH values in the water tab have now 2 decimal digits. The mash pH field is only shown in auto calculate mode. The calculated acid addition results are now a bit better and compare with several famous spreadsheets.
Michiel Broek <mbroek@mbse.eu>
parents:
660
diff
changeset
|
2038 | var bicarbonate = total_alkalinity * 1.22; |
4bb005694ce7
Version 0.3.32 Inventory water and profile water edit screens updated and added ion balance fields. Moved acid specs to global.js. In prod_edit and rec_edit changed the water calculations, eliminated the double percentage calculation. The pH values in the water tab have now 2 decimal digits. The mash pH field is only shown in auto calculate mode. The calculated acid addition results are now a bit better and compare with several famous spreadsheets.
Michiel Broek <mbroek@mbse.eu>
parents:
660
diff
changeset
|
2039 | |
4bb005694ce7
Version 0.3.32 Inventory water and profile water edit screens updated and added ion balance fields. Moved acid specs to global.js. In prod_edit and rec_edit changed the water calculations, eliminated the double percentage calculation. The pH values in the water tab have now 2 decimal digits. The mash pH field is only shown in auto calculate mode. The calculated acid addition results are now a bit better and compare with several famous spreadsheets.
Michiel Broek <mbroek@mbse.eu>
parents:
660
diff
changeset
|
2040 | /* Save mixed water ions for later */ |
4bb005694ce7
Version 0.3.32 Inventory water and profile water edit screens updated and added ion balance fields. Moved acid specs to global.js. In prod_edit and rec_edit changed the water calculations, eliminated the double percentage calculation. The pH values in the water tab have now 2 decimal digits. The mash pH field is only shown in auto calculate mode. The calculated acid addition results are now a bit better and compare with several famous spreadsheets.
Michiel Broek <mbroek@mbse.eu>
parents:
660
diff
changeset
|
2041 | var wg_calcium = calcium; |
4bb005694ce7
Version 0.3.32 Inventory water and profile water edit screens updated and added ion balance fields. Moved acid specs to global.js. In prod_edit and rec_edit changed the water calculations, eliminated the double percentage calculation. The pH values in the water tab have now 2 decimal digits. The mash pH field is only shown in auto calculate mode. The calculated acid addition results are now a bit better and compare with several famous spreadsheets.
Michiel Broek <mbroek@mbse.eu>
parents:
660
diff
changeset
|
2042 | var wg_sodium = sodium; |
4bb005694ce7
Version 0.3.32 Inventory water and profile water edit screens updated and added ion balance fields. Moved acid specs to global.js. In prod_edit and rec_edit changed the water calculations, eliminated the double percentage calculation. The pH values in the water tab have now 2 decimal digits. The mash pH field is only shown in auto calculate mode. The calculated acid addition results are now a bit better and compare with several famous spreadsheets.
Michiel Broek <mbroek@mbse.eu>
parents:
660
diff
changeset
|
2043 | var wg_total_alkalinity = total_alkalinity; |
4bb005694ce7
Version 0.3.32 Inventory water and profile water edit screens updated and added ion balance fields. Moved acid specs to global.js. In prod_edit and rec_edit changed the water calculations, eliminated the double percentage calculation. The pH values in the water tab have now 2 decimal digits. The mash pH field is only shown in auto calculate mode. The calculated acid addition results are now a bit better and compare with several famous spreadsheets.
Michiel Broek <mbroek@mbse.eu>
parents:
660
diff
changeset
|
2044 | var wg_chloride = chloride; |
4bb005694ce7
Version 0.3.32 Inventory water and profile water edit screens updated and added ion balance fields. Moved acid specs to global.js. In prod_edit and rec_edit changed the water calculations, eliminated the double percentage calculation. The pH values in the water tab have now 2 decimal digits. The mash pH field is only shown in auto calculate mode. The calculated acid addition results are now a bit better and compare with several famous spreadsheets.
Michiel Broek <mbroek@mbse.eu>
parents:
660
diff
changeset
|
2045 | var wg_sulfate = sulfate; |
4bb005694ce7
Version 0.3.32 Inventory water and profile water edit screens updated and added ion balance fields. Moved acid specs to global.js. In prod_edit and rec_edit changed the water calculations, eliminated the double percentage calculation. The pH values in the water tab have now 2 decimal digits. The mash pH field is only shown in auto calculate mode. The calculated acid addition results are now a bit better and compare with several famous spreadsheets.
Michiel Broek <mbroek@mbse.eu>
parents:
660
diff
changeset
|
2046 | var wg_bicarbonate = bicarbonate; |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2047 | |
662
4bb005694ce7
Version 0.3.32 Inventory water and profile water edit screens updated and added ion balance fields. Moved acid specs to global.js. In prod_edit and rec_edit changed the water calculations, eliminated the double percentage calculation. The pH values in the water tab have now 2 decimal digits. The mash pH field is only shown in auto calculate mode. The calculated acid addition results are now a bit better and compare with several famous spreadsheets.
Michiel Broek <mbroek@mbse.eu>
parents:
660
diff
changeset
|
2048 | $('#wg_amount').val(liters); |
772
f9d266eb0ec6
In product editor calculate fermentables before the first IBU calculation. In recipe editor changed to the new water calculations like in the product editor.
Michiel Broek <mbroek@mbse.eu>
parents:
756
diff
changeset
|
2049 | $('#wg_calcium').val(Round(calcium, 1)); |
f9d266eb0ec6
In product editor calculate fermentables before the first IBU calculation. In recipe editor changed to the new water calculations like in the product editor.
Michiel Broek <mbroek@mbse.eu>
parents:
756
diff
changeset
|
2050 | $('#wg_magnesium').val(Round(magnesium, 1)); |
f9d266eb0ec6
In product editor calculate fermentables before the first IBU calculation. In recipe editor changed to the new water calculations like in the product editor.
Michiel Broek <mbroek@mbse.eu>
parents:
756
diff
changeset
|
2051 | $('#wg_sodium').val(Round(sodium, 1)); |
f9d266eb0ec6
In product editor calculate fermentables before the first IBU calculation. In recipe editor changed to the new water calculations like in the product editor.
Michiel Broek <mbroek@mbse.eu>
parents:
756
diff
changeset
|
2052 | $('#wg_bicarbonate').val(Round(bicarbonate, 1)); |
f9d266eb0ec6
In product editor calculate fermentables before the first IBU calculation. In recipe editor changed to the new water calculations like in the product editor.
Michiel Broek <mbroek@mbse.eu>
parents:
756
diff
changeset
|
2053 | $('#wg_total_alkalinity').val(Round(total_alkalinity, 1)); |
f9d266eb0ec6
In product editor calculate fermentables before the first IBU calculation. In recipe editor changed to the new water calculations like in the product editor.
Michiel Broek <mbroek@mbse.eu>
parents:
756
diff
changeset
|
2054 | $('#wg_chloride').val(Round(chloride, 1)); |
f9d266eb0ec6
In product editor calculate fermentables before the first IBU calculation. In recipe editor changed to the new water calculations like in the product editor.
Michiel Broek <mbroek@mbse.eu>
parents:
756
diff
changeset
|
2055 | $('#wg_sulfate').val(Round(sulfate, 1)); |
f9d266eb0ec6
In product editor calculate fermentables before the first IBU calculation. In recipe editor changed to the new water calculations like in the product editor.
Michiel Broek <mbroek@mbse.eu>
parents:
756
diff
changeset
|
2056 | $('#wg_ph').val(Round(ph, 2)); |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2057 | |
662
4bb005694ce7
Version 0.3.32 Inventory water and profile water edit screens updated and added ion balance fields. Moved acid specs to global.js. In prod_edit and rec_edit changed the water calculations, eliminated the double percentage calculation. The pH values in the water tab have now 2 decimal digits. The mash pH field is only shown in auto calculate mode. The calculated acid addition results are now a bit better and compare with several famous spreadsheets.
Michiel Broek <mbroek@mbse.eu>
parents:
660
diff
changeset
|
2058 | var mash_ph = Round(MashpH(), 3); |
4bb005694ce7
Version 0.3.32 Inventory water and profile water edit screens updated and added ion balance fields. Moved acid specs to global.js. In prod_edit and rec_edit changed the water calculations, eliminated the double percentage calculation. The pH values in the water tab have now 2 decimal digits. The mash pH field is only shown in auto calculate mode. The calculated acid addition results are now a bit better and compare with several famous spreadsheets.
Michiel Broek <mbroek@mbse.eu>
parents:
660
diff
changeset
|
2059 | console.log('Distilled water mash pH: ' + mash_ph); |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2060 | |
662
4bb005694ce7
Version 0.3.32 Inventory water and profile water edit screens updated and added ion balance fields. Moved acid specs to global.js. In prod_edit and rec_edit changed the water calculations, eliminated the double percentage calculation. The pH values in the water tab have now 2 decimal digits. The mash pH field is only shown in auto calculate mode. The calculated acid addition results are now a bit better and compare with several famous spreadsheets.
Michiel Broek <mbroek@mbse.eu>
parents:
660
diff
changeset
|
2061 | /* Calculate Salt additions */ |
4bb005694ce7
Version 0.3.32 Inventory water and profile water edit screens updated and added ion balance fields. Moved acid specs to global.js. In prod_edit and rec_edit changed the water calculations, eliminated the double percentage calculation. The pH values in the water tab have now 2 decimal digits. The mash pH field is only shown in auto calculate mode. The calculated acid addition results are now a bit better and compare with several famous spreadsheets.
Michiel Broek <mbroek@mbse.eu>
parents:
660
diff
changeset
|
2062 | if (liters > 0) { |
4bb005694ce7
Version 0.3.32 Inventory water and profile water edit screens updated and added ion balance fields. Moved acid specs to global.js. In prod_edit and rec_edit changed the water calculations, eliminated the double percentage calculation. The pH values in the water tab have now 2 decimal digits. The mash pH field is only shown in auto calculate mode. The calculated acid addition results are now a bit better and compare with several famous spreadsheets.
Michiel Broek <mbroek@mbse.eu>
parents:
660
diff
changeset
|
2063 | calcium += (parseFloat($('#wa_cacl2').jqxNumberInput('decimal')) * MMCa / MMCaCl2 * 1000 + |
772
f9d266eb0ec6
In product editor calculate fermentables before the first IBU calculation. In recipe editor changed to the new water calculations like in the product editor.
Michiel Broek <mbroek@mbse.eu>
parents:
756
diff
changeset
|
2064 | parseFloat($('#wa_caso4').jqxNumberInput('decimal')) * MMCa / MMCaSO4 * 1000 + |
f9d266eb0ec6
In product editor calculate fermentables before the first IBU calculation. In recipe editor changed to the new water calculations like in the product editor.
Michiel Broek <mbroek@mbse.eu>
parents:
756
diff
changeset
|
2065 | parseFloat($('#wa_caco3').jqxNumberInput('decimal')) * MMCa / MMCaCO3 * 1000) / liters; |
f9d266eb0ec6
In product editor calculate fermentables before the first IBU calculation. In recipe editor changed to the new water calculations like in the product editor.
Michiel Broek <mbroek@mbse.eu>
parents:
756
diff
changeset
|
2066 | magnesium += (parseFloat($('#wa_mgso4').jqxNumberInput('decimal')) * MMMg / MMMgSO4 * 1000 + |
f9d266eb0ec6
In product editor calculate fermentables before the first IBU calculation. In recipe editor changed to the new water calculations like in the product editor.
Michiel Broek <mbroek@mbse.eu>
parents:
756
diff
changeset
|
2067 | parseFloat($('#wa_mgcl2').jqxNumberInput('decimal')) * MMMg / MMMgCl2 * 1000) / liters; |
662
4bb005694ce7
Version 0.3.32 Inventory water and profile water edit screens updated and added ion balance fields. Moved acid specs to global.js. In prod_edit and rec_edit changed the water calculations, eliminated the double percentage calculation. The pH values in the water tab have now 2 decimal digits. The mash pH field is only shown in auto calculate mode. The calculated acid addition results are now a bit better and compare with several famous spreadsheets.
Michiel Broek <mbroek@mbse.eu>
parents:
660
diff
changeset
|
2068 | sodium += (parseFloat($('#wa_nacl').jqxNumberInput('decimal')) * MMNa / MMNaCl * 1000 + |
772
f9d266eb0ec6
In product editor calculate fermentables before the first IBU calculation. In recipe editor changed to the new water calculations like in the product editor.
Michiel Broek <mbroek@mbse.eu>
parents:
756
diff
changeset
|
2069 | parseFloat($('#wa_nahco3').jqxNumberInput('decimal')) * MMNa / MMNaHCO3 * 1000) / liters; |
662
4bb005694ce7
Version 0.3.32 Inventory water and profile water edit screens updated and added ion balance fields. Moved acid specs to global.js. In prod_edit and rec_edit changed the water calculations, eliminated the double percentage calculation. The pH values in the water tab have now 2 decimal digits. The mash pH field is only shown in auto calculate mode. The calculated acid addition results are now a bit better and compare with several famous spreadsheets.
Michiel Broek <mbroek@mbse.eu>
parents:
660
diff
changeset
|
2070 | sulfate += (parseFloat($('#wa_caso4').jqxNumberInput('decimal')) * MMSO4 / MMCaSO4 * 1000 + |
4bb005694ce7
Version 0.3.32 Inventory water and profile water edit screens updated and added ion balance fields. Moved acid specs to global.js. In prod_edit and rec_edit changed the water calculations, eliminated the double percentage calculation. The pH values in the water tab have now 2 decimal digits. The mash pH field is only shown in auto calculate mode. The calculated acid addition results are now a bit better and compare with several famous spreadsheets.
Michiel Broek <mbroek@mbse.eu>
parents:
660
diff
changeset
|
2071 | parseFloat($('#wa_mgso4').jqxNumberInput('decimal')) * MMSO4 / MMMgSO4 * 1000) / liters; |
4bb005694ce7
Version 0.3.32 Inventory water and profile water edit screens updated and added ion balance fields. Moved acid specs to global.js. In prod_edit and rec_edit changed the water calculations, eliminated the double percentage calculation. The pH values in the water tab have now 2 decimal digits. The mash pH field is only shown in auto calculate mode. The calculated acid addition results are now a bit better and compare with several famous spreadsheets.
Michiel Broek <mbroek@mbse.eu>
parents:
660
diff
changeset
|
2072 | chloride += (2 * parseFloat($('#wa_cacl2').jqxNumberInput('decimal')) * MMCl / MMCaCl2 * 1000 + |
772
f9d266eb0ec6
In product editor calculate fermentables before the first IBU calculation. In recipe editor changed to the new water calculations like in the product editor.
Michiel Broek <mbroek@mbse.eu>
parents:
756
diff
changeset
|
2073 | parseFloat($('#wa_nacl').jqxNumberInput('decimal')) * MMCl / MMNaCl * 1000 + |
f9d266eb0ec6
In product editor calculate fermentables before the first IBU calculation. In recipe editor changed to the new water calculations like in the product editor.
Michiel Broek <mbroek@mbse.eu>
parents:
756
diff
changeset
|
2074 | parseFloat($('#wa_mgcl2').jqxNumberInput('decimal')) * MMCl / MMMgCl2 * 1000) / liters; |
f9d266eb0ec6
In product editor calculate fermentables before the first IBU calculation. In recipe editor changed to the new water calculations like in the product editor.
Michiel Broek <mbroek@mbse.eu>
parents:
756
diff
changeset
|
2075 | bicarbonate += (parseFloat($('#wa_nahco3').jqxNumberInput('decimal')) * MMHCO3 / MMNaHCO3 * 1000 + |
f9d266eb0ec6
In product editor calculate fermentables before the first IBU calculation. In recipe editor changed to the new water calculations like in the product editor.
Michiel Broek <mbroek@mbse.eu>
parents:
756
diff
changeset
|
2076 | parseFloat($('#wa_caco3').jqxNumberInput('decimal')) / 3 * MMHCO3 / MMCaCO3 * 1000) / liters; |
662
4bb005694ce7
Version 0.3.32 Inventory water and profile water edit screens updated and added ion balance fields. Moved acid specs to global.js. In prod_edit and rec_edit changed the water calculations, eliminated the double percentage calculation. The pH values in the water tab have now 2 decimal digits. The mash pH field is only shown in auto calculate mode. The calculated acid addition results are now a bit better and compare with several famous spreadsheets.
Michiel Broek <mbroek@mbse.eu>
parents:
660
diff
changeset
|
2077 | } |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2078 | |
662
4bb005694ce7
Version 0.3.32 Inventory water and profile water edit screens updated and added ion balance fields. Moved acid specs to global.js. In prod_edit and rec_edit changed the water calculations, eliminated the double percentage calculation. The pH values in the water tab have now 2 decimal digits. The mash pH field is only shown in auto calculate mode. The calculated acid addition results are now a bit better and compare with several famous spreadsheets.
Michiel Broek <mbroek@mbse.eu>
parents:
660
diff
changeset
|
2079 | if (dataRecord.wa_acid_name < 0 || dataRecord,wa_acid_name >= AcidTypeData.length) { |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2080 | $('#wa_acid_name').val(0); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2081 | dataRecord.wa_acid_name = 0; |
662
4bb005694ce7
Version 0.3.32 Inventory water and profile water edit screens updated and added ion balance fields. Moved acid specs to global.js. In prod_edit and rec_edit changed the water calculations, eliminated the double percentage calculation. The pH values in the water tab have now 2 decimal digits. The mash pH field is only shown in auto calculate mode. The calculated acid addition results are now a bit better and compare with several famous spreadsheets.
Michiel Broek <mbroek@mbse.eu>
parents:
660
diff
changeset
|
2082 | dataRecord.wa_acid_perc = AcidTypeData[0].AcidPrc; |
4bb005694ce7
Version 0.3.32 Inventory water and profile water edit screens updated and added ion balance fields. Moved acid specs to global.js. In prod_edit and rec_edit changed the water calculations, eliminated the double percentage calculation. The pH values in the water tab have now 2 decimal digits. The mash pH field is only shown in auto calculate mode. The calculated acid addition results are now a bit better and compare with several famous spreadsheets.
Michiel Broek <mbroek@mbse.eu>
parents:
660
diff
changeset
|
2083 | $('#wa_acid_perc').val(AcidTypeData[0].AcidPrc); |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2084 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2085 | if (last_acid == '') |
662
4bb005694ce7
Version 0.3.32 Inventory water and profile water edit screens updated and added ion balance fields. Moved acid specs to global.js. In prod_edit and rec_edit changed the water calculations, eliminated the double percentage calculation. The pH values in the water tab have now 2 decimal digits. The mash pH field is only shown in auto calculate mode. The calculated acid addition results are now a bit better and compare with several famous spreadsheets.
Michiel Broek <mbroek@mbse.eu>
parents:
660
diff
changeset
|
2086 | last_acid = AcidTypeData[dataRecord.wa_acid_name].nl; |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2087 | |
662
4bb005694ce7
Version 0.3.32 Inventory water and profile water edit screens updated and added ion balance fields. Moved acid specs to global.js. In prod_edit and rec_edit changed the water calculations, eliminated the double percentage calculation. The pH values in the water tab have now 2 decimal digits. The mash pH field is only shown in auto calculate mode. The calculated acid addition results are now a bit better and compare with several famous spreadsheets.
Michiel Broek <mbroek@mbse.eu>
parents:
660
diff
changeset
|
2088 | if (parseFloat(dataRecord.wa_acid_perc) == 0) { |
4bb005694ce7
Version 0.3.32 Inventory water and profile water edit screens updated and added ion balance fields. Moved acid specs to global.js. In prod_edit and rec_edit changed the water calculations, eliminated the double percentage calculation. The pH values in the water tab have now 2 decimal digits. The mash pH field is only shown in auto calculate mode. The calculated acid addition results are now a bit better and compare with several famous spreadsheets.
Michiel Broek <mbroek@mbse.eu>
parents:
660
diff
changeset
|
2089 | dataRecord.wa_acid_perc = AcidTypeData[AT].AcidPrc; |
4bb005694ce7
Version 0.3.32 Inventory water and profile water edit screens updated and added ion balance fields. Moved acid specs to global.js. In prod_edit and rec_edit changed the water calculations, eliminated the double percentage calculation. The pH values in the water tab have now 2 decimal digits. The mash pH field is only shown in auto calculate mode. The calculated acid addition results are now a bit better and compare with several famous spreadsheets.
Michiel Broek <mbroek@mbse.eu>
parents:
660
diff
changeset
|
2090 | $('#wa_acid_perc').val(AcidTypeData[AT].AcidPrc); |
4bb005694ce7
Version 0.3.32 Inventory water and profile water edit screens updated and added ion balance fields. Moved acid specs to global.js. In prod_edit and rec_edit changed the water calculations, eliminated the double percentage calculation. The pH values in the water tab have now 2 decimal digits. The mash pH field is only shown in auto calculate mode. The calculated acid addition results are now a bit better and compare with several famous spreadsheets.
Michiel Broek <mbroek@mbse.eu>
parents:
660
diff
changeset
|
2091 | } |
4bb005694ce7
Version 0.3.32 Inventory water and profile water edit screens updated and added ion balance fields. Moved acid specs to global.js. In prod_edit and rec_edit changed the water calculations, eliminated the double percentage calculation. The pH values in the water tab have now 2 decimal digits. The mash pH field is only shown in auto calculate mode. The calculated acid addition results are now a bit better and compare with several famous spreadsheets.
Michiel Broek <mbroek@mbse.eu>
parents:
660
diff
changeset
|
2092 | |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2093 | AT = dataRecord.wa_acid_name; |
150
159d7a89fcef
Better stage detection during product import from brouwhulp. Added tooltips for treated water.
Michiel Broek <mbroek@mbse.eu>
parents:
149
diff
changeset
|
2094 | |
662
4bb005694ce7
Version 0.3.32 Inventory water and profile water edit screens updated and added ion balance fields. Moved acid specs to global.js. In prod_edit and rec_edit changed the water calculations, eliminated the double percentage calculation. The pH values in the water tab have now 2 decimal digits. The mash pH field is only shown in auto calculate mode. The calculated acid addition results are now a bit better and compare with several famous spreadsheets.
Michiel Broek <mbroek@mbse.eu>
parents:
660
diff
changeset
|
2095 | /* Note that the next calculations do not correct the pH change by the added salts. |
4bb005694ce7
Version 0.3.32 Inventory water and profile water edit screens updated and added ion balance fields. Moved acid specs to global.js. In prod_edit and rec_edit changed the water calculations, eliminated the double percentage calculation. The pH values in the water tab have now 2 decimal digits. The mash pH field is only shown in auto calculate mode. The calculated acid addition results are now a bit better and compare with several famous spreadsheets.
Michiel Broek <mbroek@mbse.eu>
parents:
660
diff
changeset
|
2096 | This pH change is at most 0.1 pH and is a minor difference in Acid amount. */ |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2097 | |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2098 | if (dataRecord.calc_acid) { |
662
4bb005694ce7
Version 0.3.32 Inventory water and profile water edit screens updated and added ion balance fields. Moved acid specs to global.js. In prod_edit and rec_edit changed the water calculations, eliminated the double percentage calculation. The pH values in the water tab have now 2 decimal digits. The mash pH field is only shown in auto calculate mode. The calculated acid addition results are now a bit better and compare with several famous spreadsheets.
Michiel Broek <mbroek@mbse.eu>
parents:
660
diff
changeset
|
2099 | $('.c_mashph').show(); |
4bb005694ce7
Version 0.3.32 Inventory water and profile water edit screens updated and added ion balance fields. Moved acid specs to global.js. In prod_edit and rec_edit changed the water calculations, eliminated the double percentage calculation. The pH values in the water tab have now 2 decimal digits. The mash pH field is only shown in auto calculate mode. The calculated acid addition results are now a bit better and compare with several famous spreadsheets.
Michiel Broek <mbroek@mbse.eu>
parents:
660
diff
changeset
|
2100 | /* Auto calculate pH */ |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2101 | TpH = parseFloat(dataRecord.mash_ph); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2102 | protonDeficit = ProtonDeficit(TpH); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2103 | console.log('calc_acid tgt: ' + TpH + ' protonDeficit: ' + protonDeficit); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2104 | if (protonDeficit > 0) { // Add acid |
662
4bb005694ce7
Version 0.3.32 Inventory water and profile water edit screens updated and added ion balance fields. Moved acid specs to global.js. In prod_edit and rec_edit changed the water calculations, eliminated the double percentage calculation. The pH values in the water tab have now 2 decimal digits. The mash pH field is only shown in auto calculate mode. The calculated acid addition results are now a bit better and compare with several famous spreadsheets.
Michiel Broek <mbroek@mbse.eu>
parents:
660
diff
changeset
|
2105 | frac = CalcFrac(TpH, AcidTypeData[AT].pK1, AcidTypeData[AT].pK2, AcidTypeData[AT].pK3); |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2106 | Acid = protonDeficit / frac; |
662
4bb005694ce7
Version 0.3.32 Inventory water and profile water edit screens updated and added ion balance fields. Moved acid specs to global.js. In prod_edit and rec_edit changed the water calculations, eliminated the double percentage calculation. The pH values in the water tab have now 2 decimal digits. The mash pH field is only shown in auto calculate mode. The calculated acid addition results are now a bit better and compare with several famous spreadsheets.
Michiel Broek <mbroek@mbse.eu>
parents:
660
diff
changeset
|
2107 | Acid *= AcidTypeData[AT].MolWt; // mg |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2108 | Acidmg = Acid; |
662
4bb005694ce7
Version 0.3.32 Inventory water and profile water edit screens updated and added ion balance fields. Moved acid specs to global.js. In prod_edit and rec_edit changed the water calculations, eliminated the double percentage calculation. The pH values in the water tab have now 2 decimal digits. The mash pH field is only shown in auto calculate mode. The calculated acid addition results are now a bit better and compare with several famous spreadsheets.
Michiel Broek <mbroek@mbse.eu>
parents:
660
diff
changeset
|
2109 | Acid = Acid / AcidTypeData[AT].AcidSG; // ml |
4bb005694ce7
Version 0.3.32 Inventory water and profile water edit screens updated and added ion balance fields. Moved acid specs to global.js. In prod_edit and rec_edit changed the water calculations, eliminated the double percentage calculation. The pH values in the water tab have now 2 decimal digits. The mash pH field is only shown in auto calculate mode. The calculated acid addition results are now a bit better and compare with several famous spreadsheets.
Michiel Broek <mbroek@mbse.eu>
parents:
660
diff
changeset
|
2110 | Acid = Round(Acid / (parseFloat(dataRecord.wa_acid_perc) / 100), 2); // ml |
4bb005694ce7
Version 0.3.32 Inventory water and profile water edit screens updated and added ion balance fields. Moved acid specs to global.js. In prod_edit and rec_edit changed the water calculations, eliminated the double percentage calculation. The pH values in the water tab have now 2 decimal digits. The mash pH field is only shown in auto calculate mode. The calculated acid addition results are now a bit better and compare with several famous spreadsheets.
Michiel Broek <mbroek@mbse.eu>
parents:
660
diff
changeset
|
2111 | console.log('Mash auto Acid final ml: ' + Acid); |
4bb005694ce7
Version 0.3.32 Inventory water and profile water edit screens updated and added ion balance fields. Moved acid specs to global.js. In prod_edit and rec_edit changed the water calculations, eliminated the double percentage calculation. The pH values in the water tab have now 2 decimal digits. The mash pH field is only shown in auto calculate mode. The calculated acid addition results are now a bit better and compare with several famous spreadsheets.
Michiel Broek <mbroek@mbse.eu>
parents:
660
diff
changeset
|
2112 | $('#wa_acid').val(Acid); |
4bb005694ce7
Version 0.3.32 Inventory water and profile water edit screens updated and added ion balance fields. Moved acid specs to global.js. In prod_edit and rec_edit changed the water calculations, eliminated the double percentage calculation. The pH values in the water tab have now 2 decimal digits. The mash pH field is only shown in auto calculate mode. The calculated acid addition results are now a bit better and compare with several famous spreadsheets.
Michiel Broek <mbroek@mbse.eu>
parents:
660
diff
changeset
|
2113 | setWaterAgent(AcidTypeData[AT].nl, Acid); |
68 | 2114 | |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2115 | bicarbonate = bicarbonate - protonDeficit * frac / liters; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2116 | total_alkalinity = bicarbonate * 50 / 61; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2117 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2118 | ph = TpH; |
662
4bb005694ce7
Version 0.3.32 Inventory water and profile water edit screens updated and added ion balance fields. Moved acid specs to global.js. In prod_edit and rec_edit changed the water calculations, eliminated the double percentage calculation. The pH values in the water tab have now 2 decimal digits. The mash pH field is only shown in auto calculate mode. The calculated acid addition results are now a bit better and compare with several famous spreadsheets.
Michiel Broek <mbroek@mbse.eu>
parents:
660
diff
changeset
|
2119 | $('#wb_ph').val(Round(ph, 2)); |
4bb005694ce7
Version 0.3.32 Inventory water and profile water edit screens updated and added ion balance fields. Moved acid specs to global.js. In prod_edit and rec_edit changed the water calculations, eliminated the double percentage calculation. The pH values in the water tab have now 2 decimal digits. The mash pH field is only shown in auto calculate mode. The calculated acid addition results are now a bit better and compare with several famous spreadsheets.
Michiel Broek <mbroek@mbse.eu>
parents:
660
diff
changeset
|
2120 | $('#est_mash_ph').val(Round(ph, 2)); |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2121 | } else { // Manual |
662
4bb005694ce7
Version 0.3.32 Inventory water and profile water edit screens updated and added ion balance fields. Moved acid specs to global.js. In prod_edit and rec_edit changed the water calculations, eliminated the double percentage calculation. The pH values in the water tab have now 2 decimal digits. The mash pH field is only shown in auto calculate mode. The calculated acid addition results are now a bit better and compare with several famous spreadsheets.
Michiel Broek <mbroek@mbse.eu>
parents:
660
diff
changeset
|
2122 | /* Manual calculate pH */ |
4bb005694ce7
Version 0.3.32 Inventory water and profile water edit screens updated and added ion balance fields. Moved acid specs to global.js. In prod_edit and rec_edit changed the water calculations, eliminated the double percentage calculation. The pH values in the water tab have now 2 decimal digits. The mash pH field is only shown in auto calculate mode. The calculated acid addition results are now a bit better and compare with several famous spreadsheets.
Michiel Broek <mbroek@mbse.eu>
parents:
660
diff
changeset
|
2123 | $('.c_mashph').hide(); |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2124 | console.log('calc_acid no'); |
662
4bb005694ce7
Version 0.3.32 Inventory water and profile water edit screens updated and added ion balance fields. Moved acid specs to global.js. In prod_edit and rec_edit changed the water calculations, eliminated the double percentage calculation. The pH values in the water tab have now 2 decimal digits. The mash pH field is only shown in auto calculate mode. The calculated acid addition results are now a bit better and compare with several famous spreadsheets.
Michiel Broek <mbroek@mbse.eu>
parents:
660
diff
changeset
|
2125 | pHa = Round(ph, 3); // Adjusted water pH |
4bb005694ce7
Version 0.3.32 Inventory water and profile water edit screens updated and added ion balance fields. Moved acid specs to global.js. In prod_edit and rec_edit changed the water calculations, eliminated the double percentage calculation. The pH values in the water tab have now 2 decimal digits. The mash pH field is only shown in auto calculate mode. The calculated acid addition results are now a bit better and compare with several famous spreadsheets.
Michiel Broek <mbroek@mbse.eu>
parents:
660
diff
changeset
|
2126 | // Then calculate the new pH with added acids and malts |
4bb005694ce7
Version 0.3.32 Inventory water and profile water edit screens updated and added ion balance fields. Moved acid specs to global.js. In prod_edit and rec_edit changed the water calculations, eliminated the double percentage calculation. The pH values in the water tab have now 2 decimal digits. The mash pH field is only shown in auto calculate mode. The calculated acid addition results are now a bit better and compare with several famous spreadsheets.
Michiel Broek <mbroek@mbse.eu>
parents:
660
diff
changeset
|
2127 | console.log('Mash pH: ' + pHa); |
4bb005694ce7
Version 0.3.32 Inventory water and profile water edit screens updated and added ion balance fields. Moved acid specs to global.js. In prod_edit and rec_edit changed the water calculations, eliminated the double percentage calculation. The pH values in the water tab have now 2 decimal digits. The mash pH field is only shown in auto calculate mode. The calculated acid addition results are now a bit better and compare with several famous spreadsheets.
Michiel Broek <mbroek@mbse.eu>
parents:
660
diff
changeset
|
2128 | Acid = AcidTypeData[AT].AcidSG * (parseFloat(dataRecord.wa_acid_perc) / 100); // ml |
4bb005694ce7
Version 0.3.32 Inventory water and profile water edit screens updated and added ion balance fields. Moved acid specs to global.js. In prod_edit and rec_edit changed the water calculations, eliminated the double percentage calculation. The pH values in the water tab have now 2 decimal digits. The mash pH field is only shown in auto calculate mode. The calculated acid addition results are now a bit better and compare with several famous spreadsheets.
Michiel Broek <mbroek@mbse.eu>
parents:
660
diff
changeset
|
2129 | Acid *= parseFloat($('#wa_acid').jqxNumberInput('decimal')); |
4bb005694ce7
Version 0.3.32 Inventory water and profile water edit screens updated and added ion balance fields. Moved acid specs to global.js. In prod_edit and rec_edit changed the water calculations, eliminated the double percentage calculation. The pH values in the water tab have now 2 decimal digits. The mash pH field is only shown in auto calculate mode. The calculated acid addition results are now a bit better and compare with several famous spreadsheets.
Michiel Broek <mbroek@mbse.eu>
parents:
660
diff
changeset
|
2130 | Acid /= AcidTypeData[AT].MolWt; // mg |
4bb005694ce7
Version 0.3.32 Inventory water and profile water edit screens updated and added ion balance fields. Moved acid specs to global.js. In prod_edit and rec_edit changed the water calculations, eliminated the double percentage calculation. The pH values in the water tab have now 2 decimal digits. The mash pH field is only shown in auto calculate mode. The calculated acid addition results are now a bit better and compare with several famous spreadsheets.
Michiel Broek <mbroek@mbse.eu>
parents:
660
diff
changeset
|
2131 | Acidmg = Acid; |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2132 | |
662
4bb005694ce7
Version 0.3.32 Inventory water and profile water edit screens updated and added ion balance fields. Moved acid specs to global.js. In prod_edit and rec_edit changed the water calculations, eliminated the double percentage calculation. The pH values in the water tab have now 2 decimal digits. The mash pH field is only shown in auto calculate mode. The calculated acid addition results are now a bit better and compare with several famous spreadsheets.
Michiel Broek <mbroek@mbse.eu>
parents:
660
diff
changeset
|
2133 | //find the pH where the protondeficit = protondeficit by the acid |
4bb005694ce7
Version 0.3.32 Inventory water and profile water edit screens updated and added ion balance fields. Moved acid specs to global.js. In prod_edit and rec_edit changed the water calculations, eliminated the double percentage calculation. The pH values in the water tab have now 2 decimal digits. The mash pH field is only shown in auto calculate mode. The calculated acid addition results are now a bit better and compare with several famous spreadsheets.
Michiel Broek <mbroek@mbse.eu>
parents:
660
diff
changeset
|
2134 | frac = CalcFrac(pHa, AcidTypeData[AT].pK1, AcidTypeData[AT].pK2, AcidTypeData[AT].pK3); |
4bb005694ce7
Version 0.3.32 Inventory water and profile water edit screens updated and added ion balance fields. Moved acid specs to global.js. In prod_edit and rec_edit changed the water calculations, eliminated the double percentage calculation. The pH values in the water tab have now 2 decimal digits. The mash pH field is only shown in auto calculate mode. The calculated acid addition results are now a bit better and compare with several famous spreadsheets.
Michiel Broek <mbroek@mbse.eu>
parents:
660
diff
changeset
|
2135 | protonDeficit = Round(Acid * frac, 3); |
4bb005694ce7
Version 0.3.32 Inventory water and profile water edit screens updated and added ion balance fields. Moved acid specs to global.js. In prod_edit and rec_edit changed the water calculations, eliminated the double percentage calculation. The pH values in the water tab have now 2 decimal digits. The mash pH field is only shown in auto calculate mode. The calculated acid addition results are now a bit better and compare with several famous spreadsheets.
Michiel Broek <mbroek@mbse.eu>
parents:
660
diff
changeset
|
2136 | //console.log('protonDeficit Acid: ' + protonDeficit + ' frac: ' + frac + ' pH: ' + pHa); |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2137 | |
662
4bb005694ce7
Version 0.3.32 Inventory water and profile water edit screens updated and added ion balance fields. Moved acid specs to global.js. In prod_edit and rec_edit changed the water calculations, eliminated the double percentage calculation. The pH values in the water tab have now 2 decimal digits. The mash pH field is only shown in auto calculate mode. The calculated acid addition results are now a bit better and compare with several famous spreadsheets.
Michiel Broek <mbroek@mbse.eu>
parents:
660
diff
changeset
|
2138 | deltapH = 0.001; |
4bb005694ce7
Version 0.3.32 Inventory water and profile water edit screens updated and added ion balance fields. Moved acid specs to global.js. In prod_edit and rec_edit changed the water calculations, eliminated the double percentage calculation. The pH values in the water tab have now 2 decimal digits. The mash pH field is only shown in auto calculate mode. The calculated acid addition results are now a bit better and compare with several famous spreadsheets.
Michiel Broek <mbroek@mbse.eu>
parents:
660
diff
changeset
|
2139 | deltapd = 0.1; |
4bb005694ce7
Version 0.3.32 Inventory water and profile water edit screens updated and added ion balance fields. Moved acid specs to global.js. In prod_edit and rec_edit changed the water calculations, eliminated the double percentage calculation. The pH values in the water tab have now 2 decimal digits. The mash pH field is only shown in auto calculate mode. The calculated acid addition results are now a bit better and compare with several famous spreadsheets.
Michiel Broek <mbroek@mbse.eu>
parents:
660
diff
changeset
|
2140 | pd = Round(ProtonDeficit(pHa), 6); |
4bb005694ce7
Version 0.3.32 Inventory water and profile water edit screens updated and added ion balance fields. Moved acid specs to global.js. In prod_edit and rec_edit changed the water calculations, eliminated the double percentage calculation. The pH values in the water tab have now 2 decimal digits. The mash pH field is only shown in auto calculate mode. The calculated acid addition results are now a bit better and compare with several famous spreadsheets.
Michiel Broek <mbroek@mbse.eu>
parents:
660
diff
changeset
|
2141 | n = 0; |
4bb005694ce7
Version 0.3.32 Inventory water and profile water edit screens updated and added ion balance fields. Moved acid specs to global.js. In prod_edit and rec_edit changed the water calculations, eliminated the double percentage calculation. The pH values in the water tab have now 2 decimal digits. The mash pH field is only shown in auto calculate mode. The calculated acid addition results are now a bit better and compare with several famous spreadsheets.
Michiel Broek <mbroek@mbse.eu>
parents:
660
diff
changeset
|
2142 | while (((pd < (protonDeficit - deltapd)) || (pd > (protonDeficit + deltapd))) && (n < 4000)) { |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2143 | n++; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2144 | if (pd < (protonDeficit - deltapd)) |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2145 | pHa -= deltapH; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2146 | else if (pd > (protonDeficit + deltapd)) |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2147 | pHa += deltapH; |
662
4bb005694ce7
Version 0.3.32 Inventory water and profile water edit screens updated and added ion balance fields. Moved acid specs to global.js. In prod_edit and rec_edit changed the water calculations, eliminated the double percentage calculation. The pH values in the water tab have now 2 decimal digits. The mash pH field is only shown in auto calculate mode. The calculated acid addition results are now a bit better and compare with several famous spreadsheets.
Michiel Broek <mbroek@mbse.eu>
parents:
660
diff
changeset
|
2148 | frac = CalcFrac(pHa, AcidTypeData[AT].pK1, AcidTypeData[AT].pK2, AcidTypeData[AT].pK3); |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2149 | protonDeficit = Acid * frac; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2150 | pd = ProtonDeficit(pHa); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2151 | } |
662
4bb005694ce7
Version 0.3.32 Inventory water and profile water edit screens updated and added ion balance fields. Moved acid specs to global.js. In prod_edit and rec_edit changed the water calculations, eliminated the double percentage calculation. The pH values in the water tab have now 2 decimal digits. The mash pH field is only shown in auto calculate mode. The calculated acid addition results are now a bit better and compare with several famous spreadsheets.
Michiel Broek <mbroek@mbse.eu>
parents:
660
diff
changeset
|
2152 | //console.log('n: ' + n + ' pd: ' + pd + ' protonDeficit: ' + protonDeficit + ' frac: ' + frac + ' pHa: ' + pHa); |
4bb005694ce7
Version 0.3.32 Inventory water and profile water edit screens updated and added ion balance fields. Moved acid specs to global.js. In prod_edit and rec_edit changed the water calculations, eliminated the double percentage calculation. The pH values in the water tab have now 2 decimal digits. The mash pH field is only shown in auto calculate mode. The calculated acid addition results are now a bit better and compare with several famous spreadsheets.
Michiel Broek <mbroek@mbse.eu>
parents:
660
diff
changeset
|
2153 | RA = wg_bicarbonate - protonDeficit * frac / liters; |
4bb005694ce7
Version 0.3.32 Inventory water and profile water edit screens updated and added ion balance fields. Moved acid specs to global.js. In prod_edit and rec_edit changed the water calculations, eliminated the double percentage calculation. The pH values in the water tab have now 2 decimal digits. The mash pH field is only shown in auto calculate mode. The calculated acid addition results are now a bit better and compare with several famous spreadsheets.
Michiel Broek <mbroek@mbse.eu>
parents:
660
diff
changeset
|
2154 | bicarbonate = RA; |
4bb005694ce7
Version 0.3.32 Inventory water and profile water edit screens updated and added ion balance fields. Moved acid specs to global.js. In prod_edit and rec_edit changed the water calculations, eliminated the double percentage calculation. The pH values in the water tab have now 2 decimal digits. The mash pH field is only shown in auto calculate mode. The calculated acid addition results are now a bit better and compare with several famous spreadsheets.
Michiel Broek <mbroek@mbse.eu>
parents:
660
diff
changeset
|
2155 | total_alkalinity = RA * 50 / 61; |
4bb005694ce7
Version 0.3.32 Inventory water and profile water edit screens updated and added ion balance fields. Moved acid specs to global.js. In prod_edit and rec_edit changed the water calculations, eliminated the double percentage calculation. The pH values in the water tab have now 2 decimal digits. The mash pH field is only shown in auto calculate mode. The calculated acid addition results are now a bit better and compare with several famous spreadsheets.
Michiel Broek <mbroek@mbse.eu>
parents:
660
diff
changeset
|
2156 | ph = pHa; |
4bb005694ce7
Version 0.3.32 Inventory water and profile water edit screens updated and added ion balance fields. Moved acid specs to global.js. In prod_edit and rec_edit changed the water calculations, eliminated the double percentage calculation. The pH values in the water tab have now 2 decimal digits. The mash pH field is only shown in auto calculate mode. The calculated acid addition results are now a bit better and compare with several famous spreadsheets.
Michiel Broek <mbroek@mbse.eu>
parents:
660
diff
changeset
|
2157 | $('#wb_ph').val(Round(ph, 2)); |
4bb005694ce7
Version 0.3.32 Inventory water and profile water edit screens updated and added ion balance fields. Moved acid specs to global.js. In prod_edit and rec_edit changed the water calculations, eliminated the double percentage calculation. The pH values in the water tab have now 2 decimal digits. The mash pH field is only shown in auto calculate mode. The calculated acid addition results are now a bit better and compare with several famous spreadsheets.
Michiel Broek <mbroek@mbse.eu>
parents:
660
diff
changeset
|
2158 | $('#est_mash_ph').val(Round(ph, 2)); |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2159 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2160 | |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2161 | if ((AT == 3) && (liters > 0)) { // Sulfuctic / Zwavelzuur |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2162 | RA = parseFloat($('#wa_caso4').jqxNumberInput('decimal')) * MMSO4 / MMCaSO4 + |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2163 | parseFloat($('#wa_mgso4').jqxNumberInput('decimal')) * MMSO4 / MMMgSO4 + |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2164 | Acidmg / 1000 * MMSO4 / (MMSO4 + 2); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2165 | RA = 1000 * RA / liters; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2166 | sulfate = wg_sulfate + RA; // Not add to sulfate?? |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2167 | } else if ((AT == 1) && (liters > 0)) { // Hydrochloric, Zoutzuur |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2168 | RA = parseFloat($('#wa_cacl2').jqxNumberInput('decimal')) * MMCl / MMCaCl2 + |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2169 | parseFloat($('#wa_nacl').jqxNumberInput('decimal')) * MMCl / MMNaCl + |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2170 | Acidmg / 1000 * MMCl / (MMCl + 1); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2171 | RA = 1000 * RA / liters; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2172 | chloride = wg_chloride + RA; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2173 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2174 | |
559
10cc2400b5d5
Backported extra yeast fields and the SO4:Cl ratio changes into the recipes editor.
Michiel Broek <mbroek@mbse.eu>
parents:
549
diff
changeset
|
2175 | var BUGU = GetBUGU(); |
10cc2400b5d5
Backported extra yeast fields and the SO4:Cl ratio changes into the recipes editor.
Michiel Broek <mbroek@mbse.eu>
parents:
549
diff
changeset
|
2176 | $('#tgt_bu').val(Round(BUGU, 2)); |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2177 | // From brouwhulp. |
559
10cc2400b5d5
Backported extra yeast fields and the SO4:Cl ratio changes into the recipes editor.
Michiel Broek <mbroek@mbse.eu>
parents:
549
diff
changeset
|
2178 | if (BUGU < 0.32) |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2179 | $('#wr_bu').html("<span style='vertical-align: top; font-size: 14px; font-style: italic;'>Zeer moutig en zoet</span>"); |
559
10cc2400b5d5
Backported extra yeast fields and the SO4:Cl ratio changes into the recipes editor.
Michiel Broek <mbroek@mbse.eu>
parents:
549
diff
changeset
|
2180 | else if (BUGU < 0.43) |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2181 | $('#wr_bu').html("<span style='vertical-align: top; font-size: 14px; font-style: italic;'>Moutig, zoet</span>"); |
559
10cc2400b5d5
Backported extra yeast fields and the SO4:Cl ratio changes into the recipes editor.
Michiel Broek <mbroek@mbse.eu>
parents:
549
diff
changeset
|
2182 | else if (BUGU < 0.52) |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2183 | $('#wr_bu').html("<span style='vertical-align: top; font-size: 14px; font-style: italic;'>Evenwichtig</span>"); |
559
10cc2400b5d5
Backported extra yeast fields and the SO4:Cl ratio changes into the recipes editor.
Michiel Broek <mbroek@mbse.eu>
parents:
549
diff
changeset
|
2184 | else if (BUGU < 0.63) |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2185 | $('#wr_bu').html("<span style='vertical-align: top; font-size: 14px; font-style: italic;'>Licht hoppig, bitter</span>"); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2186 | else |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2187 | $('#wr_bu').html("<span style='vertical-align: top; font-size: 14px; font-style: italic;'>Extra hoppig, zeer bitter</span>"); |
559
10cc2400b5d5
Backported extra yeast fields and the SO4:Cl ratio changes into the recipes editor.
Michiel Broek <mbroek@mbse.eu>
parents:
549
diff
changeset
|
2188 | |
10cc2400b5d5
Backported extra yeast fields and the SO4:Cl ratio changes into the recipes editor.
Michiel Broek <mbroek@mbse.eu>
parents:
549
diff
changeset
|
2189 | // Sulfate to Chloride ratio (Palmer). |
10cc2400b5d5
Backported extra yeast fields and the SO4:Cl ratio changes into the recipes editor.
Michiel Broek <mbroek@mbse.eu>
parents:
549
diff
changeset
|
2190 | var OptSO4Clratio = GetOptSO4Clratio(); |
10cc2400b5d5
Backported extra yeast fields and the SO4:Cl ratio changes into the recipes editor.
Michiel Broek <mbroek@mbse.eu>
parents:
549
diff
changeset
|
2191 | $('#tgt_so4_cl').val(Round(OptSO4Clratio, 1)); |
10cc2400b5d5
Backported extra yeast fields and the SO4:Cl ratio changes into the recipes editor.
Michiel Broek <mbroek@mbse.eu>
parents:
549
diff
changeset
|
2192 | if (OptSO4Clratio < 0.4) |
10cc2400b5d5
Backported extra yeast fields and the SO4:Cl ratio changes into the recipes editor.
Michiel Broek <mbroek@mbse.eu>
parents:
549
diff
changeset
|
2193 | $('#wrt_so4_cl').html("<span style='vertical-align: top; font-size: 14px; font-style: italic;'>Te moutig</span>"); |
10cc2400b5d5
Backported extra yeast fields and the SO4:Cl ratio changes into the recipes editor.
Michiel Broek <mbroek@mbse.eu>
parents:
549
diff
changeset
|
2194 | else if (OptSO4Clratio < 0.6) |
10cc2400b5d5
Backported extra yeast fields and the SO4:Cl ratio changes into the recipes editor.
Michiel Broek <mbroek@mbse.eu>
parents:
549
diff
changeset
|
2195 | $('#wrt_so4_cl').html("<span style='vertical-align: top; font-size: 14px; font-style: italic;'>Zeer moutig</span>"); |
10cc2400b5d5
Backported extra yeast fields and the SO4:Cl ratio changes into the recipes editor.
Michiel Broek <mbroek@mbse.eu>
parents:
549
diff
changeset
|
2196 | else if (OptSO4Clratio < 0.8) |
10cc2400b5d5
Backported extra yeast fields and the SO4:Cl ratio changes into the recipes editor.
Michiel Broek <mbroek@mbse.eu>
parents:
549
diff
changeset
|
2197 | $('#wrt_so4_cl').html("<span style='vertical-align: top; font-size: 14px; font-style: italic;'>Moutig</span>"); |
10cc2400b5d5
Backported extra yeast fields and the SO4:Cl ratio changes into the recipes editor.
Michiel Broek <mbroek@mbse.eu>
parents:
549
diff
changeset
|
2198 | else if (OptSO4Clratio < 1.5) |
10cc2400b5d5
Backported extra yeast fields and the SO4:Cl ratio changes into the recipes editor.
Michiel Broek <mbroek@mbse.eu>
parents:
549
diff
changeset
|
2199 | $('#wrt_so4_cl').html("<span style='vertical-align: top; font-size: 14px; font-style: italic;'>Gebalanceerd</span>"); |
10cc2400b5d5
Backported extra yeast fields and the SO4:Cl ratio changes into the recipes editor.
Michiel Broek <mbroek@mbse.eu>
parents:
549
diff
changeset
|
2200 | else if (OptSO4Clratio < 2.0) |
10cc2400b5d5
Backported extra yeast fields and the SO4:Cl ratio changes into the recipes editor.
Michiel Broek <mbroek@mbse.eu>
parents:
549
diff
changeset
|
2201 | $('#wrt_so4_cl').html("<span style='vertical-align: top; font-size: 14px; font-style: italic;'>Licht bitter</span>"); |
10cc2400b5d5
Backported extra yeast fields and the SO4:Cl ratio changes into the recipes editor.
Michiel Broek <mbroek@mbse.eu>
parents:
549
diff
changeset
|
2202 | else if (OptSO4Clratio < 4.0) |
10cc2400b5d5
Backported extra yeast fields and the SO4:Cl ratio changes into the recipes editor.
Michiel Broek <mbroek@mbse.eu>
parents:
549
diff
changeset
|
2203 | $('#wrt_so4_cl').html("<span style='vertical-align: top; font-size: 14px; font-style: italic;'>Bitter</span>"); |
10cc2400b5d5
Backported extra yeast fields and the SO4:Cl ratio changes into the recipes editor.
Michiel Broek <mbroek@mbse.eu>
parents:
549
diff
changeset
|
2204 | else if (OptSO4Clratio < 9.0) |
10cc2400b5d5
Backported extra yeast fields and the SO4:Cl ratio changes into the recipes editor.
Michiel Broek <mbroek@mbse.eu>
parents:
549
diff
changeset
|
2205 | $('#wrt_so4_cl').html("<span style='vertical-align: top; font-size: 14px; font-style: italic;'>Zeer bitter</span>"); |
10cc2400b5d5
Backported extra yeast fields and the SO4:Cl ratio changes into the recipes editor.
Michiel Broek <mbroek@mbse.eu>
parents:
549
diff
changeset
|
2206 | else |
10cc2400b5d5
Backported extra yeast fields and the SO4:Cl ratio changes into the recipes editor.
Michiel Broek <mbroek@mbse.eu>
parents:
549
diff
changeset
|
2207 | $('#wrt_so4_cl').html("<span style='vertical-align: top; font-size: 14px; font-style: italic;'>Te bitter</span>"); |
10cc2400b5d5
Backported extra yeast fields and the SO4:Cl ratio changes into the recipes editor.
Michiel Broek <mbroek@mbse.eu>
parents:
549
diff
changeset
|
2208 | if (chloride > 0) |
10cc2400b5d5
Backported extra yeast fields and the SO4:Cl ratio changes into the recipes editor.
Michiel Broek <mbroek@mbse.eu>
parents:
549
diff
changeset
|
2209 | RA = sulfate / chloride; |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2210 | else |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2211 | RA = 10; |
559
10cc2400b5d5
Backported extra yeast fields and the SO4:Cl ratio changes into the recipes editor.
Michiel Broek <mbroek@mbse.eu>
parents:
549
diff
changeset
|
2212 | $('#got_so4_cl').val(Round(RA, 1)); |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2213 | Res = 'normaal'; |
559
10cc2400b5d5
Backported extra yeast fields and the SO4:Cl ratio changes into the recipes editor.
Michiel Broek <mbroek@mbse.eu>
parents:
549
diff
changeset
|
2214 | if (RA < (0.8 * OptSO4Clratio)) |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2215 | Res = 'laag'; |
559
10cc2400b5d5
Backported extra yeast fields and the SO4:Cl ratio changes into the recipes editor.
Michiel Broek <mbroek@mbse.eu>
parents:
549
diff
changeset
|
2216 | else if (RA > (1.2 * OptSO4Clratio)) |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2217 | Res = 'hoog'; |
559
10cc2400b5d5
Backported extra yeast fields and the SO4:Cl ratio changes into the recipes editor.
Michiel Broek <mbroek@mbse.eu>
parents:
549
diff
changeset
|
2218 | setRangeIndicator('so4_cl', Res); |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2219 | |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2220 | $('#wb_calcium').val(Round(calcium, 1)); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2221 | $('#wb_magnesium').val(Round(magnesium, 1)); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2222 | $('#wb_sodium').val(Round(sodium, 1)); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2223 | $('#wb_sulfate').val(Round(sulfate, 1)); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2224 | $('#wb_chloride').val(Round(chloride, 1)); |
772
f9d266eb0ec6
In product editor calculate fermentables before the first IBU calculation. In recipe editor changed to the new water calculations like in the product editor.
Michiel Broek <mbroek@mbse.eu>
parents:
756
diff
changeset
|
2225 | $('#wb_bicarbonate').val(Round(bicarbonate, 1)); |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2226 | $('#wb_total_alkalinity').val(Round(total_alkalinity, 1)); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2227 | |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2228 | if (calcium < 40) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2229 | setRangeIndicator('calcium', 'laag'); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2230 | } else if (calcium > 150) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2231 | setRangeIndicator('calcium', 'hoog'); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2232 | } else { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2233 | setRangeIndicator('calcium', 'normaal'); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2234 | } |
772
f9d266eb0ec6
In product editor calculate fermentables before the first IBU calculation. In recipe editor changed to the new water calculations like in the product editor.
Michiel Broek <mbroek@mbse.eu>
parents:
756
diff
changeset
|
2235 | if (magnesium < 5) { |
f9d266eb0ec6
In product editor calculate fermentables before the first IBU calculation. In recipe editor changed to the new water calculations like in the product editor.
Michiel Broek <mbroek@mbse.eu>
parents:
756
diff
changeset
|
2236 | setRangeIndicator('magnesium', 'laag'); |
f9d266eb0ec6
In product editor calculate fermentables before the first IBU calculation. In recipe editor changed to the new water calculations like in the product editor.
Michiel Broek <mbroek@mbse.eu>
parents:
756
diff
changeset
|
2237 | } else if (magnesium > 40) { |
f9d266eb0ec6
In product editor calculate fermentables before the first IBU calculation. In recipe editor changed to the new water calculations like in the product editor.
Michiel Broek <mbroek@mbse.eu>
parents:
756
diff
changeset
|
2238 | setRangeIndicator('magnesium', 'hoog'); |
f9d266eb0ec6
In product editor calculate fermentables before the first IBU calculation. In recipe editor changed to the new water calculations like in the product editor.
Michiel Broek <mbroek@mbse.eu>
parents:
756
diff
changeset
|
2239 | } else { |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2240 | setRangeIndicator('magnesium', 'normaal'); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2241 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2242 | if (sodium <= 150) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2243 | setRangeIndicator('sodium', 'normaal'); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2244 | } else { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2245 | setRangeIndicator('sodium', 'hoog'); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2246 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2247 | // Both chloride and sulfate should be above 50 according to |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2248 | // John Palmer. So the Cl/SO4 ratio calculation will work. |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2249 | if (chloride <= 50) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2250 | setRangeIndicator('chloride', 'laag'); |
772
f9d266eb0ec6
In product editor calculate fermentables before the first IBU calculation. In recipe editor changed to the new water calculations like in the product editor.
Michiel Broek <mbroek@mbse.eu>
parents:
756
diff
changeset
|
2251 | } else if (chloride <= 150) { |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2252 | setRangeIndicator('chloride', 'normaal'); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2253 | } else { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2254 | setRangeIndicator('chloride', 'hoog'); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2255 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2256 | if (sulfate <= 50) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2257 | setRangeIndicator('sulfate', 'laag'); |
772
f9d266eb0ec6
In product editor calculate fermentables before the first IBU calculation. In recipe editor changed to the new water calculations like in the product editor.
Michiel Broek <mbroek@mbse.eu>
parents:
756
diff
changeset
|
2258 | } else if (sulfate <= 400) { |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2259 | setRangeIndicator('sulfate', 'normaal'); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2260 | } else { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2261 | setRangeIndicator('sulfate', 'hoog'); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2262 | } |
772
f9d266eb0ec6
In product editor calculate fermentables before the first IBU calculation. In recipe editor changed to the new water calculations like in the product editor.
Michiel Broek <mbroek@mbse.eu>
parents:
756
diff
changeset
|
2263 | // (cloride + sulfate) > 500 is too high |
f9d266eb0ec6
In product editor calculate fermentables before the first IBU calculation. In recipe editor changed to the new water calculations like in the product editor.
Michiel Broek <mbroek@mbse.eu>
parents:
756
diff
changeset
|
2264 | if ((chloride + sulfate) > 500) { |
f9d266eb0ec6
In product editor calculate fermentables before the first IBU calculation. In recipe editor changed to the new water calculations like in the product editor.
Michiel Broek <mbroek@mbse.eu>
parents:
756
diff
changeset
|
2265 | setRangeIndicator('chloride', 'hoog'); |
f9d266eb0ec6
In product editor calculate fermentables before the first IBU calculation. In recipe editor changed to the new water calculations like in the product editor.
Michiel Broek <mbroek@mbse.eu>
parents:
756
diff
changeset
|
2266 | setRangeIndicator('sulfate', 'hoog'); |
f9d266eb0ec6
In product editor calculate fermentables before the first IBU calculation. In recipe editor changed to the new water calculations like in the product editor.
Michiel Broek <mbroek@mbse.eu>
parents:
756
diff
changeset
|
2267 | } |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2268 | if (ph < 5.2) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2269 | setRangeIndicator('ph', 'laag'); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2270 | } else if (ph > 5.6) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2271 | setRangeIndicator('ph', 'hoog'); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2272 | } else { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2273 | setRangeIndicator('ph', 'normaal'); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2274 | } |
772
f9d266eb0ec6
In product editor calculate fermentables before the first IBU calculation. In recipe editor changed to the new water calculations like in the product editor.
Michiel Broek <mbroek@mbse.eu>
parents:
756
diff
changeset
|
2275 | if (bicarbonate > 250) { |
f9d266eb0ec6
In product editor calculate fermentables before the first IBU calculation. In recipe editor changed to the new water calculations like in the product editor.
Michiel Broek <mbroek@mbse.eu>
parents:
756
diff
changeset
|
2276 | setRangeIndicator('bicarbonate', 'hoog'); |
f9d266eb0ec6
In product editor calculate fermentables before the first IBU calculation. In recipe editor changed to the new water calculations like in the product editor.
Michiel Broek <mbroek@mbse.eu>
parents:
756
diff
changeset
|
2277 | } else { |
f9d266eb0ec6
In product editor calculate fermentables before the first IBU calculation. In recipe editor changed to the new water calculations like in the product editor.
Michiel Broek <mbroek@mbse.eu>
parents:
756
diff
changeset
|
2278 | setRangeIndicator('bicarbonate', 'normaal'); |
f9d266eb0ec6
In product editor calculate fermentables before the first IBU calculation. In recipe editor changed to the new water calculations like in the product editor.
Michiel Broek <mbroek@mbse.eu>
parents:
756
diff
changeset
|
2279 | } |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2280 | calcSparge(); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2281 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2282 | |
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
|
2283 | |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2284 | function calcSparge() { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2285 | |
662
4bb005694ce7
Version 0.3.32 Inventory water and profile water edit screens updated and added ion balance fields. Moved acid specs to global.js. In prod_edit and rec_edit changed the water calculations, eliminated the double percentage calculation. The pH values in the water tab have now 2 decimal digits. The mash pH field is only shown in auto calculate mode. The calculated acid addition results are now a bit better and compare with several famous spreadsheets.
Michiel Broek <mbroek@mbse.eu>
parents:
660
diff
changeset
|
2286 | /* Based on the work of ajDeLange. */ |
4bb005694ce7
Version 0.3.32 Inventory water and profile water edit screens updated and added ion balance fields. Moved acid specs to global.js. In prod_edit and rec_edit changed the water calculations, eliminated the double percentage calculation. The pH values in the water tab have now 2 decimal digits. The mash pH field is only shown in auto calculate mode. The calculated acid addition results are now a bit better and compare with several famous spreadsheets.
Michiel Broek <mbroek@mbse.eu>
parents:
660
diff
changeset
|
2287 | var TargetpH = dataRecord.sparge_ph; |
4bb005694ce7
Version 0.3.32 Inventory water and profile water edit screens updated and added ion balance fields. Moved acid specs to global.js. In prod_edit and rec_edit changed the water calculations, eliminated the double percentage calculation. The pH values in the water tab have now 2 decimal digits. The mash pH field is only shown in auto calculate mode. The calculated acid addition results are now a bit better and compare with several famous spreadsheets.
Michiel Broek <mbroek@mbse.eu>
parents:
660
diff
changeset
|
2288 | var Source_pH = dataRecord.w1_ph; |
4bb005694ce7
Version 0.3.32 Inventory water and profile water edit screens updated and added ion balance fields. Moved acid specs to global.js. In prod_edit and rec_edit changed the water calculations, eliminated the double percentage calculation. The pH values in the water tab have now 2 decimal digits. The mash pH field is only shown in auto calculate mode. The calculated acid addition results are now a bit better and compare with several famous spreadsheets.
Michiel Broek <mbroek@mbse.eu>
parents:
660
diff
changeset
|
2289 | var Source_alkalinity = dataRecord.w1_total_alkalinity; |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2290 | // Select watersource or fallback to the first source. |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2291 | if (dataRecord.sparge_source == 1) { // Source 2 |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2292 | if (dataRecord.w2_ph > 0.0) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2293 | Source_pH = dataRecord.w2_ph; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2294 | Source_alkalinity = dataRecord.w2_total_alkalinity; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2295 | } else { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2296 | dataRecord.sparge_source = 0; // Source 1 |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2297 | $('#sparge_source').val(0); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2298 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2299 | } else if (dataRecord.sparge_source == 2) { // Mixed |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2300 | if (dataRecord.w2_ph > 0.0) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2301 | Source_pH = parseFloat($('#wg_ph').jqxNumberInput('decimal')); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2302 | Source_alkalinity = parseFloat($('#wg_total_alkalinity').jqxNumberInput('decimal')); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2303 | } else { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2304 | dataRecord.sparge_source = 0; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2305 | $('#sparge_source').val(0); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2306 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2307 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2308 | |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2309 | // Step 1: Compute the mole fractions of carbonic (f1o), bicarbonate (f2o) and carbonate(f3o) at the water pH |
662
4bb005694ce7
Version 0.3.32 Inventory water and profile water edit screens updated and added ion balance fields. Moved acid specs to global.js. In prod_edit and rec_edit changed the water calculations, eliminated the double percentage calculation. The pH values in the water tab have now 2 decimal digits. The mash pH field is only shown in auto calculate mode. The calculated acid addition results are now a bit better and compare with several famous spreadsheets.
Michiel Broek <mbroek@mbse.eu>
parents:
660
diff
changeset
|
2310 | var r1 = Math.pow(10, Source_pH - 6.35); |
4bb005694ce7
Version 0.3.32 Inventory water and profile water edit screens updated and added ion balance fields. Moved acid specs to global.js. In prod_edit and rec_edit changed the water calculations, eliminated the double percentage calculation. The pH values in the water tab have now 2 decimal digits. The mash pH field is only shown in auto calculate mode. The calculated acid addition results are now a bit better and compare with several famous spreadsheets.
Michiel Broek <mbroek@mbse.eu>
parents:
660
diff
changeset
|
2311 | var r2 = Math.pow(10, Source_pH - 10.33); |
4bb005694ce7
Version 0.3.32 Inventory water and profile water edit screens updated and added ion balance fields. Moved acid specs to global.js. In prod_edit and rec_edit changed the water calculations, eliminated the double percentage calculation. The pH values in the water tab have now 2 decimal digits. The mash pH field is only shown in auto calculate mode. The calculated acid addition results are now a bit better and compare with several famous spreadsheets.
Michiel Broek <mbroek@mbse.eu>
parents:
660
diff
changeset
|
2312 | var d = 1 + r1 + r1 * r2; |
4bb005694ce7
Version 0.3.32 Inventory water and profile water edit screens updated and added ion balance fields. Moved acid specs to global.js. In prod_edit and rec_edit changed the water calculations, eliminated the double percentage calculation. The pH values in the water tab have now 2 decimal digits. The mash pH field is only shown in auto calculate mode. The calculated acid addition results are now a bit better and compare with several famous spreadsheets.
Michiel Broek <mbroek@mbse.eu>
parents:
660
diff
changeset
|
2313 | var f1 = 1 / d; |
4bb005694ce7
Version 0.3.32 Inventory water and profile water edit screens updated and added ion balance fields. Moved acid specs to global.js. In prod_edit and rec_edit changed the water calculations, eliminated the double percentage calculation. The pH values in the water tab have now 2 decimal digits. The mash pH field is only shown in auto calculate mode. The calculated acid addition results are now a bit better and compare with several famous spreadsheets.
Michiel Broek <mbroek@mbse.eu>
parents:
660
diff
changeset
|
2314 | var f3 = r1 * r2 / d; |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2315 | |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2316 | //Step 2. Compute the mole fractions at pH = 4.3 (the pH which defines alkalinity) |
662
4bb005694ce7
Version 0.3.32 Inventory water and profile water edit screens updated and added ion balance fields. Moved acid specs to global.js. In prod_edit and rec_edit changed the water calculations, eliminated the double percentage calculation. The pH values in the water tab have now 2 decimal digits. The mash pH field is only shown in auto calculate mode. The calculated acid addition results are now a bit better and compare with several famous spreadsheets.
Michiel Broek <mbroek@mbse.eu>
parents:
660
diff
changeset
|
2317 | var r143 = Math.pow(10, 4.3 - 6.35); |
4bb005694ce7
Version 0.3.32 Inventory water and profile water edit screens updated and added ion balance fields. Moved acid specs to global.js. In prod_edit and rec_edit changed the water calculations, eliminated the double percentage calculation. The pH values in the water tab have now 2 decimal digits. The mash pH field is only shown in auto calculate mode. The calculated acid addition results are now a bit better and compare with several famous spreadsheets.
Michiel Broek <mbroek@mbse.eu>
parents:
660
diff
changeset
|
2318 | var r243 = Math.pow(10, 4.3 - 10.33); |
4bb005694ce7
Version 0.3.32 Inventory water and profile water edit screens updated and added ion balance fields. Moved acid specs to global.js. In prod_edit and rec_edit changed the water calculations, eliminated the double percentage calculation. The pH values in the water tab have now 2 decimal digits. The mash pH field is only shown in auto calculate mode. The calculated acid addition results are now a bit better and compare with several famous spreadsheets.
Michiel Broek <mbroek@mbse.eu>
parents:
660
diff
changeset
|
2319 | var d43 = 1 + r143 + r143 * r243; |
4bb005694ce7
Version 0.3.32 Inventory water and profile water edit screens updated and added ion balance fields. Moved acid specs to global.js. In prod_edit and rec_edit changed the water calculations, eliminated the double percentage calculation. The pH values in the water tab have now 2 decimal digits. The mash pH field is only shown in auto calculate mode. The calculated acid addition results are now a bit better and compare with several famous spreadsheets.
Michiel Broek <mbroek@mbse.eu>
parents:
660
diff
changeset
|
2320 | var f143 = 1 / d43; |
4bb005694ce7
Version 0.3.32 Inventory water and profile water edit screens updated and added ion balance fields. Moved acid specs to global.js. In prod_edit and rec_edit changed the water calculations, eliminated the double percentage calculation. The pH values in the water tab have now 2 decimal digits. The mash pH field is only shown in auto calculate mode. The calculated acid addition results are now a bit better and compare with several famous spreadsheets.
Michiel Broek <mbroek@mbse.eu>
parents:
660
diff
changeset
|
2321 | var f343 = r143 * r243 / d43; |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2322 | |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2323 | //Step 4. Solve |
662
4bb005694ce7
Version 0.3.32 Inventory water and profile water edit screens updated and added ion balance fields. Moved acid specs to global.js. In prod_edit and rec_edit changed the water calculations, eliminated the double percentage calculation. The pH values in the water tab have now 2 decimal digits. The mash pH field is only shown in auto calculate mode. The calculated acid addition results are now a bit better and compare with several famous spreadsheets.
Michiel Broek <mbroek@mbse.eu>
parents:
660
diff
changeset
|
2324 | //var Ct = (alkalinity - 1000 * (Math.pow(10, -4.3) - Math.pow(10, -Source_pH))) / ((f143 - f1) + (f3 - f343)); |
4bb005694ce7
Version 0.3.32 Inventory water and profile water edit screens updated and added ion balance fields. Moved acid specs to global.js. In prod_edit and rec_edit changed the water calculations, eliminated the double percentage calculation. The pH values in the water tab have now 2 decimal digits. The mash pH field is only shown in auto calculate mode. The calculated acid addition results are now a bit better and compare with several famous spreadsheets.
Michiel Broek <mbroek@mbse.eu>
parents:
660
diff
changeset
|
2325 | var Ct = Source_alkalinity / 50 / ((f143 - f1) + (f3 - f343)); |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2326 | |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2327 | //Step 5. Compute mole fractions at desired pH |
662
4bb005694ce7
Version 0.3.32 Inventory water and profile water edit screens updated and added ion balance fields. Moved acid specs to global.js. In prod_edit and rec_edit changed the water calculations, eliminated the double percentage calculation. The pH values in the water tab have now 2 decimal digits. The mash pH field is only shown in auto calculate mode. The calculated acid addition results are now a bit better and compare with several famous spreadsheets.
Michiel Broek <mbroek@mbse.eu>
parents:
660
diff
changeset
|
2328 | var r1g = Math.pow(10, TargetpH - 6.35); |
4bb005694ce7
Version 0.3.32 Inventory water and profile water edit screens updated and added ion balance fields. Moved acid specs to global.js. In prod_edit and rec_edit changed the water calculations, eliminated the double percentage calculation. The pH values in the water tab have now 2 decimal digits. The mash pH field is only shown in auto calculate mode. The calculated acid addition results are now a bit better and compare with several famous spreadsheets.
Michiel Broek <mbroek@mbse.eu>
parents:
660
diff
changeset
|
2329 | var r2g = Math.pow(10, TargetpH - 10.33); |
4bb005694ce7
Version 0.3.32 Inventory water and profile water edit screens updated and added ion balance fields. Moved acid specs to global.js. In prod_edit and rec_edit changed the water calculations, eliminated the double percentage calculation. The pH values in the water tab have now 2 decimal digits. The mash pH field is only shown in auto calculate mode. The calculated acid addition results are now a bit better and compare with several famous spreadsheets.
Michiel Broek <mbroek@mbse.eu>
parents:
660
diff
changeset
|
2330 | var dg = 1 + r1g + r1g * r2g; |
4bb005694ce7
Version 0.3.32 Inventory water and profile water edit screens updated and added ion balance fields. Moved acid specs to global.js. In prod_edit and rec_edit changed the water calculations, eliminated the double percentage calculation. The pH values in the water tab have now 2 decimal digits. The mash pH field is only shown in auto calculate mode. The calculated acid addition results are now a bit better and compare with several famous spreadsheets.
Michiel Broek <mbroek@mbse.eu>
parents:
660
diff
changeset
|
2331 | var f1g = 1 / dg; |
4bb005694ce7
Version 0.3.32 Inventory water and profile water edit screens updated and added ion balance fields. Moved acid specs to global.js. In prod_edit and rec_edit changed the water calculations, eliminated the double percentage calculation. The pH values in the water tab have now 2 decimal digits. The mash pH field is only shown in auto calculate mode. The calculated acid addition results are now a bit better and compare with several famous spreadsheets.
Michiel Broek <mbroek@mbse.eu>
parents:
660
diff
changeset
|
2332 | var f3g = r1g * r2g / dg; |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2333 | |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2334 | //Step 6. Use these to compute the milliequivalents acid required per liter (mEq/L) |
662
4bb005694ce7
Version 0.3.32 Inventory water and profile water edit screens updated and added ion balance fields. Moved acid specs to global.js. In prod_edit and rec_edit changed the water calculations, eliminated the double percentage calculation. The pH values in the water tab have now 2 decimal digits. The mash pH field is only shown in auto calculate mode. The calculated acid addition results are now a bit better and compare with several famous spreadsheets.
Michiel Broek <mbroek@mbse.eu>
parents:
660
diff
changeset
|
2335 | var Acid = Ct * ((f1g - f1) + (f3 - f3g)) + Math.pow(10, -TargetpH) - Math.pow(10, -Source_pH); //mEq/l |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2336 | Acid += 0.01; // Add acid that would be required for distilled water. |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2337 | |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2338 | //Step 8. Get the acid data. |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2339 | AT = dataRecord.sparge_acid_type; |
662
4bb005694ce7
Version 0.3.32 Inventory water and profile water edit screens updated and added ion balance fields. Moved acid specs to global.js. In prod_edit and rec_edit changed the water calculations, eliminated the double percentage calculation. The pH values in the water tab have now 2 decimal digits. The mash pH field is only shown in auto calculate mode. The calculated acid addition results are now a bit better and compare with several famous spreadsheets.
Michiel Broek <mbroek@mbse.eu>
parents:
660
diff
changeset
|
2340 | if (AT < 0 || AT >= AcidTypeData.length) { |
4bb005694ce7
Version 0.3.32 Inventory water and profile water edit screens updated and added ion balance fields. Moved acid specs to global.js. In prod_edit and rec_edit changed the water calculations, eliminated the double percentage calculation. The pH values in the water tab have now 2 decimal digits. The mash pH field is only shown in auto calculate mode. The calculated acid addition results are now a bit better and compare with several famous spreadsheets.
Michiel Broek <mbroek@mbse.eu>
parents:
660
diff
changeset
|
2341 | AT = 0; |
4bb005694ce7
Version 0.3.32 Inventory water and profile water edit screens updated and added ion balance fields. Moved acid specs to global.js. In prod_edit and rec_edit changed the water calculations, eliminated the double percentage calculation. The pH values in the water tab have now 2 decimal digits. The mash pH field is only shown in auto calculate mode. The calculated acid addition results are now a bit better and compare with several famous spreadsheets.
Michiel Broek <mbroek@mbse.eu>
parents:
660
diff
changeset
|
2342 | dataRecord.sparge_acid_type = 0; |
4bb005694ce7
Version 0.3.32 Inventory water and profile water edit screens updated and added ion balance fields. Moved acid specs to global.js. In prod_edit and rec_edit changed the water calculations, eliminated the double percentage calculation. The pH values in the water tab have now 2 decimal digits. The mash pH field is only shown in auto calculate mode. The calculated acid addition results are now a bit better and compare with several famous spreadsheets.
Michiel Broek <mbroek@mbse.eu>
parents:
660
diff
changeset
|
2343 | $('#sparge_acid_type').val(0); |
4bb005694ce7
Version 0.3.32 Inventory water and profile water edit screens updated and added ion balance fields. Moved acid specs to global.js. In prod_edit and rec_edit changed the water calculations, eliminated the double percentage calculation. The pH values in the water tab have now 2 decimal digits. The mash pH field is only shown in auto calculate mode. The calculated acid addition results are now a bit better and compare with several famous spreadsheets.
Michiel Broek <mbroek@mbse.eu>
parents:
660
diff
changeset
|
2344 | dataRecord.sparge_acid_perc = AcidTypeData[0].AcidPrc; |
4bb005694ce7
Version 0.3.32 Inventory water and profile water edit screens updated and added ion balance fields. Moved acid specs to global.js. In prod_edit and rec_edit changed the water calculations, eliminated the double percentage calculation. The pH values in the water tab have now 2 decimal digits. The mash pH field is only shown in auto calculate mode. The calculated acid addition results are now a bit better and compare with several famous spreadsheets.
Michiel Broek <mbroek@mbse.eu>
parents:
660
diff
changeset
|
2345 | $('#sparge_acid_perc').val(dataRecord.sparge_acid_perc); |
4bb005694ce7
Version 0.3.32 Inventory water and profile water edit screens updated and added ion balance fields. Moved acid specs to global.js. In prod_edit and rec_edit changed the water calculations, eliminated the double percentage calculation. The pH values in the water tab have now 2 decimal digits. The mash pH field is only shown in auto calculate mode. The calculated acid addition results are now a bit better and compare with several famous spreadsheets.
Michiel Broek <mbroek@mbse.eu>
parents:
660
diff
changeset
|
2346 | } |
4bb005694ce7
Version 0.3.32 Inventory water and profile water edit screens updated and added ion balance fields. Moved acid specs to global.js. In prod_edit and rec_edit changed the water calculations, eliminated the double percentage calculation. The pH values in the water tab have now 2 decimal digits. The mash pH field is only shown in auto calculate mode. The calculated acid addition results are now a bit better and compare with several famous spreadsheets.
Michiel Broek <mbroek@mbse.eu>
parents:
660
diff
changeset
|
2347 | var fract = CalcFrac(TargetpH, AcidTypeData[AT].pK1, AcidTypeData[AT].pK2, AcidTypeData[AT].pK3); |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2348 | |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2349 | //Step 9. Now divide the mEq required by the "fraction". This is the required number of moles of acid. |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2350 | Acid /= fract; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2351 | |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2352 | //Step 10. Multiply by molecular weight of the acid |
662
4bb005694ce7
Version 0.3.32 Inventory water and profile water edit screens updated and added ion balance fields. Moved acid specs to global.js. In prod_edit and rec_edit changed the water calculations, eliminated the double percentage calculation. The pH values in the water tab have now 2 decimal digits. The mash pH field is only shown in auto calculate mode. The calculated acid addition results are now a bit better and compare with several famous spreadsheets.
Michiel Broek <mbroek@mbse.eu>
parents:
660
diff
changeset
|
2353 | Acid *= AcidTypeData[AT].MolWt; //mg |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2354 | |
662
4bb005694ce7
Version 0.3.32 Inventory water and profile water edit screens updated and added ion balance fields. Moved acid specs to global.js. In prod_edit and rec_edit changed the water calculations, eliminated the double percentage calculation. The pH values in the water tab have now 2 decimal digits. The mash pH field is only shown in auto calculate mode. The calculated acid addition results are now a bit better and compare with several famous spreadsheets.
Michiel Broek <mbroek@mbse.eu>
parents:
660
diff
changeset
|
2355 | //Step 11. Divide by Specific Gravity and Percentage to get the final ml. |
4bb005694ce7
Version 0.3.32 Inventory water and profile water edit screens updated and added ion balance fields. Moved acid specs to global.js. In prod_edit and rec_edit changed the water calculations, eliminated the double percentage calculation. The pH values in the water tab have now 2 decimal digits. The mash pH field is only shown in auto calculate mode. The calculated acid addition results are now a bit better and compare with several famous spreadsheets.
Michiel Broek <mbroek@mbse.eu>
parents:
660
diff
changeset
|
2356 | Acid = Acid / AcidTypeData[AT].AcidSG / (dataRecord.sparge_acid_perc / 100); //ml |
4bb005694ce7
Version 0.3.32 Inventory water and profile water edit screens updated and added ion balance fields. Moved acid specs to global.js. In prod_edit and rec_edit changed the water calculations, eliminated the double percentage calculation. The pH values in the water tab have now 2 decimal digits. The mash pH field is only shown in auto calculate mode. The calculated acid addition results are now a bit better and compare with several famous spreadsheets.
Michiel Broek <mbroek@mbse.eu>
parents:
660
diff
changeset
|
2357 | Acid *= dataRecord.sparge_volume; //ml acid total |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2358 | Acid = Round(Acid, 2); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2359 | dataRecord.sparge_acid_amount = Acid / 1000; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2360 | $('#sparge_acid_amount').val(Acid); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2361 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2362 | |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2363 | /* |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2364 | * Change OG of recipe but keep the water volumes. |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2365 | */ |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2366 | function calcFermentablesFromOG(OG) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2367 | |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2368 | console.log('calcFermentablesFromOG(' + OG + ')'); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2369 | var amount, row, d, i, sug, tot = 0, totmass = 0, rowscount, efficiency = parseFloat($('#efficiency').jqxNumberInput('decimal')); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2370 | sug = sg_to_plato(OG) * parseFloat($('#batch_size').jqxNumberInput('decimal')) * OG / 100; //total amount of sugars in kg |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2371 | rowscount = $('#fermentableGrid').jqxGrid('getdatainformation').rowscount; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2372 | |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2373 | for (i = 0; i < rowscount; i++) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2374 | row = $('#fermentableGrid').jqxGrid('getrowdata', i); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2375 | if (row.f_added < 4) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2376 | d = row.f_percentage / 100 * (row.f_yield / 100) * (1 - row.f_moisture / 100); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2377 | if (row.f_added == 0) // Mash |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2378 | d = efficiency / 100 * d; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2379 | tot += d; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2380 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2381 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2382 | if (tot) |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2383 | totmass = Math.round((sug / tot) * 1000) / 1000; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2384 | |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2385 | if (totmass) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2386 | for (i = 0; i < rowscount; i++) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2387 | row = $('#fermentableGrid').jqxGrid('getrowdata', i); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2388 | if (row.f_added < 4) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2389 | amount = Math.round(row.f_percentage * 10 * totmass) / 1000; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2390 | $('#fermentableGrid').jqxGrid('setcellvalue', i, 'f_amount', amount); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2391 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2392 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2393 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2394 | }; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2395 | |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2396 | function calcInit() { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2397 | console.log('calc.init()'); |
68 | 2398 | |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2399 | $('#calc_acid').on('checked', function(event) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2400 | dataRecord.calc_acid = 1; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2401 | calcWater(); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2402 | }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2403 | $('#calc_acid').on('unchecked', function(event) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2404 | dataRecord.calc_acid = 0; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2405 | calcWater(); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2406 | }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2407 | $('#w1_name').jqxDropDownList('selectItem', dataRecord.w1_name); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2408 | $('#w2_name').jqxDropDownList('selectItem', dataRecord.w2_name); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2409 | // Fix tap water if zero using mash infuse amount. |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2410 | if (parseFloat($('#w1_amount').jqxNumberInput('decimal')) == 0 && mash_infuse > 0) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2411 | $('#w1_amount').val(mash_infuse); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2412 | dataRecord.w1_amount = mash_infuse; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2413 | $('#wg_amount').val(mash_infuse); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2414 | $('#w2_amount').val(0); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2415 | dataRecord.w2_amount = 0; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2416 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2417 | calcWater(); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2418 | $('#w2_amount').on('change', function(event) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2419 | var newval = parseFloat(event.args.value); |
68 | 2420 | |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2421 | if (newval > mash_infuse) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2422 | $('#w2_amount').val(dataRecord.w2_amount); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2423 | return; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2424 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2425 | dataRecord.w1_amount = parseFloat($('#wg_amount').jqxNumberInput('decimal')) - newval; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2426 | $('#w1_amount').val(dataRecord.w1_amount); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2427 | dataRecord.w2_amount = newval; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2428 | console.log('new: ' + event.args.value + ' w1: ' + dataRecord.w1_amount + ' w2: ' + dataRecord.w2_amount); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2429 | calcWater(); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2430 | }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2431 | $('#wa_cacl2').on('change', function(event) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2432 | if (event.args) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2433 | setWaterAgent('CaCl2', 0); // This can prevent double entries. |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2434 | setWaterAgent('CaCl2', event.args.value); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2435 | calcWater(); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2436 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2437 | }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2438 | $('#wa_caso4').on('change', function(event) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2439 | if (event.args) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2440 | setWaterAgent('CaSO4', 0); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2441 | setWaterAgent('CaSO4', event.args.value); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2442 | calcWater(); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2443 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2444 | }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2445 | $('#wa_mgso4').on('change', function(event) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2446 | if (event.args) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2447 | setWaterAgent('MgSO4', 0); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2448 | setWaterAgent('MgSO4', event.args.value); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2449 | calcWater(); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2450 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2451 | }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2452 | $('#wa_nacl').on('change', function(event) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2453 | if (event.args) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2454 | setWaterAgent('NaCl', 0); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2455 | setWaterAgent('NaCl', event.args.value); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2456 | calcWater(); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2457 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2458 | }); |
772
f9d266eb0ec6
In product editor calculate fermentables before the first IBU calculation. In recipe editor changed to the new water calculations like in the product editor.
Michiel Broek <mbroek@mbse.eu>
parents:
756
diff
changeset
|
2459 | $('#wa_mgcl2').on('change', function(event) { |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2460 | if (event.args) { |
772
f9d266eb0ec6
In product editor calculate fermentables before the first IBU calculation. In recipe editor changed to the new water calculations like in the product editor.
Michiel Broek <mbroek@mbse.eu>
parents:
756
diff
changeset
|
2461 | setWaterAgent('MgCl2', 0); |
f9d266eb0ec6
In product editor calculate fermentables before the first IBU calculation. In recipe editor changed to the new water calculations like in the product editor.
Michiel Broek <mbroek@mbse.eu>
parents:
756
diff
changeset
|
2462 | setWaterAgent('MgCl2', event.args.value); |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2463 | calcWater(); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2464 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2465 | }); |
772
f9d266eb0ec6
In product editor calculate fermentables before the first IBU calculation. In recipe editor changed to the new water calculations like in the product editor.
Michiel Broek <mbroek@mbse.eu>
parents:
756
diff
changeset
|
2466 | $('#wa_nahco3').on('change', function(event) { |
f9d266eb0ec6
In product editor calculate fermentables before the first IBU calculation. In recipe editor changed to the new water calculations like in the product editor.
Michiel Broek <mbroek@mbse.eu>
parents:
756
diff
changeset
|
2467 | if (event.args) { |
f9d266eb0ec6
In product editor calculate fermentables before the first IBU calculation. In recipe editor changed to the new water calculations like in the product editor.
Michiel Broek <mbroek@mbse.eu>
parents:
756
diff
changeset
|
2468 | setWaterAgent('NaHCO3', 0); |
f9d266eb0ec6
In product editor calculate fermentables before the first IBU calculation. In recipe editor changed to the new water calculations like in the product editor.
Michiel Broek <mbroek@mbse.eu>
parents:
756
diff
changeset
|
2469 | setWaterAgent('NaHCO3', event.args.value); |
f9d266eb0ec6
In product editor calculate fermentables before the first IBU calculation. In recipe editor changed to the new water calculations like in the product editor.
Michiel Broek <mbroek@mbse.eu>
parents:
756
diff
changeset
|
2470 | calcWater(); |
f9d266eb0ec6
In product editor calculate fermentables before the first IBU calculation. In recipe editor changed to the new water calculations like in the product editor.
Michiel Broek <mbroek@mbse.eu>
parents:
756
diff
changeset
|
2471 | } |
f9d266eb0ec6
In product editor calculate fermentables before the first IBU calculation. In recipe editor changed to the new water calculations like in the product editor.
Michiel Broek <mbroek@mbse.eu>
parents:
756
diff
changeset
|
2472 | }); |
f9d266eb0ec6
In product editor calculate fermentables before the first IBU calculation. In recipe editor changed to the new water calculations like in the product editor.
Michiel Broek <mbroek@mbse.eu>
parents:
756
diff
changeset
|
2473 | $('#wa_caco3').on('change', function(event) { |
f9d266eb0ec6
In product editor calculate fermentables before the first IBU calculation. In recipe editor changed to the new water calculations like in the product editor.
Michiel Broek <mbroek@mbse.eu>
parents:
756
diff
changeset
|
2474 | if (event.args) { |
f9d266eb0ec6
In product editor calculate fermentables before the first IBU calculation. In recipe editor changed to the new water calculations like in the product editor.
Michiel Broek <mbroek@mbse.eu>
parents:
756
diff
changeset
|
2475 | setWaterAgent('CaCO3', 0); |
f9d266eb0ec6
In product editor calculate fermentables before the first IBU calculation. In recipe editor changed to the new water calculations like in the product editor.
Michiel Broek <mbroek@mbse.eu>
parents:
756
diff
changeset
|
2476 | setWaterAgent('CaCO3', event.args.value); |
f9d266eb0ec6
In product editor calculate fermentables before the first IBU calculation. In recipe editor changed to the new water calculations like in the product editor.
Michiel Broek <mbroek@mbse.eu>
parents:
756
diff
changeset
|
2477 | calcWater(); |
f9d266eb0ec6
In product editor calculate fermentables before the first IBU calculation. In recipe editor changed to the new water calculations like in the product editor.
Michiel Broek <mbroek@mbse.eu>
parents:
756
diff
changeset
|
2478 | } |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2479 | }); |
642
9d1af81b20ef
Limit debug ProtoDeficit error messages. If the need for a yeast starter changes, make sure the screen is updated. Another set of extra debug logs. Fixed try yeast starter. Several dropdown lists changed the action from change to select. This should fix te too early calculations while the data was not yet loaded.
Michiel Broek <mbroek@mbse.eu>
parents:
561
diff
changeset
|
2480 | $('#wa_acid_name').on('select', function(event) { |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2481 | if (event.args) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2482 | var index = event.args.index; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2483 | setWaterAgent(last_acid, 0); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2484 | last_acid = AcidTypeData[index].nl; |
772
f9d266eb0ec6
In product editor calculate fermentables before the first IBU calculation. In recipe editor changed to the new water calculations like in the product editor.
Michiel Broek <mbroek@mbse.eu>
parents:
756
diff
changeset
|
2485 | dataRecord.wa_acid_name = index; |
f9d266eb0ec6
In product editor calculate fermentables before the first IBU calculation. In recipe editor changed to the new water calculations like in the product editor.
Michiel Broek <mbroek@mbse.eu>
parents:
756
diff
changeset
|
2486 | dataRecord.wa_acid_perc = AcidTypeData[index].AcidPrc; |
f9d266eb0ec6
In product editor calculate fermentables before the first IBU calculation. In recipe editor changed to the new water calculations like in the product editor.
Michiel Broek <mbroek@mbse.eu>
parents:
756
diff
changeset
|
2487 | $('#wa_acid_perc').val(dataRecord.wa_acid_perc); |
f9d266eb0ec6
In product editor calculate fermentables before the first IBU calculation. In recipe editor changed to the new water calculations like in the product editor.
Michiel Broek <mbroek@mbse.eu>
parents:
756
diff
changeset
|
2488 | calcWater(); |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2489 | setWaterAgent(last_acid, parseFloat($('#wa_acid').jqxNumberInput('decimal'))); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2490 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2491 | }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2492 | $('#wa_acid').on('change', function(event) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2493 | var name = AcidTypeData[$('#wa_acid_name').val()].nl; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2494 | setWaterAgent(name, parseFloat(event.args.value)); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2495 | calcWater(); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2496 | }); |
772
f9d266eb0ec6
In product editor calculate fermentables before the first IBU calculation. In recipe editor changed to the new water calculations like in the product editor.
Michiel Broek <mbroek@mbse.eu>
parents:
756
diff
changeset
|
2497 | $('#wa_acid_perc').on('change', function(event) { |
f9d266eb0ec6
In product editor calculate fermentables before the first IBU calculation. In recipe editor changed to the new water calculations like in the product editor.
Michiel Broek <mbroek@mbse.eu>
parents:
756
diff
changeset
|
2498 | dataRecord.wa_acid_perc = parseFloat(event.args.value); |
f9d266eb0ec6
In product editor calculate fermentables before the first IBU calculation. In recipe editor changed to the new water calculations like in the product editor.
Michiel Broek <mbroek@mbse.eu>
parents:
756
diff
changeset
|
2499 | calcWater(); |
f9d266eb0ec6
In product editor calculate fermentables before the first IBU calculation. In recipe editor changed to the new water calculations like in the product editor.
Michiel Broek <mbroek@mbse.eu>
parents:
756
diff
changeset
|
2500 | }); |
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
|
2501 | |
642
9d1af81b20ef
Limit debug ProtoDeficit error messages. If the need for a yeast starter changes, make sure the screen is updated. Another set of extra debug logs. Fixed try yeast starter. Several dropdown lists changed the action from change to select. This should fix te too early calculations while the data was not yet loaded.
Michiel Broek <mbroek@mbse.eu>
parents:
561
diff
changeset
|
2502 | $('#color_method').on('select', function(event) { |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2503 | dataRecord.color_method = event.args.index; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2504 | calcFermentables(); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2505 | }); |
642
9d1af81b20ef
Limit debug ProtoDeficit error messages. If the need for a yeast starter changes, make sure the screen is updated. Another set of extra debug logs. Fixed try yeast starter. Several dropdown lists changed the action from change to select. This should fix te too early calculations while the data was not yet loaded.
Michiel Broek <mbroek@mbse.eu>
parents:
561
diff
changeset
|
2506 | $('#ibu_method').on('select', function(event) { |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2507 | dataRecord.ibu_method = event.args.index; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2508 | calcFermentables(); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2509 | calcIBUs(); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2510 | }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2511 | $('#batch_size').on('change', function(event) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2512 | console.log('batch_size change:' + event.args.value + ' old:' + dataRecord.batch_size); |
660
0e9a725354ac
Fixed bugs in calculation of boil volume/batch or boiltime changes.
Michiel Broek <mbroek@mbse.eu>
parents:
648
diff
changeset
|
2513 | var evap = (0.1 * parseFloat(event.args.value)) * dataRecord.boil_time / 60; |
0e9a725354ac
Fixed bugs in calculation of boil volume/batch or boiltime changes.
Michiel Broek <mbroek@mbse.eu>
parents:
648
diff
changeset
|
2514 | dataRecord.boil_size = parseFloat(event.args.value) + evap; |
0e9a725354ac
Fixed bugs in calculation of boil volume/batch or boiltime changes.
Michiel Broek <mbroek@mbse.eu>
parents:
648
diff
changeset
|
2515 | var factor = parseFloat(event.args.value) / dataRecord.batch_size; |
0e9a725354ac
Fixed bugs in calculation of boil volume/batch or boiltime changes.
Michiel Broek <mbroek@mbse.eu>
parents:
648
diff
changeset
|
2516 | $('#boil_size').val(Round(dataRecord.boil_size, 2)); |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2517 | dataRecord.sparge_volume *= factor; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2518 | $('#sparge_volume').val(dataRecord.sparge_volume); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2519 | dataRecord.batch_size = parseFloat(event.args.value); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2520 | calcFermentablesFromOG(parseFloat($('#est_og').jqxNumberInput('decimal'))); // Keep the OG |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2521 | adjustWaters(factor); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2522 | calcFermentables(); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2523 | adjustHops(factor); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2524 | adjustMiscs(factor); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2525 | adjustYeasts(factor); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2526 | calcIBUs(); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2527 | calcWater(); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2528 | calcSparge(); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2529 | calcMash(); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2530 | }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2531 | $('#boil_time').on('change', function(event) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2532 | console.log('boil_time change:' + parseFloat(event.args.value) + ' old:' + dataRecord.boil_time); |
660
0e9a725354ac
Fixed bugs in calculation of boil volume/batch or boiltime changes.
Michiel Broek <mbroek@mbse.eu>
parents:
648
diff
changeset
|
2533 | var new_evap = (0.1 * parseFloat(dataRecord.batch_size)) * parseFloat(event.args.value) / 60; |
0e9a725354ac
Fixed bugs in calculation of boil volume/batch or boiltime changes.
Michiel Broek <mbroek@mbse.eu>
parents:
648
diff
changeset
|
2534 | dataRecord.boil_size = parseFloat(dataRecord.batch_size) + new_evap; |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2535 | dataRecord.boil_time = parseFloat(event.args.value); |
660
0e9a725354ac
Fixed bugs in calculation of boil volume/batch or boiltime changes.
Michiel Broek <mbroek@mbse.eu>
parents:
648
diff
changeset
|
2536 | $('#boil_size').val(Round(dataRecord.boil_size, 2)); |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2537 | calcFermentables(); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2538 | calcIBUs(); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2539 | }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2540 | $('#efficiency').on('change', function(event) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2541 | var estog = parseFloat($('#est_og').jqxNumberInput('decimal')); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2542 | dataRecord.efficiency = parseFloat(event.args.value); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2543 | console.log('efficiency change:' + dataRecord.efficiency); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2544 | calcFermentablesFromOG(estog); // Keep the OG |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2545 | calcFermentables(); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2546 | calcIBUs(); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2547 | }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2548 | $('#est_og').on('change', function(event) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2549 | dataRecord.est_og = parseFloat(event.args.value); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2550 | console.log('est_og change:' + dataRecord.est_og); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2551 | calcFermentablesFromOG(dataRecord.est_og); // Adjust fermentables amounts |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2552 | calcFermentables(); // Update the recipe details |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2553 | calcIBUs(); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2554 | calcMash(); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2555 | }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2556 | $('#mash_ph').on('change', function(event) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2557 | dataRecord.mash_ph = parseFloat(event.args.value); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2558 | calcWater(); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2559 | }); |
68 | 2560 | |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2561 | $('#sparge_ph').on('change', function(event) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2562 | dataRecord.sparge_ph = parseFloat(event.args.value); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2563 | calcSparge(); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2564 | }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2565 | $('#sparge_volume').on('change', function(event) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2566 | dataRecord.sparge_volume = parseFloat(event.args.value); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2567 | calcSparge(); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2568 | }); |
642
9d1af81b20ef
Limit debug ProtoDeficit error messages. If the need for a yeast starter changes, make sure the screen is updated. Another set of extra debug logs. Fixed try yeast starter. Several dropdown lists changed the action from change to select. This should fix te too early calculations while the data was not yet loaded.
Michiel Broek <mbroek@mbse.eu>
parents:
561
diff
changeset
|
2569 | $('#sparge_source').on('select', function(event) { |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2570 | if (event.args) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2571 | var index = event.args.index; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2572 | dataRecord.sparge_source = index; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2573 | calcSparge(); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2574 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2575 | }); |
642
9d1af81b20ef
Limit debug ProtoDeficit error messages. If the need for a yeast starter changes, make sure the screen is updated. Another set of extra debug logs. Fixed try yeast starter. Several dropdown lists changed the action from change to select. This should fix te too early calculations while the data was not yet loaded.
Michiel Broek <mbroek@mbse.eu>
parents:
561
diff
changeset
|
2576 | $('#sparge_acid_type').on('select', function(event) { |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2577 | if (event.args) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2578 | var index = event.args.index; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2579 | dataRecord.sparge_acid_type = index; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2580 | console.log('new sparge_acid_type: ' + dataRecord.sparge_acid_type); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2581 | calcSparge(); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2582 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2583 | }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2584 | $('#sparge_acid_perc').on('change', function(event) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2585 | dataRecord.sparge_acid_perc = parseFloat(event.args.value); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2586 | calcSparge(); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2587 | }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2588 | $('#locked').on('checked', function(event) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2589 | dataRecord.locked = 1; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2590 | setReadonly(true); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2591 | }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2592 | $('#locked').on('unchecked', function(event) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2593 | dataRecord.locked = 0; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2594 | setReadonly(false); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2595 | }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2596 | }; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2597 | |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2598 | $('#styleSelect').jqxDropDownList({ |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2599 | placeHolder: 'Kies bierstijl:', |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2600 | theme: theme, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2601 | source: styleslist, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2602 | displayMember: 'name', |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2603 | width: 180, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2604 | height: 23, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2605 | dropDownVerticalAlignment: 'top', |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2606 | dropDownWidth: 500, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2607 | dropDownHeight: 350, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2608 | renderer: function(index, label, value) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2609 | var datarecord = styleslist.records[index]; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2610 | return datarecord.style_guide + ' ' + datarecord.style_letter + ' ' + datarecord.name; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2611 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2612 | }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2613 | $('#styleSelect').on('select', function(event) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2614 | if (event.args) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2615 | var datarecord, index = event.args.index; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2616 | datarecord = styleslist.records[index]; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2617 | $('#st_name').val(datarecord.name); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2618 | $('#st_category').val(datarecord.category); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2619 | $('#st_category_number').val(datarecord.category_number); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2620 | $('#st_letter').val(datarecord.style_letter); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2621 | $('#st_guide').val(datarecord.style_guide); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2622 | $('#st_type').val(StyleTypeData[datarecord.type].nl); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2623 | $('#st_og_min').val(datarecord.og_min); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2624 | $('#st_og_max').val(datarecord.og_max); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2625 | $('#st_fg_min').val(datarecord.fg_min); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2626 | $('#st_fg_max').val(datarecord.fg_max); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2627 | $('#st_ibu_min').val(datarecord.ibu_min); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2628 | $('#st_ibu_max').val(datarecord.ibu_max); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2629 | $('#st_color_min').val(datarecord.color_min); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2630 | $('#st_color_max').val(datarecord.color_max); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2631 | $('#st_carb_min').val(datarecord.carb_min); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2632 | $('#st_carb_max').val(datarecord.carb_max); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2633 | $('#st_abv_min').val(datarecord.abv_min); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2634 | $('#st_abv_max').val(datarecord.abv_max); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2635 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2636 | }); |
68 | 2637 | |
489
18e5cfe5d126
Load new url in database write callback
Michiel Broek <mbroek@mbse.eu>
parents:
474
diff
changeset
|
2638 | function saveRecord(goback) { |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2639 | var row = { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2640 | record: my_record, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2641 | uuid: dataRecord.uuid, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2642 | name: $('#name').val(), |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2643 | locked: dataRecord.locked, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2644 | notes: $('#notes').val(), |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2645 | st_name: $('#st_name').val(), |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2646 | st_letter: $('#st_letter').val(), |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2647 | st_guide: $('#st_guide').val(), |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2648 | st_type: dataRecord.st_type, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2649 | st_category: $('#st_category').val(), |
710
9646123ea063
Fixed st_category_namber to be an integer value instead of float. The calc_acid in a new recipe is integer. Added missing wg_ and wb_ fields in a new recipe.
Michiel Broek <mbroek@mbse.eu>
parents:
667
diff
changeset
|
2650 | st_category_number: $('#st_category_number').val(), |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2651 | st_og_min: parseFloat($('#st_og_min').jqxNumberInput('decimal')), |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2652 | st_og_max: parseFloat($('#st_og_max').jqxNumberInput('decimal')), |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2653 | st_fg_min: parseFloat($('#st_fg_min').jqxNumberInput('decimal')), |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2654 | st_fg_max: parseFloat($('#st_fg_max').jqxNumberInput('decimal')), |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2655 | st_ibu_min: parseFloat($('#st_ibu_min').jqxNumberInput('decimal')), |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2656 | st_ibu_max: parseFloat($('#st_ibu_max').jqxNumberInput('decimal')), |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2657 | st_color_min: parseFloat($('#st_color_min').jqxNumberInput('decimal')), |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2658 | st_color_max: parseFloat($('#st_color_max').jqxNumberInput('decimal')), |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2659 | st_carb_min: parseFloat($('#st_carb_min').jqxNumberInput('decimal')), |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2660 | st_carb_max: parseFloat($('#st_carb_max').jqxNumberInput('decimal')), |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2661 | st_abv_min: parseFloat($('#st_abv_min').jqxNumberInput('decimal')), |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2662 | st_abv_max: parseFloat($('#st_abv_max').jqxNumberInput('decimal')), |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2663 | type: $('#type').val(), |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2664 | batch_size: parseFloat($('#batch_size').jqxNumberInput('decimal')), |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2665 | boil_size: parseFloat($('#boil_size').jqxNumberInput('decimal')), |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2666 | boil_time: parseFloat($('#boil_time').jqxNumberInput('decimal')), |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2667 | efficiency: parseFloat($('#efficiency').jqxNumberInput('decimal')), |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2668 | est_og: parseFloat($('#est_og').jqxNumberInput('decimal')), |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2669 | est_fg: parseFloat($('#est_fg').jqxNumberInput('decimal')), |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2670 | est_abv: parseFloat($('#est_abv').jqxNumberInput('decimal')), |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2671 | est_color: parseFloat($('#est_color').jqxNumberInput('decimal')), |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2672 | color_method: $('#color_method').val(), |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2673 | est_ibu: parseFloat($('#est_ibu').jqxNumberInput('decimal')), |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2674 | ibu_method: $('#ibu_method').val(), |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2675 | est_carb: parseFloat($('#est_carb').jqxNumberInput('decimal')), |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2676 | mash_name: $('#mash_name').val(), |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2677 | mash_ph: parseFloat($('#mash_ph').jqxNumberInput('decimal')), |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2678 | sparge_temp: parseFloat($('#sparge_temp').jqxNumberInput('decimal')), |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2679 | sparge_ph: parseFloat($('#sparge_ph').jqxNumberInput('decimal')), |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2680 | sparge_volume: parseFloat($('#sparge_volume').jqxNumberInput('decimal')), |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2681 | sparge_source: $('#sparge_source').val(), |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2682 | sparge_acid_type: $('#sparge_acid_type').val(), |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2683 | sparge_acid_perc: parseFloat($('#sparge_acid_perc').jqxNumberInput('decimal')), |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2684 | sparge_acid_amount: dataRecord.sparge_acid_amount, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2685 | calc_acid: dataRecord.calc_acid, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2686 | w1_name: $('#w1_name').val(), |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2687 | w1_amount: parseFloat($('#w1_amount').jqxNumberInput('decimal')), |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2688 | w1_calcium: parseFloat($('#w1_calcium').jqxNumberInput('decimal')), |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2689 | w1_sulfate: parseFloat($('#w1_sulfate').jqxNumberInput('decimal')), |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2690 | w1_chloride: parseFloat($('#w1_chloride').jqxNumberInput('decimal')), |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2691 | w1_sodium: parseFloat($('#w1_sodium').jqxNumberInput('decimal')), |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2692 | w1_magnesium: parseFloat($('#w1_magnesium').jqxNumberInput('decimal')), |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2693 | w1_total_alkalinity: parseFloat($('#w1_total_alkalinity').jqxNumberInput('decimal')), |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2694 | w1_ph: parseFloat($('#w1_ph').jqxNumberInput('decimal')), |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2695 | w1_cost: dataRecord.w1_cost, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2696 | w2_name: $('#w2_name').val(), |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2697 | w2_amount: parseFloat($('#w2_amount').jqxNumberInput('decimal')), |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2698 | w2_calcium: parseFloat($('#w2_calcium').jqxNumberInput('decimal')), |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2699 | w2_sulfate: parseFloat($('#w2_sulfate').jqxNumberInput('decimal')), |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2700 | w2_chloride: parseFloat($('#w2_chloride').jqxNumberInput('decimal')), |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2701 | w2_sodium: parseFloat($('#w2_sodium').jqxNumberInput('decimal')), |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2702 | w2_magnesium: parseFloat($('#w2_magnesium').jqxNumberInput('decimal')), |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2703 | w2_total_alkalinity: parseFloat($('#w2_total_alkalinity').jqxNumberInput('decimal')), |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2704 | w2_ph: parseFloat($('#w2_ph').jqxNumberInput('decimal')), |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2705 | w2_cost: dataRecord.w2_cost, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2706 | wg_amount: parseFloat($('#wg_amount').jqxNumberInput('decimal')), |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2707 | wg_calcium: parseFloat($('#wg_calcium').jqxNumberInput('decimal')), |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2708 | wg_sulfate: parseFloat($('#wg_sulfate').jqxNumberInput('decimal')), |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2709 | wg_chloride: parseFloat($('#wg_chloride').jqxNumberInput('decimal')), |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2710 | wg_sodium: parseFloat($('#wg_sodium').jqxNumberInput('decimal')), |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2711 | wg_magnesium: parseFloat($('#wg_magnesium').jqxNumberInput('decimal')), |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2712 | wg_total_alkalinity: parseFloat($('#wg_total_alkalinity').jqxNumberInput('decimal')), |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2713 | wg_ph: parseFloat($('#wg_ph').jqxNumberInput('decimal')), |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2714 | wb_calcium: parseFloat($('#wb_calcium').jqxNumberInput('decimal')), |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2715 | wb_sulfate: parseFloat($('#wb_sulfate').jqxNumberInput('decimal')), |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2716 | wb_chloride: parseFloat($('#wb_chloride').jqxNumberInput('decimal')), |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2717 | wb_sodium: parseFloat($('#wb_sodium').jqxNumberInput('decimal')), |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2718 | wb_magnesium: parseFloat($('#wb_magnesium').jqxNumberInput('decimal')), |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2719 | wb_total_alkalinity: parseFloat($('#wb_total_alkalinity').jqxNumberInput('decimal')), |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2720 | wb_ph: parseFloat($('#wb_ph').jqxNumberInput('decimal')), |
772
f9d266eb0ec6
In product editor calculate fermentables before the first IBU calculation. In recipe editor changed to the new water calculations like in the product editor.
Michiel Broek <mbroek@mbse.eu>
parents:
756
diff
changeset
|
2721 | wa_acid_name: parseInt($('#wa_acid_name').val()), |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2722 | wa_acid_perc: parseFloat($('#wa_acid_perc').jqxNumberInput('decimal')), |
772
f9d266eb0ec6
In product editor calculate fermentables before the first IBU calculation. In recipe editor changed to the new water calculations like in the product editor.
Michiel Broek <mbroek@mbse.eu>
parents:
756
diff
changeset
|
2723 | wa_base_name: 0, |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2724 | fermentables: $('#fermentableGrid').jqxGrid('getrows'), |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2725 | hops: $('#hopGrid').jqxGrid('getrows'), |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2726 | miscs: $('#miscGrid').jqxGrid('getrows'), |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2727 | yeasts: $('#yeastGrid').jqxGrid('getrows'), |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2728 | mashs: $('#mashGrid').jqxGrid('getrows') |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2729 | }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2730 | data = 'update=true&' + $.param(row); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2731 | $.ajax({ |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2732 | dataType: 'json', |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2733 | url: url, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2734 | cache: false, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2735 | async: false, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2736 | data: data, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2737 | type: 'POST', |
777
daf55c944fb0
Recipes backport for new dry-yeast fields and SQL error handlers.
Michiel Broek <mbroek@mbse.eu>
parents:
775
diff
changeset
|
2738 | success: function(data) { |
daf55c944fb0
Recipes backport for new dry-yeast fields and SQL error handlers.
Michiel Broek <mbroek@mbse.eu>
parents:
775
diff
changeset
|
2739 | if (data.error) { |
daf55c944fb0
Recipes backport for new dry-yeast fields and SQL error handlers.
Michiel Broek <mbroek@mbse.eu>
parents:
775
diff
changeset
|
2740 | console.log('saveRecord(' + goback + ') error ' + data.msg); |
daf55c944fb0
Recipes backport for new dry-yeast fields and SQL error handlers.
Michiel Broek <mbroek@mbse.eu>
parents:
775
diff
changeset
|
2741 | alert('SQL fout: ' + data.msg); |
daf55c944fb0
Recipes backport for new dry-yeast fields and SQL error handlers.
Michiel Broek <mbroek@mbse.eu>
parents:
775
diff
changeset
|
2742 | } else { |
daf55c944fb0
Recipes backport for new dry-yeast fields and SQL error handlers.
Michiel Broek <mbroek@mbse.eu>
parents:
775
diff
changeset
|
2743 | console.log('saveRecord(' + goback + ') success'); |
daf55c944fb0
Recipes backport for new dry-yeast fields and SQL error handlers.
Michiel Broek <mbroek@mbse.eu>
parents:
775
diff
changeset
|
2744 | } |
489
18e5cfe5d126
Load new url in database write callback
Michiel Broek <mbroek@mbse.eu>
parents:
474
diff
changeset
|
2745 | if (goback) |
18e5cfe5d126
Load new url in database write callback
Michiel Broek <mbroek@mbse.eu>
parents:
474
diff
changeset
|
2746 | window.location.href = my_return; |
18e5cfe5d126
Load new url in database write callback
Michiel Broek <mbroek@mbse.eu>
parents:
474
diff
changeset
|
2747 | else |
18e5cfe5d126
Load new url in database write callback
Michiel Broek <mbroek@mbse.eu>
parents:
474
diff
changeset
|
2748 | window.location.href = 'rec_export.php?record=' + my_record + '&return=' + my_return + '&name=' + dataRecord.name; |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2749 | }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2750 | error: function(jqXHR, textStatus, errorThrown) { |
489
18e5cfe5d126
Load new url in database write callback
Michiel Broek <mbroek@mbse.eu>
parents:
474
diff
changeset
|
2751 | console.log('saveRecord() ' + textStatus); |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2752 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2753 | }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2754 | }; |
68 | 2755 | |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2756 | dataAdapter.dataBind(); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2757 | |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2758 | // initialize the input fields. |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2759 | // Tab 1, Algemeen |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2760 | $('#name').jqxTooltip({ content: 'De naam voor dit recept.' }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2761 | $('#name').jqxInput({ theme: theme, width: 640, height: 23 }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2762 | $('#locked').jqxCheckBox({ theme: theme, width: 120, height: 23 }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2763 | $('#notes').jqxTooltip({ content: 'De uitgebreide opmerkingen over dit recept.' }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2764 | $('#notes').jqxInput({ theme: theme, width: 960, height: 200 }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2765 | $('#type').jqxTooltip({ content: 'Het brouw type van dit recept.' }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2766 | $('#type').jqxDropDownList({ |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2767 | theme: theme, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2768 | source: RecipeTypeAdapter, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2769 | valueMember: 'id', |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2770 | displayMember: 'nl', |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2771 | width: 180, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2772 | height: 23, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2773 | autoDropDownHeight: true |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2774 | }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2775 | $('#efficiency').jqxTooltip({ content: 'Het rendement van maischen en koken.' }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2776 | $('#efficiency').jqxNumberInput(Perc1dec); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2777 | $('#batch_size').jqxTooltip({ content: 'Het volume van het gekoelde wort na het koken.' }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2778 | $('#batch_size').jqxNumberInput(Spin1dec); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2779 | $('#batch_size').jqxNumberInput({ min: 4 }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2780 | $('#boil_size').jqxTooltip({ content: 'Het volume van het wort voor het koken.' }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2781 | $('#boil_size').jqxNumberInput({ inputMode: 'simple', theme: theme, width: 90, height: 23, decimalDigits: 2, readOnly: true }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2782 | $('#boil_time').jqxTooltip({ content: 'De kooktijd in minuten.' }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2783 | $('#boil_time').jqxNumberInput(PosInt); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2784 | $('#boil_time').jqxNumberInput({ min: 4, max: 360 }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2785 | |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2786 | $('#st_name').jqxTooltip({ content: 'De bierstijl naam voor dit recept.'}); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2787 | $('#st_name').jqxInput({ theme: theme, width: 250, height: 23 }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2788 | $('#st_letter').jqxTooltip({ content: 'De bierstijl letter voor dit recept.'}); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2789 | $('#st_letter').jqxInput({ theme: theme, width: 90, height: 23 }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2790 | $('#st_guide').jqxTooltip({ content: 'De bierstijl gids voor dit recept.'}); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2791 | $('#st_guide').jqxInput({ theme: theme, width: 250, height: 23 }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2792 | $('#st_category').jqxTooltip({ content: 'De Amerikaanse bierstijl categorie.'}); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2793 | $('#st_category').jqxInput({ theme: theme, width: 250, height: 23 }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2794 | $('#st_category_number').jqxTooltip({ content: 'De Amerikaanse bierstijl categorie sub nummer.'}); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2795 | $('#st_category_number').jqxNumberInput(Smal0dec); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2796 | $('#st_type').jqxTooltip({ content: 'Het bierstijl type.'}); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2797 | $('#st_type').jqxInput({ theme: theme, width: 250, height: 23 }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2798 | |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2799 | $('#est_og').jqxTooltip({ content: 'Het begin SG wat je wilt bereiken. De moutstort wordt automatisch herberekend.' }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2800 | $('#est_og').jqxNumberInput(SGopts); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2801 | $('#st_og_min').jqxTooltip({ content: 'Het minimum begin SG voor deze bierstijl.'}); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2802 | $('#st_og_min').jqxNumberInput({ inputMode: 'simple', theme: theme, width: 50, height: 23, decimalDigits: 3, readOnly: true }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2803 | $('#st_og_max').jqxTooltip({ content: 'Het maximum begin SG voor deze bierstijl.'}); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2804 | $('#st_og_max').jqxNumberInput({ inputMode: 'simple', theme: theme, width: 50, height: 23, decimalDigits: 3, readOnly: true }); |
68 | 2805 | |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2806 | $('#est_fg').jqxTooltip({ content: 'Het eind SG. Dit wordt automatisch berekend.' }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2807 | $('#est_fg').jqxNumberInput(Show3dec); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2808 | $('#st_fg_min').jqxTooltip({ content: 'Het minimum eind SG voor deze bierstijl.'}); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2809 | $('#st_fg_min').jqxNumberInput({ inputMode: 'simple', theme: theme, width: 50, height: 23, decimalDigits: 3, readOnly: true }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2810 | $('#st_fg_max').jqxTooltip({ content: 'Het maximum eind SG voor deze bierstijl.'}); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2811 | $('#st_fg_max').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
|
2812 | |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2813 | $('#est_abv').jqxTooltip({ content: 'Alcohol volume %. Dit wordt automatisch berekend.' }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2814 | $('#est_abv').jqxNumberInput(Smal1dec); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2815 | $('#st_abv_min').jqxTooltip({ content: 'Het minimum alcohol volume % voor deze bierstijl.'}); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2816 | $('#st_abv_min').jqxNumberInput(Smal1dec); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2817 | $('#st_abv_max').jqxTooltip({ content: 'Het maximum alcohol volume % voor deze bierstijl.'}); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2818 | $('#st_abv_max').jqxNumberInput(Smal1dec); |
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
|
2819 | |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2820 | $('#est_color').jqxTooltip({ content: 'De kleur in EBC. Dit wordt automatisch berekend.' }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2821 | $('#est_color').jqxNumberInput(Show0dec); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2822 | $('#st_color_min').jqxTooltip({ content: 'De minimum kleur voor deze bierstijl.'}); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2823 | $('#st_color_min').jqxNumberInput(Smal0dec); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2824 | $('#st_color_max').jqxTooltip({ content: 'De maximum kleur voor deze bierstijl.'}); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2825 | $('#st_color_max').jqxNumberInput(Smal0dec); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2826 | $('#color_method').jqxDropDownList({ |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2827 | theme: theme, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2828 | source: ColorMethodAdapter, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2829 | valueMember: 'id', |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2830 | displayMember: 'nl', |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2831 | width: 180, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2832 | height: 23, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2833 | autoDropDownHeight: true |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2834 | }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2835 | $('#est_ibu').jqxTooltip({ content: 'De bitterheid in IBU. Dit wordt automatisch berekend.' }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2836 | $('#est_ibu').jqxNumberInput(Show0dec); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2837 | $('#st_ibu_min').jqxTooltip({ content: 'De minimum bitterheid voor deze bierstijl.'}); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2838 | $('#st_ibu_min').jqxNumberInput(Smal0dec); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2839 | $('#st_ibu_max').jqxTooltip({ content: 'De maximum bitterheid voor deze bierstijl.'}); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2840 | $('#st_ibu_max').jqxNumberInput(Smal0dec); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2841 | $('#ibu_method').jqxDropDownList({ |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2842 | theme: theme, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2843 | source: IBUmethodAdapter, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2844 | valueMember: 'id', |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2845 | displayMember: 'nl', |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2846 | width: 180, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2847 | height: 23, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2848 | autoDropDownHeight: true, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2849 | dropDownVerticalAlignment: 'top' |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2850 | }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2851 | $('#kcal').jqxTooltip({ content: 'Energie-inhoud in kcal/liter.' }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2852 | $('#kcal').jqxNumberInput(Smal0dec); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2853 | $('#est_carb').jqxTooltip({ content: 'Koolzuur volume. Dit wordt automatisch berekend.' }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2854 | $('#est_carb').jqxNumberInput(Smal1dec); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2855 | $('#st_carb_min').jqxTooltip({ content: 'Het minimum koolzuur volume voor deze bierstijl.'}); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2856 | $('#st_carb_min').jqxNumberInput(Smal1dec); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2857 | $('#st_carb_max').jqxTooltip({ content: 'Het maximum koolzuur volume voor deze bierstijl.'}); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2858 | $('#st_carb_max').jqxNumberInput(Smal1dec); |
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
|
2859 | |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2860 | // Tab 2, Vergistbaar |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2861 | $('#est_color2').jqxTooltip({ content: 'De kleur in EBC. Dit wordt automatisch berekend.' }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2862 | $('#est_color2').jqxNumberInput(Show0dec); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2863 | $('#est_og2').jqxTooltip({ content: 'Het begin SG wat je wilt bereiken. De moutstort wordt automatisch herberekend.' }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2864 | $('#est_og2').jqxNumberInput(Show3dec); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2865 | $('#perc_malts').jqxProgressBar({ |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2866 | width: 300, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2867 | height: 23, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2868 | theme: theme, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2869 | showText: true, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2870 | max: 120, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2871 | animationDuration: 0, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2872 | colorRanges: [ |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2873 | { stop: 90, color: '#008C00' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2874 | { stop: 100, color: '#EB7331' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2875 | { stop: 120, color: '#FF0000' } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2876 | ], |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2877 | renderText: function(text) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2878 | return (Math.round(parseInt(text) * 1.2)) + '%'; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2879 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2880 | }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2881 | $('#perc_sugars').jqxProgressBar({ |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2882 | width: 300, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2883 | height: 23, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2884 | theme: theme, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2885 | showText: true, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2886 | max: 50, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2887 | animationDuration: 0, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2888 | colorRanges: [ |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2889 | { stop: 20, color: '#008C00' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2890 | { stop: 50, color: '#FF0000' } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2891 | ], |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2892 | renderText: function(text) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2893 | return (Math.round(parseInt(text) * 5) / 10) + '%'; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2894 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2895 | }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2896 | $('#perc_cara').jqxProgressBar({ |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2897 | width: 300, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2898 | height: 23, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2899 | theme: theme, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2900 | showText: true, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2901 | max: 50, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2902 | animationDuration: 0, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2903 | colorRanges: [ |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2904 | { stop: 25, color: '#008C00' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2905 | { stop: 50, color: '#FF0000' } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2906 | ], |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2907 | renderText: function(text) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2908 | return (Math.round(parseInt(text) * 5) / 10) + '%'; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2909 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2910 | }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2911 | $('#ferm_lintner').jqxProgressBar({ |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2912 | width: 300, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2913 | height: 23, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2914 | theme: theme, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2915 | showText: true, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2916 | max: 200, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2917 | animationDuration: 0, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2918 | colorRanges: [ |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2919 | { stop: 30, color: '#FF0000' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2920 | { stop: 40, color: '#EB7331' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2921 | { stop: 200, color: '#008C00' } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2922 | ], |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2923 | renderText: function(text) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2924 | return (parseInt(text) * 2) + ' lintner'; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2925 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2926 | }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2927 | $('#popupFermentable').jqxWindow({ |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2928 | width: 800, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2929 | height: 300, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2930 | position: { x: 230, y: 100 }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2931 | resizable: false, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2932 | theme: theme, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2933 | isModal: true, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2934 | autoOpen: false, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2935 | cancelButton: $('#FermentableReady'), |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2936 | modalOpacity: 0.40 |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2937 | }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2938 | $('#FermentableReady').jqxButton({ template: 'success', width: '90px', theme: theme }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2939 | $('#FermentableReady').click(function() { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2940 | var row, rowID = $('#fermentableGrid').jqxGrid('getrowid', fermentableRow); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2941 | console.log('FermentableReady row:' + fermentableRow + ' ID:' + rowID); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2942 | row = { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2943 | f_name: fermentableData.f_name, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2944 | f_origin: fermentableData.f_origin, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2945 | f_supplier: fermentableData.f_supplier, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2946 | f_amount: fermentableData.f_amount, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2947 | f_cost: fermentableData.f_cost, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2948 | f_type: fermentableData.f_type, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2949 | f_yield: fermentableData.f_yield, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2950 | f_color: fermentableData.f_color, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2951 | f_coarse_fine_diff: fermentableData.f_coarse_fine_diff, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2952 | f_moisture: fermentableData.f_moisture, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2953 | f_diastatic_power: fermentableData.f_diastatic_power, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2954 | f_protein: fermentableData.f_protein, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2955 | f_max_in_batch: fermentableData.f_max_in_batch, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2956 | f_graintype: fermentableData.f_graintype, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2957 | f_added: fermentableData.f_added, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2958 | f_dissolved_protein: fermentableData.f_dissolved_protein, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2959 | f_recommend_mash: fermentableData.f_recommend_mash, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2960 | f_add_after_boil: fermentableData.f_add_after_boil, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2961 | f_adjust_to_total_100: fermentableData.f_adjust_to_total_100, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2962 | f_percentage: fermentableData.f_percentage, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2963 | f_di_ph: fermentableData.f_di_ph, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2964 | f_acid_to_ph_57: fermentableData.f_acid_to_ph_57, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2965 | f_inventory: fermentableData.f_inventory, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2966 | f_avail: fermentableData.f_avail |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2967 | }; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2968 | $('#fermentableGrid').jqxGrid('updaterow', rowID, row); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2969 | calcPercentages(); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2970 | calcFermentables(); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2971 | calcIBUs(); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2972 | calcMash(); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2973 | // Waters: yes there is impact. |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2974 | }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2975 | $('#wf_name').jqxInput({ theme: theme, width: 320, height: 23 }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2976 | $('#wf_instock').jqxCheckBox({ theme: theme, height: 23 }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2977 | $('#wf_instock').on('change', function(event) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2978 | fermentableinstock = event.args.checked; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2979 | fermentablelist.dataBind(); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2980 | }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2981 | $('#wf_select').jqxDropDownList({ |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2982 | placeHolder: 'Kies mout:', |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2983 | theme: theme, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2984 | source: fermentablelist, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2985 | displayMember: 'name', |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2986 | width: 150, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2987 | height: 23, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2988 | dropDownWidth: 500, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2989 | dropDownHeight: 500, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2990 | renderer: function(index, label, value) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2991 | var datarecord = fermentablelist.records[index]; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2992 | return datarecord.supplier + ' / ' + datarecord.name + ' (' + datarecord.color + ' EBC)'; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2993 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2994 | }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2995 | $('#wf_select').on('select', function(event) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2996 | if (event.args) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2997 | var datarecord, index = event.args.index; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2998 | datarecord = fermentablelist.records[index]; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
2999 | $('#wf_name').val(datarecord.name); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3000 | fermentableData.f_name = datarecord.name; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3001 | fermentableData.f_origin = datarecord.origin; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3002 | fermentableData.f_supplier = datarecord.supplier; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3003 | fermentableData.f_type = datarecord.type; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3004 | fermentableData.f_cost = datarecord.cost; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3005 | fermentableData.f_yield = datarecord.yield; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3006 | fermentableData.f_color = datarecord.color; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3007 | fermentableData.f_coarse_fine_diff = datarecord.coarse_fine_diff; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3008 | fermentableData.f_moisture = datarecord.moisture; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3009 | fermentableData.f_diastatic_power = datarecord.diastatic_power; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3010 | fermentableData.f_protein = datarecord.protein; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3011 | fermentableData.f_max_in_batch = datarecord.max_in_batch; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3012 | fermentableData.f_graintype = datarecord.graintype; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3013 | fermentableData.f_dissolved_protein = datarecord.dissolved_protein; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3014 | fermentableData.f_recommend_mash = datarecord.recommend_mash; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3015 | fermentableData.f_add_after_boil = datarecord.add_after_boil; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3016 | fermentableData.f_di_ph = datarecord.di_ph; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3017 | fermentableData.f_acid_to_ph_57 = datarecord.acid_to_ph_57; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3018 | fermentableData.f_inventory = datarecord.inventory; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3019 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3020 | }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3021 | $('#wf_amount').jqxNumberInput(Spin3dec); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3022 | $('#wf_amount').on('change', function(event) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3023 | console.log('amount changed: ' + event.args.value); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3024 | $('#fermentableGrid').jqxGrid('setcellvalue', fermentableRow, 'f_amount', event.args.value); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3025 | fermentableData.f_amount = event.args.value; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3026 | if (! to_100) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3027 | calcPercentages(); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3028 | calcFermentables(); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3029 | calcMash(); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3030 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3031 | }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3032 | $('#wf_percentage').jqxNumberInput(Perc1dec); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3033 | $('#wf_percentage').on('change', function(event) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3034 | var newperc, nw, damount, namount, rowscount, rowdata, diff, tw, i, newvalue, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3035 | oldvalue = Round(fermentableData.f_percentage, 1); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3036 | newvalue = event.args.value; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3037 | console.log('percentage changed: ' + newvalue + ' old: ' + oldvalue); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3038 | fermentableData.f_percent = newvalue; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3039 | rowscount = $('#fermentableGrid').jqxGrid('getdatainformation').rowscount; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3040 | if ((oldvalue != newvalue) && (rowscount > 1)) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3041 | rowdata = $('#fermentableGrid').jqxGrid('getrowdata', fermentableRow); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3042 | if (rowdata.f_adjust_to_total_100) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3043 | $('#wf_percentage').val(oldvalue); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3044 | } else { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3045 | diff = newvalue - oldvalue; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3046 | tw = 0; // total weight |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3047 | for (i = 0; i < rowscount; i++) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3048 | rowdata = $('#fermentableGrid').jqxGrid('getrowdata', i); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3049 | if (rowdata.f_added < 4) |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3050 | tw += Round(rowdata.f_amount, 3); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3051 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3052 | tw = Round(tw, 3); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3053 | if (to_100) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3054 | // Adjust this row and the 100% row. |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3055 | damount = Math.round(tw * diff * 10) / 1000; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3056 | rowdata = $('#fermentableGrid').jqxGrid('getrowdata', fermentableRow); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3057 | namount = Round((rowdata.f_amount + damount), 3); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3058 | $('#fermentableGrid').jqxGrid('setcellvalue', fermentableRow, 'f_amount', namount); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3059 | $('#wf_amount').val(namount); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3060 | $('#fermentableGrid').jqxGrid('setcellvalue', fermentableRow, 'f_percentage', rowdata.f_percentage + diff); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3061 | for (i = 0; i < rowscount; i++) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3062 | rowdata = $('#fermentableGrid').jqxGrid('getrowdata', i); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3063 | if (rowdata.f_adjust_to_total_100) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3064 | namount = rowdata.f_amount - damount; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3065 | $('#fermentableGrid').jqxGrid('setcellvalue', i, 'f_percentage', rowdata.f_percentage - diff); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3066 | $('#fermentableGrid').jqxGrid('setcellvalue', i, 'f_amount', namount); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3067 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3068 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3069 | calcFermentables(); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3070 | calcMash(); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3071 | } else { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3072 | // Adjust all the rows. |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3073 | nw = tw * diff / 100; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3074 | for (i = 0; i < rowscount; i++) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3075 | rowdata = $('#fermentableGrid').jqxGrid('getrowdata', i); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3076 | if (rowdata.f_added < 4) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3077 | if (i == fermentableRow) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3078 | namount = Math.round((rowdata.f_amount + nw) * 1000) / 1000; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3079 | $('#fermentableGrid').jqxGrid('setcellvalue', i, 'f_amount', namount); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3080 | // $('#wf_amount').val(namount); // Will crash the script. |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3081 | $('#fermentableGrid').jqxGrid('setcellvalue', i, 'f_percentage', newvalue); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3082 | } else { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3083 | namount = Round((rowdata.f_amount - (nw / (rowscount - 1))), 3); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3084 | newperc = Round((namount / tw) * 100, 1); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3085 | $('#fermentableGrid').jqxGrid('setcellvalue', i, 'f_amount', namount); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3086 | $('#fermentableGrid').jqxGrid('setcellvalue', i, 'f_percentage', newperc); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3087 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3088 | } else { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3089 | $('#fermentableGrid').jqxGrid('setcellvalue', i, 'f_percentage', 0); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3090 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3091 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3092 | calcFermentables(); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3093 | calcMash(); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3094 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3095 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3096 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3097 | }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3098 | $('#wf_max_in_batch').jqxNumberInput(Show1dec); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3099 | $('#wf_adjust_to_total_100').jqxCheckBox({ theme: theme, width: 120, height: 23 }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3100 | $('#wf_adjust_to_total_100').on('checked', function(event) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3101 | if (fermentableData.f_adjust_to_total_100 == 0) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3102 | if (to_100) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3103 | // Reset other flag first. |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3104 | rowscount = $('#fermentableGrid').jqxGrid('getdatainformation').rowscount; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3105 | for (i = 0; i < rowscount; i++) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3106 | if (i != fermentableRow) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3107 | $('#fermentableGrid').jqxGrid('setcellvalue', i, 'f_adjust_to_total_100', 0); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3108 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3109 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3110 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3111 | $('#fermentableGrid').jqxGrid('setcellvalue', fermentableRow, 'f_adjust_to_total_100', 1); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3112 | calcFermentables(); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3113 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3114 | }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3115 | $('#wf_adjust_to_total_100').on('unchecked', function(event) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3116 | if (fermentableData.f_adjust_to_total_100 != 0) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3117 | $('#fermentableGrid').jqxGrid('setcellvalue', fermentableRow, 'f_adjust_to_total_100', 0); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3118 | calcFermentables(); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3119 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3120 | }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3121 | $('#wf_added').jqxDropDownList({ |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3122 | theme: theme, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3123 | source: AddedAdapter, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3124 | valueMember: 'id', |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3125 | displayMember: 'nl', |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3126 | width: 180, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3127 | height: 23, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3128 | autoDropDownHeight: true, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3129 | dropDownVerticalAlignment: 'top' |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3130 | }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3131 | $('#wf_added').on('select', function(event) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3132 | if (event.args) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3133 | var index = event.args.index; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3134 | $('#fermentableGrid').jqxGrid('setcellvalue', fermentableRow, 'f_added', index); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3135 | calcFermentables(); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3136 | calcIBUs(); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3137 | calcMash(); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3138 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3139 | }); |
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
|
3140 | |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3141 | // Tab 3, Hoppen |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3142 | $('#est_ibu2').jqxTooltip({ content: 'De bitterheid in IBU. Dit wordt automatisch berekend.' }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3143 | $('#est_ibu2').jqxNumberInput(Smal0dec); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3144 | $('#hop_flavour').jqxProgressBar({ |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3145 | width: 300, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3146 | height: 23, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3147 | theme: theme, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3148 | showText: true, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3149 | animationDuration: 0, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3150 | colorRanges: [ |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3151 | { stop: 20, color: '#004D00' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3152 | { stop: 40, color: '#008C00' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3153 | { stop: 60, color: '#00BF00' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3154 | { stop: 80, color: '#00FF00' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3155 | { stop: 100, color: '#80FF80' } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3156 | ], |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3157 | renderText: function(text) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3158 | var val = parseInt(text); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3159 | if (val < 20) |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3160 | return 'Weinig'; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3161 | else if (val < 40) |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3162 | return 'Matig'; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3163 | else if (val < 60) |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3164 | return 'Redelijk'; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3165 | else if (val < 80) |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3166 | return 'Veel'; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3167 | else |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3168 | return 'Zeer veel'; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3169 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3170 | }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3171 | $('#hop_aroma').jqxProgressBar({ |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3172 | width: 300, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3173 | height: 23, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3174 | theme: theme, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3175 | showText: true, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3176 | animationDuration: 0, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3177 | colorRanges: [ |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3178 | { stop: 20, color: '#004D00' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3179 | { stop: 40, color: '#008C00' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3180 | { stop: 60, color: '#00BF00' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3181 | { stop: 80, color: '#00FF00' }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3182 | { stop: 100, color: '#80FF80' } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3183 | ], |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3184 | renderText: function(text) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3185 | var val = parseInt(text); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3186 | if (val < 20) |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3187 | return 'Weinig'; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3188 | else if (val < 40) |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3189 | return 'Matig'; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3190 | else if (val < 60) |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3191 | return 'Redelijk'; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3192 | else if (val < 80) |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3193 | return 'Veel'; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3194 | else |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3195 | return 'Zeer veel'; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3196 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3197 | }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3198 | $('#popupHop').jqxWindow({ |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3199 | width: 800, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3200 | height: 300, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3201 | position: { x: 230, y: 100 }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3202 | resizable: false, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3203 | theme: theme, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3204 | isModal: true, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3205 | autoOpen: false, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3206 | cancelButton: $('#HopReady'), |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3207 | modalOpacity: 0.40 |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3208 | }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3209 | $('#HopReady').jqxButton({ template: 'success', width: '90px', theme: theme }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3210 | $('#HopReady').click(function() { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3211 | var row, rowID = $('#hopGrid').jqxGrid('getrowid', hopRow); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3212 | console.log('HopReady row:' + hopRow + ' ID:' + rowID); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3213 | row = { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3214 | h_name: $('#wh_name').val(), |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3215 | h_origin: hopData.h_origin, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3216 | h_amount: parseFloat($('#wh_amount').jqxNumberInput('decimal')) / 1000, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3217 | h_cost: hopData.h_cost, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3218 | h_type: hopData.h_type, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3219 | h_form: hopData.h_form, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3220 | h_useat: $('#wh_useat').val(), |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3221 | h_time: hopData.h_time, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3222 | h_alpha: hopData.h_alpha, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3223 | h_beta: hopData.h_beta, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3224 | h_hsi: hopData.h_hsi, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3225 | h_humulene: hopData.h_humulene, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3226 | h_caryophyllene: hopData.h_caryophyllene, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3227 | h_cohumulone: hopData.h_cohumulone, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3228 | h_myrcene: hopData.h_myrcene, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3229 | h_total_oil: hopData.h_total_oil, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3230 | h_inventory: hopData.h_inventory, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3231 | h_avail: hopData.h_avail |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3232 | }; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3233 | $('#hopGrid').jqxGrid('updaterow', rowID, row); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3234 | calcIBUs(); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3235 | }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3236 | $('#wh_name').jqxInput({ theme: theme, width: 320, height: 23 }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3237 | $('#wh_instock').jqxCheckBox({ theme: theme, height: 23 }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3238 | $('#wh_instock').on('change', function(event) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3239 | hopinstock = event.args.checked; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3240 | hoplist.dataBind(); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3241 | }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3242 | $('#wh_select').jqxDropDownList({ |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3243 | placeHolder: 'Kies hop:', |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3244 | theme: theme, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3245 | source: hoplist, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3246 | displayMember: 'name', |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3247 | width: 150, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3248 | height: 23, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3249 | dropDownWidth: 500, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3250 | dropDownHeight: 500, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3251 | renderer: function(index, label, value) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3252 | var datarecord = hoplist.records[index]; |
772
f9d266eb0ec6
In product editor calculate fermentables before the first IBU calculation. In recipe editor changed to the new water calculations like in the product editor.
Michiel Broek <mbroek@mbse.eu>
parents:
756
diff
changeset
|
3253 | return datarecord.origin + ' - ' + datarecord.name + ' / ' + HopFormData[datarecord.form].nl + ' (' + datarecord.alpha + ' % α)'; |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3254 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3255 | }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3256 | $('#wh_select').on('select', function(event) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3257 | if (event.args) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3258 | var datarecord, index = event.args.index; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3259 | datarecord = hoplist.records[index]; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3260 | $('#wh_name').val(datarecord.name); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3261 | hopData.h_name = datarecord.name; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3262 | hopData.h_origin = datarecord.origin; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3263 | hopData.h_cost = datarecord.cost; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3264 | hopData.h_type = datarecord.type; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3265 | hopData.h_form = datarecord.form; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3266 | hopData.h_alpha = datarecord.alpha; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3267 | hopData.h_beta = datarecord.beta; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3268 | hopData.h_hsi = datarecord.hsi; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3269 | hopData.h_humulene = datarecord.humulene; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3270 | hopData.h_caryophyllene = datarecord.caryophyllene; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3271 | hopData.h_cohumulone = datarecord.cohumulone; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3272 | hopData.h_myrcene = datarecord.myrcene; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3273 | hopData.h_total_oil = datarecord.total_oil; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3274 | hopData.h_inventory = datarecord.inventory; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3275 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3276 | }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3277 | $('#wh_amount').jqxNumberInput(Spin1dec); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3278 | $('#wh_amount').on('change', function(event) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3279 | var ibu, amount = parseFloat(event.args.value) / 1000; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3280 | ibu = toIBU(hopData.h_useat, hopData.h_form, preboil_sg, parseFloat($('#batch_size').jqxNumberInput('decimal')), |
540
756fe9afe72b
Recipes editor handles whirlpool hop IBUs.
Michiel Broek <mbroek@mbse.eu>
parents:
524
diff
changeset
|
3281 | amount, parseFloat(hopData.h_time), parseFloat(hopData.h_alpha), $('#ibu_method').val(), 0, parseFloat(hopData.h_time), 0); |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3282 | hopData.h_amount = amount; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3283 | console.log('amount changed: ' + event.args.value + ' time:' + hopData.h_time + ' alpha:' + hopData.h_alpha + ' IBU:' + ibu); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3284 | $('#wh_ibu').val(ibu); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3285 | }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3286 | $('#wh_ibu').jqxNumberInput(Show1dec); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3287 | $('#wh_time').jqxNumberInput(PosInt); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3288 | $('#wh_time').on('change', function(event) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3289 | var ibu, newtime = parseFloat(event.args.value); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3290 | // Check limits and correct |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3291 | if (hopData.h_useat == 2) { // Boil |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3292 | if (newtime > parseFloat($('#boil_time').jqxNumberInput('decimal'))) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3293 | newtime = parseFloat($('#boil_time').jqxNumberInput('decimal')); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3294 | $('#wh_time').val(newtime); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3295 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3296 | hopData.h_time = newtime; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3297 | } else if (hopData.h_useat == 4) { // Whirlpool |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3298 | if (newtime > 120) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3299 | newtime = 120; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3300 | $('#wh_time').val(newtime); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3301 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3302 | hopData.h_time = newtime; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3303 | } else if (hopData.h_useat == 5) { // Dry hop |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3304 | if (newtime > 21) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3305 | newtime = 21; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3306 | $('#wh_time').val(newtime); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3307 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3308 | hopData.h_time = newtime * 1440; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3309 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3310 | ibu = toIBU(hopData.h_useat, hopData.h_form, preboil_sg, parseFloat($('#batch_size').jqxNumberInput('decimal')), |
540
756fe9afe72b
Recipes editor handles whirlpool hop IBUs.
Michiel Broek <mbroek@mbse.eu>
parents:
524
diff
changeset
|
3311 | parseFloat(hopData.h_amount), parseFloat(hopData.h_time), parseFloat(hopData.h_alpha), $('#ibu_method').val(), 0, parseFloat(hopData.h_time), 0); |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3312 | $('#wh_ibu').val(ibu); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3313 | }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3314 | $('#wh_useat').jqxDropDownList({ |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3315 | theme: theme, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3316 | source: HopUseAdapter, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3317 | valueMember: 'id', |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3318 | displayMember: 'nl', |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3319 | width: 180, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3320 | height: 23, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3321 | autoDropDownHeight: true, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3322 | dropDownVerticalAlignment: 'top' |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3323 | }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3324 | $('#wh_useat').on('select', function(event) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3325 | if (event.args) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3326 | var index = event.args.index; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3327 | hopData.h_useat = index; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3328 | if ((index == 0) || (index == 1)) { // Mashhop or First wort hop |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3329 | hopData.h_time = parseFloat(dataRecord.boil_time); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3330 | $('#wh_time').jqxNumberInput({ spinButtons: false, readOnly: true, width: 90 }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3331 | $('#wh_time').val(hopData.h_time); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3332 | } else if (index == 3) { // Aroma |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3333 | hopData.h_time = 0; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3334 | $('#wh_time').jqxNumberInput({ spinButtons: false, readOnly: true, width: 90 }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3335 | $('#wh_time').val(0); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3336 | } else { // Boil, Whirlpool or Dry hop |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3337 | $('#wh_time').jqxNumberInput({ spinButtons: true, readOnly: false, width: 110 }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3338 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3339 | if (index == 5) // Dry hop |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3340 | $('#wh_pmpt_time').html('Tijd in dagen'); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3341 | else |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3342 | $('#wh_pmpt_time').html('Tijd in minuten'); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3343 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3344 | }); |
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
|
3345 | |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3346 | // Tab 4, Diversen |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3347 | $('#popupMisc').jqxWindow({ |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3348 | width: 800, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3349 | height: 275, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3350 | position: { x: 230, y: 100 }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3351 | resizable: false, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3352 | theme: theme, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3353 | isModal: true, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3354 | autoOpen: false, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3355 | cancelButton: $('#MiscReady'), |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3356 | modalOpacity: 0.40 |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3357 | }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3358 | $('#MiscReady').jqxButton({ template: 'success', width: '90px', theme: theme }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3359 | $('#MiscReady').click(function() { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3360 | var row, rowID = $('#miscGrid').jqxGrid('getrowid', miscRow); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3361 | console.log('MiscReady row:' + miscRow + ' ID:' + rowID); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3362 | row = { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3363 | m_name: miscData.m_name, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3364 | m_amount: miscData.m_amount, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3365 | m_cost: miscData.m_cost, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3366 | m_type: miscData.m_type, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3367 | m_use_use: miscData.m_use_use, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3368 | m_time: miscData.m_time, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3369 | m_amount_is_weight: miscData.m_amount_is_weight, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3370 | m_inventory: miscData.m_inventory, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3371 | m_avail: miscData.m_avail |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3372 | }; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3373 | $('#miscGrid').jqxGrid('updaterow', rowID, row); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3374 | }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3375 | $('#wm_name').jqxInput({ theme: theme, width: 320, height: 23 }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3376 | $('#wm_instock').jqxCheckBox({ theme: theme, height: 23 }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3377 | $('#wm_instock').on('change', function(event) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3378 | miscinstock = event.args.checked; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3379 | misclist.dataBind(); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3380 | }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3381 | $('#wm_select').jqxDropDownList({ |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3382 | placeHolder: 'Kies ingrediënt:', |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3383 | theme: theme, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3384 | source: misclist, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3385 | displayMember: 'name', |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3386 | width: 150, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3387 | height: 23, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3388 | dropDownWidth: 500, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3389 | dropDownHeight: 500 |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3390 | }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3391 | $('#wm_select').on('select', function(event) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3392 | if (event.args) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3393 | var datarecord, index = event.args.index; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3394 | datarecord = misclist.records[index]; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3395 | $('#wm_name').val(datarecord.name); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3396 | miscData.m_name = datarecord.name; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3397 | miscData.m_cost = datarecord.cost; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3398 | miscData.m_type = datarecord.type; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3399 | miscData.m_use_use = datarecord.use_use; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3400 | miscData.m_amount_is_weight = datarecord.amount_is_weight; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3401 | miscData.m_inventory = datarecord.inventory; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3402 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3403 | }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3404 | $('#wm_amount').jqxNumberInput(Spin1dec); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3405 | $('#wm_amount').on('change', function(event) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3406 | console.log('amount changed: ' + event.args.value); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3407 | miscData.m_amount = parseFloat(event.args.value) / 1000; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3408 | }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3409 | $('#wm_time').jqxNumberInput(PosInt); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3410 | $('#wm_time').on('change', function(event) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3411 | console.log('time changed: ' + event.args.value); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3412 | var newtime = parseFloat(event.args.value); |
225
ad2e1e3ccaca
The miscs grid rebuild to use a popup editor for the rows.
Michiel Broek <mbroek@mbse.eu>
parents:
224
diff
changeset
|
3413 | |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3414 | if (miscData.m_use_use == 2) { // Boil |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3415 | if (newtime > parseFloat($('#boil_time').jqxNumberInput('decimal'))) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3416 | newtime = parseFloat($('#boil_time').jqxNumberInput('decimal')); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3417 | $('#wm_time').val(newtime); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3418 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3419 | miscData.m_time = newtime; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3420 | } else if ((miscData.m_use_use == 3) || (miscData.m_use_use == 4)) { // Primary or Secondary |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3421 | if (newtime > 21) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3422 | newtime = 21; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3423 | $('#wm_time').val(newtime); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3424 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3425 | miscData.m_time = newtime * 1440; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3426 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3427 | }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3428 | $('#wm_use_use').jqxDropDownList({ |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3429 | theme: theme, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3430 | source: MiscUseAdapter, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3431 | valueMember: 'id', |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3432 | displayMember: 'nl', |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3433 | width: 180, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3434 | height: 23, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3435 | autoDropDownHeight: true, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3436 | dropDownVerticalAlignment: 'top' |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3437 | }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3438 | $('#wm_use_use').on('select', function(event) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3439 | if (event.args) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3440 | var index = event.args.index; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3441 | miscData.m_use_use = index; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3442 | if ((index == 2) || (index == 3) || (index == 4)) { // Boil, Primary or Secondary |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3443 | $('#wm_time').jqxNumberInput({ spinButtons: true, readOnly: false, width: 110 }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3444 | } else { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3445 | miscData.m_time = 0; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3446 | $('#wm_time').jqxNumberInput({ spinButtons: false, readOnly: true, width: 90 }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3447 | $('#wm_time').val(0); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3448 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3449 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3450 | }); |
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
|
3451 | |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3452 | // Tab 5, Gist |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3453 | $('#est_fg2').jqxTooltip({ content: 'Het eind SG. Dit wordt automatisch berekend.' }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3454 | $('#est_fg2').jqxNumberInput(Show3dec); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3455 | $('#est_abv2').jqxTooltip({ content: 'Alcohol volume %. Dit wordt automatisch berekend.' }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3456 | $('#est_abv2').jqxNumberInput(Smal1dec); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3457 | $('#popupYeast').jqxWindow({ |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3458 | width: 800, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3459 | height: 300, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3460 | position: { x: 230, y: 100 }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3461 | resizable: false, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3462 | theme: theme, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3463 | isModal: true, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3464 | autoOpen: false, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3465 | cancelButton: $('#YeastReady'), |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3466 | modalOpacity: 0.40 |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3467 | }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3468 | $('#YeastReady').jqxButton({ template: 'success', width: '90px', theme: theme }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3469 | $('#YeastReady').click(function() { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3470 | var row, rowID = $('#yeastGrid').jqxGrid('getrowid', yeastRow); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3471 | console.log('YeastReady row:' + yeastRow + ' ID:' + rowID); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3472 | row = { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3473 | y_name: yeastData.y_name, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3474 | y_laboratory: yeastData.y_laboratory, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3475 | y_product_id: yeastData.y_product_id, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3476 | y_amount: yeastData.y_amount, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3477 | y_cost: yeastData.y_cost, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3478 | y_type: yeastData.y_type, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3479 | y_form: yeastData.y_form, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3480 | y_flocculation: yeastData.y_flocculation, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3481 | y_min_temperature: yeastData.y_min_temperature, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3482 | y_max_temperature: yeastData.y_max_temperature, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3483 | y_attenuation: yeastData.y_attenuation, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3484 | y_use: yeastData.y_use, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3485 | y_cells: yeastData.y_cells, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3486 | y_tolerance: yeastData.y_tolerance, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3487 | y_inventory: yeastData.y_inventory, |
559
10cc2400b5d5
Backported extra yeast fields and the SO4:Cl ratio changes into the recipes editor.
Michiel Broek <mbroek@mbse.eu>
parents:
549
diff
changeset
|
3488 | y_sta1: yeastData.y_sta1, |
10cc2400b5d5
Backported extra yeast fields and the SO4:Cl ratio changes into the recipes editor.
Michiel Broek <mbroek@mbse.eu>
parents:
549
diff
changeset
|
3489 | y_bacteria: yeastData.y_bacteria, |
10cc2400b5d5
Backported extra yeast fields and the SO4:Cl ratio changes into the recipes editor.
Michiel Broek <mbroek@mbse.eu>
parents:
549
diff
changeset
|
3490 | y_harvest_top: yeastData.y_harvest_top, |
10cc2400b5d5
Backported extra yeast fields and the SO4:Cl ratio changes into the recipes editor.
Michiel Broek <mbroek@mbse.eu>
parents:
549
diff
changeset
|
3491 | y_harvest_time: yeastData.y_harvest_time, |
10cc2400b5d5
Backported extra yeast fields and the SO4:Cl ratio changes into the recipes editor.
Michiel Broek <mbroek@mbse.eu>
parents:
549
diff
changeset
|
3492 | y_pitch_temperature: yeastData.y_pitch_temperature, |
10cc2400b5d5
Backported extra yeast fields and the SO4:Cl ratio changes into the recipes editor.
Michiel Broek <mbroek@mbse.eu>
parents:
549
diff
changeset
|
3493 | y_pofpos: yeastData.y_pofpos, |
10cc2400b5d5
Backported extra yeast fields and the SO4:Cl ratio changes into the recipes editor.
Michiel Broek <mbroek@mbse.eu>
parents:
549
diff
changeset
|
3494 | y_zymocide: yeastData.y_zymocide, |
735
23d972f5d784
Added new dry-yeast parameters to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
710
diff
changeset
|
3495 | y_gr_hl_lo: yeastData.y_gr_hl_lo, |
23d972f5d784
Added new dry-yeast parameters to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
710
diff
changeset
|
3496 | y_sg_lo: yeastData.y_sg_lo, |
23d972f5d784
Added new dry-yeast parameters to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
710
diff
changeset
|
3497 | y_gr_hl_hi: yeastData.y_gr_hl_hi, |
23d972f5d784
Added new dry-yeast parameters to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
710
diff
changeset
|
3498 | y_sg_hi: yeastData.y_sg_hi, |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3499 | y_avail: yeastData.y_avail |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3500 | }; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3501 | $('#yeastGrid').jqxGrid('updaterow', rowID, row); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3502 | calcFermentables(); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3503 | }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3504 | $('#wy_name').jqxInput({ theme: theme, width: 320, height: 23 }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3505 | $('#wy_laboratory').jqxInput({ theme: theme, width: 320, height: 23 }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3506 | $('#wy_product_id').jqxInput({ theme: theme, width: 320, height: 23 }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3507 | $('#wy_instock').jqxCheckBox({ theme: theme, height: 23 }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3508 | $('#wy_instock').on('change', function(event) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3509 | yeastinstock = event.args.checked; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3510 | yeastlist.dataBind(); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3511 | }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3512 | $('#wy_select').jqxDropDownList({ |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3513 | placeHolder: 'Kies gist:', |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3514 | theme: theme, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3515 | source: yeastlist, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3516 | displayMember: 'name', |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3517 | width: 150, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3518 | height: 23, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3519 | dropDownWidth: 500, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3520 | dropDownHeight: 500, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3521 | renderer: function(index, label, value) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3522 | var datarecord = yeastlist.records[index]; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3523 | return datarecord.laboratory + ' ' + datarecord.product_id + ' ' + datarecord.name; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3524 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3525 | }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3526 | $('#wy_select').on('select', function(event) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3527 | if (event.args) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3528 | var datarecord, index = event.args.index; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3529 | datarecord = yeastlist.records[index]; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3530 | $('#wy_name').val(datarecord.name); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3531 | $('#wy_laboratory').val(datarecord.laboratory); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3532 | $('#wy_product_id').val(datarecord.product_id); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3533 | yeastData.y_name = datarecord.name; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3534 | yeastData.y_cost = datarecord.cost; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3535 | yeastData.y_type = datarecord.type; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3536 | yeastData.y_form = datarecord.form; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3537 | yeastData.y_laboratory = datarecord.laboratory; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3538 | yeastData.y_product_id = datarecord.product_id; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3539 | yeastData.y_min_temperature = datarecord.min_temperature; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3540 | yeastData.y_max_temperature = datarecord.max_temperature; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3541 | yeastData.y_flocculation = datarecord.flocculation; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3542 | yeastData.y_attenuation = datarecord.attenuation; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3543 | yeastData.y_cells = datarecord.cells; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3544 | yeastData.y_inventory = datarecord.inventory; |
559
10cc2400b5d5
Backported extra yeast fields and the SO4:Cl ratio changes into the recipes editor.
Michiel Broek <mbroek@mbse.eu>
parents:
549
diff
changeset
|
3545 | yeastData.y_sta1 = datarecord.sta1; |
561
dc618b8a9552
Refracto calculation for FG is now a global function using the New Cubic method. Fixed to typos in the prod_edit en rec_edit yeastData varialbles.
Michiel Broek <mbroek@mbse.eu>
parents:
559
diff
changeset
|
3546 | yeastData.y_bacteria = datarecord.bacteria; |
559
10cc2400b5d5
Backported extra yeast fields and the SO4:Cl ratio changes into the recipes editor.
Michiel Broek <mbroek@mbse.eu>
parents:
549
diff
changeset
|
3547 | yeastData.y_harvest_top = datarecord.harvest_top; |
10cc2400b5d5
Backported extra yeast fields and the SO4:Cl ratio changes into the recipes editor.
Michiel Broek <mbroek@mbse.eu>
parents:
549
diff
changeset
|
3548 | yeastData.y_harvest_time = datarecord.harvest_time; |
10cc2400b5d5
Backported extra yeast fields and the SO4:Cl ratio changes into the recipes editor.
Michiel Broek <mbroek@mbse.eu>
parents:
549
diff
changeset
|
3549 | yeastData.y_pitch_temperature = datarecord.pitch_temperature; |
10cc2400b5d5
Backported extra yeast fields and the SO4:Cl ratio changes into the recipes editor.
Michiel Broek <mbroek@mbse.eu>
parents:
549
diff
changeset
|
3550 | yeastData.y_pofpos = datarecord.pofpos; |
10cc2400b5d5
Backported extra yeast fields and the SO4:Cl ratio changes into the recipes editor.
Michiel Broek <mbroek@mbse.eu>
parents:
549
diff
changeset
|
3551 | yeastData.y_zymocide = datarecord.zymocide; |
735
23d972f5d784
Added new dry-yeast parameters to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
710
diff
changeset
|
3552 | yeastData.y_gr_hl_lo = datarecord.gr_hl_lo; |
23d972f5d784
Added new dry-yeast parameters to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
710
diff
changeset
|
3553 | yeastData.y_sg_lo = datarecord.sg_lo; |
23d972f5d784
Added new dry-yeast parameters to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
710
diff
changeset
|
3554 | yeastData.y_gr_hl_hi = datarecord.gr_hl_hi; |
23d972f5d784
Added new dry-yeast parameters to the recipe editor.
Michiel Broek <mbroek@mbse.eu>
parents:
710
diff
changeset
|
3555 | yeastData.y_sg_hi = datarecord.sg_hi; |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3556 | if (yeastData.y_form == 0) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3557 | $('#wy_pmpt_amount').html('Pak(ken):'); |
559
10cc2400b5d5
Backported extra yeast fields and the SO4:Cl ratio changes into the recipes editor.
Michiel Broek <mbroek@mbse.eu>
parents:
549
diff
changeset
|
3558 | } else if (yeastData.y_form == 1 || yeastData.y_form == 6) { |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3559 | $('#wy_pmpt_amount').html('Gewicht gram:'); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3560 | } else { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3561 | $('#wy_pmpt_amount').html('Volume ml:'); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3562 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3563 | calcFermentables(); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3564 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3565 | }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3566 | $('#wy_amount').jqxNumberInput(Spin1dec); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3567 | $('#wy_amount').on('change', function(event) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3568 | console.log('amount changed: ' + event.args.value); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3569 | var amount; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3570 | if (yeastData.y_form == 0) // Liquid |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3571 | amount = parseFloat(event.args.value); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3572 | else |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3573 | amount = parseFloat(event.args.value) / 1000; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3574 | yeastData.y_amount = amount; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3575 | calcFermentables(); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3576 | }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3577 | $('#wy_use').jqxDropDownList({ |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3578 | theme: theme, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3579 | source: YeastUseAdapter, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3580 | valueMember: 'id', |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3581 | displayMember: 'nl', |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3582 | width: 180, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3583 | height: 23, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3584 | autoDropDownHeight: true, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3585 | dropDownVerticalAlignment: 'top' |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3586 | }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3587 | $('#wy_use').on('select', function(event) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3588 | if (event.args) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3589 | var index = event.args.index; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3590 | yeastData.y_use = index; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3591 | calcFermentabes(); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3592 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3593 | }); |
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
|
3594 | |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3595 | // Tab 6, Maischen |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3596 | $('#mash_name').jqxInput({ theme: theme, width: 320, height: 23 }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3597 | $('#mash_select').jqxDropDownList({ |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3598 | placeHolder: 'Kies schema:', |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3599 | theme: theme, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3600 | source: mashlist, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3601 | displayMember: 'name', |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3602 | width: 250, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3603 | height: 23, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3604 | dropDownWidth: 500, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3605 | dropDownHeight: 500, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3606 | dropDownHorizontalAlignment: 'right' |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3607 | }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3608 | $('#mash_select').on('select', function(event) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3609 | if (event.args) { |
667
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
3610 | var infused = 0, data, datarecord, i, row, rows, rowIDs, index = event.args.index; |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3611 | // First delete all current steps |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3612 | rowIDs = new Array(); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3613 | rows = $('#mashGrid').jqxGrid('getdisplayrows'); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3614 | for (i = 0; i < rows.length; i++) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3615 | row = rows[i]; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3616 | rowIDs.push(row.uid); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3617 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3618 | $('#mashGrid').jqxGrid('deleterow', rowIDs); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3619 | // Then add the new steps |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3620 | datarecord = mashlist.records[index]; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3621 | $('#mash_name').val(datarecord.name); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3622 | for (i = 0; i < datarecord.steps.length; i++) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3623 | data = datarecord.steps[i]; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3624 | row = {}; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3625 | row['step_name'] = data.step_name; |
667
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
3626 | row['step_type'] = parseInt(data.step_type); |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
3627 | row['step_temp'] = parseFloat(data.step_temp); |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
3628 | row['end_temp'] = parseFloat(data.end_temp); |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
3629 | row['step_time'] = parseFloat(data.step_time); |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
3630 | row['ramp_time'] = parseFloat(data.ramp_time); |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
3631 | row['step_infuse_temp'] = 0.0; |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
3632 | row['step_infuse_amount'] = 0.0; |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
3633 | if (mash_infuse == 0 && dataRecord.wg_amount > 0) |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
3634 | mash_infuse = dataRecord.wg_amount; |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
3635 | if (data.step_type == 0) { // Infusion |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
3636 | if (i == 0) { |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
3637 | row['step_infuse_amount'] = parseFloat(mash_infuse); |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
3638 | } else { |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
3639 | row['step_infuse_temp'] = 99.0; |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
3640 | } |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
3641 | } |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
3642 | //console.log(i + ' type: ' + row['step_type'] + ' start infusion: ' + parseFloat(row['step_infuse_amount']) + ' mash_infuse: ' + mash_infuse); |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
3643 | infused += parseFloat(row['step_infuse_amount']); |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
3644 | row['step_volume'] = infused; |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
3645 | if (mashkg > 0) |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
3646 | row['step_wg_ratio'] = Round(parseFloat(mash_infuse / mashkg), 2); |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3647 | else |
667
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
3648 | row['step_wg_ratio'] = 0; |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3649 | $('#mashGrid').jqxGrid('addrow', null, row); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3650 | } |
667
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
3651 | calcMash(); |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3652 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3653 | }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3654 | $('#popupMash').jqxWindow({ |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3655 | width: 800, |
667
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
3656 | height: 375, |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3657 | position: { x: 230, y: 100 }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3658 | resizable: false, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3659 | theme: theme, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3660 | isModal: true, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3661 | autoOpen: false, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3662 | cancelButton: $('#MashReady'), |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3663 | modalOpacity: 0.40 |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3664 | }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3665 | $('#MashReady').jqxButton({ template: 'success', width: '90px', theme: theme }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3666 | $('#MashReady').click(function() { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3667 | calcMash(); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3668 | }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3669 | $('#wstep_name').jqxInput({ theme: theme, width: 320, height: 23 }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3670 | $('#wstep_name').on('change', function(event) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3671 | var rowdata = $('#mashGrid').jqxGrid('getrowdata', mashRow); |
667
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
3672 | rowdata.step_name = $('#wstep_name').val(); |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3673 | }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3674 | $('#wstep_type').jqxDropDownList({ |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3675 | theme: theme, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3676 | source: MashStepTypeAdapter, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3677 | valueMember: 'id', |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3678 | displayMember: 'nl', |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3679 | width: 180, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3680 | height: 23, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3681 | autoDropDownHeight: true |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3682 | }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3683 | $('#wstep_type').on('select', function(event) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3684 | if (event.args) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3685 | var rowdata, rows, i, row, index = event.args.index; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3686 | rowdata = $('#mashGrid').jqxGrid('getrowdata', mashRow); |
667
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
3687 | if (rowdata.step_type != index) { |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
3688 | rowdata.step_type = index; |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3689 | $('#wstep_infuse_amount').hide(); |
667
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
3690 | $('#wstep_infuse_temp').hide(); |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
3691 | $('#wstep_pmpt_amount').hide(); |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
3692 | $('#wstep_pmpt_temp').hide(); |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
3693 | if (index == 0) { // Infusion |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
3694 | if (mashRow == 0) { |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
3695 | $('#wstep_infuse_amount').show(); |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
3696 | $('#wstep_pmpt_amount').show(); |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
3697 | } else { |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
3698 | $('#wstep_infuse_temp').show(); |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
3699 | $('#wstep_pmpt_temp').show(); |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
3700 | } |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
3701 | } |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
3702 | if (index == 1) { // Temperature |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
3703 | if (mashRow > 0) |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
3704 | rowdata.step_infuse_amount = 0; |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
3705 | rowdata.step_infuse_temp = 0; |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
3706 | } |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
3707 | if (index == 2) { // Decoction |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
3708 | var rowprev = $('#mashGrid').jqxGrid('getrowdata', mashRow-1); |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
3709 | rowdata.step_infuse_temp = 99; |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
3710 | rowdata.step_infuse_amount = decoctionVol(rowdata.step_volume, rowdata.step_temp, rowprev.end_temp); |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
3711 | console.log('decoction: ' + rowdata.step_infuse_amount + '/' + rowdata.step_infuse_temp); |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
3712 | } |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
3713 | $('#mashGrid').jqxGrid('updaterow', mashRow, rowdata); |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
3714 | mash_infuse = 0; |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
3715 | rows = $('#mashGrid').jqxGrid('getrows'); |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
3716 | for (i = 0; i < rows.length; i++) { |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
3717 | row = rows[i]; |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
3718 | if (row.step_type == 0) // Infusion |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
3719 | mash_infuse += parseFloat(row.step_infuse_amount); |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
3720 | } |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
3721 | calcMash(); |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3722 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3723 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3724 | }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3725 | $('#wstep_temp').jqxNumberInput(Spin1dec); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3726 | $('#wstep_temp').on('change', function(event) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3727 | var rowdata = $('#mashGrid').jqxGrid('getrowdata', mashRow); |
667
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
3728 | if (rowdata.step_type == 2) { // Decoction |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
3729 | var rowprev = $('#mashGrid').jqxGrid('getrowdata', mashRow-1); |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
3730 | var a = (eq_tun_weight * eq_tun_specific_heat + rowdata.step_volume * SpecificHeatWater) * |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
3731 | (parseFloat(event.args.value) - rowprev.end_temp); |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
3732 | var b = SpecificHeatWater * (99 - parseFloat(event.args.value)); |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
3733 | if (b > 0) { |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
3734 | rowdata.step_temp = parseFloat(event.args.value); |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
3735 | rowdata.step_infuse_amount = Round(a / b, 2); |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
3736 | } else |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
3737 | rowdata.step_infuse_amount = 0; |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
3738 | console.log('change temp ' + rowdata.step_temp + ' decoction: ' + rowdata.step_infuse_amount + '/' + rowdata.step_infuse_temp); |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
3739 | } else { |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
3740 | rowdata.step_temp = parseFloat(event.args.value); |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
3741 | } |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3742 | }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3743 | $('#wend_temp').jqxNumberInput(Spin1dec); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3744 | $('#wend_temp').on('change', function(event) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3745 | var rowdata = $('#mashGrid').jqxGrid('getrowdata', mashRow); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3746 | rowdata.end_temp = parseFloat(event.args.value); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3747 | }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3748 | $('#wstep_time').jqxNumberInput(PosInt); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3749 | $('#wstep_time').on('change', function(event) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3750 | var rowdata = $('#mashGrid').jqxGrid('getrowdata', mashRow); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3751 | rowdata.step_time = parseFloat(event.args.value); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3752 | }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3753 | $('#wramp_time').jqxNumberInput(PosInt); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3754 | $('#wramp_time').on('change', function(event) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3755 | var rowdata = $('#mashGrid').jqxGrid('getrowdata', mashRow); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3756 | rowdata.ramp_time = parseFloat(event.args.value); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3757 | }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3758 | $('#wstep_infuse_amount').jqxNumberInput(Spin1dec); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3759 | $('#wstep_infuse_amount').on('change', function(event) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3760 | var i, rows, row, rowdata = $('#mashGrid').jqxGrid('getrowdata', mashRow); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3761 | rowdata.step_infuse_amount = parseFloat(event.args.value); |
667
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
3762 | if (mashRow == 0) { |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
3763 | rowdata.step_infuse_amount = parseFloat(event.args.value); |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
3764 | mash_infuse = 0; |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
3765 | rows = $('#mashGrid').jqxGrid('getrows'); |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
3766 | for (i = 0; i < rows.length; i++) { |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
3767 | row = rows[i]; |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
3768 | if (row.step_type == 0) // Infusion |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
3769 | mash_infuse += parseFloat(row.step_infuse_amount); |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
3770 | } |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
3771 | if (dataRecord.w2_amount == 0) { |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
3772 | dataRecord.w1_amount = mash_infuse; |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
3773 | $('#w1_amount').val(mash_infuse); |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
3774 | } else { |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
3775 | var w1_amount = (dataRecord.w1_amount / (dataRecord.w1_amount + dataRecord.w2_amount)) * mash_infuse; |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
3776 | var w2_amount = (dataRecord.w2_amount / (dataRecord.w1_amount + dataRecord.w2_amount)) * mash_infuse; |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
3777 | dataRecord.w1_amount = Round(w1_amount, 3); |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
3778 | dataRecord.w2_amount = Round(w2_amount, 3); |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
3779 | $('#w1_amount').val(dataRecord.w1_amount); |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
3780 | $('#w2_amount').val(dataRecord.w2_amount); |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
3781 | } |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
3782 | $('#wg_amount').val(mash_infuse); |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
3783 | console.log('new infuse amount: ' + mash_infuse); |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
3784 | calcWater(); |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3785 | } |
667
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
3786 | }); |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
3787 | $('#wstep_infuse_temp').jqxNumberInput(Spin1dec); |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
3788 | $('#wstep_infuse_temp').on('change', function(event) { |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
3789 | var prevdata = $('#mashGrid').jqxGrid('getrowdata', mashRow-1); |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
3790 | var rowdata = $('#mashGrid').jqxGrid('getrowdata', mashRow); |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
3791 | rowdata.step_infuse_temp = parseFloat(event.args.value); |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
3792 | var vol = infusionVol(prevdata.step_volume, mashkg, rowdata.step_infuse_temp, rowdata.step_temp, prevdata.end_temp); |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
3793 | console.log('new vol: ' + vol); |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
3794 | rowdata.step_infuse_amount = vol; |
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
3795 | $('#wstep_infuse_amount').val(vol); |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3796 | }); |
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
|
3797 | |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3798 | // Tab 7, Water |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3799 | $('#tgt_bu').jqxNumberInput(Show2wat); |
662
4bb005694ce7
Version 0.3.32 Inventory water and profile water edit screens updated and added ion balance fields. Moved acid specs to global.js. In prod_edit and rec_edit changed the water calculations, eliminated the double percentage calculation. The pH values in the water tab have now 2 decimal digits. The mash pH field is only shown in auto calculate mode. The calculated acid addition results are now a bit better and compare with several famous spreadsheets.
Michiel Broek <mbroek@mbse.eu>
parents:
660
diff
changeset
|
3800 | $('#tgt_so4_cl,#got_so4_cl').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
|
3801 | |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3802 | // Water source 1 |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3803 | $('#w1_name').jqxDropDownList({ |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3804 | placeHolder: 'Kies hoofd water:', |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3805 | theme: theme, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3806 | source: waterlist, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3807 | displayMember: 'name', |
772
f9d266eb0ec6
In product editor calculate fermentables before the first IBU calculation. In recipe editor changed to the new water calculations like in the product editor.
Michiel Broek <mbroek@mbse.eu>
parents:
756
diff
changeset
|
3808 | width: 200, |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3809 | height: 27, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3810 | dropDownWidth: 400, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3811 | dropDownHeight: 400 |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3812 | }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3813 | $('#w1_name').on('select', function(event) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3814 | if (event.args) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3815 | var datarecord, index = event.args.index; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3816 | datarecord = waterlist.records[index]; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3817 | dataRecord.w1_name = datarecord.name; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3818 | $('#w1_calcium').val(datarecord.calcium); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3819 | dataRecord.w1_calcium = datarecord.calcium; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3820 | $('#w1_sulfate').val(datarecord.sulfate); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3821 | dataRecord.w1_sulfate = datarecord.sulfate; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3822 | $('#w1_chloride').val(datarecord.chloride); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3823 | dataRecord.w1_chloride = datarecord.chloride; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3824 | $('#w1_sodium').val(datarecord.sodium); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3825 | dataRecord.w1_sodium = datarecord.sodium; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3826 | $('#w1_magnesium').val(datarecord.magnesium); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3827 | dataRecord.w1_magnesium = datarecord.magnesium; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3828 | $('#w1_total_alkalinity').val(datarecord.total_alkalinity); |
772
f9d266eb0ec6
In product editor calculate fermentables before the first IBU calculation. In recipe editor changed to the new water calculations like in the product editor.
Michiel Broek <mbroek@mbse.eu>
parents:
756
diff
changeset
|
3829 | $('#w1_bicarbonate').val(datarecord.total_alkalinity * 1.22); |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3830 | dataRecord.w1_total_alkalinity = datarecord.total_alkalinity; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3831 | $('#w1_ph').val(datarecord.ph); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3832 | dataRecord.w1_ph = datarecord.ph; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3833 | $('#w1_cost').val(datarecord.cost); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3834 | dataRecord.w1_cost = datarecord.cost; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3835 | calcWater(); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3836 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3837 | }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3838 | $('#w1_amount').jqxNumberInput(Show1wat); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3839 | $('#w1_calcium').jqxNumberInput(Show1wat); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3840 | $('#w1_magnesium').jqxNumberInput(Show1wat); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3841 | $('#w1_sodium').jqxNumberInput(Show1wat); |
772
f9d266eb0ec6
In product editor calculate fermentables before the first IBU calculation. In recipe editor changed to the new water calculations like in the product editor.
Michiel Broek <mbroek@mbse.eu>
parents:
756
diff
changeset
|
3842 | $('#w1_bicarbonate').jqxNumberInput(Show1wat); |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3843 | $('#w1_total_alkalinity').jqxNumberInput(Show1wat); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3844 | $('#w1_chloride').jqxNumberInput(Show1wat); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3845 | $('#w1_sulfate').jqxNumberInput(Show1wat); |
662
4bb005694ce7
Version 0.3.32 Inventory water and profile water edit screens updated and added ion balance fields. Moved acid specs to global.js. In prod_edit and rec_edit changed the water calculations, eliminated the double percentage calculation. The pH values in the water tab have now 2 decimal digits. The mash pH field is only shown in auto calculate mode. The calculated acid addition results are now a bit better and compare with several famous spreadsheets.
Michiel Broek <mbroek@mbse.eu>
parents:
660
diff
changeset
|
3846 | $('#w1_ph').jqxNumberInput(Show2wat); |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3847 | // Water source 2 |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3848 | $('#w2_name').jqxDropDownList({ |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3849 | placeHolder: 'Kies meng water:', |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3850 | theme: theme, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3851 | source: waterlist, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3852 | displayMember: 'name', |
772
f9d266eb0ec6
In product editor calculate fermentables before the first IBU calculation. In recipe editor changed to the new water calculations like in the product editor.
Michiel Broek <mbroek@mbse.eu>
parents:
756
diff
changeset
|
3853 | width: 200, |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3854 | height: 27, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3855 | dropDownWidth: 400, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3856 | dropDownHeight: 400 |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3857 | }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3858 | $('#w2_name').on('select', function(event) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3859 | if (event.args) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3860 | var datarecord, index = event.args.index; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3861 | datarecord = waterlist.records[index]; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3862 | dataRecord.w2_name = datarecord.name; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3863 | $('#w2_calcium').val(datarecord.calcium); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3864 | dataRecord.w2_calcium = datarecord.calcium; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3865 | $('#w2_sulfate').val(datarecord.sulfate); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3866 | dataRecord.w2_sulfate = datarecord.sulfate; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3867 | $('#w2_chloride').val(datarecord.chloride); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3868 | dataRecord.w2_chloride = datarecord.chloride; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3869 | $('#w2_sodium').val(datarecord.sodium); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3870 | dataRecord.w2_sodium = datarecord.sodium; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3871 | $('#w2_magnesium').val(datarecord.magnesium); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3872 | dataRecord.w2_magnesium = datarecord.magnesium; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3873 | $('#w2_total_alkalinity').val(datarecord.total_alkalinity); |
772
f9d266eb0ec6
In product editor calculate fermentables before the first IBU calculation. In recipe editor changed to the new water calculations like in the product editor.
Michiel Broek <mbroek@mbse.eu>
parents:
756
diff
changeset
|
3874 | $('#w2_bicarbonate').val(datarecord.total_alkalinity * 1.22); |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3875 | dataRecord.w2_total_alkalinity = datarecord.total_alkalinity; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3876 | $('#w2_ph').val(datarecord.ph); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3877 | dataRecord.w2_ph = datarecord.ph; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3878 | $('#w2_cost').val(datarecord.cost); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3879 | dataRecord.w2_cost = datarecord.cost; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3880 | $('#w2_amount').jqxNumberInput({ max: 100000, readOnly: false }); // Set high max to enable the spinbuttons. |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3881 | calcWater(); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3882 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3883 | }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3884 | $('#w2_amount').jqxTooltip({ content: 'De verdeling van het hoofd en meng water. Het totale maisch water volume blijft gelijk.'}); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3885 | $('#w2_amount').jqxNumberInput({ inputMode: 'simple', theme: theme, width: 94, height: 23, min: 0, decimalDigits: 1, spinButtons: true, readOnly: true }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3886 | $('#w2_calcium').jqxNumberInput(Show1wat); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3887 | $('#w2_magnesium').jqxNumberInput(Show1wat); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3888 | $('#w2_sodium').jqxNumberInput(Show1wat); |
772
f9d266eb0ec6
In product editor calculate fermentables before the first IBU calculation. In recipe editor changed to the new water calculations like in the product editor.
Michiel Broek <mbroek@mbse.eu>
parents:
756
diff
changeset
|
3889 | $('#w2_bicarbonate').jqxNumberInput(Show1wat); |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3890 | $('#w2_total_alkalinity').jqxNumberInput(Show1wat); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3891 | $('#w2_chloride').jqxNumberInput(Show1wat); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3892 | $('#w2_sulfate').jqxNumberInput(Show1wat); |
662
4bb005694ce7
Version 0.3.32 Inventory water and profile water edit screens updated and added ion balance fields. Moved acid specs to global.js. In prod_edit and rec_edit changed the water calculations, eliminated the double percentage calculation. The pH values in the water tab have now 2 decimal digits. The mash pH field is only shown in auto calculate mode. The calculated acid addition results are now a bit better and compare with several famous spreadsheets.
Michiel Broek <mbroek@mbse.eu>
parents:
660
diff
changeset
|
3893 | $('#w2_ph').jqxNumberInput(Show2wat); |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3894 | // Water mixed |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3895 | $('#wg_amount').jqxNumberInput(Show1wat); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3896 | $('#wg_calcium').jqxNumberInput(Show1wat); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3897 | $('#wg_magnesium').jqxNumberInput(Show1wat); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3898 | $('#wg_sodium').jqxNumberInput(Show1wat); |
772
f9d266eb0ec6
In product editor calculate fermentables before the first IBU calculation. In recipe editor changed to the new water calculations like in the product editor.
Michiel Broek <mbroek@mbse.eu>
parents:
756
diff
changeset
|
3899 | $('#wg_bicarbonate').jqxNumberInput(Show1wat); |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3900 | $('#wg_total_alkalinity').jqxNumberInput(Show1wat); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3901 | $('#wg_chloride').jqxNumberInput(Show1wat); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3902 | $('#wg_sulfate').jqxNumberInput(Show1wat); |
662
4bb005694ce7
Version 0.3.32 Inventory water and profile water edit screens updated and added ion balance fields. Moved acid specs to global.js. In prod_edit and rec_edit changed the water calculations, eliminated the double percentage calculation. The pH values in the water tab have now 2 decimal digits. The mash pH field is only shown in auto calculate mode. The calculated acid addition results are now a bit better and compare with several famous spreadsheets.
Michiel Broek <mbroek@mbse.eu>
parents:
660
diff
changeset
|
3903 | $('#wg_ph').jqxNumberInput(Show2wat); |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3904 | // Water treated |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3905 | $('#wb_calcium').jqxTooltip({ content: 'De ideale hoeveelheid Calcium is tussen 40 en 150.'}); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3906 | $('#wb_calcium').jqxNumberInput(Show1wat); |
772
f9d266eb0ec6
In product editor calculate fermentables before the first IBU calculation. In recipe editor changed to the new water calculations like in the product editor.
Michiel Broek <mbroek@mbse.eu>
parents:
756
diff
changeset
|
3907 | $('#wb_magnesium').jqxTooltip({ content: 'De ideale hoeveelheid Magnesium is tussen 5 en 40.'}); |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3908 | $('#wb_magnesium').jqxNumberInput(Show1wat); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3909 | $('#wb_sodium').jqxTooltip({ content: 'De ideale hoeveelheid Natrium is lager dan 150.'}); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3910 | $('#wb_sodium').jqxNumberInput(Show1wat); |
772
f9d266eb0ec6
In product editor calculate fermentables before the first IBU calculation. In recipe editor changed to the new water calculations like in the product editor.
Michiel Broek <mbroek@mbse.eu>
parents:
756
diff
changeset
|
3911 | $('#wb_chloride').jqxTooltip({ content: 'De ideale hoeveelheid Chloride is tussen 50 en 150. Samen met Sulfaat minder dan 500.'}); |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3912 | $('#wb_chloride').jqxNumberInput(Show1wat); |
772
f9d266eb0ec6
In product editor calculate fermentables before the first IBU calculation. In recipe editor changed to the new water calculations like in the product editor.
Michiel Broek <mbroek@mbse.eu>
parents:
756
diff
changeset
|
3913 | $('#wb_sulfate').jqxTooltip({ content: 'De ideale hoeveelheid Sulfaat is tussen 50 en 400. Samen met Sulfaat minder dan 500.'}); |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3914 | $('#wb_sulfate').jqxNumberInput(Show1wat); |
772
f9d266eb0ec6
In product editor calculate fermentables before the first IBU calculation. In recipe editor changed to the new water calculations like in the product editor.
Michiel Broek <mbroek@mbse.eu>
parents:
756
diff
changeset
|
3915 | $('#wb_bicarbonate').jqxTooltip({ content: '0 tot 50 lichte bieren, 50 tot 150 amber bieren, 150 tot 250 donkere bieren.'}); |
f9d266eb0ec6
In product editor calculate fermentables before the first IBU calculation. In recipe editor changed to the new water calculations like in the product editor.
Michiel Broek <mbroek@mbse.eu>
parents:
756
diff
changeset
|
3916 | $('#wb_bicarbonate').jqxNumberInput(Show1wat); |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3917 | $('#wb_total_alkalinity').jqxNumberInput(Show1wat); |
662
4bb005694ce7
Version 0.3.32 Inventory water and profile water edit screens updated and added ion balance fields. Moved acid specs to global.js. In prod_edit and rec_edit changed the water calculations, eliminated the double percentage calculation. The pH values in the water tab have now 2 decimal digits. The mash pH field is only shown in auto calculate mode. The calculated acid addition results are now a bit better and compare with several famous spreadsheets.
Michiel Broek <mbroek@mbse.eu>
parents:
660
diff
changeset
|
3918 | $('#wb_ph').jqxNumberInput(Show2wat); |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3919 | // Water target profile |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3920 | $('#pr_name').jqxDropDownList({ |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3921 | placeHolder: 'Kies doel profiel:', |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3922 | theme: theme, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3923 | source: waterprofiles, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3924 | displayMember: 'name', |
772
f9d266eb0ec6
In product editor calculate fermentables before the first IBU calculation. In recipe editor changed to the new water calculations like in the product editor.
Michiel Broek <mbroek@mbse.eu>
parents:
756
diff
changeset
|
3925 | width: 200, |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3926 | height: 27, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3927 | dropDownWidth: 400, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3928 | dropDownHeight: 300 |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3929 | }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3930 | $('#pr_name').on('select', function(event) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3931 | if (event.args) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3932 | var datarecord, index = event.args.index; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3933 | datarecord = waterprofiles.records[index]; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3934 | $('#pr_calcium').val(datarecord.calcium); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3935 | $('#pr_sulfate').val(datarecord.sulfate); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3936 | $('#pr_chloride').val(datarecord.chloride); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3937 | $('#pr_sodium').val(datarecord.sodium); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3938 | $('#pr_magnesium').val(datarecord.magnesium); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3939 | $('#pr_total_alkalinity').val(datarecord.total_alkalinity); |
772
f9d266eb0ec6
In product editor calculate fermentables before the first IBU calculation. In recipe editor changed to the new water calculations like in the product editor.
Michiel Broek <mbroek@mbse.eu>
parents:
756
diff
changeset
|
3940 | $('#pr_bicarbonate').val(datarecord.total_alkalinity * 1.22); |
559
10cc2400b5d5
Backported extra yeast fields and the SO4:Cl ratio changes into the recipes editor.
Michiel Broek <mbroek@mbse.eu>
parents:
549
diff
changeset
|
3941 | calcWater(); |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3942 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3943 | }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3944 | $('#pr_calcium').jqxNumberInput(Show1wat); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3945 | $('#pr_magnesium').jqxNumberInput(Show1wat); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3946 | $('#pr_sodium').jqxNumberInput(Show1wat); |
772
f9d266eb0ec6
In product editor calculate fermentables before the first IBU calculation. In recipe editor changed to the new water calculations like in the product editor.
Michiel Broek <mbroek@mbse.eu>
parents:
756
diff
changeset
|
3947 | $('#pr_bicarbonate').jqxNumberInput(Show1wat); |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3948 | $('#pr_total_alkalinity').jqxNumberInput(Show1wat); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3949 | $('#pr_chloride').jqxNumberInput(Show1wat); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3950 | $('#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
|
3951 | |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3952 | // Water agents |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3953 | $('#wa_cacl2').jqxTooltip({ content: 'Voor het maken van een ander waterprofiel. Voegt calcium en chloride toe. Voor het verbeteren van zoetere bieren.'}); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3954 | $('#wa_cacl2').jqxNumberInput(Spin1dec); |
524
55a246085522
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
489
diff
changeset
|
3955 | $('#wa_caso4').jqxTooltip({ |
55a246085522
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
489
diff
changeset
|
3956 | content: 'Gips. Voor het maken van een ander waterprofiel. Voegt calcium en sulfaat toe. Voor het verbeteren van bittere bieren.' |
55a246085522
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
489
diff
changeset
|
3957 | }); |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3958 | $('#wa_caso4').jqxNumberInput(Spin1dec); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3959 | $('#wa_mgso4').jqxTooltip({ content: 'Epsom zout. Voor het maken van een ander waterprofiel. Voegt magnesium en sulfaat toe. Gebruik spaarzaam!'}); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3960 | $('#wa_mgso4').jqxNumberInput(Spin1dec); |
524
55a246085522
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
489
diff
changeset
|
3961 | $('#wa_nacl').jqxTooltip({ |
55a246085522
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
489
diff
changeset
|
3962 | content: 'Keukenzout. Voor het maken van een ander waterprofiel. Voegt natrium en chloride toe. ' + |
55a246085522
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
489
diff
changeset
|
3963 | 'Voor het accentueren van zoetheid. Bij hoge dosering wordt het bier ziltig.' |
55a246085522
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
489
diff
changeset
|
3964 | }); |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3965 | $('#wa_nacl').jqxNumberInput(Spin1dec); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3966 | $('#mash_ph').jqxTooltip({ content: 'Maisch pH tussen 5.2 en 5.6. Gebruik 5.2 voor lichte en 5.5 voor donkere bieren.'}); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3967 | $('#mash_ph').jqxNumberInput(SpinpH); |
772
f9d266eb0ec6
In product editor calculate fermentables before the first IBU calculation. In recipe editor changed to the new water calculations like in the product editor.
Michiel Broek <mbroek@mbse.eu>
parents:
756
diff
changeset
|
3968 | $('#wa_mgcl2').jqxTooltip({ content: 'Magnesiumchloride'}); |
f9d266eb0ec6
In product editor calculate fermentables before the first IBU calculation. In recipe editor changed to the new water calculations like in the product editor.
Michiel Broek <mbroek@mbse.eu>
parents:
756
diff
changeset
|
3969 | $('#wa_nahco3').jqxTooltip({ content: 'Baksoda'}); |
f9d266eb0ec6
In product editor calculate fermentables before the first IBU calculation. In recipe editor changed to the new water calculations like in the product editor.
Michiel Broek <mbroek@mbse.eu>
parents:
756
diff
changeset
|
3970 | $('#wa_caco3').jqxTooltip({ content: 'Kalk'}); |
f9d266eb0ec6
In product editor calculate fermentables before the first IBU calculation. In recipe editor changed to the new water calculations like in the product editor.
Michiel Broek <mbroek@mbse.eu>
parents:
756
diff
changeset
|
3971 | $('#wa_mgcl2,#wa_nahco3,#wa_caco3').jqxNumberInput(Spin1dec); |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3972 | $('#calc_acid').jqxCheckBox({ theme: theme, width: 120, height: 23 }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3973 | $('#wa_acid_name').jqxDropDownList({ |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3974 | theme: theme, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3975 | source: AcidTypeAdapter, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3976 | valueMember: 'id', |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3977 | displayMember: 'nl', |
772
f9d266eb0ec6
In product editor calculate fermentables before the first IBU calculation. In recipe editor changed to the new water calculations like in the product editor.
Michiel Broek <mbroek@mbse.eu>
parents:
756
diff
changeset
|
3978 | width: 130, |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3979 | height: 23, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3980 | autoDropDownHeight: true |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3981 | }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3982 | $('#wa_acid').jqxNumberInput(Spin2dec); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3983 | $('#wa_acid').jqxNumberInput({ symbol: ' ml', symbolPosition: 'right' }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3984 | $('#wa_acid_perc').jqxNumberInput(Perc0); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3985 | $('#wa_acid_perc').jqxNumberInput({ width: 70, symbol: '%', symbolPosition: 'right' }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3986 | // Sparge water |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3987 | $('#sparge_temp').jqxNumberInput(Spin1dec); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3988 | $('#sparge_volume').jqxNumberInput(Spin1dec); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3989 | $('#sparge_ph').jqxNumberInput(SpinpH); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3990 | $('#sparge_source').jqxDropDownList({ |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3991 | theme: theme, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3992 | source: SpargeSourceAdapter, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3993 | valueMember: 'id', |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3994 | displayMember: 'nl', |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3995 | width: 110, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3996 | height: 23, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3997 | autoDropDownHeight: true |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3998 | }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
3999 | $('#sparge_acid_amount').jqxNumberInput(Spin2dec); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
4000 | $('#sparge_acid_amount').jqxNumberInput({ spinButtons: false, readOnly: true, symbol: ' ml', symbolPosition: 'right' }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
4001 | $('#sparge_acid_type').jqxDropDownList({ |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
4002 | theme: theme, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
4003 | source: AcidTypeAdapter, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
4004 | valueMember: 'id', |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
4005 | displayMember: 'nl', |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
4006 | width: 110, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
4007 | height: 23, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
4008 | autoDropDownHeight: true |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
4009 | }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
4010 | $('#sparge_acid_perc').jqxNumberInput(Perc0); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
4011 | $('#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
|
4012 | |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
4013 | // Tabs inside the popup window. |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
4014 | $('#jqxTabs').jqxTabs({ |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
4015 | theme: theme, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
4016 | width: 1280, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
4017 | height: 660, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
4018 | autoHeight: false, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
4019 | position: 'top' |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
4020 | }); |
68 | 4021 | |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
4022 | // Buttons below |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
4023 | $('#Export').jqxButton({ template: 'info', width: '80px', theme: theme }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
4024 | $('#Export').bind('click', function() { |
489
18e5cfe5d126
Load new url in database write callback
Michiel Broek <mbroek@mbse.eu>
parents:
474
diff
changeset
|
4025 | saveRecord(0); |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
4026 | }); |
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
|
4027 | |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
4028 | $('#Delete').jqxButton({ template: 'danger', width: '80px', theme: theme }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
4029 | $('#Delete').bind('click', function() { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
4030 | // Open a popup to confirm this action. |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
4031 | $('#eventWindow').jqxWindow('open'); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
4032 | $('#delOk').click(function() { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
4033 | var data = 'delete=true&' + $.param({ record: my_record }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
4034 | $.ajax({ |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
4035 | dataType: 'json', |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
4036 | url: url, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
4037 | cache: false, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
4038 | data: data, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
4039 | type: 'POST', |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
4040 | success: function(data, status, xhr) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
4041 | // delete command is executed. |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
4042 | window.location.href = my_return; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
4043 | }, |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
4044 | error: function(jqXHR, textStatus, errorThrown) { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
4045 | } |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
4046 | }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
4047 | }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
4048 | }); |
68 | 4049 | |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
4050 | $('#Cancel').jqxButton({ template: 'primary', width: '80px', theme: theme }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
4051 | $('#Cancel').bind('click', function() { |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
4052 | window.location.href = my_return; |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
4053 | }); |
68 | 4054 | |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
4055 | $('#Save').jqxButton({ template: 'success', width: '80px', theme: theme }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
4056 | $('#Save').bind('click', function() { |
489
18e5cfe5d126
Load new url in database write callback
Michiel Broek <mbroek@mbse.eu>
parents:
474
diff
changeset
|
4057 | saveRecord(1); |
474
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
4058 | }); |
7b7df475e67d
Code check and cleanup using gjslint
Michiel Broek <mbroek@mbse.eu>
parents:
428
diff
changeset
|
4059 | createDelElements(); |
68 | 4060 | }); |
4061 |