www/js/prod_edit.js@509510586665 (annotated)
www/js/prod_edit.js
Fri, 18 Jun 2021 21:26:28 +0200
- author
- Michiel Broek <mbroek@mbse.eu>
- date
- Fri, 18 Jun 2021 21:26:28 +0200
- changeset 755
- 509510586665
- parent 752
- f68e3bbc1ada
- child 756
- b702c25661e7
- permissions
- -rw-r--r--
Added a empty second water source to the dropdown for water 2. When the empty water is selected, all volumes are reset to a single water source. Don't show the second water in the printed recipe and checklist if there is only one water source.
| 741 | 1 | /***************************************************************************** |
|
738
11e6bd8d8107
Added mash SG and pH fields. Fixed default Yeast update. Added mash step SG and pH input datafields. Added a Brix input too. The print report shows the mash measurements too. Other brewing results now show expected and measured values and the difference.
Michiel Broek <mbroek@mbse.eu>
parents:
726
diff
changeset
|
2 | * Copyright (C) 2018-2021 |
|
111
8c4ba91adf58
Basic screens for brew products.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
3 | * |
|
8c4ba91adf58
Basic screens for brew products.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
4 | * Michiel Broek <mbroek at mbse dot eu> |
|
8c4ba91adf58
Basic screens for brew products.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
5 | * |
|
8c4ba91adf58
Basic screens for brew products.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
6 | * This file is part of BMS |
|
8c4ba91adf58
Basic screens for brew products.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
7 | * |
|
8c4ba91adf58
Basic screens for brew products.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
8 | * This is free software; you can redistribute it and/or modify it |
|
8c4ba91adf58
Basic screens for brew products.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
9 | * under the terms of the GNU General Public License as published by the |
|
8c4ba91adf58
Basic screens for brew products.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
10 | * Free Software Foundation; either version 2, or (at your option) any |
|
8c4ba91adf58
Basic screens for brew products.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
11 | * later version. |
|
8c4ba91adf58
Basic screens for brew products.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
12 | * |
|
8c4ba91adf58
Basic screens for brew products.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
13 | * BrewCloud is distributed in the hope that it will be useful, but |
|
8c4ba91adf58
Basic screens for brew products.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
14 | * WITHOUT ANY WARRANTY; without even the implied warranty of |
|
8c4ba91adf58
Basic screens for brew products.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
15 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
|
8c4ba91adf58
Basic screens for brew products.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
16 | * General Public License for more details. |
|
8c4ba91adf58
Basic screens for brew products.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
17 | * |
|
8c4ba91adf58
Basic screens for brew products.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
18 | * You should have received a copy of the GNU General Public License |
|
8c4ba91adf58
Basic screens for brew products.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
19 | * along with ThermFerm; see the file COPYING. If not, write to the Free |
|
8c4ba91adf58
Basic screens for brew products.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
20 | * Software Foundation, 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. |
|
8c4ba91adf58
Basic screens for brew products.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
21 | *****************************************************************************/ |
|
8c4ba91adf58
Basic screens for brew products.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
22 | |
|
8c4ba91adf58
Basic screens for brew products.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
23 | |
|
697
367ae7ff52f0
Version 0.3.34 Changed log messages in the daemon. Added yeast_pitchrate field to the product database. Added yeast pitchrate edit field to the yeast tab. Initial value is guessed. There is also a popup window for predefined values. An finally the value can be edited by the user. All popup windows are initialized together.
Michiel Broek <mbroek@mbse.eu>
parents:
669
diff
changeset
|
24 | function createPopupElements() { |
| 478 | 25 | |
| 26 | $('#eventWindow').jqxWindow({ | |
| 27 | theme: theme, | |
| 28 | position: { x: 490, y: 210 }, | |
| 29 | width: 300, | |
| 30 | height: 175, | |
| 31 | resizable: false, | |
| 32 | isModal: true, | |
| 33 | modalOpacity: 0.4, | |
|
646
2246d830a42a
Fixed some html errors. Added volume calculations for the brewday tab using a popup tool.
Michiel Broek <mbroek@mbse.eu>
parents:
644
diff
changeset
|
34 | autoOpen: false, |
| 478 | 35 | okButton: $('#delOk'), |
| 36 | cancelButton: $('#delCancel'), | |
| 37 | initContent: function() { | |
| 38 | $('#delOk').jqxButton({ template: 'danger', width: '65px', theme: theme }); | |
| 39 | $('#delCancel').jqxButton({ template: 'success', width: '65px', theme: theme }); | |
| 40 | $('#delCancel').focus(); | |
| 41 | } | |
| 42 | }); | |
|
646
2246d830a42a
Fixed some html errors. Added volume calculations for the brewday tab using a popup tool.
Michiel Broek <mbroek@mbse.eu>
parents:
644
diff
changeset
|
43 | |
|
2246d830a42a
Fixed some html errors. Added volume calculations for the brewday tab using a popup tool.
Michiel Broek <mbroek@mbse.eu>
parents:
644
diff
changeset
|
44 | $('#volumeWindow').jqxWindow({ |
|
2246d830a42a
Fixed some html errors. Added volume calculations for the brewday tab using a popup tool.
Michiel Broek <mbroek@mbse.eu>
parents:
644
diff
changeset
|
45 | theme: theme, |
|
2246d830a42a
Fixed some html errors. Added volume calculations for the brewday tab using a popup tool.
Michiel Broek <mbroek@mbse.eu>
parents:
644
diff
changeset
|
46 | position: { x: 380, y: 210 }, |
|
2246d830a42a
Fixed some html errors. Added volume calculations for the brewday tab using a popup tool.
Michiel Broek <mbroek@mbse.eu>
parents:
644
diff
changeset
|
47 | width: 500, |
|
2246d830a42a
Fixed some html errors. Added volume calculations for the brewday tab using a popup tool.
Michiel Broek <mbroek@mbse.eu>
parents:
644
diff
changeset
|
48 | height: 200, |
|
2246d830a42a
Fixed some html errors. Added volume calculations for the brewday tab using a popup tool.
Michiel Broek <mbroek@mbse.eu>
parents:
644
diff
changeset
|
49 | resizable: false, |
|
2246d830a42a
Fixed some html errors. Added volume calculations for the brewday tab using a popup tool.
Michiel Broek <mbroek@mbse.eu>
parents:
644
diff
changeset
|
50 | isModal: true, |
|
2246d830a42a
Fixed some html errors. Added volume calculations for the brewday tab using a popup tool.
Michiel Broek <mbroek@mbse.eu>
parents:
644
diff
changeset
|
51 | modalOpacity: 0.4, |
|
2246d830a42a
Fixed some html errors. Added volume calculations for the brewday tab using a popup tool.
Michiel Broek <mbroek@mbse.eu>
parents:
644
diff
changeset
|
52 | autoOpen: false, |
|
2246d830a42a
Fixed some html errors. Added volume calculations for the brewday tab using a popup tool.
Michiel Broek <mbroek@mbse.eu>
parents:
644
diff
changeset
|
53 | cancelButton: $('#volumeReady') |
|
2246d830a42a
Fixed some html errors. Added volume calculations for the brewday tab using a popup tool.
Michiel Broek <mbroek@mbse.eu>
parents:
644
diff
changeset
|
54 | }); |
|
697
367ae7ff52f0
Version 0.3.34 Changed log messages in the daemon. Added yeast_pitchrate field to the product database. Added yeast pitchrate edit field to the yeast tab. Initial value is guessed. There is also a popup window for predefined values. An finally the value can be edited by the user. All popup windows are initialized together.
Michiel Broek <mbroek@mbse.eu>
parents:
669
diff
changeset
|
55 | |
|
367ae7ff52f0
Version 0.3.34 Changed log messages in the daemon. Added yeast_pitchrate field to the product database. Added yeast pitchrate edit field to the yeast tab. Initial value is guessed. There is also a popup window for predefined values. An finally the value can be edited by the user. All popup windows are initialized together.
Michiel Broek <mbroek@mbse.eu>
parents:
669
diff
changeset
|
56 | $('#pitchrateWindow').jqxWindow({ |
|
367ae7ff52f0
Version 0.3.34 Changed log messages in the daemon. Added yeast_pitchrate field to the product database. Added yeast pitchrate edit field to the yeast tab. Initial value is guessed. There is also a popup window for predefined values. An finally the value can be edited by the user. All popup windows are initialized together.
Michiel Broek <mbroek@mbse.eu>
parents:
669
diff
changeset
|
57 | theme: theme, |
|
367ae7ff52f0
Version 0.3.34 Changed log messages in the daemon. Added yeast_pitchrate field to the product database. Added yeast pitchrate edit field to the yeast tab. Initial value is guessed. There is also a popup window for predefined values. An finally the value can be edited by the user. All popup windows are initialized together.
Michiel Broek <mbroek@mbse.eu>
parents:
669
diff
changeset
|
58 | position: { x: 330, y: 210 }, |
|
367ae7ff52f0
Version 0.3.34 Changed log messages in the daemon. Added yeast_pitchrate field to the product database. Added yeast pitchrate edit field to the yeast tab. Initial value is guessed. There is also a popup window for predefined values. An finally the value can be edited by the user. All popup windows are initialized together.
Michiel Broek <mbroek@mbse.eu>
parents:
669
diff
changeset
|
59 | width: 600, |
|
367ae7ff52f0
Version 0.3.34 Changed log messages in the daemon. Added yeast_pitchrate field to the product database. Added yeast pitchrate edit field to the yeast tab. Initial value is guessed. There is also a popup window for predefined values. An finally the value can be edited by the user. All popup windows are initialized together.
Michiel Broek <mbroek@mbse.eu>
parents:
669
diff
changeset
|
60 | height: 200, |
|
367ae7ff52f0
Version 0.3.34 Changed log messages in the daemon. Added yeast_pitchrate field to the product database. Added yeast pitchrate edit field to the yeast tab. Initial value is guessed. There is also a popup window for predefined values. An finally the value can be edited by the user. All popup windows are initialized together.
Michiel Broek <mbroek@mbse.eu>
parents:
669
diff
changeset
|
61 | resizable: false, |
|
367ae7ff52f0
Version 0.3.34 Changed log messages in the daemon. Added yeast_pitchrate field to the product database. Added yeast pitchrate edit field to the yeast tab. Initial value is guessed. There is also a popup window for predefined values. An finally the value can be edited by the user. All popup windows are initialized together.
Michiel Broek <mbroek@mbse.eu>
parents:
669
diff
changeset
|
62 | isModal: true, |
|
367ae7ff52f0
Version 0.3.34 Changed log messages in the daemon. Added yeast_pitchrate field to the product database. Added yeast pitchrate edit field to the yeast tab. Initial value is guessed. There is also a popup window for predefined values. An finally the value can be edited by the user. All popup windows are initialized together.
Michiel Broek <mbroek@mbse.eu>
parents:
669
diff
changeset
|
63 | modalOpacity: 0.4, |
|
367ae7ff52f0
Version 0.3.34 Changed log messages in the daemon. Added yeast_pitchrate field to the product database. Added yeast pitchrate edit field to the yeast tab. Initial value is guessed. There is also a popup window for predefined values. An finally the value can be edited by the user. All popup windows are initialized together.
Michiel Broek <mbroek@mbse.eu>
parents:
669
diff
changeset
|
64 | autoOpen: false, |
|
367ae7ff52f0
Version 0.3.34 Changed log messages in the daemon. Added yeast_pitchrate field to the product database. Added yeast pitchrate edit field to the yeast tab. Initial value is guessed. There is also a popup window for predefined values. An finally the value can be edited by the user. All popup windows are initialized together.
Michiel Broek <mbroek@mbse.eu>
parents:
669
diff
changeset
|
65 | cancelButton: $('#pitchrateReady') |
|
367ae7ff52f0
Version 0.3.34 Changed log messages in the daemon. Added yeast_pitchrate field to the product database. Added yeast pitchrate edit field to the yeast tab. Initial value is guessed. There is also a popup window for predefined values. An finally the value can be edited by the user. All popup windows are initialized together.
Michiel Broek <mbroek@mbse.eu>
parents:
669
diff
changeset
|
66 | }); |
|
367ae7ff52f0
Version 0.3.34 Changed log messages in the daemon. Added yeast_pitchrate field to the product database. Added yeast pitchrate edit field to the yeast tab. Initial value is guessed. There is also a popup window for predefined values. An finally the value can be edited by the user. All popup windows are initialized together.
Michiel Broek <mbroek@mbse.eu>
parents:
669
diff
changeset
|
67 | |
|
367ae7ff52f0
Version 0.3.34 Changed log messages in the daemon. Added yeast_pitchrate field to the product database. Added yeast pitchrate edit field to the yeast tab. Initial value is guessed. There is also a popup window for predefined values. An finally the value can be edited by the user. All popup windows are initialized together.
Michiel Broek <mbroek@mbse.eu>
parents:
669
diff
changeset
|
68 | $('#popupFermentable').jqxWindow({ |
|
367ae7ff52f0
Version 0.3.34 Changed log messages in the daemon. Added yeast_pitchrate field to the product database. Added yeast pitchrate edit field to the yeast tab. Initial value is guessed. There is also a popup window for predefined values. An finally the value can be edited by the user. All popup windows are initialized together.
Michiel Broek <mbroek@mbse.eu>
parents:
669
diff
changeset
|
69 | width: 800, |
|
367ae7ff52f0
Version 0.3.34 Changed log messages in the daemon. Added yeast_pitchrate field to the product database. Added yeast pitchrate edit field to the yeast tab. Initial value is guessed. There is also a popup window for predefined values. An finally the value can be edited by the user. All popup windows are initialized together.
Michiel Broek <mbroek@mbse.eu>
parents:
669
diff
changeset
|
70 | height: 300, |
|
367ae7ff52f0
Version 0.3.34 Changed log messages in the daemon. Added yeast_pitchrate field to the product database. Added yeast pitchrate edit field to the yeast tab. Initial value is guessed. There is also a popup window for predefined values. An finally the value can be edited by the user. All popup windows are initialized together.
Michiel Broek <mbroek@mbse.eu>
parents:
669
diff
changeset
|
71 | position: { x: 230, y: 100 }, |
|
367ae7ff52f0
Version 0.3.34 Changed log messages in the daemon. Added yeast_pitchrate field to the product database. Added yeast pitchrate edit field to the yeast tab. Initial value is guessed. There is also a popup window for predefined values. An finally the value can be edited by the user. All popup windows are initialized together.
Michiel Broek <mbroek@mbse.eu>
parents:
669
diff
changeset
|
72 | resizable: false, |
|
367ae7ff52f0
Version 0.3.34 Changed log messages in the daemon. Added yeast_pitchrate field to the product database. Added yeast pitchrate edit field to the yeast tab. Initial value is guessed. There is also a popup window for predefined values. An finally the value can be edited by the user. All popup windows are initialized together.
Michiel Broek <mbroek@mbse.eu>
parents:
669
diff
changeset
|
73 | theme: theme, |
|
367ae7ff52f0
Version 0.3.34 Changed log messages in the daemon. Added yeast_pitchrate field to the product database. Added yeast pitchrate edit field to the yeast tab. Initial value is guessed. There is also a popup window for predefined values. An finally the value can be edited by the user. All popup windows are initialized together.
Michiel Broek <mbroek@mbse.eu>
parents:
669
diff
changeset
|
74 | isModal: true, |
|
367ae7ff52f0
Version 0.3.34 Changed log messages in the daemon. Added yeast_pitchrate field to the product database. Added yeast pitchrate edit field to the yeast tab. Initial value is guessed. There is also a popup window for predefined values. An finally the value can be edited by the user. All popup windows are initialized together.
Michiel Broek <mbroek@mbse.eu>
parents:
669
diff
changeset
|
75 | autoOpen: false, |
|
367ae7ff52f0
Version 0.3.34 Changed log messages in the daemon. Added yeast_pitchrate field to the product database. Added yeast pitchrate edit field to the yeast tab. Initial value is guessed. There is also a popup window for predefined values. An finally the value can be edited by the user. All popup windows are initialized together.
Michiel Broek <mbroek@mbse.eu>
parents:
669
diff
changeset
|
76 | cancelButton: $('#FermentableReady'), |
|
367ae7ff52f0
Version 0.3.34 Changed log messages in the daemon. Added yeast_pitchrate field to the product database. Added yeast pitchrate edit field to the yeast tab. Initial value is guessed. There is also a popup window for predefined values. An finally the value can be edited by the user. All popup windows are initialized together.
Michiel Broek <mbroek@mbse.eu>
parents:
669
diff
changeset
|
77 | modalOpacity: 0.40 |
|
367ae7ff52f0
Version 0.3.34 Changed log messages in the daemon. Added yeast_pitchrate field to the product database. Added yeast pitchrate edit field to the yeast tab. Initial value is guessed. There is also a popup window for predefined values. An finally the value can be edited by the user. All popup windows are initialized together.
Michiel Broek <mbroek@mbse.eu>
parents:
669
diff
changeset
|
78 | }); |
|
367ae7ff52f0
Version 0.3.34 Changed log messages in the daemon. Added yeast_pitchrate field to the product database. Added yeast pitchrate edit field to the yeast tab. Initial value is guessed. There is also a popup window for predefined values. An finally the value can be edited by the user. All popup windows are initialized together.
Michiel Broek <mbroek@mbse.eu>
parents:
669
diff
changeset
|
79 | |
|
367ae7ff52f0
Version 0.3.34 Changed log messages in the daemon. Added yeast_pitchrate field to the product database. Added yeast pitchrate edit field to the yeast tab. Initial value is guessed. There is also a popup window for predefined values. An finally the value can be edited by the user. All popup windows are initialized together.
Michiel Broek <mbroek@mbse.eu>
parents:
669
diff
changeset
|
80 | $('#popupHop').jqxWindow({ |
|
367ae7ff52f0
Version 0.3.34 Changed log messages in the daemon. Added yeast_pitchrate field to the product database. Added yeast pitchrate edit field to the yeast tab. Initial value is guessed. There is also a popup window for predefined values. An finally the value can be edited by the user. All popup windows are initialized together.
Michiel Broek <mbroek@mbse.eu>
parents:
669
diff
changeset
|
81 | width: 800, |
|
367ae7ff52f0
Version 0.3.34 Changed log messages in the daemon. Added yeast_pitchrate field to the product database. Added yeast pitchrate edit field to the yeast tab. Initial value is guessed. There is also a popup window for predefined values. An finally the value can be edited by the user. All popup windows are initialized together.
Michiel Broek <mbroek@mbse.eu>
parents:
669
diff
changeset
|
82 | height: 300, |
|
367ae7ff52f0
Version 0.3.34 Changed log messages in the daemon. Added yeast_pitchrate field to the product database. Added yeast pitchrate edit field to the yeast tab. Initial value is guessed. There is also a popup window for predefined values. An finally the value can be edited by the user. All popup windows are initialized together.
Michiel Broek <mbroek@mbse.eu>
parents:
669
diff
changeset
|
83 | position: { x: 230, y: 100 }, |
|
367ae7ff52f0
Version 0.3.34 Changed log messages in the daemon. Added yeast_pitchrate field to the product database. Added yeast pitchrate edit field to the yeast tab. Initial value is guessed. There is also a popup window for predefined values. An finally the value can be edited by the user. All popup windows are initialized together.
Michiel Broek <mbroek@mbse.eu>
parents:
669
diff
changeset
|
84 | resizable: false, |
|
367ae7ff52f0
Version 0.3.34 Changed log messages in the daemon. Added yeast_pitchrate field to the product database. Added yeast pitchrate edit field to the yeast tab. Initial value is guessed. There is also a popup window for predefined values. An finally the value can be edited by the user. All popup windows are initialized together.
Michiel Broek <mbroek@mbse.eu>
parents:
669
diff
changeset
|
85 | theme: theme, |
|
367ae7ff52f0
Version 0.3.34 Changed log messages in the daemon. Added yeast_pitchrate field to the product database. Added yeast pitchrate edit field to the yeast tab. Initial value is guessed. There is also a popup window for predefined values. An finally the value can be edited by the user. All popup windows are initialized together.
Michiel Broek <mbroek@mbse.eu>
parents:
669
diff
changeset
|
86 | isModal: true, |
|
367ae7ff52f0
Version 0.3.34 Changed log messages in the daemon. Added yeast_pitchrate field to the product database. Added yeast pitchrate edit field to the yeast tab. Initial value is guessed. There is also a popup window for predefined values. An finally the value can be edited by the user. All popup windows are initialized together.
Michiel Broek <mbroek@mbse.eu>
parents:
669
diff
changeset
|
87 | autoOpen: false, |
|
367ae7ff52f0
Version 0.3.34 Changed log messages in the daemon. Added yeast_pitchrate field to the product database. Added yeast pitchrate edit field to the yeast tab. Initial value is guessed. There is also a popup window for predefined values. An finally the value can be edited by the user. All popup windows are initialized together.
Michiel Broek <mbroek@mbse.eu>
parents:
669
diff
changeset
|
88 | cancelButton: $('#HopReady'), |
|
367ae7ff52f0
Version 0.3.34 Changed log messages in the daemon. Added yeast_pitchrate field to the product database. Added yeast pitchrate edit field to the yeast tab. Initial value is guessed. There is also a popup window for predefined values. An finally the value can be edited by the user. All popup windows are initialized together.
Michiel Broek <mbroek@mbse.eu>
parents:
669
diff
changeset
|
89 | modalOpacity: 0.40 |
|
367ae7ff52f0
Version 0.3.34 Changed log messages in the daemon. Added yeast_pitchrate field to the product database. Added yeast pitchrate edit field to the yeast tab. Initial value is guessed. There is also a popup window for predefined values. An finally the value can be edited by the user. All popup windows are initialized together.
Michiel Broek <mbroek@mbse.eu>
parents:
669
diff
changeset
|
90 | }); |
|
367ae7ff52f0
Version 0.3.34 Changed log messages in the daemon. Added yeast_pitchrate field to the product database. Added yeast pitchrate edit field to the yeast tab. Initial value is guessed. There is also a popup window for predefined values. An finally the value can be edited by the user. All popup windows are initialized together.
Michiel Broek <mbroek@mbse.eu>
parents:
669
diff
changeset
|
91 | |
|
367ae7ff52f0
Version 0.3.34 Changed log messages in the daemon. Added yeast_pitchrate field to the product database. Added yeast pitchrate edit field to the yeast tab. Initial value is guessed. There is also a popup window for predefined values. An finally the value can be edited by the user. All popup windows are initialized together.
Michiel Broek <mbroek@mbse.eu>
parents:
669
diff
changeset
|
92 | $('#popupMisc').jqxWindow({ |
|
367ae7ff52f0
Version 0.3.34 Changed log messages in the daemon. Added yeast_pitchrate field to the product database. Added yeast pitchrate edit field to the yeast tab. Initial value is guessed. There is also a popup window for predefined values. An finally the value can be edited by the user. All popup windows are initialized together.
Michiel Broek <mbroek@mbse.eu>
parents:
669
diff
changeset
|
93 | width: 800, |
|
367ae7ff52f0
Version 0.3.34 Changed log messages in the daemon. Added yeast_pitchrate field to the product database. Added yeast pitchrate edit field to the yeast tab. Initial value is guessed. There is also a popup window for predefined values. An finally the value can be edited by the user. All popup windows are initialized together.
Michiel Broek <mbroek@mbse.eu>
parents:
669
diff
changeset
|
94 | height: 275, |
|
367ae7ff52f0
Version 0.3.34 Changed log messages in the daemon. Added yeast_pitchrate field to the product database. Added yeast pitchrate edit field to the yeast tab. Initial value is guessed. There is also a popup window for predefined values. An finally the value can be edited by the user. All popup windows are initialized together.
Michiel Broek <mbroek@mbse.eu>
parents:
669
diff
changeset
|
95 | position: { x: 230, y: 100 }, |
|
367ae7ff52f0
Version 0.3.34 Changed log messages in the daemon. Added yeast_pitchrate field to the product database. Added yeast pitchrate edit field to the yeast tab. Initial value is guessed. There is also a popup window for predefined values. An finally the value can be edited by the user. All popup windows are initialized together.
Michiel Broek <mbroek@mbse.eu>
parents:
669
diff
changeset
|
96 | resizable: false, |
|
367ae7ff52f0
Version 0.3.34 Changed log messages in the daemon. Added yeast_pitchrate field to the product database. Added yeast pitchrate edit field to the yeast tab. Initial value is guessed. There is also a popup window for predefined values. An finally the value can be edited by the user. All popup windows are initialized together.
Michiel Broek <mbroek@mbse.eu>
parents:
669
diff
changeset
|
97 | theme: theme, |
|
367ae7ff52f0
Version 0.3.34 Changed log messages in the daemon. Added yeast_pitchrate field to the product database. Added yeast pitchrate edit field to the yeast tab. Initial value is guessed. There is also a popup window for predefined values. An finally the value can be edited by the user. All popup windows are initialized together.
Michiel Broek <mbroek@mbse.eu>
parents:
669
diff
changeset
|
98 | isModal: true, |
|
367ae7ff52f0
Version 0.3.34 Changed log messages in the daemon. Added yeast_pitchrate field to the product database. Added yeast pitchrate edit field to the yeast tab. Initial value is guessed. There is also a popup window for predefined values. An finally the value can be edited by the user. All popup windows are initialized together.
Michiel Broek <mbroek@mbse.eu>
parents:
669
diff
changeset
|
99 | autoOpen: false, |
|
367ae7ff52f0
Version 0.3.34 Changed log messages in the daemon. Added yeast_pitchrate field to the product database. Added yeast pitchrate edit field to the yeast tab. Initial value is guessed. There is also a popup window for predefined values. An finally the value can be edited by the user. All popup windows are initialized together.
Michiel Broek <mbroek@mbse.eu>
parents:
669
diff
changeset
|
100 | cancelButton: $('#MiscReady'), |
|
367ae7ff52f0
Version 0.3.34 Changed log messages in the daemon. Added yeast_pitchrate field to the product database. Added yeast pitchrate edit field to the yeast tab. Initial value is guessed. There is also a popup window for predefined values. An finally the value can be edited by the user. All popup windows are initialized together.
Michiel Broek <mbroek@mbse.eu>
parents:
669
diff
changeset
|
101 | modalOpacity: 0.40 |
|
367ae7ff52f0
Version 0.3.34 Changed log messages in the daemon. Added yeast_pitchrate field to the product database. Added yeast pitchrate edit field to the yeast tab. Initial value is guessed. There is also a popup window for predefined values. An finally the value can be edited by the user. All popup windows are initialized together.
Michiel Broek <mbroek@mbse.eu>
parents:
669
diff
changeset
|
102 | }); |
|
367ae7ff52f0
Version 0.3.34 Changed log messages in the daemon. Added yeast_pitchrate field to the product database. Added yeast pitchrate edit field to the yeast tab. Initial value is guessed. There is also a popup window for predefined values. An finally the value can be edited by the user. All popup windows are initialized together.
Michiel Broek <mbroek@mbse.eu>
parents:
669
diff
changeset
|
103 | |
|
367ae7ff52f0
Version 0.3.34 Changed log messages in the daemon. Added yeast_pitchrate field to the product database. Added yeast pitchrate edit field to the yeast tab. Initial value is guessed. There is also a popup window for predefined values. An finally the value can be edited by the user. All popup windows are initialized together.
Michiel Broek <mbroek@mbse.eu>
parents:
669
diff
changeset
|
104 | $('#popupYeast').jqxWindow({ |
|
367ae7ff52f0
Version 0.3.34 Changed log messages in the daemon. Added yeast_pitchrate field to the product database. Added yeast pitchrate edit field to the yeast tab. Initial value is guessed. There is also a popup window for predefined values. An finally the value can be edited by the user. All popup windows are initialized together.
Michiel Broek <mbroek@mbse.eu>
parents:
669
diff
changeset
|
105 | width: 800, |
|
367ae7ff52f0
Version 0.3.34 Changed log messages in the daemon. Added yeast_pitchrate field to the product database. Added yeast pitchrate edit field to the yeast tab. Initial value is guessed. There is also a popup window for predefined values. An finally the value can be edited by the user. All popup windows are initialized together.
Michiel Broek <mbroek@mbse.eu>
parents:
669
diff
changeset
|
106 | height: 300, |
|
367ae7ff52f0
Version 0.3.34 Changed log messages in the daemon. Added yeast_pitchrate field to the product database. Added yeast pitchrate edit field to the yeast tab. Initial value is guessed. There is also a popup window for predefined values. An finally the value can be edited by the user. All popup windows are initialized together.
Michiel Broek <mbroek@mbse.eu>
parents:
669
diff
changeset
|
107 | position: { x: 230, y: 100 }, |
|
367ae7ff52f0
Version 0.3.34 Changed log messages in the daemon. Added yeast_pitchrate field to the product database. Added yeast pitchrate edit field to the yeast tab. Initial value is guessed. There is also a popup window for predefined values. An finally the value can be edited by the user. All popup windows are initialized together.
Michiel Broek <mbroek@mbse.eu>
parents:
669
diff
changeset
|
108 | resizable: false, |
|
367ae7ff52f0
Version 0.3.34 Changed log messages in the daemon. Added yeast_pitchrate field to the product database. Added yeast pitchrate edit field to the yeast tab. Initial value is guessed. There is also a popup window for predefined values. An finally the value can be edited by the user. All popup windows are initialized together.
Michiel Broek <mbroek@mbse.eu>
parents:
669
diff
changeset
|
109 | theme: theme, |
|
367ae7ff52f0
Version 0.3.34 Changed log messages in the daemon. Added yeast_pitchrate field to the product database. Added yeast pitchrate edit field to the yeast tab. Initial value is guessed. There is also a popup window for predefined values. An finally the value can be edited by the user. All popup windows are initialized together.
Michiel Broek <mbroek@mbse.eu>
parents:
669
diff
changeset
|
110 | isModal: true, |
|
367ae7ff52f0
Version 0.3.34 Changed log messages in the daemon. Added yeast_pitchrate field to the product database. Added yeast pitchrate edit field to the yeast tab. Initial value is guessed. There is also a popup window for predefined values. An finally the value can be edited by the user. All popup windows are initialized together.
Michiel Broek <mbroek@mbse.eu>
parents:
669
diff
changeset
|
111 | autoOpen: false, |
|
367ae7ff52f0
Version 0.3.34 Changed log messages in the daemon. Added yeast_pitchrate field to the product database. Added yeast pitchrate edit field to the yeast tab. Initial value is guessed. There is also a popup window for predefined values. An finally the value can be edited by the user. All popup windows are initialized together.
Michiel Broek <mbroek@mbse.eu>
parents:
669
diff
changeset
|
112 | cancelButton: $('#YeastReady'), |
|
367ae7ff52f0
Version 0.3.34 Changed log messages in the daemon. Added yeast_pitchrate field to the product database. Added yeast pitchrate edit field to the yeast tab. Initial value is guessed. There is also a popup window for predefined values. An finally the value can be edited by the user. All popup windows are initialized together.
Michiel Broek <mbroek@mbse.eu>
parents:
669
diff
changeset
|
113 | modalOpacity: 0.40 |
|
367ae7ff52f0
Version 0.3.34 Changed log messages in the daemon. Added yeast_pitchrate field to the product database. Added yeast pitchrate edit field to the yeast tab. Initial value is guessed. There is also a popup window for predefined values. An finally the value can be edited by the user. All popup windows are initialized together.
Michiel Broek <mbroek@mbse.eu>
parents:
669
diff
changeset
|
114 | }); |
|
367ae7ff52f0
Version 0.3.34 Changed log messages in the daemon. Added yeast_pitchrate field to the product database. Added yeast pitchrate edit field to the yeast tab. Initial value is guessed. There is also a popup window for predefined values. An finally the value can be edited by the user. All popup windows are initialized together.
Michiel Broek <mbroek@mbse.eu>
parents:
669
diff
changeset
|
115 | |
|
367ae7ff52f0
Version 0.3.34 Changed log messages in the daemon. Added yeast_pitchrate field to the product database. Added yeast pitchrate edit field to the yeast tab. Initial value is guessed. There is also a popup window for predefined values. An finally the value can be edited by the user. All popup windows are initialized together.
Michiel Broek <mbroek@mbse.eu>
parents:
669
diff
changeset
|
116 | $('#popupMash').jqxWindow({ |
|
367ae7ff52f0
Version 0.3.34 Changed log messages in the daemon. Added yeast_pitchrate field to the product database. Added yeast pitchrate edit field to the yeast tab. Initial value is guessed. There is also a popup window for predefined values. An finally the value can be edited by the user. All popup windows are initialized together.
Michiel Broek <mbroek@mbse.eu>
parents:
669
diff
changeset
|
117 | width: 800, |
|
738
11e6bd8d8107
Added mash SG and pH fields. Fixed default Yeast update. Added mash step SG and pH input datafields. Added a Brix input too. The print report shows the mash measurements too. Other brewing results now show expected and measured values and the difference.
Michiel Broek <mbroek@mbse.eu>
parents:
726
diff
changeset
|
118 | height: 400, |
|
697
367ae7ff52f0
Version 0.3.34 Changed log messages in the daemon. Added yeast_pitchrate field to the product database. Added yeast pitchrate edit field to the yeast tab. Initial value is guessed. There is also a popup window for predefined values. An finally the value can be edited by the user. All popup windows are initialized together.
Michiel Broek <mbroek@mbse.eu>
parents:
669
diff
changeset
|
119 | position: { x: 230, y: 100 }, |
|
367ae7ff52f0
Version 0.3.34 Changed log messages in the daemon. Added yeast_pitchrate field to the product database. Added yeast pitchrate edit field to the yeast tab. Initial value is guessed. There is also a popup window for predefined values. An finally the value can be edited by the user. All popup windows are initialized together.
Michiel Broek <mbroek@mbse.eu>
parents:
669
diff
changeset
|
120 | resizable: false, |
|
367ae7ff52f0
Version 0.3.34 Changed log messages in the daemon. Added yeast_pitchrate field to the product database. Added yeast pitchrate edit field to the yeast tab. Initial value is guessed. There is also a popup window for predefined values. An finally the value can be edited by the user. All popup windows are initialized together.
Michiel Broek <mbroek@mbse.eu>
parents:
669
diff
changeset
|
121 | theme: theme, |
|
367ae7ff52f0
Version 0.3.34 Changed log messages in the daemon. Added yeast_pitchrate field to the product database. Added yeast pitchrate edit field to the yeast tab. Initial value is guessed. There is also a popup window for predefined values. An finally the value can be edited by the user. All popup windows are initialized together.
Michiel Broek <mbroek@mbse.eu>
parents:
669
diff
changeset
|
122 | isModal: true, |
|
367ae7ff52f0
Version 0.3.34 Changed log messages in the daemon. Added yeast_pitchrate field to the product database. Added yeast pitchrate edit field to the yeast tab. Initial value is guessed. There is also a popup window for predefined values. An finally the value can be edited by the user. All popup windows are initialized together.
Michiel Broek <mbroek@mbse.eu>
parents:
669
diff
changeset
|
123 | autoOpen: false, |
|
367ae7ff52f0
Version 0.3.34 Changed log messages in the daemon. Added yeast_pitchrate field to the product database. Added yeast pitchrate edit field to the yeast tab. Initial value is guessed. There is also a popup window for predefined values. An finally the value can be edited by the user. All popup windows are initialized together.
Michiel Broek <mbroek@mbse.eu>
parents:
669
diff
changeset
|
124 | cancelButton: $('#MashReady'), |
|
367ae7ff52f0
Version 0.3.34 Changed log messages in the daemon. Added yeast_pitchrate field to the product database. Added yeast pitchrate edit field to the yeast tab. Initial value is guessed. There is also a popup window for predefined values. An finally the value can be edited by the user. All popup windows are initialized together.
Michiel Broek <mbroek@mbse.eu>
parents:
669
diff
changeset
|
125 | modalOpacity: 0.40 |
|
367ae7ff52f0
Version 0.3.34 Changed log messages in the daemon. Added yeast_pitchrate field to the product database. Added yeast pitchrate edit field to the yeast tab. Initial value is guessed. There is also a popup window for predefined values. An finally the value can be edited by the user. All popup windows are initialized together.
Michiel Broek <mbroek@mbse.eu>
parents:
669
diff
changeset
|
126 | }); |
|
112
7ef48396f705
Added some buttons. Only allow product delete if it has no serious data.
Michiel Broek <mbroek@mbse.eu>
parents:
111
diff
changeset
|
127 | } |
|
7ef48396f705
Added some buttons. Only allow product delete if it has no serious data.
Michiel Broek <mbroek@mbse.eu>
parents:
111
diff
changeset
|
128 | |
|
7ef48396f705
Added some buttons. Only allow product delete if it has no serious data.
Michiel Broek <mbroek@mbse.eu>
parents:
111
diff
changeset
|
129 | |
|
7ef48396f705
Added some buttons. Only allow product delete if it has no serious data.
Michiel Broek <mbroek@mbse.eu>
parents:
111
diff
changeset
|
130 | |
|
752
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
131 | function drop_endis(flag, item, index) { |
|
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
132 | (flag) ? $(item).jqxDropDownList('disableAt', index) : $(item).jqxDropDownList('enableAt', index); |
|
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
133 | } |
|
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
134 | |
|
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
135 | |
|
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
136 | |
|
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
137 | function block_fermentable(stage, added) { |
|
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
138 | if (stage > 5 && added < 4) // After fermentation and added before packaging |
|
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
139 | return true; |
|
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
140 | if (stage > 3 && added < 3) // After primary and added before sec/tert |
|
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
141 | return true; |
|
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
142 | if (stage > 2 && added < 2) // After boil and added during mash or boil |
|
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
143 | return true; |
|
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
144 | return false; |
|
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
145 | } |
|
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
146 | |
|
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
147 | |
|
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
148 | |
|
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
149 | function minimum_fermentable(stage, added) { |
|
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
150 | if (stage > 5 && added < 4) |
|
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
151 | return 4; |
|
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
152 | if (stage > 3 && added < 3) |
|
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
153 | return 3; |
|
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
154 | if (stage > 2 && added < 2) |
|
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
155 | return 2; |
|
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
156 | return added; |
|
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
157 | } |
|
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
158 | |
|
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
159 | |
|
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
160 | |
|
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
161 | function minimum_hop(stage, useat) |
|
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
162 | { |
|
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
163 | if (stage > 2 && useat < 5) |
|
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
164 | return 5; |
|
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
165 | return useat; |
|
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
166 | } |
|
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
167 | |
|
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
168 | |
|
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
169 | |
|
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
170 | function block_hop(stage, useat) |
|
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
171 | { |
|
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
172 | if (stage > 2 && useat < 5) |
|
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
173 | return true; |
|
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
174 | return false; |
|
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
175 | } |
|
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
176 | |
|
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
177 | |
|
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
178 | |
|
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
179 | function block_misc(stage, use_use) { |
|
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
180 | if (stage > 5 && use_use < 5) |
|
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
181 | return true; |
|
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
182 | if (stage > 3 && use_use < 4) |
|
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
183 | return true; |
|
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
184 | if (stage > 2 && use_use < 3) |
|
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
185 | return true; |
|
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
186 | if (stage > 1 && use_use < 1) |
|
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
187 | return true; |
|
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
188 | return false; |
|
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
189 | } |
|
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
190 | |
|
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
191 | |
|
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
192 | |
|
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
193 | function minimum_misc(stage, use_use) { |
|
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
194 | if (stage > 5 && use_use < 5) |
|
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
195 | return 5; |
|
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
196 | if (stage > 3 && use_use < 4) |
|
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
197 | return 4; |
|
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
198 | if (stage > 2 && use_use < 3) |
|
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
199 | return 3; |
|
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
200 | if (stage > 1 && use_use < 1) |
|
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
201 | return 1; |
|
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
202 | return use_use; |
|
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
203 | } |
|
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
204 | |
|
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
205 | |
|
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
206 | |
|
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
207 | function block_yeast(stage, use) { |
|
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
208 | if (stage > 3 && use < 1) |
|
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
209 | return true; |
|
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
210 | if (stage > 4 && use < 2) |
|
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
211 | return true; |
|
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
212 | if (stage > 5 && use < 3) |
|
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
213 | return true; |
|
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
214 | if (stage > 6 && use < 4) |
|
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
215 | return true; |
|
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
216 | return false; |
|
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
217 | } |
|
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
218 | |
|
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
219 | |
|
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
220 | |
|
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
221 | function minimum_yeast(stage, use) { |
|
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
222 | if (stage > 3 && use < 1) |
|
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
223 | return 1; |
|
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
224 | if (stage > 4 && use < 2) |
|
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
225 | return 2; |
|
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
226 | if (stage > 5 && use < 3) |
|
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
227 | return 3; |
|
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
228 | if (stage > 6 && use < 4) |
|
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
229 | return 4; |
|
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
230 | return use; |
|
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
231 | } |
|
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
232 | |
|
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
233 | |
|
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
234 | |
| 478 | 235 | $(document).ready(function() { |
| 236 | ||
| 237 | var i, | |
| 238 | to_100 = false, // Fermentables adjust to 100% | |
| 239 | preboil_sg = 0, | |
| 240 | aboil_sg = 0, | |
| 241 | est_mash_sg = 0, | |
| 242 | psugar = 0, // Percentage real sugars | |
| 243 | pcara = 0, // Percentage cara/crystal malts | |
| 244 | svg = 77, // Default attenuation | |
| 245 | mashkg = 0, // Malt in mash weight | |
| 246 | initcells = 0, // Initial yeast cell count | |
| 247 | ||
| 248 | ok_fermentables = 1, // Fermentables are in stock | |
| 249 | ok_hops = 1, // Hops are in stock | |
| 250 | ok_miscs = 1, // Miscs are in stock | |
| 251 | ok_yeasts = 1, // Yeasts are in stock | |
| 252 | ok_waters = 1, // Waters are in stock | |
| 253 | ||
|
643
9ac2fb6b1311
Added failsave starting calcWater() when the main data is not yet loaded.
Michiel Broek <mbroek@mbse.eu>
parents:
642
diff
changeset
|
254 | data_loaded = 0; |
|
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:
641
diff
changeset
|
255 | error_count = 0; |
|
646
2246d830a42a
Fixed some html errors. Added volume calculations for the brewday tab using a popup tool.
Michiel Broek <mbroek@mbse.eu>
parents:
644
diff
changeset
|
256 | k_cm = 0; |
|
2246d830a42a
Fixed some html errors. Added volume calculations for the brewday tab using a popup tool.
Michiel Broek <mbroek@mbse.eu>
parents:
644
diff
changeset
|
257 | k_vol = 0; |
|
2246d830a42a
Fixed some html errors. Added volume calculations for the brewday tab using a popup tool.
Michiel Broek <mbroek@mbse.eu>
parents:
644
diff
changeset
|
258 | k_what = 0; |
|
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:
641
diff
changeset
|
259 | |
| 478 | 260 | hop_flavour = 0, |
| 261 | hop_aroma = 0, | |
| 262 | mash_infuse = 0, | |
| 263 | last_base = '', | |
| 264 | last_acid = '', | |
| 265 | ||
| 266 | MMCa = 40.048, | |
| 267 | MMMg = 24.305, | |
| 268 | MMNa = 22.98976928, | |
| 269 | MMCl = 35.453, | |
| 270 | MMSO4 = 96.0626, | |
| 271 | MMHCO3 = 61.01684, | |
| 272 | MMCaSO4 = 172.171, | |
| 273 | MMCaCl2 = 147.015, | |
| 274 | MMCaCO3 = 100.087, | |
| 275 | MMMgSO4 = 246.475, | |
| 276 | MMNaHCO3 = 84.007, | |
| 277 | MMNa2CO3 = 105.996, | |
| 278 | MMNaCl = 58.443, | |
| 279 | MMCaOH2 = 74.06268, | |
| 280 | ||
| 281 | fermentableRow = 0, | |
| 282 | fermentableData = {}, | |
| 283 | fermentableInit = 1, | |
| 284 | hopRow = 0, | |
| 285 | hopData = {}, | |
| 286 | miscRow = 0, | |
| 287 | miscData = {}, | |
| 288 | yeastRow = 0, | |
| 289 | yeastData = {}, | |
| 290 | mashRow = 0, | |
| 291 | mashData = {}, | |
| 292 | Ka1 = 0.0000004445, | |
| 293 | Ka2 = 0.0000000000468, | |
| 294 | dataRecord = {}, | |
| 295 | url = 'includes/db_product.php', | |
|
484
2083c274b283
In the product editor mash tab, display the total mash volume and the total mash time.
Michiel Broek <mbroek@mbse.eu>
parents:
479
diff
changeset
|
296 | MaltVolume = 0.87, // l/kg 0.688 volgens internetbronnen, gemeten 0.874 l/kg, na enige tijd maischen 0,715 l/kg (A3 Otten). |
|
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
|
297 | 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
|
298 | 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
|
299 | SlakingHeat = 10.318, //cal/g.°C |
| 478 | 300 | |
| 301 | // Prepare the data | |
| 302 | source = { | |
| 303 | datatype: 'json', | |
| 304 | cache: false, | |
|
638
736c8d29bc87
Binding the data earlier to try to prevent a race condition.
Michiel Broek <mbroek@mbse.eu>
parents:
637
diff
changeset
|
305 | async: true, |
| 478 | 306 | datafields: [ |
| 307 | // From prod_main | |
| 308 | { name: 'record', type: 'number' }, | |
| 309 | { name: 'uuid', type: 'string' }, | |
| 310 | { name: 'name', type: 'string' }, | |
| 311 | { name: 'code', type: 'string' }, | |
| 312 | { name: 'birth', type: 'string' }, | |
| 313 | { name: 'stage', type: 'int' }, | |
| 314 | { name: 'notes', type: 'string' }, | |
| 315 | { name: 'log_brew', type: 'int' }, | |
| 316 | { name: 'log_fermentation', type: 'int' }, | |
|
602
10b61aacb1c1
New products field log_ispindel. Add check for ispindel log to crontasks.php Added log_ispindel to prod_edit, pprod_divide, prod_new and prod_duplicate. Renamed some log_fermentation vergisting names into klimaatkast.
Michiel Broek <mbroek@mbse.eu>
parents:
586
diff
changeset
|
317 | { name: 'log_ispindel', type: 'int' }, |
|
615
9034e65b0d7a
Added CO2 carbonation log to the products database. Added button in the packaging tab.
Michiel Broek <mbroek@mbse.eu>
parents:
613
diff
changeset
|
318 | { name: 'log_co2pressure', type: 'int' }, |
| 478 | 319 | { name: 'inventory_reduced', type: 'int' }, |
| 320 | { name: 'locked', type: 'int' }, | |
| 321 | { name: 'eq_name', type: 'string' }, | |
| 322 | { name: 'eq_boil_size', type: 'float' }, | |
| 323 | { name: 'eq_batch_size', type: 'float' }, | |
| 324 | { name: 'eq_tun_volume', type: 'float' }, | |
| 325 | { name: 'eq_tun_weight', type: 'float' }, | |
| 326 | { name: 'eq_tun_specific_heat', type: 'float' }, | |
| 327 | { name: 'eq_tun_material', type: 'int' }, | |
| 328 | { name: 'eq_tun_height', type: 'float' }, | |
| 329 | { name: 'eq_top_up_water', type: 'float' }, | |
| 330 | { name: 'eq_trub_chiller_loss', type: 'float' }, | |
| 331 | { name: 'eq_evap_rate', type: 'float' }, | |
| 332 | { name: 'eq_boil_time', type: 'float' }, | |
| 333 | { name: 'eq_calc_boil_volume', type: 'int' }, | |
| 334 | { name: 'eq_top_up_kettle', type: 'float' }, | |
| 335 | { name: 'eq_hop_utilization', type: 'float' }, | |
| 336 | { name: 'eq_notes', type: 'string' }, | |
| 337 | { name: 'eq_lauter_volume', type: 'float' }, | |
| 338 | { name: 'eq_lauter_height', type: 'float' }, | |
| 339 | { name: 'eq_lauter_deadspace', type: 'float' }, | |
| 340 | { name: 'eq_kettle_volume', type: 'float' }, | |
| 341 | { name: 'eq_kettle_height', type: 'float' }, | |
| 342 | { name: 'eq_mash_volume', type: 'float' }, | |
| 343 | { name: 'eq_mash_max', type: 'float' }, | |
| 344 | { name: 'eq_efficiency', type: 'float' }, | |
| 345 | { name: 'brew_date_start', type: 'string' }, | |
| 346 | { name: 'brew_mash_ph', type: 'float' }, | |
| 347 | { name: 'brew_mash_sg', type: 'float' }, | |
| 348 | { name: 'brew_mash_efficiency', type: 'float' }, | |
| 349 | { name: 'brew_sparge_est', type: 'float' }, | |
| 350 | { name: 'brew_sparge_ph', type: 'float' }, | |
| 351 | { name: 'brew_preboil_volume', type: 'float' }, | |
| 352 | { name: 'brew_preboil_sg', type: 'float' }, | |
| 353 | { name: 'brew_preboil_ph', type: 'float' }, | |
| 354 | { name: 'brew_preboil_efficiency', type: 'float' }, | |
| 355 | { name: 'brew_aboil_volume', type: 'float' }, | |
| 356 | { name: 'brew_aboil_sg', type: 'float' }, | |
| 357 | { name: 'brew_aboil_ph', type: 'float' }, | |
| 358 | { name: 'brew_aboil_efficiency', type: 'float' }, | |
| 359 | { name: 'brew_cooling_method', type: 'int' }, | |
| 360 | { name: 'brew_cooling_time', type: 'float' }, | |
| 361 | { name: 'brew_cooling_to', type: 'float' }, | |
| 362 | { name: 'brew_whirlpool9', type: 'float' }, | |
| 363 | { name: 'brew_whirlpool7', type: 'float' }, | |
| 364 | { name: 'brew_whirlpool6', type: 'float' }, | |
| 365 | { name: 'brew_whirlpool2', type: 'float' }, | |
| 366 | { name: 'brew_fermenter_volume', type: 'float' }, | |
| 367 | { name: 'brew_fermenter_extrawater', type: 'float' }, | |
| 368 | { name: 'brew_fermenter_tcloss', type: 'float' }, | |
| 369 | { name: 'brew_aeration_time', type: 'float' }, | |
| 370 | { name: 'brew_aeration_speed', type: 'float' }, | |
| 371 | { name: 'brew_aeration_type', type: 'int' }, | |
| 372 | { name: 'brew_fermenter_sg', type: 'float' }, | |
| 373 | { name: 'brew_fermenter_ibu', type: 'float' }, | |
| 374 | { name: 'brew_fermenter_color', type: 'float' }, | |
| 375 | { name: 'brew_date_end', type: 'string' }, | |
| 376 | { name: 'og', type: 'float' }, | |
| 377 | { name: 'fg', type: 'float' }, | |
| 378 | { name: 'primary_start_temp', type: 'float' }, | |
| 379 | { name: 'primary_max_temp', type: 'float' }, | |
| 380 | { name: 'primary_end_temp', type: 'float' }, | |
| 381 | { name: 'primary_end_sg', type: 'float' }, | |
| 382 | { name: 'primary_end_date', type: 'string' }, | |
| 383 | { name: 'secondary_temp', type: 'float' }, | |
| 384 | { name: 'secondary_end_sg', type: 'float' }, | |
| 385 | { name: 'secondary_end_date', type: 'string' }, | |
| 386 | { name: 'tertiary_temp', type: 'float' }, | |
| 387 | { name: 'package_date', type: 'string' }, | |
| 388 | { name: 'package_volume', type: 'float' }, | |
| 389 | { name: 'package_infuse_amount', type: 'float' }, | |
| 390 | { name: 'package_infuse_abv', type: 'float' }, | |
| 391 | { name: 'package_infuse_notes', type: 'string' }, | |
| 392 | { name: 'package_abv', type: 'float' }, | |
| 393 | { name: 'package_ph', type: 'float' }, | |
| 394 | { name: 'bottle_amount', type: 'float' }, | |
| 395 | { name: 'bottle_carbonation', type: 'float' }, | |
| 396 | { name: 'bottle_priming_water', type: 'float' }, | |
| 397 | { name: 'bottle_priming_amount', type: 'float' }, | |
| 398 | { name: 'bottle_carbonation_temp', type: 'float' }, | |
| 399 | { name: 'keg_amount', type: 'float' }, | |
| 400 | { name: 'keg_carbonation', type: 'float' }, | |
| 401 | { name: 'keg_priming_water', type: 'float' }, | |
| 402 | { name: 'keg_priming_amount', type: 'float' }, | |
| 403 | { name: 'keg_carbonation_temp', type: 'float' }, | |
| 404 | { name: 'keg_forced_carb', type: 'int' }, | |
| 405 | { name: 'keg_pressure', type: 'float' }, | |
| 406 | { name: 'taste_notes', type: 'string' }, | |
| 407 | { name: 'taste_rate', type: 'float' }, | |
| 408 | { name: 'taste_date', type: 'string' }, | |
| 409 | { name: 'taste_color', type: 'string' }, | |
| 410 | { name: 'taste_transparency', type: 'string' }, | |
| 411 | { name: 'taste_head', type: 'string' }, | |
| 412 | { name: 'taste_aroma', type: 'string' }, | |
| 413 | { name: 'taste_taste', type: 'string' }, | |
| 414 | { name: 'taste_mouthfeel', type: 'string' }, | |
| 415 | { name: 'taste_aftertaste', type: 'string' }, | |
| 416 | { name: 'st_name', type: 'string' }, | |
| 417 | { name: 'st_letter', type: 'string' }, | |
| 418 | { name: 'st_guide', type: 'string' }, | |
| 419 | { name: 'st_category', type: 'string' }, | |
|
706
12f9316de113
Less logging in the db_product interface. Fixed some empty default values that bugged the newer php and mariadb versions.
Michiel Broek <mbroek@mbse.eu>
parents:
697
diff
changeset
|
420 | { name: 'st_category_number', type: 'int' }, |
| 478 | 421 | { name: 'st_type', type: 'int' }, |
| 422 | { name: 'st_og_min', type: 'float' }, | |
| 423 | { name: 'st_og_max', type: 'float' }, | |
| 424 | { name: 'st_fg_min', type: 'float' }, | |
| 425 | { name: 'st_fg_max', type: 'float' }, | |
| 426 | { name: 'st_ibu_min', type: 'float' }, | |
| 427 | { name: 'st_ibu_max', type: 'float' }, | |
| 428 | { name: 'st_color_min', type: 'float' }, | |
| 429 | { name: 'st_color_max', type: 'float' }, | |
| 430 | { name: 'st_carb_min', type: 'float' }, | |
| 431 | { name: 'st_carb_max', type: 'float' }, | |
| 432 | { name: 'st_abv_min', type: 'float' }, | |
| 433 | { name: 'st_abv_max', type: 'float' }, | |
| 434 | { name: 'type', type: 'int' }, | |
| 435 | { name: 'batch_size', type: 'float' }, | |
| 436 | { name: 'boil_size', type: 'float' }, | |
| 437 | { name: 'boil_time', type: 'float' }, | |
| 438 | { name: 'efficiency', type: 'float' }, | |
| 439 | { name: 'est_og', type: 'float' }, | |
|
616
2cbf21bb9bdc
Added est_og3 field in the products database so that the checklist can use it.
Michiel Broek <mbroek@mbse.eu>
parents:
615
diff
changeset
|
440 | { name: 'est_og3', type: 'float' }, |
| 478 | 441 | { name: 'est_fg', type: 'float' }, |
| 442 | { name: 'est_abv', type: 'float' }, | |
| 443 | { name: 'est_color', type: 'float' }, | |
| 444 | { name: 'color_method', type: 'int' }, | |
| 445 | { name: 'est_ibu', type: 'float' }, | |
| 446 | { name: 'ibu_method', type: 'int' }, | |
| 447 | { name: 'est_carb', type: 'float' }, | |
| 448 | { name: 'sparge_temp', type: 'float' }, | |
| 449 | { name: 'sparge_ph', type: 'float' }, | |
| 450 | { name: 'sparge_volume', type: 'float' }, | |
| 451 | { name: 'sparge_source', type: 'int' }, | |
| 452 | { name: 'sparge_acid_type', type: 'int' }, | |
| 453 | { name: 'sparge_acid_perc', type: 'float' }, | |
| 454 | { name: 'sparge_acid_amount', type: 'float' }, | |
| 455 | { name: 'mash_ph', type: 'float' }, | |
| 456 | { name: 'mash_name', type: 'string' }, | |
| 457 | { name: 'calc_acid', type: 'int' }, | |
| 458 | { name: 'w1_name', type: 'string' }, | |
| 459 | { name: 'w1_amount', type: 'float' }, | |
| 460 | { name: 'w1_calcium', type: 'float' }, | |
| 461 | { name: 'w1_sulfate', type: 'float' }, | |
| 462 | { name: 'w1_chloride', type: 'float' }, | |
| 463 | { name: 'w1_sodium', type: 'float' }, | |
| 464 | { name: 'w1_magnesium', type: 'float' }, | |
| 465 | { name: 'w1_total_alkalinity', type: 'float' }, | |
| 466 | { name: 'w1_ph', type: 'float' }, | |
| 467 | { name: 'w1_cost', type: 'float' }, | |
| 468 | { name: 'w2_name', type: 'string' }, | |
| 469 | { name: 'w2_amount', type: 'float' }, | |
| 470 | { name: 'w2_calcium', type: 'float' }, | |
| 471 | { name: 'w2_sulfate', type: 'float' }, | |
| 472 | { name: 'w2_chloride', type: 'float' }, | |
| 473 | { name: 'w2_sodium', type: 'float' }, | |
| 474 | { name: 'w2_magnesium', type: 'float' }, | |
| 475 | { name: 'w2_total_alkalinity', type: 'float' }, | |
| 476 | { name: 'w2_ph', type: 'float' }, | |
| 477 | { name: 'w2_cost', type: 'float' }, | |
| 478 | { name: 'wg_amount', type: 'float' }, | |
| 479 | { name: 'wg_calcium', type: 'float' }, | |
| 480 | { name: 'wg_sulfate', type: 'float' }, | |
| 481 | { name: 'wg_chloride', type: 'float' }, | |
| 482 | { name: 'wg_sodium', type: 'float' }, | |
| 483 | { name: 'wg_magnesium', type: 'float' }, | |
| 484 | { name: 'wg_total_alkalinity', type: 'float' }, | |
| 485 | { name: 'wg_ph', type: 'float' }, | |
| 486 | { name: 'wb_calcium', type: 'float' }, | |
| 487 | { name: 'wb_sulfate', type: 'float' }, | |
| 488 | { name: 'wb_chloride', type: 'float' }, | |
| 489 | { name: 'wb_sodium', type: 'float' }, | |
| 490 | { name: 'wb_magnesium', type: 'float' }, | |
| 491 | { name: 'wb_total_alkalinity', type: 'float' }, | |
| 492 | { name: 'wb_ph', type: 'float' }, | |
| 493 | { name: 'wa_acid_name', type: 'int' }, | |
| 494 | { name: 'wa_acid_perc', type: 'int' }, | |
| 495 | { name: 'wa_base_name', type: 'int' }, | |
| 496 | { name: 'starter_enable', type: 'int' }, | |
| 497 | { name: 'starter_type', type: 'int' }, | |
| 498 | { name: 'starter_sg', type: 'float' }, | |
| 499 | { name: 'starter_viability', type: 'int' }, | |
|
617
f962f1e5936e
Implemented yeast viability calculation from the yeast production date. Changed the pitchrate logic and added Ale above 1.076 rate of 1.25.
Michiel Broek <mbroek@mbse.eu>
parents:
616
diff
changeset
|
500 | { name: 'yeast_prod_date', type: 'string' }, |
|
697
367ae7ff52f0
Version 0.3.34 Changed log messages in the daemon. Added yeast_pitchrate field to the product database. Added yeast pitchrate edit field to the yeast tab. Initial value is guessed. There is also a popup window for predefined values. An finally the value can be edited by the user. All popup windows are initialized together.
Michiel Broek <mbroek@mbse.eu>
parents:
669
diff
changeset
|
501 | { name: 'yeast_pitchrate', type: 'float' }, |
| 478 | 502 | { name: 'prop1_type', type: 'int' }, |
| 503 | { name: 'prop1_volume', type: 'float' }, | |
| 504 | { name: 'prop2_type', type: 'int' }, | |
| 505 | { name: 'prop2_volume', type: 'float' }, | |
| 506 | { name: 'prop3_type', type: 'int' }, | |
| 507 | { name: 'prop3_volume', type: 'float' }, | |
| 508 | { name: 'prop4_type', type: 'int' }, | |
| 509 | { name: 'prop4_volume', type: 'float' }, | |
|
497
0fe366d953ab
Prepare screens for product divide batch.
Michiel Broek <mbroek@mbse.eu>
parents:
495
diff
changeset
|
510 | { name: 'divide_type', type: 'int' }, |
|
0fe366d953ab
Prepare screens for product divide batch.
Michiel Broek <mbroek@mbse.eu>
parents:
495
diff
changeset
|
511 | { name: 'divide_size', type: 'float' }, |
|
533
be8691b7d634
Added the product divide scripts. All parts have all the volumes and weights divided, including the master record. Splitted batches have their own records with the product code formatted as code-n. From this design, we can rebuild the print and checklist.
Michiel Broek <mbroek@mbse.eu>
parents:
525
diff
changeset
|
512 | { name: 'divide_factor', type: 'float' }, |
|
497
0fe366d953ab
Prepare screens for product divide batch.
Michiel Broek <mbroek@mbse.eu>
parents:
495
diff
changeset
|
513 | { name: 'divide_parts', type: 'int' }, |
|
533
be8691b7d634
Added the product divide scripts. All parts have all the volumes and weights divided, including the master record. Splitted batches have their own records with the product code formatted as code-n. From this design, we can rebuild the print and checklist.
Michiel Broek <mbroek@mbse.eu>
parents:
525
diff
changeset
|
514 | { name: 'divide_part', type: 'int' }, |
| 478 | 515 | { name: 'fermentables', type: 'array' }, |
| 516 | { name: 'hops', type: 'array' }, | |
| 517 | { name: 'miscs', type: 'array' }, | |
| 518 | { name: 'yeasts', type: 'array' }, | |
| 519 | { name: 'mashs', type: 'array' } | |
| 520 | ], | |
| 521 | id: 'record', | |
| 522 | url: url + '?record=' + my_record | |
| 523 | }, | |
| 524 | ||
| 525 | // Load data and select one record. | |
| 526 | dataAdapter = new $.jqx.dataAdapter(source, { | |
| 527 | loadComplete: function() { | |
| 528 | var records = dataAdapter.records; | |
| 529 | dataRecord = records[0]; | |
| 530 | // Hidden record uuid | |
| 531 | $('#name').val(dataRecord.name); | |
| 532 | $('#code').val(dataRecord.code); | |
| 533 | $('#birth').val(dataRecord.birth); | |
| 534 | $('#stage').val(StageData[dataRecord.stage].nl); | |
| 535 | $('#notes').val(dataRecord.notes); | |
| 536 | $('#locked').val(dataRecord.locked); | |
| 537 | $('#eq_name').val(dataRecord.eq_name); | |
| 538 | $('#eq_notes').val(dataRecord.eq_notes); | |
| 539 | $('#eq_boil_size').val(dataRecord.eq_boil_size); | |
| 540 | $('#eq_batch_size').val(dataRecord.eq_batch_size); | |
| 541 | $('#eq_tun_volume').val(dataRecord.eq_tun_volume); | |
| 542 | $('#eq_top_up_water').val(dataRecord.eq_top_up_water); | |
| 543 | $('#eq_trub_chiller_loss').val(dataRecord.eq_trub_chiller_loss); | |
| 544 | $('#eq_evap_rate').val(dataRecord.eq_evap_rate); | |
| 545 | $('#eq_boil_time').val(dataRecord.eq_boil_time); | |
| 546 | $('#eq_top_up_kettle').val(dataRecord.eq_top_up_kettle); | |
| 547 | $('#eq_hop_utilization').val(dataRecord.eq_hop_utilization); | |
| 548 | $('#eq_lauter_volume').val(dataRecord.eq_lauter_volume); | |
| 549 | $('#eq_lauter_deadspace').val(dataRecord.eq_lauter_deadspace); | |
| 550 | $('#eq_kettle_volume').val(dataRecord.eq_kettle_volume); | |
| 551 | $('#eq_mash_volume').val(dataRecord.eq_mash_volume); | |
| 552 | $('#eq_mash_max').val(dataRecord.eq_mash_max); | |
| 553 | $('#eq_efficiency').val(dataRecord.eq_efficiency); | |
| 554 | // Brewdate | |
| 555 | $('#brew_date_start').val(dataRecord.brew_date_start); | |
| 556 | $('#brew_mash_ph').val(dataRecord.brew_mash_ph); | |
| 557 | $('#brew_mash_sg').val(dataRecord.brew_mash_sg); | |
| 558 | $('#brew_mash_efficiency').val(dataRecord.brew_mash_efficiency); | |
| 559 | // Header Spoelen en filteren | |
| 560 | $('#brew_sparge_temperature').val(dataRecord.sparge_temp); | |
| 561 | $('#brew_sparge_volume').val(dataRecord.sparge_volume); | |
| 562 | $('#brew_sparge_est').val(dataRecord.brew_sparge_est); | |
| 563 | $('#brew_sparge_ph').val(dataRecord.brew_sparge_ph); | |
| 564 | // Header Beluchten | |
| 565 | $('#brew_aeration_type').val(dataRecord.brew_aeration_type); | |
| 566 | $('#brew_aeration_time').val(dataRecord.brew_aeration_time); | |
| 567 | $('#brew_aeration_speed').val(dataRecord.brew_aeration_speed); | |
| 568 | ||
| 569 | $('#brew_preboil_ph').val(dataRecord.brew_preboil_ph); | |
| 570 | $('#brew_preboil_sg').val(dataRecord.brew_preboil_sg); | |
| 571 | $('#brew_preboil_volume').val(dataRecord.brew_preboil_volume); | |
| 572 | $('#brew_preboil_efficiency').val(dataRecord.brew_preboil_efficiency); | |
| 573 | // Header Koelen en whirlpoolen | |
| 574 | $('#brew_whirlpool9').val(dataRecord.brew_whirlpool9); | |
| 575 | $('#brew_whirlpool7').val(dataRecord.brew_whirlpool7); | |
| 576 | $('#brew_whirlpool6').val(dataRecord.brew_whirlpool6); | |
| 577 | $('#brew_whirlpool2').val(dataRecord.brew_whirlpool2); | |
| 578 | // Header Naar gistvat | |
| 579 | $('#brew_fermenter_volume').val(dataRecord.brew_fermenter_volume); | |
| 580 | $('#brew_fermenter_sg').val(dataRecord.brew_fermenter_sg); | |
| 581 | $('#brew_fermenter_sg2').val(dataRecord.brew_fermenter_sg); | |
| 582 | $('#brew_fermenter_ibu').val(dataRecord.brew_fermenter_ibu); | |
| 583 | $('#brew_fermenter_color').val(dataRecord.brew_fermenter_color); | |
| 584 | $('#brew_fermenter_extrawater').val(dataRecord.brew_fermenter_extrawater); | |
| 585 | $('#brew_fermenter_tcloss').val(dataRecord.brew_fermenter_tcloss); | |
| 586 | ||
| 587 | $('#brew_aboil_ph').val(dataRecord.brew_aboil_ph); | |
| 588 | $('#brew_aboil_sg').val(dataRecord.brew_aboil_sg); | |
| 589 | $('#brew_aboil_volume').val(dataRecord.brew_aboil_volume); | |
| 590 | $('#brew_aboil_efficiency').val(dataRecord.brew_aboil_efficiency); | |
| 591 | // Header Koelen en whirlpoolen | |
| 592 | $('#brew_cooling_to').val(dataRecord.brew_cooling_to); | |
| 593 | $('#brew_cooling_method').val(dataRecord.brew_cooling_method); | |
| 594 | $('#brew_cooling_time').val(dataRecord.brew_cooling_time); | |
| 595 | // Niks | |
| 596 | $('#brew_date_end').val(dataRecord.brew_date_end); | |
| 597 | $('#og').val(dataRecord.og); | |
| 598 | $('#fg').val(dataRecord.fg); | |
| 599 | $('#primary_start_temp').val(dataRecord.primary_start_temp); | |
| 600 | $('#primary_max_temp').val(dataRecord.primary_max_temp); | |
| 601 | $('#primary_end_temp').val(dataRecord.primary_end_temp); | |
| 602 | $('#primary_end_sg').val(dataRecord.primary_end_sg); | |
| 603 | $('#primary_end_date').val(dataRecord.primary_end_date); | |
| 604 | $('#secondary_temp').val(dataRecord.secondary_temp); | |
| 605 | $('#secondary_end_sg').val(dataRecord.secondary_end_sg); | |
| 606 | $('#secondary_end_date').val(dataRecord.secondary_end_date); | |
| 607 | $('#tertiary_temp').val(dataRecord.tertiary_temp); | |
| 608 | $('#package_date').val(dataRecord.package_date); | |
| 609 | $('#package_volume').val(dataRecord.package_volume); | |
| 610 | $('#package_infuse_amount').val(dataRecord.package_infuse_amount); | |
| 611 | $('#package_infuse_abv').val(dataRecord.package_infuse_abv); | |
| 612 | $('#package_infuse_notes').val(dataRecord.package_infuse_notes); | |
| 613 | $('#package_abv').val(dataRecord.package_abv); | |
| 614 | $('#package_ph').val(dataRecord.package_ph); | |
| 615 | $('#bottle_amount').val(dataRecord.bottle_amount); | |
| 616 | $('#bottle_carbonation').val(dataRecord.bottle_carbonation); | |
| 617 | $('#bottle_priming_water').val(dataRecord.bottle_priming_water); | |
| 618 | $('#bottle_priming_amount').val(dataRecord.bottle_priming_amount); | |
| 619 | $('#bottle_carbonation_temp').val(dataRecord.bottle_carbonation_temp); | |
| 620 | $('#keg_amount').val(dataRecord.keg_amount); | |
| 621 | $('#keg_carbonation').val(dataRecord.keg_carbonation); | |
| 622 | $('#keg_priming_water').val(dataRecord.keg_priming_water); | |
| 623 | $('#keg_priming_amount').val(dataRecord.keg_priming_amount); | |
| 624 | $('#keg_carbonation_temp').val(dataRecord.keg_carbonation_temp); | |
| 625 | $('#keg_forced_carb').val(dataRecord.keg_forced_carb); | |
| 626 | $('#keg_pressure').val(dataRecord.keg_pressure); | |
| 627 | $('#taste_notes').val(dataRecord.taste_notes); | |
| 628 | $('#taste_rate').val(dataRecord.taste_rate); | |
| 629 | $('#taste_date').val(dataRecord.taste_date); | |
| 630 | $('#taste_color').val(dataRecord.taste_color); | |
| 631 | $('#taste_transparency').val(dataRecord.taste_transparency); | |
| 632 | $('#taste_head').val(dataRecord.taste_head); | |
| 633 | $('#taste_aroma').val(dataRecord.taste_aroma); | |
| 634 | $('#taste_taste').val(dataRecord.taste_taste); | |
| 635 | $('#taste_mouthfeel').val(dataRecord.taste_mouthfeel); | |
| 636 | $('#taste_aftertaste').val(dataRecord.taste_aftertaste); | |
| 637 | ||
| 638 | // Recipe | |
| 639 | $('#st_name').val(dataRecord.st_name); | |
| 640 | $('#st_letter').val(dataRecord.st_letter); | |
| 641 | $('#st_guide').val(dataRecord.st_guide); | |
| 642 | $('#st_category').val(dataRecord.st_category); | |
| 643 | $('#st_category_number').val(dataRecord.st_category_number); | |
| 644 | $('#st_type').val(StyleTypeData[dataRecord.st_type].nl); | |
| 645 | $('#st_og_min').val(dataRecord.st_og_min); | |
| 646 | $('#st_og_max').val(dataRecord.st_og_max); | |
| 647 | $('#st_fg_min').val(dataRecord.st_fg_min); | |
| 648 | $('#st_fg_max').val(dataRecord.st_fg_max); | |
| 649 | $('#st_abv_min').val(dataRecord.st_abv_min); | |
| 650 | $('#st_abv_max').val(dataRecord.st_abv_max); | |
| 651 | $('#st_color_min').val(dataRecord.st_color_min); | |
| 652 | $('#st_color_max').val(dataRecord.st_color_max); | |
| 653 | $('#st_ibu_min').val(dataRecord.st_ibu_min); | |
| 654 | $('#st_ibu_max').val(dataRecord.st_ibu_max); | |
| 655 | $('#st_carb_min').val(dataRecord.st_carb_min); | |
| 656 | $('#st_carb_min2').val(dataRecord.st_carb_min); | |
| 657 | $('#st_carb_max').val(dataRecord.st_carb_max); | |
| 658 | $('#st_carb_max2').val(dataRecord.st_carb_max); | |
| 659 | $('#type').val(dataRecord.type); | |
| 660 | $('#batch_size').val(dataRecord.batch_size); | |
| 661 | $('#est_a_vol').val(dataRecord.batch_size * 1.04); | |
| 662 | $('#boil_size').val(dataRecord.boil_size); | |
| 663 | $('#est_pre_vol').val(dataRecord.boil_size * 1.04); | |
| 664 | $('#boil_time').val(dataRecord.boil_time); | |
| 665 | $('#efficiency').val(dataRecord.efficiency); | |
| 666 | $('#est_og').val(dataRecord.est_og); | |
| 667 | $('#est_og2').val(dataRecord.est_og); | |
|
616
2cbf21bb9bdc
Added est_og3 field in the products database so that the checklist can use it.
Michiel Broek <mbroek@mbse.eu>
parents:
615
diff
changeset
|
668 | $('#est_og3').val(dataRecord.est_og3); |
| 478 | 669 | $('#est_fg').val(dataRecord.est_fg); |
| 670 | $('#est_fg2').val(dataRecord.est_fg); | |
| 671 | $('#est_fg3').val(dataRecord.est_fg); | |
| 672 | $('#est_color').val(dataRecord.est_color); | |
| 673 | $('#est_color2').val(dataRecord.est_color); | |
| 674 | $('#est_abv').val(dataRecord.est_abv); | |
| 675 | $('#color_method').val(dataRecord.color_method); | |
| 676 | $('#est_ibu').val(dataRecord.est_ibu); | |
| 677 | $('#est_ibu2').val(dataRecord.est_ibu); | |
| 678 | $('#ibu_method').val(dataRecord.ibu_method); | |
| 679 | $('#est_carb').val(dataRecord.est_carb); | |
| 680 | $('#mash_name').val(dataRecord.mash_name); | |
| 681 | $('#mash_ph').val(dataRecord.mash_ph); | |
| 682 | $('#sparge_temp').val(dataRecord.sparge_temp); | |
| 683 | $('#sparge_ph').val(dataRecord.sparge_ph); | |
| 684 | $('#sparge_volume').val(dataRecord.sparge_volume); | |
| 685 | $('#sparge_source').val(dataRecord.sparge_source); | |
| 686 | $('#sparge_acid_type').val(dataRecord.sparge_acid_type); | |
| 687 | $('#sparge_acid_perc').val(dataRecord.sparge_acid_perc); | |
| 688 | $('#sparge_acid_amount').val(dataRecord.sparge_acid_amount * 1000); | |
| 689 | $('#calc_acid').val(dataRecord.calc_acid); | |
| 690 | $('#w1_name').val(dataRecord.w1_name); | |
| 691 | $('#w1_amount').val(dataRecord.w1_amount); | |
| 692 | $('#w1_calcium').val(dataRecord.w1_calcium); | |
| 693 | $('#w1_sulfate').val(dataRecord.w1_sulfate); | |
| 694 | $('#w1_chloride').val(dataRecord.w1_chloride); | |
| 695 | $('#w1_sodium').val(dataRecord.w1_sodium); | |
| 696 | $('#w1_magnesium').val(dataRecord.w1_magnesium); | |
| 697 | $('#w1_total_alkalinity').val(dataRecord.w1_total_alkalinity); | |
| 698 | $('#w1_ph').val(dataRecord.w1_ph); | |
| 699 | $('#w1_cost').val(dataRecord.w1_cost); | |
| 700 | $('#w2_name').val(dataRecord.w2_name); | |
| 701 | $('#w2_amount').val(dataRecord.w2_amount); | |
| 702 | $('#w2_calcium').val(dataRecord.w2_calcium); | |
| 703 | $('#w2_sulfate').val(dataRecord.w2_sulfate); | |
| 704 | $('#w2_chloride').val(dataRecord.w2_chloride); | |
| 705 | $('#w2_sodium').val(dataRecord.w2_sodium); | |
| 706 | $('#w2_magnesium').val(dataRecord.w2_magnesium); | |
| 707 | $('#w2_total_alkalinity').val(dataRecord.w2_total_alkalinity); | |
| 708 | $('#w2_ph').val(dataRecord.w2_ph); | |
| 709 | $('#w2_cost').val(dataRecord.w2_cost); | |
| 710 | $('#wg_amount').val(dataRecord.wg_amount); | |
| 711 | $('#wg_calcium').val(dataRecord.wg_calcium); | |
| 712 | $('#wg_sulfate').val(dataRecord.wg_sulfate); | |
| 713 | $('#wg_chloride').val(dataRecord.wg_chloride); | |
| 714 | $('#wg_sodium').val(dataRecord.wg_sodium); | |
| 715 | $('#wg_magnesium').val(dataRecord.wg_magnesium); | |
| 716 | $('#wg_total_alkalinity').val(dataRecord.wg_total_alkalinity); | |
| 717 | $('#wg_ph').val(dataRecord.wg_ph); | |
| 718 | $('#wb_calcium').val(dataRecord.wb_calcium); | |
| 719 | $('#wb_sulfate').val(dataRecord.wb_sulfate); | |
| 720 | $('#wb_chloride').val(dataRecord.wb_chloride); | |
| 721 | $('#wb_sodium').val(dataRecord.wb_sodium); | |
| 722 | $('#wb_magnesium').val(dataRecord.wb_magnesium); | |
| 723 | $('#wb_total_alkalinity').val(dataRecord.wb_total_alkalinity); | |
| 724 | $('#wb_ph').val(dataRecord.wb_ph); | |
| 725 | $('#wa_acid_name').val(dataRecord.wa_acid_name); | |
| 726 | $('#wa_acid_perc').val(dataRecord.wa_acid_perc); | |
| 727 | $('#wa_base_name').val(dataRecord.wa_base_name); | |
| 728 | $('#starter_type').val(dataRecord.starter_type); | |
| 729 | $('#starter_sg').val(dataRecord.starter_sg); | |
| 730 | $('#starter_viability').val(dataRecord.starter_viability); | |
|
617
f962f1e5936e
Implemented yeast viability calculation from the yeast production date. Changed the pitchrate logic and added Ale above 1.076 rate of 1.25.
Michiel Broek <mbroek@mbse.eu>
parents:
616
diff
changeset
|
731 | $('#yeast_prod_date').val(dataRecord.yeast_prod_date); |
|
697
367ae7ff52f0
Version 0.3.34 Changed log messages in the daemon. Added yeast_pitchrate field to the product database. Added yeast pitchrate edit field to the yeast tab. Initial value is guessed. There is also a popup window for predefined values. An finally the value can be edited by the user. All popup windows are initialized together.
Michiel Broek <mbroek@mbse.eu>
parents:
669
diff
changeset
|
732 | $('#yeast_pitchrate').val(dataRecord.yeast_pitchrate); |
| 478 | 733 | $('#prop1_type').val(dataRecord.prop1_type); |
| 734 | $('#prop1_volume').val(dataRecord.prop1_volume); | |
| 735 | $('#prop2_type').val(dataRecord.prop2_type); | |
| 736 | $('#prop2_volume').val(dataRecord.prop2_volume); | |
| 737 | $('#prop3_type').val(dataRecord.prop3_type); | |
| 738 | $('#prop3_volume').val(dataRecord.prop3_volume); | |
| 739 | $('#prop4_type').val(dataRecord.prop4_type); | |
| 740 | $('#prop4_volume').val(dataRecord.prop4_volume); | |
|
500
8d53ad389204
Reworked the splitted batches, the data is now in a separate table and there is only one product record.
Michiel Broek <mbroek@mbse.eu>
parents:
497
diff
changeset
|
741 | $('#divide_type').val(SplitData[dataRecord.divide_type].nl); |
|
545
f71079a45f5c
More screen improvements. Updated the design README.
Michiel Broek <mbroek@mbse.eu>
parents:
544
diff
changeset
|
742 | if (dataRecord.divide_type > 0) |
|
f71079a45f5c
More screen improvements. Updated the design README.
Michiel Broek <mbroek@mbse.eu>
parents:
544
diff
changeset
|
743 | $('#divide_batch').val((dataRecord.divide_part + 1) + ' van ' + (dataRecord.divide_parts + 1)); |
|
f71079a45f5c
More screen improvements. Updated the design README.
Michiel Broek <mbroek@mbse.eu>
parents:
544
diff
changeset
|
744 | else |
|
f71079a45f5c
More screen improvements. Updated the design README.
Michiel Broek <mbroek@mbse.eu>
parents:
544
diff
changeset
|
745 | $('#divide_batch').val('n.v.t.'); |
|
497
0fe366d953ab
Prepare screens for product divide batch.
Michiel Broek <mbroek@mbse.eu>
parents:
495
diff
changeset
|
746 | // hidden divide_size |
|
533
be8691b7d634
Added the product divide scripts. All parts have all the volumes and weights divided, including the master record. Splitted batches have their own records with the product code formatted as code-n. From this design, we can rebuild the print and checklist.
Michiel Broek <mbroek@mbse.eu>
parents:
525
diff
changeset
|
747 | // hidden divide_factor |
|
544
f3faa54581ff
Better way to show splitted batches. Added flameout calculations to the php scripts.
Michiel Broek <mbroek@mbse.eu>
parents:
542
diff
changeset
|
748 | // hidden divide_parts |
|
533
be8691b7d634
Added the product divide scripts. All parts have all the volumes and weights divided, including the master record. Splitted batches have their own records with the product code formatted as code-n. From this design, we can rebuild the print and checklist.
Michiel Broek <mbroek@mbse.eu>
parents:
525
diff
changeset
|
749 | // hidden divide_part |
| 478 | 750 | editFermentable(dataRecord); |
| 751 | editHop(dataRecord); | |
| 752 | editMisc(dataRecord); | |
| 753 | editYeast(dataRecord); | |
| 754 | editMash(dataRecord); | |
| 755 | calcStage(); | |
| 756 | $('#jqxTabs').jqxTabs('select', 2); | |
|
643
9ac2fb6b1311
Added failsave starting calcWater() when the main data is not yet loaded.
Michiel Broek <mbroek@mbse.eu>
parents:
642
diff
changeset
|
757 | data_loaded = 1; |
| 478 | 758 | }, |
| 640 | 759 | loadError: function(jqXHR, status, error) { |
| 639 | 760 | console.log('main data load error: ' + status + ' ' + error); |
| 478 | 761 | } |
| 762 | }); | |
| 763 | ||
| 764 | // Inline fermentables editor | |
| 765 | var editFermentable = function(data) { | |
| 766 | var fermentableSource = { | |
| 767 | localdata: data.fermentables, | |
| 768 | datatype: 'local', | |
| 769 | cache: false, | |
| 641 | 770 | async: true, |
| 478 | 771 | datafields: [ |
| 772 | { name: 'f_name', type: 'string' }, | |
| 773 | { name: 'f_origin', type: 'string' }, | |
| 774 | { name: 'f_supplier', type: 'string' }, | |
| 775 | { name: 'f_amount', type: 'float' }, | |
| 776 | { name: 'f_cost', type: 'float' }, | |
| 777 | { name: 'f_type', type: 'int' }, | |
| 778 | { name: 'f_yield', type: 'float' }, | |
| 779 | { name: 'f_color', type: 'float' }, | |
| 780 | { name: 'f_coarse_fine_diff', type: 'float' }, | |
| 781 | { name: 'f_moisture', type: 'float' }, | |
| 782 | { name: 'f_diastatic_power', type: 'float' }, | |
| 783 | { name: 'f_protein', type: 'float' }, | |
| 784 | { name: 'f_max_in_batch', type: 'float' }, | |
| 785 | { name: 'f_graintype', type: 'int' }, | |
| 786 | { name: 'f_added', type: 'int' }, | |
| 787 | { name: 'f_dissolved_protein', type: 'float' }, | |
| 788 | { name: 'f_recommend_mash', type: 'int' }, | |
| 789 | { name: 'f_add_after_boil', type: 'int' }, | |
| 790 | { name: 'f_adjust_to_total_100', type: 'int' }, | |
| 791 | { name: 'f_percentage', type: 'float' }, | |
| 792 | { name: 'f_di_ph', type: 'float' }, | |
| 793 | { name: 'f_acid_to_ph_57', type: 'float' }, | |
| 794 | { name: 'f_inventory', type: 'float' }, | |
| 795 | { name: 'f_avail', type: 'int' } | |
| 796 | ], | |
|
644
4654b8ee4690
Version 0.3.30 Code and logging cleanup.
Michiel Broek <mbroek@mbse.eu>
parents:
643
diff
changeset
|
797 | addrow: function(rowid, rowdata, position, commit) { commit(true); }, |
|
4654b8ee4690
Version 0.3.30 Code and logging cleanup.
Michiel Broek <mbroek@mbse.eu>
parents:
643
diff
changeset
|
798 | deleterow: function(rowid, commit) { commit(true); }, |
|
4654b8ee4690
Version 0.3.30 Code and logging cleanup.
Michiel Broek <mbroek@mbse.eu>
parents:
643
diff
changeset
|
799 | updaterow: function(rowid, rowdata, commit) { commit(true); } |
| 478 | 800 | }, |
| 801 | fermentableAdapter = new $.jqx.dataAdapter(fermentableSource); | |
| 802 | ||
| 803 | $('#fermentableGrid').jqxGrid({ | |
| 804 | width: 1240, | |
| 805 | height: 470, | |
| 806 | source: fermentableAdapter, | |
| 807 | theme: theme, | |
| 808 | selectionmode: 'singlerow', | |
| 809 | showtoolbar: true, | |
| 810 | rendertoolbar: function(toolbar) { | |
| 811 | var container = $("<div style='overflow: hidden; position: relative; margin: 5px;'></div>"); | |
| 812 | toolbar.append(container); | |
| 813 | container.append('<div style="float: left; margin-left: 165px;" id="faddrowbutton"></div>'); | |
| 814 | container.append('<div style="float: left; margin-left: 10px; margin-top: 5px;">In voorraad:</div>'); | |
| 815 | container.append('<div style="float: left; margin-left: 10px;" id="finstockbutton"></div>'); | |
| 816 | container.append('<input style="float: left; margin-left: 400px;" id="fdeleterowbutton" type="button" value="Verwijder mout" />'); | |
| 817 | // add fermentable from dropdownlist. | |
| 818 | $('#faddrowbutton').jqxDropDownList({ | |
| 819 | placeHolder: 'Kies mout:', | |
| 820 | theme: theme, | |
| 821 | template: 'primary', | |
| 822 | source: fermentablelist, | |
| 823 | displayMember: 'name', | |
|
751
3ba26a83eb93
Allow add and delete of fermentables durring valid brew moments. Add and edit a fermantable only to stages that have not yet been done. Block the packaging choices, edited elsewhere.
Michiel Broek <mbroek@mbse.eu>
parents:
741
diff
changeset
|
824 | disabled: (dataRecord.stage > 6), |
| 478 | 825 | width: 150, |
| 826 | height: 27, | |
| 827 | dropDownWidth: 500, | |
| 828 | dropDownHeight: 500, | |
| 829 | renderer: function(index, label, value) { | |
| 830 | var datarecord = fermentablelist.records[index]; | |
|
564
d5fad7d80899
When adding fermentables or hops to a product, show the current inventory in the dropdownlist.
Michiel Broek <mbroek@mbse.eu>
parents:
561
diff
changeset
|
831 | return datarecord.supplier + ' / ' + datarecord.name + ' (' + datarecord.color + ' EBC) (' + Round(datarecord.inventory, 3) + ' kg)'; |
| 478 | 832 | } |
| 833 | }); | |
| 834 | $('#faddrowbutton').on('select', function(event) { | |
| 835 | if (event.args) { | |
| 836 | var index, datarecord, row = {}, rowscount = $('#fermentableGrid').jqxGrid('getdatainformation').rowscount; | |
| 837 | index = event.args.index; | |
| 838 | datarecord = fermentablelist.records[index]; | |
| 839 | row['f_name'] = datarecord.name; | |
| 840 | row['f_origin'] = datarecord.origin; | |
| 841 | row['f_supplier'] = datarecord.supplier; | |
| 842 | row['f_amount'] = 0; | |
| 843 | row['f_cost'] = datarecord.cost; | |
| 844 | row['f_type'] = datarecord.type; | |
| 845 | row['f_yield'] = datarecord.yield; | |
| 846 | row['f_color'] = datarecord.color; | |
| 847 | row['f_coarse_fine_diff'] = datarecord.coarse_fine_diff; | |
| 848 | row['f_moisture'] = datarecord.moisture; | |
| 849 | row['f_diastatic_power'] = datarecord.diastatic_power; | |
| 850 | row['f_protein'] = datarecord.protein; | |
| 851 | row['f_max_in_batch'] = datarecord.max_in_batch; | |
| 852 | row['f_graintype'] = datarecord.graintype; | |
| 853 | if (datarecord.add_after_boil) { | |
| 854 | row['f_added'] = 2; // Fermentation | |
| 855 | } else if ((datarecord.type == 1) || (datarecord.type == 4)) { // Sugar or Adjunct | |
| 856 | row['f_added'] = 1; // Boil | |
| 857 | } else { | |
| 858 | row['f_added'] = 0; // Mash | |
| 859 | } | |
|
751
3ba26a83eb93
Allow add and delete of fermentables durring valid brew moments. Add and edit a fermantable only to stages that have not yet been done. Block the packaging choices, edited elsewhere.
Michiel Broek <mbroek@mbse.eu>
parents:
741
diff
changeset
|
860 | /* If stage > added moment, adjust the moment */ |
|
752
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
861 | row['f_added'] = minimum_fermentable(dataRecord.stage, row['f_added']); |
| 478 | 862 | row['f_dissolved_protein'] = datarecord.dissolved_protein; |
| 863 | row['f_recommend_mash'] = datarecord.recommend_mash; | |
| 864 | row['f_add_after_boil'] = datarecord.add_after_boil; | |
| 865 | if (rowscount == 0) { | |
| 866 | // The first fermentable | |
| 867 | row['f_adjust_to_total_100'] = 1; | |
| 868 | row['f_percentage'] = 100; | |
| 869 | } else { | |
| 870 | row['f_adjust_to_total_100'] = 0; | |
| 871 | row['f_percentage'] = 0; | |
| 872 | } | |
| 873 | row['f_di_ph'] = datarecord.di_ph; | |
| 874 | row['f_acid_to_ph_57'] = datarecord.acid_to_ph_57; | |
| 875 | row['f_inventory'] = datarecord.inventory; | |
| 876 | $('#fermentableGrid').jqxGrid('addrow', null, row); | |
| 877 | } | |
| 878 | }); | |
| 879 | ||
|
751
3ba26a83eb93
Allow add and delete of fermentables durring valid brew moments. Add and edit a fermantable only to stages that have not yet been done. Block the packaging choices, edited elsewhere.
Michiel Broek <mbroek@mbse.eu>
parents:
741
diff
changeset
|
880 | $('#finstockbutton').jqxCheckBox({ theme: theme, height: 27, disabled: (dataRecord.stage > 6) }); |
| 478 | 881 | $('#finstockbutton').on('change', function(event) { |
| 882 | fermentableinstock = event.args.checked; | |
| 883 | fermentablelist.dataBind(); | |
| 884 | }); | |
| 885 | ||
| 886 | // delete selected fermentable. | |
|
751
3ba26a83eb93
Allow add and delete of fermentables durring valid brew moments. Add and edit a fermantable only to stages that have not yet been done. Block the packaging choices, edited elsewhere.
Michiel Broek <mbroek@mbse.eu>
parents:
741
diff
changeset
|
887 | $('#fdeleterowbutton').jqxButton({ template: 'danger', theme: theme, height: 27, width: 150, disabled: (dataRecord.stage > 6) }); |
| 478 | 888 | $('#fdeleterowbutton').on('click', function() { |
| 889 | var rowscount, id, percent, amount, i, rowdata, | |
| 890 | selectedrowindex = $('#fermentableGrid').jqxGrid('getselectedrowindex'); | |
| 891 | rowscount = $('#fermentableGrid').jqxGrid('getdatainformation').rowscount; | |
| 892 | if (selectedrowindex >= 0 && selectedrowindex < rowscount) { | |
| 893 | id = $('#fermentableGrid').jqxGrid('getrowid', selectedrowindex); | |
|
752
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
894 | added = $('#fermentableGrid').jqxGrid('getcellvalue', selectedrowindex, 'f_added'); |
|
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
895 | if (block_fermentable(dataRecord.stage, added)) { |
|
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
896 | percent = mount = 0; |
|
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
897 | alert('Ingredieënt is al verwerkt.'); |
|
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
898 | } else { |
|
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
899 | percent = $('#fermentableGrid').jqxGrid('getcellvalue', id, 'f_percentage'); |
|
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
900 | amount = $('#fermentableGrid').jqxGrid('getcellvalue', id, 'f_amount'); |
|
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
901 | $('#fermentableGrid').jqxGrid('deleterow', id); |
|
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
902 | } |
| 478 | 903 | } |
| 904 | rowscount = $('#fermentableGrid').jqxGrid('getdatainformation').rowscount; | |
| 905 | if (rowscount > 1) { | |
| 906 | if (to_100) { | |
| 907 | for (i = 0; i < rowscount; i++) { | |
| 908 | rowdata = $('#fermentableGrid').jqxGrid('getrowdata', i); | |
| 909 | if (rowdata.f_adjust_to_total_100) { | |
| 910 | rowdata.f_percentage += percent; | |
| 911 | rowdata.f_amount += amount; | |
| 912 | } | |
| 913 | } | |
| 914 | } else { | |
| 915 | calcPercentages(); | |
| 916 | } | |
| 917 | } else { | |
| 918 | $('#fermentableGrid').jqxGrid('setcellvalue', 0, 'f_percentage', 100); | |
| 919 | } | |
| 920 | calcFermentables(); | |
| 921 | calcIBUs(); | |
| 922 | }); | |
| 923 | }, | |
| 648 | 924 | ready: function() { calcFermentables(); $('#jqxTabs').jqxTabs('next'); }, |
| 478 | 925 | columns: [ |
| 926 | { text: 'Vergistbaar ingrediënt', datafield: 'f_name', | |
| 927 | cellsrenderer: function(index, datafield, value, defaultvalue, column, rowdata) { | |
| 928 | return '<span style="margin: 3px; margin-top: 6px; float: left;">' + rowdata.f_supplier + ' / ' + | |
| 929 | rowdata.f_name + ' (' + rowdata.f_color + ' EBC)</span>'; | |
| 930 | } | |
| 931 | }, | |
| 932 | { text: 'Type', width: 100, datafield: 'f_type', | |
| 933 | cellsrenderer: function(index, datafield, value, defaultvalue, column, rowdata) { | |
| 934 | return '<span style="margin: 3px; margin-top: 6px; float: left;">' + FermentableTypeData[value].nl + '</span>'; | |
| 935 | } | |
| 936 | }, | |
| 937 | { text: 'Moment', width: 110, datafield: 'f_added', | |
| 938 | cellsrenderer: function(index, datafield, value, defaultvalue, column, rowdata) { | |
| 939 | return '<span style="margin: 3px; margin-top: 6px; float: left;">' + AddedData[value].nl + '</span>'; | |
| 940 | } | |
| 941 | }, | |
| 942 | { text: 'Maxinbatch', datafield: 'f_max_in_batch', hidden: true }, | |
| 943 | { text: 'Opbrengst', datafield: 'f_yield', width: 90, align: 'right', cellsalign: 'right', cellsformat: 'p1' }, | |
| 944 | { text: 'Gewicht Kg', datafield: 'f_amount', width: 120, align: 'right', cellsalign: 'right', cellsformat: 'f3' }, | |
| 945 | { text: 'Voorraad Kg', datafield: 'f_inventory', width: 120, align: 'right', | |
| 946 | cellsrenderer: function(row, columnfield, value, defaulthtml, columnproperties, rowdata) { | |
| 947 | var color = '#ffffff'; | |
|
752
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
948 | if (block_fermentable(dataRecord.inventory_reduced, rowdata.f_added) == false) { |
| 478 | 949 | if (value < rowdata.f_amount) |
| 950 | color = '#ff4040'; | |
| 951 | return '<span style="margin: 4px; margin-top: 6px; float: right; color: ' + color + ';">' + fermentableAdapter.formatNumber(value, 'f3') + '</span>'; | |
| 952 | } else { | |
| 953 | return '<span></span>'; | |
| 954 | } | |
| 955 | } | |
| 956 | }, | |
| 957 | { text: 'Procent', datafield: 'f_percentage', width: 90, align: 'right', | |
| 958 | cellsrenderer: function(row, columnfield, value, defaulthtml, columnproperties, rowdata) { | |
| 959 | if (rowdata.f_added >= 4) | |
| 960 | return '<span></span>'; | |
| 961 | var color = '#ffffff'; | |
| 962 | if (value > rowdata.f_max_in_batch) | |
| 963 | color = '#ff4040'; | |
| 964 | return '<span style="margin: 4px; margin-top: 6px; float: right; color: ' + color + ';">' + fermentableAdapter.formatNumber(value, 'p1') + '</span>'; | |
| 965 | } | |
| 966 | }, | |
| 967 | { text: '100%', datafield: 'f_adjust_to_total_100', width: 70, align: 'center', cellsalign: 'center', | |
| 968 | cellsrenderer: function(index, datafield, value, defaultvalue, column, rowdata) { | |
| 969 | if (value == 0) | |
| 970 | return '<span></span>'; | |
| 971 | return '<span><img style="float:left; margin-left:25px; margin-top:4px;" src="images/dialog-ok-apply.png"></span>'; | |
| 972 | } | |
| 973 | }, | |
| 974 | { text: '', datafield: 'Edit', columntype: 'button', width: 100, align: 'center', | |
| 975 | cellsrenderer: function() { | |
| 976 | return 'Wijzig'; | |
| 977 | }, buttonclick: function(row) { | |
| 978 | fermentableRow = row; | |
| 979 | fermentableData = $('#fermentableGrid').jqxGrid('getrowdata', fermentableRow); | |
| 980 | if (fermentableData.f_added >= 4) { | |
| 981 | alert('Wijzig dit in de Verpakken tab'); | |
|
752
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
982 | } else if (block_fermentable(dataRecord.stage, fermentableData.f_added)) { |
| 478 | 983 | alert('Ingredieënt is al verwerkt.'); |
| 984 | } else { | |
| 985 | $('#wf_name').val(fermentableData.f_name); | |
| 986 | $('#wf_amount').val(fermentableData.f_amount); | |
| 987 | $('#wf_percentage').val(fermentableData.f_percentage); | |
| 988 | $('#wf_max_in_batch').val(fermentableData.f_max_in_batch); | |
| 989 | $('#wf_adjust_to_total_100').val(fermentableData.f_adjust_to_total_100); | |
| 990 | $('#wf_added').val(fermentableData.f_added); | |
|
752
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
991 | drop_endis(dataRecord.stage >= 3, '#wf_added', 0); |
|
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
992 | drop_endis(dataRecord.stage >= 3, '#wf_added', 1); |
|
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
993 | drop_endis(dataRecord.stage >= 4, '#wf_added', 2); |
|
751
3ba26a83eb93
Allow add and delete of fermentables durring valid brew moments. Add and edit a fermantable only to stages that have not yet been done. Block the packaging choices, edited elsewhere.
Michiel Broek <mbroek@mbse.eu>
parents:
741
diff
changeset
|
994 | $('#wf_added').jqxDropDownList('disableAt', 4); |
|
3ba26a83eb93
Allow add and delete of fermentables durring valid brew moments. Add and edit a fermantable only to stages that have not yet been done. Block the packaging choices, edited elsewhere.
Michiel Broek <mbroek@mbse.eu>
parents:
741
diff
changeset
|
995 | $('#wf_added').jqxDropDownList('disableAt', 5); |
| 478 | 996 | // show the popup window. |
| 997 | $('#popupFermentable').jqxWindow('open'); | |
| 998 | } | |
| 999 | } | |
| 1000 | } | |
| 1001 | ] | |
| 1002 | }); | |
|
525
8bbc5730aaa8
Code cleanup and manual compress
Michiel Broek <mbroek@mbse.eu>
parents:
518
diff
changeset
|
1003 | }; |
| 478 | 1004 | |
| 1005 | // Inline hops editor | |
|
525
8bbc5730aaa8
Code cleanup and manual compress
Michiel Broek <mbroek@mbse.eu>
parents:
518
diff
changeset
|
1006 | var editHop = function(data) { |
| 478 | 1007 | var hopSource = { |
| 1008 | localdata: data.hops, | |
| 1009 | datatype: 'local', | |
| 1010 | cache: false, | |
| 641 | 1011 | async: true, |
| 478 | 1012 | datafields: [ |
| 1013 | { name: 'h_name', type: 'string' }, | |
| 1014 | { name: 'h_origin', type: 'string' }, | |
| 1015 | { name: 'h_amount', type: 'float' }, | |
| 1016 | { name: 'h_cost', type: 'float' }, | |
| 1017 | { name: 'h_type', type: 'int' }, | |
| 1018 | { name: 'h_form', type: 'int' }, | |
| 1019 | { name: 'h_useat', type: 'int' }, | |
|
538
41d21817608e
Added the IBU contribution for whirlpool hops.
Michiel Broek <mbroek@mbse.eu>
parents:
525
diff
changeset
|
1020 | { name: 'h_time', type: 'int' }, |
| 478 | 1021 | { name: 'h_alpha', type: 'float' }, |
| 1022 | { name: 'h_beta', type: 'float' }, | |
| 1023 | { name: 'h_hsi', type: 'float' }, | |
| 1024 | { name: 'h_humulene', type: 'float' }, | |
| 1025 | { name: 'h_caryophyllene', type: 'float' }, | |
| 1026 | { name: 'h_cohumulone', type: 'float' }, | |
| 1027 | { name: 'h_myrcene', type: 'float' }, | |
| 1028 | { name: 'h_total_oil', type: 'float' }, | |
| 1029 | { name: 'h_inventory', type: 'float' }, | |
| 1030 | { name: 'h_avail', type: 'int' } | |
| 1031 | ], | |
| 641 | 1032 | addrow: function(rowid, rowdata, position, commit) { commit(true); }, |
| 1033 | deleterow: function(rowid, commit) { commit(true); }, | |
| 1034 | updaterow: function(rowid, rowdata, commit) { commit(true); } | |
| 478 | 1035 | }, |
| 1036 | hopAdapter = new $.jqx.dataAdapter(hopSource); | |
| 1037 | ||
| 1038 | $('#hopGrid').jqxGrid({ | |
| 1039 | width: 1240, | |
| 1040 | height: 560, | |
| 1041 | source: hopAdapter, | |
| 1042 | theme: theme, | |
| 1043 | selectionmode: 'singlerow', | |
| 1044 | showtoolbar: true, | |
| 1045 | rendertoolbar: function(toolbar) { | |
| 1046 | var container = $("<div style='overflow: hidden; position: relative; margin: 5px;'></div>"); | |
| 1047 | toolbar.append(container); | |
| 1048 | container.append('<div style="float: left; margin-left: 165px;" id="haddrowbutton"></div>'); | |
| 1049 | container.append('<div style="float: left; margin-left: 10px; margin-top: 5px;">In voorraad:</div>'); | |
| 1050 | container.append('<div style="float: left; margin-left: 10px;" id="hinstockbutton"></div>'); | |
| 1051 | container.append('<input style="float: left; margin-left: 400px;" id="hdeleterowbutton" type="button" value="Verwijder hop" />'); | |
| 1052 | // add hop from dropdownlist. | |
| 1053 | $('#haddrowbutton').jqxDropDownList({ | |
| 1054 | placeHolder: 'Kies hop:', | |
| 1055 | theme: theme, | |
| 1056 | template: 'primary', | |
| 1057 | source: hoplist, | |
|
752
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
1058 | disabled: (dataRecord.stage > 5), |
| 478 | 1059 | displayMember: 'name', |
| 1060 | width: 150, | |
| 1061 | height: 27, | |
| 1062 | dropDownWidth: 500, | |
| 1063 | dropDownHeight: 500, | |
| 1064 | renderer: function(index, label, value) { | |
| 1065 | var datarecord = hoplist.records[index]; | |
|
564
d5fad7d80899
When adding fermentables or hops to a product, show the current inventory in the dropdownlist.
Michiel Broek <mbroek@mbse.eu>
parents:
561
diff
changeset
|
1066 | return datarecord.origin + ' - ' + datarecord.name + ' / ' + HopFormData[datarecord.form].nl + ' (' + datarecord.alpha + '% α) (' + |
|
d5fad7d80899
When adding fermentables or hops to a product, show the current inventory in the dropdownlist.
Michiel Broek <mbroek@mbse.eu>
parents:
561
diff
changeset
|
1067 | Round(datarecord.inventory * 1000.0, 1) + ' gr)'; |
| 478 | 1068 | } |
| 1069 | }); | |
| 1070 | $('#haddrowbutton').on('select', function(event) { | |
| 1071 | if (event.args) { | |
| 1072 | var datarecord, row = {}, index = event.args.index; | |
| 1073 | datarecord = hoplist.records[index]; | |
| 1074 | row['h_name'] = datarecord.name; | |
| 1075 | row['h_origin'] = datarecord.origin; | |
| 1076 | row['h_amount'] = 0; | |
| 1077 | row['h_cost'] = datarecord.cost; | |
| 1078 | row['h_type'] = datarecord.type; | |
| 1079 | row['h_form'] = datarecord.form; | |
| 1080 | row['h_useat'] = 2; // Boil | |
| 1081 | row['h_time'] = 0; | |
| 1082 | row['h_alpha'] = datarecord.alpha; | |
| 1083 | row['h_beta'] = datarecord.beta; | |
| 1084 | row['h_hsi'] = datarecord.hsi; | |
| 1085 | row['h_humulene'] = datarecord.humulene; | |
| 1086 | row['h_caryophyllene'] = datarecord.caryophyllene; | |
| 1087 | row['h_cohumulone'] = datarecord.cohumulone; | |
| 1088 | row['h_myrcene'] = datarecord.myrcene; | |
| 1089 | row['h_total_oil'] = datarecord.total_oil; | |
| 1090 | row['h_inventory'] = datarecord.inventory; | |
|
752
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
1091 | /* If stage > useat moment, adjust the moment */ |
|
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
1092 | row['h_useat'] = minimum_hop(dataRecord.stage, row['h_useat']); |
| 478 | 1093 | $('#hopGrid').jqxGrid('addrow', null, row); |
| 1094 | } | |
| 1095 | $('#haddrowbutton').jqxDropDownList('clearSelection'); | |
| 1096 | }); | |
| 1097 | ||
|
752
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
1098 | $('#hinstockbutton').jqxCheckBox({ theme: theme, height: 27, disabled: (dataRecord.stage > 5) }); |
| 478 | 1099 | $('#hinstockbutton').on('change', function(event) { |
| 1100 | hopinstock = event.args.checked; | |
| 1101 | hoplist.dataBind(); | |
| 1102 | }); | |
| 1103 | ||
| 1104 | // delete selected hop. | |
|
752
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
1105 | $('#hdeleterowbutton').jqxButton({ template: 'danger', theme: theme, height: 27, width: 150, disabled: (dataRecord.stage > 5) }); |
| 478 | 1106 | $('#hdeleterowbutton').on('click', function() { |
| 1107 | var rowscount, id, selectedrowindex = $('#hopGrid').jqxGrid('getselectedrowindex'); | |
| 1108 | rowscount = $('#hopGrid').jqxGrid('getdatainformation').rowscount; | |
| 1109 | if (selectedrowindex >= 0 && selectedrowindex < rowscount) { | |
|
752
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
1110 | useat = $('#hopGrid').jqxGrid('getcellvalue', selectedrowindex, 'h_useat'); |
|
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
1111 | if (block_hop(dataRecord.stage, useat)) { |
|
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
1112 | alert('Ingredieënt is al verwerkt.'); |
|
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
1113 | } else { |
|
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
1114 | id = $('#hopGrid').jqxGrid('getrowid', selectedrowindex); |
|
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
1115 | $('#hopGrid').jqxGrid('deleterow', id); |
|
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
1116 | } |
| 478 | 1117 | } |
| 1118 | calcIBUs(); | |
| 1119 | }); | |
| 1120 | }, | |
| 648 | 1121 | ready: function() { $('#jqxTabs').jqxTabs('next'); }, |
| 478 | 1122 | columns: [ |
| 1123 | { text: 'Hop', datafield: 'h_name', | |
| 1124 | cellsrenderer: function(index, datafield, value, defaultvalue, column, rowdata) { | |
| 1125 | return '<span style="margin: 3px; margin-top: 6px; float: left;">' + rowdata.h_origin + ' / ' + rowdata.h_name + '</span>'; | |
| 1126 | }, | |
| 1127 | }, | |
| 1128 | { text: 'Type', width: 90, datafield: 'h_type', | |
| 1129 | cellsrenderer: function(index, datafield, value, defaultvalue, column, rowdata) { | |
| 1130 | return '<span style="margin: 4px; margin-top: 6px; float: left;">' + HopTypeData[value].nl + '</span>'; | |
| 1131 | } | |
| 1132 | }, | |
| 1133 | { text: 'Vorm', width: 90, datafield: 'h_form', | |
| 1134 | cellsrenderer: function(index, datafield, value, defaultvalue, column, rowdata) { | |
| 1135 | return '<span style="margin: 4px; margin-top: 6px; float: left;">' + HopFormData[value].nl + '</span>'; | |
| 1136 | } | |
| 1137 | }, | |
| 1138 | { text: 'Alpha', datafield: 'h_alpha', width: 80, align: 'right', cellsalign: 'right', cellsformat: 'p1' }, | |
| 1139 | { text: 'Gebruik', width: 110, datafield: 'h_useat', | |
| 1140 | cellsrenderer: function(index, datafield, value, defaultvalue, column, rowdata) { | |
| 1141 | return '<span style="margin: 4px; margin-top: 6px; float: left;">' + HopUseData[value].nl + '</span>'; | |
| 1142 | } | |
| 1143 | }, | |
| 1144 | { text: 'Tijdsduur', datafield: 'h_time', width: 90, align: 'right', | |
| 1145 | cellsrenderer: function(index, datafield, value, defaultvalue, column, rowdata) { | |
| 1146 | var duration = ''; | |
| 1147 | if ((rowdata.h_useat == 2) || (rowdata.h_useat == 4)) // Boil, Whirlpool | |
| 1148 | duration = dataAdapter.formatNumber(value, 'f0') + ' min.'; | |
| 1149 | else if (rowdata.h_useat == 5) // Dry hop | |
| 1150 | duration = dataAdapter.formatNumber(value / 1440, 'f0') + ' dagen'; | |
| 1151 | return '<span style="margin: 4px; margin-top: 6px; float: right;">' + duration + '</span>'; | |
| 1152 | } | |
| 1153 | }, | |
| 1154 | { text: 'IBU', datafield: 'ibu', width: 80, align: 'right', | |
| 1155 | cellsrenderer: function(index, datafield, value, defaultvalue, column, rowdata) { | |
| 1156 | var ibu = toIBU(rowdata.h_useat, rowdata.h_form, preboil_sg, parseFloat($('#batch_size').jqxNumberInput('decimal')), | |
|
538
41d21817608e
Added the IBU contribution for whirlpool hops.
Michiel Broek <mbroek@mbse.eu>
parents:
525
diff
changeset
|
1157 | parseFloat(rowdata.h_amount), parseFloat(rowdata.h_time), parseFloat(rowdata.h_alpha), $('#ibu_method').val(), |
|
41d21817608e
Added the IBU contribution for whirlpool hops.
Michiel Broek <mbroek@mbse.eu>
parents:
525
diff
changeset
|
1158 | dataRecord.brew_whirlpool9, dataRecord.brew_whirlpool7, dataRecord.brew_whirlpool6); |
| 478 | 1159 | return '<span style="margin: 4px; margin-top: 6px; float: right;">' + dataAdapter.formatNumber(ibu, 'f1') + '</span>'; |
| 1160 | } | |
| 1161 | }, | |
| 1162 | { text: 'Gewicht', datafield: 'h_amount', width: 110, align: 'right', | |
| 1163 | cellsrenderer: function(index, datafield, value, defaultvalue, column, rowdata) { | |
| 1164 | var amount = dataAdapter.formatNumber(value, 'f1') + ' kg'; | |
| 1165 | if (value < 1) | |
| 1166 | amount = dataAdapter.formatNumber(value * 1000, 'f1') + ' gr'; | |
| 1167 | return '<span style="margin: 4px; margin-top: 6px; float: right;">' + amount + '</span>'; | |
| 1168 | } | |
| 1169 | }, | |
| 1170 | { text: 'Voorraad', datafield: 'h_inventory', width: 110, align: 'right', | |
| 1171 | cellsrenderer: function(index, datafield, value, defaultvalue, column, rowdata) { | |
|
752
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
1172 | if (block_hop(dataRecord.inventory_reduced, rowdata.h_useat) == false) { |
| 478 | 1173 | var amount, color = '#ffffff'; |
| 1174 | if (value < rowdata.h_amount) | |
| 1175 | color = '#ff4040'; | |
| 1176 | amount = dataAdapter.formatNumber(value, 'f1') + ' kg'; | |
| 1177 | if (value < 1) | |
| 1178 | amount = dataAdapter.formatNumber(value * 1000, 'f1') + ' gr'; | |
| 1179 | return '<span style="margin: 4px; margin-top: 6px; float: right; color: ' + color + ';">' + amount + '</span>'; | |
| 1180 | } else { | |
| 1181 | return '<span></span>'; | |
| 1182 | } | |
| 1183 | } | |
| 1184 | }, | |
| 1185 | { text: '', datafield: 'Edit', columntype: 'button', width: 100, align: 'center', | |
| 1186 | cellsrenderer: function() { | |
| 1187 | return 'Wijzig'; | |
| 1188 | }, buttonclick: function(row) { | |
|
752
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
1189 | hopRow = row; |
|
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
1190 | hopData = $('#hopGrid').jqxGrid('getrowdata', hopRow); |
|
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
1191 | if (block_hop(dataRecord.stage, hopData.h_useat)) { |
| 478 | 1192 | alert('Ingredieënt is al verwerkt.'); |
| 1193 | } else { | |
| 1194 | console.log('edit button row ' + row); | |
| 1195 | $('#wh_name').val(hopData.h_name); | |
| 1196 | $('#wh_amount').val(hopData.h_amount * 1000); | |
| 1197 | var ibu = toIBU(hopData.h_useat, hopData.h_form, preboil_sg, parseFloat($('#batch_size').jqxNumberInput('decimal')), | |
|
538
41d21817608e
Added the IBU contribution for whirlpool hops.
Michiel Broek <mbroek@mbse.eu>
parents:
525
diff
changeset
|
1198 | parseFloat(hopData.h_amount), parseFloat(hopData.h_time), parseFloat(hopData.h_alpha), $('#ibu_method').val(), |
|
41d21817608e
Added the IBU contribution for whirlpool hops.
Michiel Broek <mbroek@mbse.eu>
parents:
525
diff
changeset
|
1199 | dataRecord.brew_whirlpool9, dataRecord.brew_whirlpool7, dataRecord.brew_whirlpool6); |
| 478 | 1200 | $('#wh_ibu').val(ibu); |
| 1201 | if (hopData.h_useat == 5) // Dry hop | |
| 1202 | $('#wh_time').val(hopData.h_time / 1440); | |
| 1203 | else | |
| 1204 | $('#wh_time').val(hopData.h_time); | |
| 1205 | $('#wh_useat').val(hopData.h_useat); | |
|
752
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
1206 | for (i = 0; i < 5; i++) { |
|
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
1207 | drop_endis(dataRecord.stage > 2, '#wh_useat', i); |
|
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
1208 | } |
| 478 | 1209 | // show the popup window. |
| 1210 | $('#popupHop').jqxWindow('open'); | |
| 1211 | } | |
| 1212 | } | |
| 1213 | } | |
| 1214 | ] | |
| 1215 | }); | |
|
525
8bbc5730aaa8
Code cleanup and manual compress
Michiel Broek <mbroek@mbse.eu>
parents:
518
diff
changeset
|
1216 | }; |
| 478 | 1217 | |
| 1218 | // Inline miscs editor | |
|
525
8bbc5730aaa8
Code cleanup and manual compress
Michiel Broek <mbroek@mbse.eu>
parents:
518
diff
changeset
|
1219 | var editMisc = function(data) { |
| 478 | 1220 | var miscSource = { |
| 1221 | localdata: data.miscs, | |
| 1222 | datatype: 'local', | |
| 1223 | cache: false, | |
| 1224 | async: false, | |
| 1225 | datafields: [ | |
| 1226 | { name: 'm_name', type: 'string' }, | |
| 1227 | { name: 'm_amount', type: 'float' }, | |
| 1228 | { name: 'm_cost', type: 'float' }, | |
| 1229 | { name: 'm_type', type: 'int' }, | |
| 1230 | { name: 'm_use_use', type: 'int' }, | |
| 1231 | { name: 'm_time', type: 'float' }, | |
| 1232 | { name: 'm_amount_is_weight', type: 'int' }, | |
| 1233 | { name: 'm_inventory', type: 'float' }, | |
| 1234 | { name: 'm_avail', type: 'int' } | |
| 1235 | ], | |
| 641 | 1236 | addrow: function(rowid, rowdata, position, commit) { commit(true); }, |
| 1237 | deleterow: function(rowid, commit) { commit(true); }, | |
| 1238 | updaterow: function(rowid, rowdata, commit) { commit(true); } | |
| 478 | 1239 | }, |
| 1240 | miscAdapter = new $.jqx.dataAdapter(miscSource, { | |
| 1241 | beforeLoadComplete: function(records) { | |
| 1242 | var row, i, data = new Array(); | |
| 1243 | for (i = 0; i < records.length; i++) { | |
| 1244 | row = records[i]; | |
| 1245 | data.push(row); | |
| 1246 | // Initial set water agent values. | |
| 1247 | switch (row.m_name) { | |
| 1248 | case 'CaCl2': | |
| 1249 | $('#wa_cacl2').val(row.m_amount * 1000); | |
| 1250 | break; | |
| 1251 | case 'CaSO4': | |
| 1252 | $('#wa_caso4').val(row.m_amount * 1000); | |
| 1253 | break; | |
| 1254 | case 'MgSO4': | |
| 1255 | $('#wa_mgso4').val(row.m_amount * 1000); | |
| 1256 | break; | |
| 1257 | case 'NaCl': | |
| 1258 | $('#wa_nacl').val(row.m_amount * 1000); | |
| 1259 | break; | |
| 1260 | case 'Melkzuur': | |
| 1261 | $('#wa_acid_name').val(0); | |
| 1262 | $('#wa_acid').val(row.m_amount * 1000); | |
|
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
|
1263 | $('#wa_acid_perc').val(AcidTypeData[0].AcidPrc); // TODO: this ignores changed percentages. |
| 478 | 1264 | last_acid = 'Melkzuur'; |
| 1265 | break; | |
| 1266 | case 'Zoutzuur': | |
| 1267 | $('#wa_acid_name').val(1); | |
| 1268 | $('#wa_acid').val(row.m_amount * 1000); | |
|
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
|
1269 | $('#wa_acid_perc').val(AcidTypeData[1].AcidPrc); |
| 478 | 1270 | last_acid = 'Zoutzuur'; |
| 1271 | break; | |
| 1272 | case 'Fosforzuur': | |
| 1273 | $('#wa_acid_name').val(2); | |
| 1274 | $('#wa_acid').val(row.m_amount * 1000); | |
|
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
|
1275 | $('#wa_acid_perc').val(AcidTypeData[2].AcidPrc); |
| 478 | 1276 | last_acid = 'Fosforzuur'; |
| 1277 | break; | |
| 1278 | case 'Zwavelzuur': | |
| 1279 | $('#wa_acid_name').val(3); | |
| 1280 | $('#wa_acid').val(row.m_amount * 1000); | |
|
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
|
1281 | $('#wa_acid_perc').val(AcidTypeData[3].AcidPrc); |
| 478 | 1282 | last_acid = 'Zwavelzuur'; |
| 1283 | break; | |
| 1284 | case 'NaHCO3': | |
| 1285 | $('#wa_base_name').val(0); | |
| 1286 | $('#wa_base').val(row.m_amount * 1000); | |
| 1287 | last_base = 'NaHCO3'; | |
| 1288 | break; | |
| 1289 | case 'Na2CO3': | |
| 1290 | $('#wa_base_name').val(1); | |
| 1291 | $('#wa_base').val(row.m_amount * 1000); | |
| 1292 | last_base = 'Na2CO3'; | |
| 1293 | break; | |
| 1294 | case 'CaCO3': | |
| 1295 | $('#wa_base_name').val(2); | |
| 1296 | $('#wa_base').val(row.m_amount * 1000); | |
| 1297 | last_base = 'CaCO3'; | |
| 1298 | break; | |
| 1299 | case 'Ca(OH)2': | |
| 1300 | $('#wa_base_name').val(3); | |
| 1301 | $('#wa_base').val(row.m_amount * 1000); | |
| 1302 | last_base = 'Ca(OH)2'; | |
| 1303 | break; | |
| 1304 | } | |
| 1305 | } | |
| 1306 | return data; | |
| 1307 | }, | |
| 641 | 1308 | loadError: function(jqXHR, status, error) { console.log('miscs load error ' + status + ' ' + error); }, |
| 478 | 1309 | }); |
| 1310 | $('#miscGrid').jqxGrid({ | |
| 1311 | width: 1240, | |
| 1312 | height: 575, | |
| 1313 | source: miscAdapter, | |
| 1314 | theme: theme, | |
| 1315 | selectionmode: 'singlerow', | |
| 1316 | showtoolbar: true, | |
| 1317 | rendertoolbar: function(toolbar) { | |
| 1318 | var container = $("<div style='overflow: hidden; position: relative; margin: 5px;'></div>"); | |
| 1319 | toolbar.append(container); | |
| 1320 | container.append('<div style="float: left; margin-left: 165px;" id="maddrowbutton"></div>'); | |
| 1321 | container.append('<div style="float: left; margin-left: 10px; margin-top: 5px;">In voorraad:</div>'); | |
| 1322 | container.append('<div style="float: left; margin-left: 10px;" id="minstockbutton"></div>'); | |
| 1323 | container.append('<input style="float: left; margin-left: 400px;" id="mdeleterowbutton" type="button" value="Verwijder ingredient" />'); | |
| 1324 | // add misc from dropdownlist. | |
| 1325 | $('#maddrowbutton').jqxDropDownList({ | |
| 1326 | placeHolder: 'Kies ingrediënt:', | |
| 1327 | theme: theme, | |
| 1328 | template: 'primary', | |
| 1329 | source: misclist, | |
|
752
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
1330 | disabled: (dataRecord.stage > 6), |
| 478 | 1331 | displayMember: 'name', |
| 1332 | width: 150, | |
| 1333 | height: 27, | |
| 1334 | dropDownWidth: 500, | |
| 1335 | dropDownHeight: 500 | |
| 1336 | }); | |
| 1337 | $('#maddrowbutton').on('select', function(event) { | |
| 1338 | if (event.args) { | |
| 1339 | var datarecord, row = {}, index = event.args.index; | |
| 1340 | datarecord = misclist.records[index]; | |
| 1341 | row['m_name'] = datarecord.name; | |
| 1342 | row['m_amount'] = 0; | |
| 1343 | row['m_cost'] = datarecord.cost; | |
| 1344 | row['m_type'] = datarecord.type; | |
|
752
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
1345 | row['m_use_use'] = minimum_misc(dataRecord.stage, datarecord.use_use); |
| 478 | 1346 | row['m_time'] = 0; |
| 1347 | row['m_amount_is_weight'] = datarecord.amount_is_weight; | |
| 1348 | row['m_inventory'] = datarecord.inventory; | |
| 1349 | $('#miscGrid').jqxGrid('addrow', null, row); | |
| 1350 | } | |
| 1351 | }); | |
|
752
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
1352 | $('#minstockbutton').jqxCheckBox({ theme: theme, height: 27, disabled: (dataRecord.stage > 6) }); |
| 478 | 1353 | $('#minstockbutton').on('change', function(event) { |
| 1354 | miscinstock = event.args.checked; | |
| 1355 | misclist.dataBind(); | |
| 1356 | }); | |
| 1357 | // delete selected misc. | |
|
752
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
1358 | $('#mdeleterowbutton').jqxButton({ template: 'danger', theme: theme, height: 27, width: 150, disabled: (dataRecord.stage > 6) }); |
| 478 | 1359 | $('#mdeleterowbutton').on('click', function() { |
| 1360 | var rowscount, type, id, selectedrowindex = $('#miscGrid').jqxGrid('getselectedrowindex'); | |
| 1361 | rowscount = $('#miscGrid').jqxGrid('getdatainformation').rowscount; | |
| 1362 | type = $('#miscGrid').jqxGrid('getcellvalue', selectedrowindex, 'm_type'); | |
|
752
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
1363 | use_use = $('#miscGrid').jqxGrid('getcellvalue', selectedrowindex, 'm_use_use'); |
|
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
1364 | if (selectedrowindex >= 0 && selectedrowindex < rowscount && type == 4) { |
|
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
1365 | alert('Brouwzouten verwijderen in de water tab.'); |
|
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
1366 | } else if (block_misc(dataRecord.stage, use_use)) { |
|
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
1367 | alert('Ingredieënt is al verwerkt.'); |
|
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
1368 | } else { |
| 478 | 1369 | id = $('#miscGrid').jqxGrid('getrowid', selectedrowindex); |
| 1370 | $('#miscGrid').jqxGrid('deleterow', id); | |
| 1371 | } | |
| 1372 | }); | |
| 1373 | }, | |
| 648 | 1374 | ready: function() { $('#jqxTabs').jqxTabs('next'); }, |
| 478 | 1375 | columns: [ |
| 1376 | { text: 'Ingredient', datafield: 'm_name' }, | |
| 1377 | { text: 'Type', width: 140, datafield: 'm_type', | |
| 1378 | cellsrenderer: function(index, datafield, value, defaultvalue, column, rowdata) { | |
| 1379 | return '<span style="margin: 3px; margin-top: 6px; float: left;">' + MiscTypeData[value].nl + '</span>'; | |
| 1380 | } | |
| 1381 | }, | |
| 1382 | { text: 'Gebruik', width: 140, datafield: 'm_use_use', | |
| 1383 | cellsrenderer: function(index, datafield, value, defaultvalue, column, rowdata) { | |
| 1384 | return '<span style="margin: 3px; margin-top: 6px; float: left;">' + MiscUseData[value].nl + '</span>'; | |
| 1385 | } | |
| 1386 | }, | |
| 1387 | { text: 'Tijd', datafield: 'm_time', width: 90, align: 'right', | |
| 1388 | cellsrenderer: function(index, datafield, value, defaultvalue, column, rowdata) { | |
| 1389 | var duration = ''; | |
| 1390 | if (rowdata.m_use_use == 2) // Boil | |
| 1391 | duration = dataAdapter.formatNumber(value, 'f0') + ' min.'; | |
| 1392 | else if ((rowdata.m_use_use == 3) || (rowdata.m_use_use == 4)) // Primary or Secondary | |
| 1393 | duration = dataAdapter.formatNumber(value / 1440, 'f0') + ' dagen'; | |
| 1394 | return '<span style="margin: 4px; margin-top: 6px; float: right;">' + duration + '</span>'; | |
| 1395 | } | |
| 1396 | }, | |
| 1397 | { text: 'Hoeveel', datafield: 'm_amount', width: 110, align: 'right', | |
| 1398 | cellsrenderer: function(index, datafield, value, defaultvalue, column, rowdata) { | |
| 1399 | var vstr = rowdata.m_amount_is_weight ? 'gr' : 'ml'; | |
| 1400 | return '<span style="margin: 4px; margin-top: 6px; float: right;">' + dataAdapter.formatNumber(value * 1000, 'f2') + ' ' + vstr + '</span>'; | |
| 1401 | } | |
| 1402 | }, | |
| 1403 | { text: 'Voorraad', datafield: 'm_inventory', width: 110, align: 'right', | |
| 1404 | cellsrenderer: function(index, datafield, value, defaultvalue, column, rowdata) { | |
| 1405 | var vstr, color, amount; | |
|
752
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
1406 | if (block_misc(dataRecord.inventory_reduced, rowdata.m_use_use) == false) { |
| 478 | 1407 | vstr = rowdata.m_amount_is_weight ? 'gr' : 'ml'; |
| 1408 | color = '#ffffff'; | |
| 1409 | if (value < rowdata.m_amount) | |
| 1410 | color = '#ff4040'; | |
| 1411 | amount = dataAdapter.formatNumber(value * 1000, 'f2') + ' ' + vstr; | |
| 1412 | return '<span style="margin: 4px; margin-top: 6px; float: right; color: ' + color + ';">' + amount + '</span>'; | |
| 1413 | } else { | |
| 1414 | return '<span></span>'; | |
| 1415 | } | |
| 1416 | } | |
| 1417 | }, | |
| 1418 | { text: '', datafield: 'Edit', columntype: 'button', width: 100, align: 'center', | |
| 1419 | cellsrenderer: function() { | |
| 1420 | return 'Wijzig'; | |
| 1421 | }, buttonclick: function(row) { | |
| 1422 | miscRow = row; | |
| 1423 | miscData = $('#miscGrid').jqxGrid('getrowdata', miscRow); | |
|
752
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
1424 | if (block_misc(dataRecord.stage, miscData.m_use_use)) { |
| 478 | 1425 | alert('Ingredieënt is al verwerkt.'); |
| 1426 | } else if (miscData.m_type == 4) { | |
| 1427 | alert('Brouwzouten wijzigen in de water tab.'); | |
| 1428 | } else { | |
| 1429 | console.log('edit button row ' + row); | |
| 1430 | if (miscData.m_amount_is_weight) | |
| 1431 | $('#wm_pmpt_amount').html('Gewicht gram:'); | |
| 1432 | else | |
| 1433 | $('#wm_pmpt_amount').html('Volume ml:'); | |
| 1434 | $('#wm_name').val(miscData.m_name); | |
| 1435 | $('#wm_amount').val(miscData.m_amount * 1000); | |
| 1436 | if ((miscData.m_use_use == 3) || (miscData.m_use_use == 4)) // Primary or Secondary | |
| 1437 | $('#wm_time').val(miscData.m_time / 1440); | |
| 1438 | else | |
| 1439 | $('#wm_time').val(miscData.m_time); | |
| 1440 | $('#wm_use_use').val(miscData.m_use_use); | |
|
752
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
1441 | drop_endis(dataRecord.stage >= 2, '#wm_use_use', 0); |
|
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
1442 | drop_endis(dataRecord.stage >= 3, '#wm_use_use', 1); |
|
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
1443 | drop_endis(dataRecord.stage >= 3, '#wm_use_use', 2); |
|
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
1444 | drop_endis(dataRecord.stage >= 4, '#wm_use_use', 3); |
|
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
1445 | drop_endis(dataRecord.stage >= 5, '#wm_use_use', 4); |
| 478 | 1446 | // show the popup window. |
| 1447 | $('#popupMisc').jqxWindow('open'); | |
| 1448 | } | |
| 1449 | } | |
| 1450 | } | |
| 1451 | ] | |
| 1452 | }); | |
|
525
8bbc5730aaa8
Code cleanup and manual compress
Michiel Broek <mbroek@mbse.eu>
parents:
518
diff
changeset
|
1453 | }; |
| 478 | 1454 | |
| 1455 | // Inline yeasts editor | |
|
525
8bbc5730aaa8
Code cleanup and manual compress
Michiel Broek <mbroek@mbse.eu>
parents:
518
diff
changeset
|
1456 | var editYeast = function(data) { |
| 478 | 1457 | var yeastSource = { |
| 1458 | localdata: data.yeasts, | |
| 1459 | datatype: 'local', | |
| 1460 | cache: false, | |
| 1461 | async: false, | |
| 1462 | datafields: [ | |
| 1463 | { name: 'y_name', type: 'string' }, | |
| 1464 | { name: 'y_laboratory', type: 'string' }, | |
| 1465 | { name: 'y_product_id', type: 'string' }, | |
| 1466 | { name: 'y_amount', type: 'float' }, | |
| 1467 | { name: 'y_cost', type: 'float' }, | |
| 1468 | { name: 'y_type', type: 'int' }, | |
| 1469 | { name: 'y_form', type: 'int' }, | |
| 1470 | { name: 'y_flocculation', type: 'int' }, | |
| 1471 | { name: 'y_min_temperature', type: 'float' }, | |
| 1472 | { name: 'y_max_temperature', type: 'float' }, | |
| 1473 | { name: 'y_attenuation', type: 'float' }, | |
| 1474 | { name: 'y_use', type: 'int' }, | |
| 1475 | { name: 'y_cells', type: 'float' }, | |
| 1476 | { name: 'y_tolerance', type: 'float' }, | |
| 1477 | { name: 'y_inventory', type: 'float' }, | |
|
554
c62ff53cfc3d
Added the new Kveik yeast fields to the product editor. Added auto update when a product is loaded. Added extra lines to the checklist about harvest yeast and pitch temperature.
Michiel Broek <mbroek@mbse.eu>
parents:
552
diff
changeset
|
1478 | { name: 'y_sta1', type: 'int' }, |
|
c62ff53cfc3d
Added the new Kveik yeast fields to the product editor. Added auto update when a product is loaded. Added extra lines to the checklist about harvest yeast and pitch temperature.
Michiel Broek <mbroek@mbse.eu>
parents:
552
diff
changeset
|
1479 | { name: 'y_bacteria', type: 'int' }, |
|
c62ff53cfc3d
Added the new Kveik yeast fields to the product editor. Added auto update when a product is loaded. Added extra lines to the checklist about harvest yeast and pitch temperature.
Michiel Broek <mbroek@mbse.eu>
parents:
552
diff
changeset
|
1480 | { name: 'y_harvest_top', type: 'int' }, |
|
c62ff53cfc3d
Added the new Kveik yeast fields to the product editor. Added auto update when a product is loaded. Added extra lines to the checklist about harvest yeast and pitch temperature.
Michiel Broek <mbroek@mbse.eu>
parents:
552
diff
changeset
|
1481 | { name: 'y_harvest_time', type: 'int' }, |
|
c62ff53cfc3d
Added the new Kveik yeast fields to the product editor. Added auto update when a product is loaded. Added extra lines to the checklist about harvest yeast and pitch temperature.
Michiel Broek <mbroek@mbse.eu>
parents:
552
diff
changeset
|
1482 | { name: 'y_pitch_temperature', type: 'float' }, |
|
c62ff53cfc3d
Added the new Kveik yeast fields to the product editor. Added auto update when a product is loaded. Added extra lines to the checklist about harvest yeast and pitch temperature.
Michiel Broek <mbroek@mbse.eu>
parents:
552
diff
changeset
|
1483 | { name: 'y_pofpos', type: 'int' }, |
|
c62ff53cfc3d
Added the new Kveik yeast fields to the product editor. Added auto update when a product is loaded. Added extra lines to the checklist about harvest yeast and pitch temperature.
Michiel Broek <mbroek@mbse.eu>
parents:
552
diff
changeset
|
1484 | { name: 'y_zymocide', type: 'int' }, |
|
726
872a3635e4ef
Changed dry-yeast calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
723
diff
changeset
|
1485 | { name: 'y_gr_hl_lo', type: 'int' }, |
|
872a3635e4ef
Changed dry-yeast calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
723
diff
changeset
|
1486 | { name: 'y_sg_lo', type: 'float' }, |
|
872a3635e4ef
Changed dry-yeast calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
723
diff
changeset
|
1487 | { name: 'y_gr_hl_hi', type: 'int' }, |
|
872a3635e4ef
Changed dry-yeast calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
723
diff
changeset
|
1488 | { name: 'y_sg_hi', type: 'float' }, |
| 478 | 1489 | { name: 'y_avail', type: 'int' } |
| 1490 | ], | |
| 641 | 1491 | addrow: function(rowid, rowdata, position, commit) { commit(true); }, |
| 1492 | deleterow: function(rowid, commit) { commit(true); }, | |
| 1493 | updaterow: function(rowid, rowdata, commit) { commit(true); } | |
| 478 | 1494 | }, |
| 1495 | yeastAdapter = new $.jqx.dataAdapter(yeastSource); | |
| 1496 | ||
| 1497 | $('#yeastGrid').jqxGrid({ | |
| 1498 | width: 1240, | |
|
617
f962f1e5936e
Implemented yeast viability calculation from the yeast production date. Changed the pitchrate logic and added Ale above 1.076 rate of 1.25.
Michiel Broek <mbroek@mbse.eu>
parents:
616
diff
changeset
|
1499 | height: 325, |
| 478 | 1500 | source: yeastAdapter, |
| 1501 | theme: theme, | |
| 1502 | selectionmode: 'singlerow', | |
| 1503 | showtoolbar: true, | |
| 1504 | rendertoolbar: function(toolbar) { | |
| 1505 | var container = $('<div style="overflow: hidden; position: relative; margin: 5px;"></div>'); | |
| 1506 | toolbar.append(container); | |
| 1507 | container.append('<div style="float: left; margin-left: 165px;" id="yaddrowbutton"></div>'); | |
| 1508 | container.append('<div style="float: left; margin-left: 10px; margin-top: 5px;">In voorraad:</div>'); | |
| 1509 | container.append('<div style="float: left; margin-left: 10px;" id="yinstockbutton"></div>'); | |
| 1510 | container.append('<input style="float: left; margin-left: 400px;" id="ydeleterowbutton" type="button" value="Verwijder gist" />'); | |
| 1511 | // add yeast from dropdownlist. | |
| 1512 | $('#yaddrowbutton').jqxDropDownList({ | |
| 1513 | placeHolder: 'Kies gist:', | |
| 1514 | theme: theme, | |
| 1515 | source: yeastlist, | |
|
752
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
1516 | disabled: (dataRecord.stage > 6), |
| 478 | 1517 | template: 'primary', |
| 1518 | displayMember: 'name', | |
| 1519 | width: 150, | |
| 1520 | height: 27, | |
| 1521 | dropDownWidth: 500, | |
| 1522 | dropDownHeight: 500, | |
| 1523 | renderer: function(index, label, value) { | |
| 1524 | var datarecord = yeastlist.records[index]; | |
| 1525 | return datarecord.laboratory + ' ' + datarecord.product_id + ' ' + datarecord.name; | |
| 1526 | } | |
| 1527 | }); | |
| 1528 | $('#yaddrowbutton').on('select', function(event) { | |
| 1529 | if (event.args) { | |
| 1530 | var datarecord, row = {}, index = event.args.index; | |
| 1531 | datarecord = yeastlist.records[index]; | |
| 1532 | row['y_name'] = datarecord.name; | |
| 1533 | row['y_laboratory'] = datarecord.laboratory; | |
| 1534 | row['y_product_id'] = datarecord.product_id; | |
| 1535 | row['y_type'] = datarecord.type; | |
| 1536 | row['y_form'] = datarecord.form; | |
| 1537 | row['y_amount'] = 0; | |
| 1538 | row['y_cost'] = datarecord.cost; | |
|
752
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
1539 | row['y_use'] = minimum_yeast(dataRecord.stage, 0); |
| 478 | 1540 | row['y_min_temperature'] = datarecord.min_temperature; |
| 1541 | row['y_max_temperature'] = datarecord.max_temperature; | |
| 1542 | row['y_attenuation'] = datarecord.attenuation; | |
| 1543 | row['y_flocculation'] = datarecord.flocculation; | |
| 1544 | row['y_cells'] = datarecord.cells; | |
| 1545 | row['y_tolerance'] = datarecord.tolerance; | |
| 1546 | row['y_inventory'] = datarecord.inventory; | |
|
554
c62ff53cfc3d
Added the new Kveik yeast fields to the product editor. Added auto update when a product is loaded. Added extra lines to the checklist about harvest yeast and pitch temperature.
Michiel Broek <mbroek@mbse.eu>
parents:
552
diff
changeset
|
1547 | row['y_sta1'] = datarecord.sta1; |
|
c62ff53cfc3d
Added the new Kveik yeast fields to the product editor. Added auto update when a product is loaded. Added extra lines to the checklist about harvest yeast and pitch temperature.
Michiel Broek <mbroek@mbse.eu>
parents:
552
diff
changeset
|
1548 | row['y_bacteria'] = datarecord.bacteria; |
|
c62ff53cfc3d
Added the new Kveik yeast fields to the product editor. Added auto update when a product is loaded. Added extra lines to the checklist about harvest yeast and pitch temperature.
Michiel Broek <mbroek@mbse.eu>
parents:
552
diff
changeset
|
1549 | row['y_harvest_top'] = datarecord.harvest_top; |
|
c62ff53cfc3d
Added the new Kveik yeast fields to the product editor. Added auto update when a product is loaded. Added extra lines to the checklist about harvest yeast and pitch temperature.
Michiel Broek <mbroek@mbse.eu>
parents:
552
diff
changeset
|
1550 | row['y_harvest_time'] = datarecord.harvest_time; |
|
c62ff53cfc3d
Added the new Kveik yeast fields to the product editor. Added auto update when a product is loaded. Added extra lines to the checklist about harvest yeast and pitch temperature.
Michiel Broek <mbroek@mbse.eu>
parents:
552
diff
changeset
|
1551 | row['y_pitch_temperature'] = datarecord.pitch_temperature; |
|
c62ff53cfc3d
Added the new Kveik yeast fields to the product editor. Added auto update when a product is loaded. Added extra lines to the checklist about harvest yeast and pitch temperature.
Michiel Broek <mbroek@mbse.eu>
parents:
552
diff
changeset
|
1552 | row['y_pofpos'] = datarecord.pofpos; |
|
c62ff53cfc3d
Added the new Kveik yeast fields to the product editor. Added auto update when a product is loaded. Added extra lines to the checklist about harvest yeast and pitch temperature.
Michiel Broek <mbroek@mbse.eu>
parents:
552
diff
changeset
|
1553 | row['y_zymocide'] = datarecord.zymocide; |
|
726
872a3635e4ef
Changed dry-yeast calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
723
diff
changeset
|
1554 | row['y_gr_hl_lo'] = datarecord.gr_hl_lo; |
|
872a3635e4ef
Changed dry-yeast calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
723
diff
changeset
|
1555 | row['y_sg_lo'] = datarecord.sg_lo; |
|
872a3635e4ef
Changed dry-yeast calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
723
diff
changeset
|
1556 | row['y_gr_hl_hi'] = datarecord.gr_hl_hi; |
|
872a3635e4ef
Changed dry-yeast calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
723
diff
changeset
|
1557 | row['y_sg_hi'] = datarecord.sg_hi; |
| 478 | 1558 | $('#yeastGrid').jqxGrid('addrow', null, row); |
| 1559 | } | |
|
617
f962f1e5936e
Implemented yeast viability calculation from the yeast production date. Changed the pitchrate logic and added Ale above 1.076 rate of 1.25.
Michiel Broek <mbroek@mbse.eu>
parents:
616
diff
changeset
|
1560 | calcViability(); |
| 478 | 1561 | calcYeast(); |
| 1562 | $('#yaddrowbutton').jqxDropDownList('clearSelection'); | |
| 1563 | }); | |
|
752
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
1564 | $('#yinstockbutton').jqxCheckBox({ theme: theme, height: 27, disabled: (dataRecord.stage > 6) }); |
| 478 | 1565 | $('#yinstockbutton').on('change', function(event) { |
| 1566 | yeastinstock = event.args.checked; | |
| 1567 | yeastlist.dataBind(); | |
| 1568 | }); | |
| 1569 | // delete selected yeast. | |
|
752
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
1570 | $('#ydeleterowbutton').jqxButton({ template: 'danger', theme: theme, height: 27, width: 150, disabled: (dataRecord.stage > 6) }); |
| 478 | 1571 | $('#ydeleterowbutton').on('click', function() { |
| 1572 | var id, rowscount, selectedrowindex = $('#yeastGrid').jqxGrid('getselectedrowindex'); | |
| 1573 | rowscount = $('#yeastGrid').jqxGrid('getdatainformation').rowscount; | |
| 1574 | if (selectedrowindex >= 0 && selectedrowindex < rowscount) { | |
|
752
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
1575 | use = $('#yeastGrid').jqxGrid('getcellvalue', selectedrowindex, 'y_use'); |
|
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
1576 | if (block_yeast(dataRecord.stage, use)) { |
|
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
1577 | alert('Ingredieënt is al verwerkt.'); |
|
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
1578 | } else { |
|
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
1579 | id = $('#yeastGrid').jqxGrid('getrowid', selectedrowindex); |
|
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
1580 | $('#yeastGrid').jqxGrid('deleterow', id); |
|
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
1581 | calcViability(); |
|
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
1582 | calcYeast(); |
|
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
1583 | } |
| 478 | 1584 | } |
| 1585 | }); | |
| 1586 | }, | |
| 648 | 1587 | ready: function() { $('#jqxTabs').jqxTabs('next'); }, |
| 478 | 1588 | columns: [ |
| 1589 | { text: 'Gist', datafield: 'y_name' }, | |
| 1590 | { text: 'Laboratorium', width: 150, datafield: 'y_laboratory' }, | |
| 1591 | { text: 'Code', width: 90, datafield: 'y_product_id' }, | |
| 1592 | { text: 'Soort', width: 100, datafield: 'y_form', | |
| 1593 | cellsrenderer: function(index, datafield, value, defaultvalue, column, rowdata) { | |
| 1594 | return '<span style="margin: 4px; margin-top: 6px; float: left;">' + YeastFormData[value].nl + '</span>'; | |
| 1595 | } | |
| 1596 | }, | |
| 1597 | { text: 'Min. °C', width: 70, align: 'right', cellsalign: 'right', datafield: 'y_min_temperature' }, | |
| 1598 | { text: 'Max. °C', width: 70, align: 'right', cellsalign: 'right', datafield: 'y_max_temperature' }, | |
| 1599 | { text: 'Tol. %', width: 60, align: 'right', cellsalign: 'right', datafield: 'y_tolerance', | |
| 1600 | cellsrenderer: function(index, datafield, value, defaultvalue, column, rowdata) { | |
| 1601 | var amount = '', color = '#ffffff'; | |
| 1602 | if (value > 0) { | |
| 1603 | amount = dataAdapter.formatNumber(value, 'f1'); | |
| 1604 | if (dataRecord.est_abv > value) | |
| 1605 | color = '#ff4040'; | |
| 1606 | } | |
| 1607 | return '<span style="margin: 4px; margin-top: 6px; float: right; color: ' + color + ';">' + amount + '</span>'; | |
| 1608 | } | |
| 1609 | }, | |
| 1610 | { text: 'Attn. %', width: 70, align: 'right', cellsalign: 'right', datafield: 'y_attenuation', cellsformat: 'f1' }, | |
| 1611 | { text: 'Voor', width: 120, datafield: 'y_use', | |
| 1612 | cellsrenderer: function(index, datafield, value, defaultvalue, column, rowdata) { | |
| 1613 | return '<span style="margin: 4px; margin-top: 6px; float: left;">' + YeastUseData[value].nl + '</span>'; | |
| 1614 | } | |
| 1615 | }, | |
| 1616 | { text: 'Hoeveel', datafield: 'y_amount', width: 90, align: 'right', | |
| 1617 | cellsrenderer: function(index, datafield, value, defaultvalue, column, rowdata) { | |
| 1618 | var amount = dataAdapter.formatNumber(value * 1000, 'f0') + ' ml'; | |
| 1619 | if (rowdata.y_form == 0) // Liquid | |
| 1620 | amount = dataAdapter.formatNumber(value, 'f0') + ' pk'; | |
|
515
9d771385a8a0
Added dried yeast form. Pitch rate for Kveik initially set at 0.25. Dried Kveik cells set to 9000000000 cells/gram.
Michiel Broek <mbroek@mbse.eu>
parents:
500
diff
changeset
|
1621 | else if (rowdata.y_form == 1 || rowdata.y_form == 6) // Dry |
| 478 | 1622 | amount = dataAdapter.formatNumber(value * 1000, 'f1') + ' gr'; |
| 1623 | return '<span style="margin: 4px; margin-top: 6px; float: right;">' + amount + '</span>'; | |
| 1624 | } | |
| 1625 | }, | |
| 1626 | { text: 'Voorraad', datafield: 'y_inventory', width: 90, align: 'right', | |
| 1627 | cellsrenderer: function(index, datafield, value, defaultvalue, column, rowdata) { | |
| 1628 | var color, amount; | |
|
752
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
1629 | if (block_yeast(dataRecord.inventory_reduced, rowdata.y_use) == false) { |
| 478 | 1630 | color = '#ffffff'; |
| 1631 | if (value < rowdata.y_amount) | |
| 1632 | color = '#ff4040'; | |
| 1633 | amount = dataAdapter.formatNumber(value * 1000, 'f0') + ' ml'; | |
| 1634 | if (rowdata.y_form == 0) // Liquid | |
| 1635 | amount = dataAdapter.formatNumber(value, 'f0') + ' pk'; | |
|
515
9d771385a8a0
Added dried yeast form. Pitch rate for Kveik initially set at 0.25. Dried Kveik cells set to 9000000000 cells/gram.
Michiel Broek <mbroek@mbse.eu>
parents:
500
diff
changeset
|
1636 | else if (rowdata.y_form == 1 || rowdata.y_form == 6) // Dry |
| 478 | 1637 | amount = dataAdapter.formatNumber(value * 1000, 'f1') + ' gr'; |
| 1638 | return '<span style="margin: 4px; margin-top: 6px; float: right; color: ' + color + ';">' + amount + '</span>'; | |
| 1639 | } else { | |
| 1640 | return '<span></span>'; | |
| 1641 | } | |
| 1642 | } | |
| 1643 | }, | |
| 1644 | { text: '', datafield: 'Edit', columntype: 'button', width: 90, align: 'center', | |
| 1645 | cellsrenderer: function() { | |
| 1646 | return 'Wijzig'; | |
| 1647 | }, buttonclick: function(row) { | |
|
707
8488195b3c50
Edit a yeast row now checks the project stage and the use moment to allow edit.
Michiel Broek <mbroek@mbse.eu>
parents:
706
diff
changeset
|
1648 | yeastRow = row; |
|
8488195b3c50
Edit a yeast row now checks the project stage and the use moment to allow edit.
Michiel Broek <mbroek@mbse.eu>
parents:
706
diff
changeset
|
1649 | yeastData = $('#yeastGrid').jqxGrid('getrowdata', yeastRow); |
|
752
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
1650 | if (block_yeast(dataRecord.stage, yeastData.y_use)) { |
| 478 | 1651 | alert('Ingredieënt is al verwerkt.'); |
| 1652 | } else { | |
| 1653 | if (yeastData.y_form == 0) { | |
| 1654 | $('#wy_pmpt_amount').html('Pak(ken):'); | |
| 1655 | $('#wy_amount').val(yeastData.y_amount); | |
| 1656 | $('#wy_amount').jqxNumberInput({ decimalDigits: 0 }); | |
|
515
9d771385a8a0
Added dried yeast form. Pitch rate for Kveik initially set at 0.25. Dried Kveik cells set to 9000000000 cells/gram.
Michiel Broek <mbroek@mbse.eu>
parents:
500
diff
changeset
|
1657 | } else if (yeastData.y_form == 1 || yeastData.y_form == 6) { |
| 478 | 1658 | $('#wy_pmpt_amount').html('Gewicht gram:'); |
| 1659 | $('#wy_amount').val(yeastData.y_amount * 1000); | |
| 1660 | $('#wy_amount').jqxNumberInput({ decimalDigits: 1 }); | |
| 1661 | } else { | |
| 1662 | $('#wy_pmpt_amount').html('Volume ml:'); | |
| 1663 | $('#wy_amount').val(yeastData.y_amount * 1000); | |
| 1664 | $('#wy_amount').jqxNumberInput({ decimalDigits: 0 }); | |
| 1665 | } | |
| 1666 | $('#wy_name').val(yeastData.y_name); | |
| 1667 | $('#wy_laboratory').val(yeastData.y_laboratory); | |
| 1668 | $('#wy_product_id').val(yeastData.y_product_id); | |
| 1669 | $('#wy_use').val(yeastData.y_use); | |
|
752
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
1670 | drop_endis(dataRecord.stage > 3, '#wy_use', 0); |
|
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
1671 | drop_endis(dataRecord.stage > 4, '#wy_use', 1); |
|
f68e3bbc1ada
Fermentables, hops, miscs and yeast now have tests against the added moment with the brewing stage. Added to inventory edit rows, delete rows, and pick choices for the moment to add or edit. Some more popups to explain certain blocks.
Michiel Broek <mbroek@mbse.eu>
parents:
751
diff
changeset
|
1672 | drop_endis(dataRecord.stage > 5, '#wy_use', 2); |
| 478 | 1673 | // show the popup window. |
| 1674 | $('#popupYeast').jqxWindow('open'); | |
| 1675 | } | |
| 1676 | } | |
| 1677 | } | |
| 1678 | ] | |
| 1679 | }); | |
|
525
8bbc5730aaa8
Code cleanup and manual compress
Michiel Broek <mbroek@mbse.eu>
parents:
518
diff
changeset
|
1680 | }; |
| 478 | 1681 | |
| 1682 | // inline mash editor | |
|
525
8bbc5730aaa8
Code cleanup and manual compress
Michiel Broek <mbroek@mbse.eu>
parents:
518
diff
changeset
|
1683 | var editMash = function(data) { |
| 478 | 1684 | var mashSource = { |
| 1685 | localdata: data.mashs, | |
| 1686 | datatype: 'local', | |
| 1687 | cache: false, | |
| 1688 | async: false, | |
| 1689 | datafields: [ | |
| 1690 | { name: 'step_name', type: 'string' }, | |
| 1691 | { 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
|
1692 | { name: 'step_volume', type: 'float' }, |
| 478 | 1693 | { 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
|
1694 | { name: 'step_infuse_temp', type: 'float' }, |
| 478 | 1695 | { name: 'step_temp', type: 'float' }, |
| 1696 | { 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
|
1697 | { name: 'step_wg_ratio', type: 'float' }, |
| 478 | 1698 | { name: 'ramp_time', type: 'float' }, |
|
738
11e6bd8d8107
Added mash SG and pH fields. Fixed default Yeast update. Added mash step SG and pH input datafields. Added a Brix input too. The print report shows the mash measurements too. Other brewing results now show expected and measured values and the difference.
Michiel Broek <mbroek@mbse.eu>
parents:
726
diff
changeset
|
1699 | { name: 'end_temp', type: 'float' }, |
|
11e6bd8d8107
Added mash SG and pH fields. Fixed default Yeast update. Added mash step SG and pH input datafields. Added a Brix input too. The print report shows the mash measurements too. Other brewing results now show expected and measured values and the difference.
Michiel Broek <mbroek@mbse.eu>
parents:
726
diff
changeset
|
1700 | { name: 'step_ph', type: 'float' }, |
|
11e6bd8d8107
Added mash SG and pH fields. Fixed default Yeast update. Added mash step SG and pH input datafields. Added a Brix input too. The print report shows the mash measurements too. Other brewing results now show expected and measured values and the difference.
Michiel Broek <mbroek@mbse.eu>
parents:
726
diff
changeset
|
1701 | { name: 'step_sg', type: 'float' } |
| 478 | 1702 | ], |
|
644
4654b8ee4690
Version 0.3.30 Code and logging cleanup.
Michiel Broek <mbroek@mbse.eu>
parents:
643
diff
changeset
|
1703 | addrow: function(rowid, rowdata, position, commit) { commit(true); }, |
|
4654b8ee4690
Version 0.3.30 Code and logging cleanup.
Michiel Broek <mbroek@mbse.eu>
parents:
643
diff
changeset
|
1704 | deleterow: function(rowid, commit) { commit(true); } |
| 478 | 1705 | }, |
| 1706 | mashAdapter = new $.jqx.dataAdapter(mashSource, { | |
| 1707 | beforeLoadComplete: function(records) { | |
| 1708 | mash_infuse = 0; | |
| 1709 | var i, row, data = new Array(); | |
| 1710 | for (i = 0; i < records.length; i++) { | |
| 1711 | row = records[i]; | |
| 1712 | if (row.step_type == 0) // Infusion | |
| 1713 | 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
|
1714 | row.step_wg_ratio = 0; // Init this field. |
| 478 | 1715 | data.push(row); |
| 1716 | } | |
| 1717 | }, | |
| 1718 | }); | |
| 1719 | $('#mashGrid').jqxGrid({ | |
| 1720 | width: 1240, | |
| 1721 | height: 400, | |
| 1722 | source: mashAdapter, | |
| 1723 | theme: theme, | |
| 1724 | selectionmode: 'singlerow', | |
| 1725 | showtoolbar: true, | |
| 1726 | rendertoolbar: function(toolbar) { | |
| 1727 | var container = $('<div style="overflow: hidden; position: relative; margin: 5px;"></div>'); | |
| 1728 | toolbar.append(container); | |
| 1729 | container.append('<input style="float: left; margin-left: 165px;" id="saddrowbutton" type="button" value="Nieuwe stap" />'); | |
| 1730 | container.append('<input style="float: left; margin-left: 565px;" id="sdeleterowbutton" type="button" value="Verwijder stap" />'); | |
| 1731 | $('#saddrowbutton').jqxButton({ template: 'primary', theme: theme, height: 27, width: 150, disabled: (dataRecord.stage > 3) }); | |
| 1732 | $('#saddrowbutton').on('click', function() { | |
| 1733 | var row = {}, rowscount = $('#mashGrid').jqxGrid('getdatainformation').rowscount; | |
| 1734 | row['step_name'] = 'Stap ' + (rowscount + 1); | |
| 1735 | if (rowscount > 0) { | |
| 1736 | row['step_type'] = 1; | |
|
740
04c0e444e48e
Upgrade mash steps when loading a product. Mash steps Brix input doesn't need wort correction. Added measure data input on the checklist for the first mash step.
Michiel Broek <mbroek@mbse.eu>
parents:
738
diff
changeset
|
1737 | row['step_infuse_amount'] = 0.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
|
1738 | row['step_volume'] = mash_infuse; |
| 478 | 1739 | } else { |
| 1740 | row['step_type'] = 0; | |
|
740
04c0e444e48e
Upgrade mash steps when loading a product. Mash steps Brix input doesn't need wort correction. Added measure data input on the checklist for the first mash step.
Michiel Broek <mbroek@mbse.eu>
parents:
738
diff
changeset
|
1741 | row['step_infuse_amount'] = 15.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
|
1742 | row['step_volume'] = 15; |
| 478 | 1743 | } |
|
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
|
1744 | row['step_infuse_temp'] = 0; |
| 478 | 1745 | row['step_temp'] = 62.0; |
| 1746 | row['step_time'] = 20.0; | |
|
740
04c0e444e48e
Upgrade mash steps when loading a product. Mash steps Brix input doesn't need wort correction. Added measure data input on the checklist for the first mash step.
Michiel Broek <mbroek@mbse.eu>
parents:
738
diff
changeset
|
1747 | row['step_wg_ratio'] = 0.0; |
| 478 | 1748 | row['ramp_time'] = 1.0; |
| 1749 | row['end_temp'] = 62.0; | |
|
738
11e6bd8d8107
Added mash SG and pH fields. Fixed default Yeast update. Added mash step SG and pH input datafields. Added a Brix input too. The print report shows the mash measurements too. Other brewing results now show expected and measured values and the difference.
Michiel Broek <mbroek@mbse.eu>
parents:
726
diff
changeset
|
1750 | row['step_ph'] = 0.0; |
|
11e6bd8d8107
Added mash SG and pH fields. Fixed default Yeast update. Added mash step SG and pH input datafields. Added a Brix input too. The print report shows the mash measurements too. Other brewing results now show expected and measured values and the difference.
Michiel Broek <mbroek@mbse.eu>
parents:
726
diff
changeset
|
1751 | row['step_sg'] = 0.0; |
| 478 | 1752 | $('#mashGrid').jqxGrid('addrow', null, row); |
|
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
|
1753 | calcMash(); |
| 478 | 1754 | }); |
| 1755 | // delete selected step. | |
| 1756 | $('#sdeleterowbutton').jqxButton({ template: 'danger', theme: theme, height: 27, width: 150, disabled: (dataRecord.stage > 3) }); | |
| 1757 | $('#sdeleterowbutton').on('click', function() { | |
| 1758 | var rowscount, id, selectedrowindex = $('#mashGrid').jqxGrid('getselectedrowindex'); | |
| 1759 | rowscount = $('#mashGrid').jqxGrid('getdatainformation').rowscount; | |
| 1760 | if (selectedrowindex >= 0 && selectedrowindex < rowscount) { | |
| 1761 | id = $('#mashGrid').jqxGrid('getrowid', selectedrowindex); | |
| 1762 | $('#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
|
1763 | calcMash(); |
| 478 | 1764 | } |
| 1765 | }); | |
| 1766 | }, | |
| 1767 | ready: function() { | |
|
633
ec4601ab3ed2
Fixed loading of the product edit page. A bit faster loading.
Michiel Broek <mbroek@mbse.eu>
parents:
623
diff
changeset
|
1768 | /* Calculate the whole recipe */ |
| 641 | 1769 | console.log('ready mashs, start calculations'); |
|
633
ec4601ab3ed2
Fixed loading of the product edit page. A bit faster loading.
Michiel Broek <mbroek@mbse.eu>
parents:
623
diff
changeset
|
1770 | calcFermentables(); |
|
ec4601ab3ed2
Fixed loading of the product edit page. A bit faster loading.
Michiel Broek <mbroek@mbse.eu>
parents:
623
diff
changeset
|
1771 | whirlpoolHops(); |
|
ec4601ab3ed2
Fixed loading of the product edit page. A bit faster loading.
Michiel Broek <mbroek@mbse.eu>
parents:
623
diff
changeset
|
1772 | calcIBUs(); |
|
ec4601ab3ed2
Fixed loading of the product edit page. A bit faster loading.
Michiel Broek <mbroek@mbse.eu>
parents:
623
diff
changeset
|
1773 | calcMiscs(); |
|
726
872a3635e4ef
Changed dry-yeast calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
723
diff
changeset
|
1774 | calcViability(); |
|
633
ec4601ab3ed2
Fixed loading of the product edit page. A bit faster loading.
Michiel Broek <mbroek@mbse.eu>
parents:
623
diff
changeset
|
1775 | showStarter(); |
|
ec4601ab3ed2
Fixed loading of the product edit page. A bit faster loading.
Michiel Broek <mbroek@mbse.eu>
parents:
623
diff
changeset
|
1776 | calcYeast(); |
| 478 | 1777 | calcInit(); |
| 1778 | calcMash(); | |
|
658
945d5eba869a
Implemented no-boil products.
Michiel Broek <mbroek@mbse.eu>
parents:
655
diff
changeset
|
1779 | kookTijd(); |
| 641 | 1780 | console.log('calculations ready'); |
| 478 | 1781 | $('#jqxLoader').jqxLoader('close'); |
| 1782 | $('#jqxTabs').jqxTabs('first'); | |
| 1783 | }, | |
| 1784 | columns: [ | |
| 1785 | { text: 'Stap naam', datafield: 'step_name' }, | |
|
738
11e6bd8d8107
Added mash SG and pH fields. Fixed default Yeast update. Added mash step SG and pH input datafields. Added a Brix input too. The print report shows the mash measurements too. Other brewing results now show expected and measured values and the difference.
Michiel Broek <mbroek@mbse.eu>
parents:
726
diff
changeset
|
1786 | { text: 'Stap type', datafield: 'step_type', width: 150, |
| 478 | 1787 | cellsrenderer: function(index, datafield, value, defaultvalue, column, rowdata) { |
| 1788 | return '<span style="margin: 4px; margin-top: 6px; float: left;">' + MashStepTypeData[value].nl + '</span>'; | |
| 1789 | } | |
| 1790 | }, | |
|
738
11e6bd8d8107
Added mash SG and pH fields. Fixed default Yeast update. Added mash step SG and pH input datafields. Added a Brix input too. The print report shows the mash measurements too. Other brewing results now show expected and measured values and the difference.
Michiel Broek <mbroek@mbse.eu>
parents:
726
diff
changeset
|
1791 | { text: 'Start °C', datafield: 'step_temp', width: 80, align: 'right', cellsalign: 'right', cellsformat: 'f1' }, |
|
11e6bd8d8107
Added mash SG and pH fields. Fixed default Yeast update. Added mash step SG and pH input datafields. Added a Brix input too. The print report shows the mash measurements too. Other brewing results now show expected and measured values and the difference.
Michiel Broek <mbroek@mbse.eu>
parents:
726
diff
changeset
|
1792 | { text: 'Eind °C', datafield: 'end_temp', width: 80, align: 'right', cellsalign: 'right', cellsformat: 'f1' }, |
|
11e6bd8d8107
Added mash SG and pH fields. Fixed default Yeast update. Added mash step SG and pH input datafields. Added a Brix input too. The print report shows the mash measurements too. Other brewing results now show expected and measured values and the difference.
Michiel Broek <mbroek@mbse.eu>
parents:
726
diff
changeset
|
1793 | { text: 'Rust min.', datafield: 'step_time', width: 80, align: 'right', cellsalign: 'right' }, |
|
11e6bd8d8107
Added mash SG and pH fields. Fixed default Yeast update. Added mash step SG and pH input datafields. Added a Brix input too. The print report shows the mash measurements too. Other brewing results now show expected and measured values and the difference.
Michiel Broek <mbroek@mbse.eu>
parents:
726
diff
changeset
|
1794 | { text: 'Stap min.', datafield: 'ramp_time', width: 80, align: 'right', cellsalign: 'right' }, |
|
11e6bd8d8107
Added mash SG and pH fields. Fixed default Yeast update. Added mash step SG and pH input datafields. Added a Brix input too. The print report shows the mash measurements too. Other brewing results now show expected and measured values and the difference.
Michiel Broek <mbroek@mbse.eu>
parents:
726
diff
changeset
|
1795 | { text: 'Inf/dec L.', datafield: 'step_infuse_amount', width: 80, align: '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
|
1796 | 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
|
1797 | 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
|
1798 | 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
|
1799 | 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
|
1800 | var mvol = mashkg * MaltVolume; |
|
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product 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 | if ((rowdata.step_wg_ratio * mashkg + mvol) > dataRecord.eq_tun_volume) |
|
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product 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 | 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
|
1803 | return '<span style="margin: 4px; margin-top: 6px; float: right; color: ' + color + ';">' + 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
|
1804 | } |
|
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product 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 | }, |
|
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
1806 | { 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
|
1807 | 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
|
1808 | 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
|
1809 | 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
|
1810 | 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
|
1811 | } |
|
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
1812 | }, |
|
738
11e6bd8d8107
Added mash SG and pH fields. Fixed default Yeast update. Added mash step SG and pH input datafields. Added a Brix input too. The print report shows the mash measurements too. Other brewing results now show expected and measured values and the difference.
Michiel Broek <mbroek@mbse.eu>
parents:
726
diff
changeset
|
1813 | { text: 'L/Kg.', datafield: 'step_wg_ratio', width: 80, align: '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
|
1814 | 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
|
1815 | 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
|
1816 | 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
|
1817 | 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
|
1818 | 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
|
1819 | } |
|
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
1820 | }, |
|
738
11e6bd8d8107
Added mash SG and pH fields. Fixed default Yeast update. Added mash step SG and pH input datafields. Added a Brix input too. The print report shows the mash measurements too. Other brewing results now show expected and measured values and the difference.
Michiel Broek <mbroek@mbse.eu>
parents:
726
diff
changeset
|
1821 | { text: 'pH', datafield: 'step_ph', width: 70, align: 'right', cellsalign: 'right', cellsformat: 'f2' }, |
|
11e6bd8d8107
Added mash SG and pH fields. Fixed default Yeast update. Added mash step SG and pH input datafields. Added a Brix input too. The print report shows the mash measurements too. Other brewing results now show expected and measured values and the difference.
Michiel Broek <mbroek@mbse.eu>
parents:
726
diff
changeset
|
1822 | { text: 'SG', datafield: 'step_sg', width: 80, align: 'right', cellsalign: 'right', cellsformat: 'f3' }, |
|
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
|
1823 | { 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
|
1824 | 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
|
1825 | 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
|
1826 | 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
|
1827 | 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
|
1828 | }, 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
|
1829 | 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
|
1830 | 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
|
1831 | } |
|
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
1832 | } |
|
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
1833 | }, |
|
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
1834 | { 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
|
1835 | 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
|
1836 | 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
|
1837 | 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
|
1838 | 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
|
1839 | 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
|
1840 | }, 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
|
1841 | 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
|
1842 | 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
|
1843 | 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
|
1844 | } |
|
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product 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 | } |
|
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product 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 | }, |
|
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product 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 | { text: '', datafield: 'Edit', columntype: 'button', width: 80, align: 'center', |
| 478 | 1848 | cellsrenderer: function() { |
| 1849 | return 'Wijzig'; | |
| 1850 | }, buttonclick: function(row) { | |
| 1851 | if (dataRecord.stage > 3) { | |
| 557 | 1852 | alert('Het maischen is al gedaan.'); |
| 478 | 1853 | } else { |
| 1854 | mashRow = row; | |
| 1855 | 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
|
1856 | 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
|
1857 | $("#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
|
1858 | 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
|
1859 | $("#wstep_type").jqxDropDownList('enableAt', 2); |
| 478 | 1860 | $('#wstep_name').val(mashData.step_name); |
| 1861 | $('#wstep_type').val(mashData.step_type); | |
| 1862 | $('#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
|
1863 | $('#wstep_infuse_temp').val(mashData.step_infuse_temp); |
| 478 | 1864 | $('#wstep_temp').val(mashData.step_temp); |
| 1865 | $('#wend_temp').val(mashData.end_temp); | |
| 1866 | $('#wstep_time').val(mashData.step_time); | |
| 1867 | $('#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
|
1868 | $('#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
|
1869 | $('#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
|
1870 | $('#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
|
1871 | $('#wstep_pmpt_temp').hide(); |
| 478 | 1872 | 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
|
1873 | 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
|
1874 | $('#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
|
1875 | $('#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
|
1876 | } 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
|
1877 | $('#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
|
1878 | $('#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
|
1879 | } |
| 478 | 1880 | } |
|
738
11e6bd8d8107
Added mash SG and pH fields. Fixed default Yeast update. Added mash step SG and pH input datafields. Added a Brix input too. The print report shows the mash measurements too. Other brewing results now show expected and measured values and the difference.
Michiel Broek <mbroek@mbse.eu>
parents:
726
diff
changeset
|
1881 | $('#wstep_ph').val(mashData.step_ph); |
|
11e6bd8d8107
Added mash SG and pH fields. Fixed default Yeast update. Added mash step SG and pH input datafields. Added a Brix input too. The print report shows the mash measurements too. Other brewing results now show expected and measured values and the difference.
Michiel Broek <mbroek@mbse.eu>
parents:
726
diff
changeset
|
1882 | $('#wstep_sg').val(mashData.step_sg); |
| 478 | 1883 | // show the popup window. |
| 1884 | $('#popupMash').jqxWindow('open'); | |
| 1885 | } | |
| 1886 | } | |
| 1887 | } | |
| 1888 | ] | |
| 1889 | }); | |
| 1890 | }; | |
| 1891 | ||
| 1892 | /* | |
| 1893 | * Remove the top menu so that we MUST use the buttons to leave the editor. | |
| 1894 | */ | |
| 1895 | $('#jqxMenu').jqxMenu('destroy'); | |
| 1896 | console.log('record:' + my_record + ' return:' + my_return + ' theme:' + theme); | |
| 557 | 1897 | $('#jqxLoader').jqxLoader({ width: 250, height: 150, isModal: true, text: 'Laden product ...', theme: theme }); |
| 640 | 1898 | $('#jqxLoader').jqxLoader('open'); |
| 478 | 1899 | |
|
638
736c8d29bc87
Binding the data earlier to try to prevent a race condition.
Michiel Broek <mbroek@mbse.eu>
parents:
637
diff
changeset
|
1900 | /* Moved to before all functions */ |
|
736c8d29bc87
Binding the data earlier to try to prevent a race condition.
Michiel Broek <mbroek@mbse.eu>
parents:
637
diff
changeset
|
1901 | dataAdapter.dataBind(); |
|
736c8d29bc87
Binding the data earlier to try to prevent a race condition.
Michiel Broek <mbroek@mbse.eu>
parents:
637
diff
changeset
|
1902 | |
| 478 | 1903 | /* |
| 1904 | * Generic functions | |
| 1905 | */ | |
|
658
945d5eba869a
Implemented no-boil products.
Michiel Broek <mbroek@mbse.eu>
parents:
655
diff
changeset
|
1906 | function kookTijd() { |
|
945d5eba869a
Implemented no-boil products.
Michiel Broek <mbroek@mbse.eu>
parents:
655
diff
changeset
|
1907 | if (dataRecord.boil_time) { |
|
945d5eba869a
Implemented no-boil products.
Michiel Broek <mbroek@mbse.eu>
parents:
655
diff
changeset
|
1908 | $('#brew_pmpt_koken').html('Koken ' + dataRecord.boil_time + ' minuten'); |
|
945d5eba869a
Implemented no-boil products.
Michiel Broek <mbroek@mbse.eu>
parents:
655
diff
changeset
|
1909 | } else { |
|
945d5eba869a
Implemented no-boil products.
Michiel Broek <mbroek@mbse.eu>
parents:
655
diff
changeset
|
1910 | $('#brew_pmpt_koken').html('Koken "no-boil"'); |
|
945d5eba869a
Implemented no-boil products.
Michiel Broek <mbroek@mbse.eu>
parents:
655
diff
changeset
|
1911 | } |
|
945d5eba869a
Implemented no-boil products.
Michiel Broek <mbroek@mbse.eu>
parents:
655
diff
changeset
|
1912 | } |
|
945d5eba869a
Implemented no-boil products.
Michiel Broek <mbroek@mbse.eu>
parents:
655
diff
changeset
|
1913 | |
|
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
|
1914 | 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
|
1915 | |
|
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
1916 | 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
|
1917 | 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
|
1918 | 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
|
1919 | 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
|
1920 | step_infuse_temp: row1.step_infuse_temp, step_temp: row1.step_temp, step_time: row1.step_time, |
|
738
11e6bd8d8107
Added mash SG and pH fields. Fixed default Yeast update. Added mash step SG and pH input datafields. Added a Brix input too. The print report shows the mash measurements too. Other brewing results now show expected and measured values and the difference.
Michiel Broek <mbroek@mbse.eu>
parents:
726
diff
changeset
|
1921 | ramp_time: row1.ramp_time, end_temp: row1.end_temp, step_wg_ratio: row1.step_wg_ratio, step_ph: row1.step_ph, step_sg: row1.step_sg }; |
|
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
|
1922 | 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
|
1923 | step_infuse_temp: row2.step_infuse_temp, step_temp: row2.step_temp, step_time: row2.step_time, |
|
738
11e6bd8d8107
Added mash SG and pH fields. Fixed default Yeast update. Added mash step SG and pH input datafields. Added a Brix input too. The print report shows the mash measurements too. Other brewing results now show expected and measured values and the difference.
Michiel Broek <mbroek@mbse.eu>
parents:
726
diff
changeset
|
1924 | ramp_time: row2.ramp_time, end_temp: row2.end_temp, step_wg_ratio: row2.step_wg_ratio, step_ph: row2.step_ph, step_sg: row2.step_sg }; |
|
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
|
1925 | $("#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
|
1926 | $("#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
|
1927 | } |
|
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
1928 | |
|
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
1929 | 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
|
1930 | var a = last_temp * (dataRecord.eq_tun_weight * dataRecord.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
|
1931 | var b = step_temp * (dataRecord.eq_tun_weight * dataRecord.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
|
1932 | //console.log('b - a: ' + (b - a) + ' t: ' + ((infuse_temp - step_temp) * 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
|
1933 | //console.log('res: ' + ((b - a) / ((infuse_temp - step_temp) * 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
|
1934 | 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
|
1935 | 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
|
1936 | 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
|
1937 | } |
|
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
1938 | |
|
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
1939 | 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
|
1940 | var a = (dataRecord.eq_tun_weight * dataRecord.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
|
1941 | 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
|
1942 | 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
|
1943 | 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
|
1944 | 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
|
1945 | 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
|
1946 | 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
|
1947 | } |
|
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
1948 | |
|
617
f962f1e5936e
Implemented yeast viability calculation from the yeast production date. Changed the pitchrate logic and added Ale above 1.076 rate of 1.25.
Michiel Broek <mbroek@mbse.eu>
parents:
616
diff
changeset
|
1949 | function calcViability() { |
|
f962f1e5936e
Implemented yeast viability calculation from the yeast production date. Changed the pitchrate logic and added Ale above 1.076 rate of 1.25.
Michiel Broek <mbroek@mbse.eu>
parents:
616
diff
changeset
|
1950 | var vpm = 1.00; |
|
f962f1e5936e
Implemented yeast viability calculation from the yeast production date. Changed the pitchrate logic and added Ale above 1.076 rate of 1.25.
Michiel Broek <mbroek@mbse.eu>
parents:
616
diff
changeset
|
1951 | var max = 100; |
|
f962f1e5936e
Implemented yeast viability calculation from the yeast production date. Changed the pitchrate logic and added Ale above 1.076 rate of 1.25.
Michiel Broek <mbroek@mbse.eu>
parents:
616
diff
changeset
|
1952 | var rowscount = $('#yeastGrid').jqxGrid('getdatainformation').rowscount; |
|
f962f1e5936e
Implemented yeast viability calculation from the yeast production date. Changed the pitchrate logic and added Ale above 1.076 rate of 1.25.
Michiel Broek <mbroek@mbse.eu>
parents:
616
diff
changeset
|
1953 | if (rowscount) { |
|
f962f1e5936e
Implemented yeast viability calculation from the yeast production date. Changed the pitchrate logic and added Ale above 1.076 rate of 1.25.
Michiel Broek <mbroek@mbse.eu>
parents:
616
diff
changeset
|
1954 | for (i = 0; i < rowscount; i++) { |
|
f962f1e5936e
Implemented yeast viability calculation from the yeast production date. Changed the pitchrate logic and added Ale above 1.076 rate of 1.25.
Michiel Broek <mbroek@mbse.eu>
parents:
616
diff
changeset
|
1955 | row = $('#yeastGrid').jqxGrid('getrowdata', i); |
|
f962f1e5936e
Implemented yeast viability calculation from the yeast production date. Changed the pitchrate logic and added Ale above 1.076 rate of 1.25.
Michiel Broek <mbroek@mbse.eu>
parents:
616
diff
changeset
|
1956 | if (row.y_use == 0) { |
|
f962f1e5936e
Implemented yeast viability calculation from the yeast production date. Changed the pitchrate logic and added Ale above 1.076 rate of 1.25.
Michiel Broek <mbroek@mbse.eu>
parents:
616
diff
changeset
|
1957 | if (row.y_form == 0) { // Liquid |
|
f962f1e5936e
Implemented yeast viability calculation from the yeast production date. Changed the pitchrate logic and added Ale above 1.076 rate of 1.25.
Michiel Broek <mbroek@mbse.eu>
parents:
616
diff
changeset
|
1958 | vpm = 0.80; |
|
f962f1e5936e
Implemented yeast viability calculation from the yeast production date. Changed the pitchrate logic and added Ale above 1.076 rate of 1.25.
Michiel Broek <mbroek@mbse.eu>
parents:
616
diff
changeset
|
1959 | max = 97; |
|
623
4aee10bcb94e
Better yeast viability for PurePitch yeast.
Michiel Broek <mbroek@mbse.eu>
parents:
622
diff
changeset
|
1960 | if (row.y_laboratory == 'White Labs') { // PurePitch |
|
617
f962f1e5936e
Implemented yeast viability calculation from the yeast production date. Changed the pitchrate logic and added Ale above 1.076 rate of 1.25.
Michiel Broek <mbroek@mbse.eu>
parents:
616
diff
changeset
|
1961 | vpm = 0.95; |
|
623
4aee10bcb94e
Better yeast viability for PurePitch yeast.
Michiel Broek <mbroek@mbse.eu>
parents:
622
diff
changeset
|
1962 | max = 100; |
|
4aee10bcb94e
Better yeast viability for PurePitch yeast.
Michiel Broek <mbroek@mbse.eu>
parents:
622
diff
changeset
|
1963 | } |
|
617
f962f1e5936e
Implemented yeast viability calculation from the yeast production date. Changed the pitchrate logic and added Ale above 1.076 rate of 1.25.
Michiel Broek <mbroek@mbse.eu>
parents:
616
diff
changeset
|
1964 | } else if (row.y_form == 1) { // dry yeast |
|
726
872a3635e4ef
Changed dry-yeast calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
723
diff
changeset
|
1965 | vpm = 0.998; |
|
617
f962f1e5936e
Implemented yeast viability calculation from the yeast production date. Changed the pitchrate logic and added Ale above 1.076 rate of 1.25.
Michiel Broek <mbroek@mbse.eu>
parents:
616
diff
changeset
|
1966 | max = 100; |
|
f962f1e5936e
Implemented yeast viability calculation from the yeast production date. Changed the pitchrate logic and added Ale above 1.076 rate of 1.25.
Michiel Broek <mbroek@mbse.eu>
parents:
616
diff
changeset
|
1967 | } else if (row.y_form == 6) { // Dried kveik |
|
618
2712082437b0
Setting the dried Kveik viability to 8% per month.
Michiel Broek <mbroek@mbse.eu>
parents:
617
diff
changeset
|
1968 | vpm = 0.92; |
|
617
f962f1e5936e
Implemented yeast viability calculation from the yeast production date. Changed the pitchrate logic and added Ale above 1.076 rate of 1.25.
Michiel Broek <mbroek@mbse.eu>
parents:
616
diff
changeset
|
1969 | max = 100; |
|
f962f1e5936e
Implemented yeast viability calculation from the yeast production date. Changed the pitchrate logic and added Ale above 1.076 rate of 1.25.
Michiel Broek <mbroek@mbse.eu>
parents:
616
diff
changeset
|
1970 | } else { // Slant, Culture, Frozen, Bottle |
|
f962f1e5936e
Implemented yeast viability calculation from the yeast production date. Changed the pitchrate logic and added Ale above 1.076 rate of 1.25.
Michiel Broek <mbroek@mbse.eu>
parents:
616
diff
changeset
|
1971 | vpm = 0.99; |
|
f962f1e5936e
Implemented yeast viability calculation from the yeast production date. Changed the pitchrate logic and added Ale above 1.076 rate of 1.25.
Michiel Broek <mbroek@mbse.eu>
parents:
616
diff
changeset
|
1972 | max = 97; |
|
f962f1e5936e
Implemented yeast viability calculation from the yeast production date. Changed the pitchrate logic and added Ale above 1.076 rate of 1.25.
Michiel Broek <mbroek@mbse.eu>
parents:
616
diff
changeset
|
1973 | } |
|
f962f1e5936e
Implemented yeast viability calculation from the yeast production date. Changed the pitchrate logic and added Ale above 1.076 rate of 1.25.
Michiel Broek <mbroek@mbse.eu>
parents:
616
diff
changeset
|
1974 | } |
|
f962f1e5936e
Implemented yeast viability calculation from the yeast production date. Changed the pitchrate logic and added Ale above 1.076 rate of 1.25.
Michiel Broek <mbroek@mbse.eu>
parents:
616
diff
changeset
|
1975 | } |
|
f962f1e5936e
Implemented yeast viability calculation from the yeast production date. Changed the pitchrate logic and added Ale above 1.076 rate of 1.25.
Michiel Broek <mbroek@mbse.eu>
parents:
616
diff
changeset
|
1976 | } |
|
f962f1e5936e
Implemented yeast viability calculation from the yeast production date. Changed the pitchrate logic and added Ale above 1.076 rate of 1.25.
Michiel Broek <mbroek@mbse.eu>
parents:
616
diff
changeset
|
1977 | var base = max; |
|
f962f1e5936e
Implemented yeast viability calculation from the yeast production date. Changed the pitchrate logic and added Ale above 1.076 rate of 1.25.
Michiel Broek <mbroek@mbse.eu>
parents:
616
diff
changeset
|
1978 | var days = 0; |
|
f962f1e5936e
Implemented yeast viability calculation from the yeast production date. Changed the pitchrate logic and added Ale above 1.076 rate of 1.25.
Michiel Broek <mbroek@mbse.eu>
parents:
616
diff
changeset
|
1979 | |
|
f962f1e5936e
Implemented yeast viability calculation from the yeast production date. Changed the pitchrate logic and added Ale above 1.076 rate of 1.25.
Michiel Broek <mbroek@mbse.eu>
parents:
616
diff
changeset
|
1980 | if (parseFloat($('#yeast_prod_date').val()) > 2000) { |
|
f962f1e5936e
Implemented yeast viability calculation from the yeast production date. Changed the pitchrate logic and added Ale above 1.076 rate of 1.25.
Michiel Broek <mbroek@mbse.eu>
parents:
616
diff
changeset
|
1981 | console.log('calculate viability'); |
|
f962f1e5936e
Implemented yeast viability calculation from the yeast production date. Changed the pitchrate logic and added Ale above 1.076 rate of 1.25.
Michiel Broek <mbroek@mbse.eu>
parents:
616
diff
changeset
|
1982 | var d = new Date(); |
|
f962f1e5936e
Implemented yeast viability calculation from the yeast production date. Changed the pitchrate logic and added Ale above 1.076 rate of 1.25.
Michiel Broek <mbroek@mbse.eu>
parents:
616
diff
changeset
|
1983 | var date2 = $('#yeast_prod_date').val(); |
|
f962f1e5936e
Implemented yeast viability calculation from the yeast production date. Changed the pitchrate logic and added Ale above 1.076 rate of 1.25.
Michiel Broek <mbroek@mbse.eu>
parents:
616
diff
changeset
|
1984 | date2 = date2.split('-'); |
|
f962f1e5936e
Implemented yeast viability calculation from the yeast production date. Changed the pitchrate logic and added Ale above 1.076 rate of 1.25.
Michiel Broek <mbroek@mbse.eu>
parents:
616
diff
changeset
|
1985 | // Now we convert the array to a Date object |
|
f962f1e5936e
Implemented yeast viability calculation from the yeast production date. Changed the pitchrate logic and added Ale above 1.076 rate of 1.25.
Michiel Broek <mbroek@mbse.eu>
parents:
616
diff
changeset
|
1986 | var date1 = new Date(d.getFullYear(), d.getMonth(), d.getDate()); |
|
f962f1e5936e
Implemented yeast viability calculation from the yeast production date. Changed the pitchrate logic and added Ale above 1.076 rate of 1.25.
Michiel Broek <mbroek@mbse.eu>
parents:
616
diff
changeset
|
1987 | date2 = new Date(date2[0], date2[1] - 1, date2[2]); |
|
f962f1e5936e
Implemented yeast viability calculation from the yeast production date. Changed the pitchrate logic and added Ale above 1.076 rate of 1.25.
Michiel Broek <mbroek@mbse.eu>
parents:
616
diff
changeset
|
1988 | var diff = parseInt(date1.getTime()) - parseInt(date2.getTime()); |
|
f962f1e5936e
Implemented yeast viability calculation from the yeast production date. Changed the pitchrate logic and added Ale above 1.076 rate of 1.25.
Michiel Broek <mbroek@mbse.eu>
parents:
616
diff
changeset
|
1989 | days = Math.floor(diff/1000/60/60/24); |
|
f962f1e5936e
Implemented yeast viability calculation from the yeast production date. Changed the pitchrate logic and added Ale above 1.076 rate of 1.25.
Michiel Broek <mbroek@mbse.eu>
parents:
616
diff
changeset
|
1990 | |
|
f962f1e5936e
Implemented yeast viability calculation from the yeast production date. Changed the pitchrate logic and added Ale above 1.076 rate of 1.25.
Michiel Broek <mbroek@mbse.eu>
parents:
616
diff
changeset
|
1991 | var degrade = 1 - ((1 - vpm) / 30.41); // viability degradation per day. |
|
f962f1e5936e
Implemented yeast viability calculation from the yeast production date. Changed the pitchrate logic and added Ale above 1.076 rate of 1.25.
Michiel Broek <mbroek@mbse.eu>
parents:
616
diff
changeset
|
1992 | for (i = 0; i < days; i++) { |
|
f962f1e5936e
Implemented yeast viability calculation from the yeast production date. Changed the pitchrate logic and added Ale above 1.076 rate of 1.25.
Michiel Broek <mbroek@mbse.eu>
parents:
616
diff
changeset
|
1993 | base = base * degrade; |
|
f962f1e5936e
Implemented yeast viability calculation from the yeast production date. Changed the pitchrate logic and added Ale above 1.076 rate of 1.25.
Michiel Broek <mbroek@mbse.eu>
parents:
616
diff
changeset
|
1994 | } |
|
f962f1e5936e
Implemented yeast viability calculation from the yeast production date. Changed the pitchrate logic and added Ale above 1.076 rate of 1.25.
Michiel Broek <mbroek@mbse.eu>
parents:
616
diff
changeset
|
1995 | if (base > max) { |
|
f962f1e5936e
Implemented yeast viability calculation from the yeast production date. Changed the pitchrate logic and added Ale above 1.076 rate of 1.25.
Michiel Broek <mbroek@mbse.eu>
parents:
616
diff
changeset
|
1996 | base = max; |
|
f962f1e5936e
Implemented yeast viability calculation from the yeast production date. Changed the pitchrate logic and added Ale above 1.076 rate of 1.25.
Michiel Broek <mbroek@mbse.eu>
parents:
616
diff
changeset
|
1997 | } |
|
f962f1e5936e
Implemented yeast viability calculation from the yeast production date. Changed the pitchrate logic and added Ale above 1.076 rate of 1.25.
Michiel Broek <mbroek@mbse.eu>
parents:
616
diff
changeset
|
1998 | base = Math.round(base); |
|
f962f1e5936e
Implemented yeast viability calculation from the yeast production date. Changed the pitchrate logic and added Ale above 1.076 rate of 1.25.
Michiel Broek <mbroek@mbse.eu>
parents:
616
diff
changeset
|
1999 | } |
|
f962f1e5936e
Implemented yeast viability calculation from the yeast production date. Changed the pitchrate logic and added Ale above 1.076 rate of 1.25.
Michiel Broek <mbroek@mbse.eu>
parents:
616
diff
changeset
|
2000 | console.log('age:' + days + ' max:' + max + ' vpm:' + vpm + ' base:' + base); |
|
f962f1e5936e
Implemented yeast viability calculation from the yeast production date. Changed the pitchrate logic and added Ale above 1.076 rate of 1.25.
Michiel Broek <mbroek@mbse.eu>
parents:
616
diff
changeset
|
2001 | |
|
f962f1e5936e
Implemented yeast viability calculation from the yeast production date. Changed the pitchrate logic and added Ale above 1.076 rate of 1.25.
Michiel Broek <mbroek@mbse.eu>
parents:
616
diff
changeset
|
2002 | if (dataRecord.starter_viability != base) { |
|
f962f1e5936e
Implemented yeast viability calculation from the yeast production date. Changed the pitchrate logic and added Ale above 1.076 rate of 1.25.
Michiel Broek <mbroek@mbse.eu>
parents:
616
diff
changeset
|
2003 | dataRecord.starter_viability = base; |
|
f962f1e5936e
Implemented yeast viability calculation from the yeast production date. Changed the pitchrate logic and added Ale above 1.076 rate of 1.25.
Michiel Broek <mbroek@mbse.eu>
parents:
616
diff
changeset
|
2004 | $('#starter_viability').val(dataRecord.starter_viability); |
|
f962f1e5936e
Implemented yeast viability calculation from the yeast production date. Changed the pitchrate logic and added Ale above 1.076 rate of 1.25.
Michiel Broek <mbroek@mbse.eu>
parents:
616
diff
changeset
|
2005 | } |
|
f962f1e5936e
Implemented yeast viability calculation from the yeast production date. Changed the pitchrate logic and added Ale above 1.076 rate of 1.25.
Michiel Broek <mbroek@mbse.eu>
parents:
616
diff
changeset
|
2006 | } |
|
f962f1e5936e
Implemented yeast viability calculation from the yeast production date. Changed the pitchrate logic and added Ale above 1.076 rate of 1.25.
Michiel Broek <mbroek@mbse.eu>
parents:
616
diff
changeset
|
2007 | |
| 478 | 2008 | function calcSupplies() { |
| 2009 | if (dataRecord.inventory_reduced > 6) { | |
| 2010 | $('#ok_pmpt').hide(); | |
| 2011 | return; | |
| 2012 | } | |
| 2013 | if (ok_fermentables && ok_hops && ok_miscs && ok_yeasts && ok_waters) | |
| 2014 | $('#ok_supplies').html("<img src='images/dialog-ok-apply.png'>"); | |
| 2015 | else | |
| 2016 | $('#ok_supplies').html("<img src='images/dialog-error.png'>"); | |
| 2017 | } | |
| 2018 | ||
| 2019 | function calcPercentages() { | |
| 2020 | ||
| 2021 | console.log('calcPercentages()'); | |
| 2022 | var tw = 0, rowdata, percentage, rowscount = $('#fermentableGrid').jqxGrid('getdatainformation').rowscount; | |
| 2023 | if (rowscount > 1) { | |
| 2024 | for (i = 0; i < rowscount; i++) { | |
| 2025 | rowdata = $('#fermentableGrid').jqxGrid('getrowdata', i); | |
| 2026 | if (rowdata.f_added < 4) | |
| 2027 | tw += Round(rowdata.f_amount, 3); | |
| 2028 | } | |
| 2029 | tw = Round(tw, 3); | |
| 2030 | ||
| 2031 | for (i = 0; i < rowscount; i++) { | |
| 2032 | rowdata = $('#fermentableGrid').jqxGrid('getrowdata', i); | |
| 2033 | if (rowdata.f_added < 4) { | |
| 2034 | percentage = Round(rowdata.f_amount / tw * 100, 1); | |
| 2035 | $('#fermentableGrid').jqxGrid('setcellvalue', i, 'f_percentage', percentage); | |
| 2036 | } else { | |
| 2037 | $('#fermentableGrid').jqxGrid('setcellvalue', i, 'f_percentage', 0); | |
| 2038 | } | |
| 2039 | } | |
| 2040 | } else { | |
| 2041 | $('#fermentableGrid').jqxGrid('setcellvalue', 0, 'f_percentage', 100); | |
| 2042 | } | |
| 2043 | } | |
| 2044 | ||
| 2045 | /* | |
| 2046 | * All calculations that depend on changes in the fermentables, | |
| 2047 | * volumes and equipments. | |
| 2048 | */ | |
| 2049 | function calcFermentables() { | |
| 2050 | ||
| 2051 | var sugarsf = 0, // fermentable sugars mash + boil | |
| 2052 | sugarsm = 0, // fermentable sugars in mash | |
| 2053 | vol = 0, // Volume sugars after boil | |
| 2054 | addedS = 0, // Added sugars after boil | |
| 2055 | addedmass = 0, // Added mass after boil | |
| 2056 | mvol = 0, // mash volume | |
| 2057 | colort = 0, // Colors srm * vol totals | |
| 2058 | colorh = 0, // Colors ebc * vol * kt | |
| 2059 | colorn = 0, // Colors ebc * pt * pct | |
| 2060 | my_100 = false, | |
| 2061 | mashtime = 0, // Total mash time | |
| 2062 | mashtemp = 0, // Average mash temperature | |
| 2063 | bv = 0.925, // Bierverlies rendement | |
| 2064 | sr = 0.95, // Mash en spoel rendement | |
| 2065 | lintner = 0, // Total recipe lintner | |
| 2066 | i, row, rows, org, timem, aboil_volume, spoelw, ogx, topw, s = 0, d, v, x, | |
| 2067 | sug, alc, pt, cw, color, scolor, fig; | |
| 2068 | ||
| 2069 | /* Init global variables */ | |
| 2070 | psugar = 0; | |
| 2071 | pcara = 0; | |
| 2072 | mashkg = 0; | |
| 2073 | ok_fermentables = 1; // All is in stock. | |
| 2074 | ok_yeasts = 1; | |
| 2075 | ||
| 2076 | if ((rows = $('#mashGrid').jqxGrid('getrows'))) { | |
| 2077 | for (i = 0; i < rows.length; i++) { | |
| 2078 | row = rows[i]; | |
| 2079 | if (row.step_type == 0) // Infusion | |
| 2080 | mvol += parseFloat(row.step_infuse_amount); | |
| 2081 | if (row.step_temp <= 75) { // Ignore mashout | |
| 2082 | timem = row.step_time + row.ramp_time; | |
| 2083 | mashtime += timem; | |
| 2084 | mashtemp += timem * row.step_temp; | |
| 2085 | } | |
| 2086 | } | |
| 2087 | if (mashtime > 5) | |
| 2088 | mashtime -= 5; //Correct last ramp > 75 | |
| 2089 | mashtemp = Round(mashtemp / mashtime, 2); | |
|
633
ec4601ab3ed2
Fixed loading of the product edit page. A bit faster loading.
Michiel Broek <mbroek@mbse.eu>
parents:
623
diff
changeset
|
2090 | } else { |
|
ec4601ab3ed2
Fixed loading of the product edit page. A bit faster loading.
Michiel Broek <mbroek@mbse.eu>
parents:
623
diff
changeset
|
2091 | console.log("calcFermentables() mashGrid not loaded"); |
| 478 | 2092 | } |
| 2093 | ||
| 2094 | if (!(rows = $('#fermentableGrid').jqxGrid('getrows'))) { | |
|
633
ec4601ab3ed2
Fixed loading of the product edit page. A bit faster loading.
Michiel Broek <mbroek@mbse.eu>
parents:
623
diff
changeset
|
2095 | console.log("calcFermentables() fermentableGrid not loaded"); |
| 478 | 2096 | return; // grid not yet loaded. |
| 2097 | } | |
| 2098 | ||
| 2099 | for (i = 0; i < rows.length; i++) { | |
| 2100 | row = rows[i]; | |
| 2101 | if (row.f_adjust_to_total_100) | |
| 2102 | my_100 = true; | |
| 2103 | if (row.f_type == 1 && row.f_added < 4) // Sugar | |
| 2104 | psugar += row.f_percentage; | |
| 2105 | if (row.f_graintype == 2 && row.f_added < 4) // Crystal | |
| 2106 | pcara += row.f_percentage; | |
| 2107 | d = row.f_amount * (row.f_yield / 100) * (1 - row.f_moisture / 100); | |
| 2108 | if (row.f_added == 0) { // Mash | |
| 2109 | if (mvol > 0) { // Only if mash already known. | |
| 2110 | mvol += row.f_amount * row.f_moisture / 100; | |
| 2111 | s += d; | |
| 2112 | } | |
| 2113 | d = parseFloat(dataRecord.efficiency) / 100 * d; | |
| 2114 | sugarsm += d; | |
| 2115 | mashkg += parseFloat(row.f_amount); | |
| 2116 | } | |
| 2117 | if (row.f_added == 0 || row.f_added == 1) // Mash or Boil | |
| 2118 | sugarsf += d; | |
| 2119 | if (row.f_added == 2 || row.f_added == 3) { // Fermentation or lagering | |
| 2120 | x = (row.f_yield / 100) * (1 - row.f_moisture / 100); | |
| 2121 | addedS += row.f_amount * x; | |
| 2122 | addedmass += row.f_amount; | |
| 2123 | vol += (x * sugardensity + (1 - x) * 1) * row.f_amount; | |
| 2124 | } | |
| 2125 | if (row.f_added < 4) { | |
| 2126 | colort += row.f_amount * ebc_to_srm(row.f_color); | |
| 2127 | colorh += row.f_amount * row.f_color * get_kt(row.f_color); | |
| 2128 | colorn += (row.f_percentage / 100) * row.f_color; // For 8.6 Pt wort. | |
| 2129 | } | |
| 2130 | if (fermentableInit) { | |
| 2131 | if (row.f_added == 4) { | |
| 2132 | $('#bottle_priming_total').val(row.f_amount * 1000); // Prevent clearing | |
| 2133 | $('#bottle_priming_sugar').jqxDropDownList('selectItem', row.f_name); | |
| 2134 | } | |
| 2135 | if (row.f_added == 5) { | |
| 2136 | $('#keg_priming_total').val(row.f_amount * 1000); | |
| 2137 | $('#keg_priming_sugar').jqxDropDownList('selectItem', row.f_name); | |
| 2138 | } | |
| 2139 | } | |
| 2140 | // Check supplies. | |
| 2141 | if ((((dataRecord.inventory_reduced <= 2) && (row.f_added <= 1)) || // Mash or boil | |
| 2142 | ((dataRecord.inventory_reduced <= 3) && (row.f_added == 2)) || // Primary | |
| 2143 | ((dataRecord.inventory_reduced <= 5) && (row.f_added == 3)) || // Secondary or Tertiary | |
| 2144 | ((dataRecord.inventory_reduced <= 6) && (row.f_added == 4)) || // Bottle | |
| 2145 | ((dataRecord.inventory_reduced <= 6) && (row.f_added == 5))) && row.f_inventory < row.f_amount) { | |
| 2146 | ok_fermentables = 0; | |
| 2147 | } | |
| 2148 | if (row.f_added == 0 && (row.f_type == 0 || row.f_type == 4) && row.f_color < 50) { // Mash and Grain/Adjunct and Color < 50 | |
| 2149 | lintner += row.f_diastatic_power * row.f_amount; | |
| 2150 | } | |
| 2151 | } | |
| 2152 | fermentableInit = 0; | |
| 2153 | $('#ferm_lintner').val(Math.round(parseFloat(lintner / mashkg))); | |
| 2154 | $('#mash_kg').val(mashkg); | |
|
633
ec4601ab3ed2
Fixed loading of the product edit page. A bit faster loading.
Michiel Broek <mbroek@mbse.eu>
parents:
623
diff
changeset
|
2155 | console.log('calcFermentables() supplies:' + ok_fermentables + ' moutsuiker:' + Round(sugarsm, 3) + '/' + Round(sugarsf, 3)); |
| 478 | 2156 | to_100 = my_100; |
| 2157 | if (to_100) { | |
| 2158 | $('#wf_amount').jqxNumberInput({ width: 90, readOnly: true, spinButtons: false }); | |
| 2159 | } else { | |
| 2160 | $('#wf_amount').jqxNumberInput({ width: 110, readOnly: false, spinButtons: true }); | |
| 2161 | } | |
| 2162 | ||
| 2163 | if (mvol > 0) { | |
| 2164 | v = s / sugardensity + mvol; | |
| 2165 | s = 1000 * s / (v * 10); //deg. Plato | |
| 2166 | est_mash_sg = Round(plato_to_sg(s), 5); | |
| 2167 | $('#est_mash_sg').val(est_mash_sg); | |
| 2168 | } | |
| 2169 | ||
| 2170 | // Estimate total recipe OG. | |
| 2171 | dataRecord.est_og = estimate_sg(sugarsf + addedS, parseFloat(dataRecord.batch_size)); | |
| 2172 | $('#est_og').val(dataRecord.est_og); | |
| 2173 | $('#est_og2').val(dataRecord.est_og); | |
| 2174 | org = dataRecord.est_og; | |
| 2175 | ||
| 2176 | // Estimate SG in kettle after boil | |
| 2177 | aboil_sg = estimate_sg(sugarsf, parseFloat(dataRecord.batch_size)); | |
| 2178 | $('#est_og3').val(aboil_sg); | |
| 2179 | ||
| 2180 | // Estimate SG in kettle before boil | |
| 2181 | preboil_sg = estimate_sg(sugarsm, parseFloat(dataRecord.boil_size)); | |
| 2182 | $('#est_pre_sg').val(preboil_sg); | |
| 2183 | ||
| 2184 | // Recalculate volumes. | |
| 2185 | aboil_volume = parseFloat(dataRecord.batch_size); | |
| 2186 | if (dataRecord.brew_aboil_volume > 0) | |
| 2187 | aboil_volume = dataRecord.brew_aboil_volume / 1.04; // volume @ 20 degrees | |
| 2188 | if (dataRecord.brew_fermenter_tcloss == 0) { | |
| 2189 | dataRecord.brew_fermenter_tcloss = dataRecord.eq_trub_chiller_loss; | |
| 2190 | $('#brew_fermenter_tcloss').val(dataRecord.brew_fermenter_tcloss); | |
| 2191 | } | |
| 2192 | dataRecord.brew_fermenter_volume = aboil_volume - dataRecord.brew_fermenter_tcloss + dataRecord.brew_fermenter_extrawater; | |
| 2193 | $('#brew_fermenter_volume').val(dataRecord.brew_fermenter_volume); | |
| 2194 | // Estimated needed sparge water corrected for the temperature. | |
| 2195 | spoelw = (dataRecord.boil_size - mash_infuse + (mashkg * my_grain_absorbtion) + dataRecord.eq_lauter_deadspace) * 1.03; | |
| 2196 | $('#brew_sparge_est').val(spoelw); | |
| 2197 | // Calculate SG in fermenter | |
| 2198 | ogx = dataRecord.brew_aboil_sg; | |
| 2199 | if (ogx < 1.002) | |
| 2200 | ogx = aboil_sg; | |
| 2201 | topw = dataRecord.brew_fermenter_extrawater; | |
| 2202 | ||
| 2203 | if (dataRecord.brew_fermenter_volume > 0) { | |
| 2204 | sug = sg_to_plato(ogx) * dataRecord.brew_fermenter_volume * ogx / 100; //kg of sugar in | |
| 2205 | sug += addedS; //kg | |
| 2206 | ||
| 2207 | if ((dataRecord.brew_fermenter_volume * ogx + addedmass) > 0) { | |
| 2208 | pt = 100 * sug / (dataRecord.brew_fermenter_volume * ogx + addedmass + topw); | |
|
577
b4bfed3684d0
In production archive lists show always the OG from the brew fermenter SG. Possible fix for the not used og field in the database.
Michiel Broek <mbroek@mbse.eu>
parents:
564
diff
changeset
|
2209 | dataRecord.og = dataRecord.brew_fermenter_sg = Round(plato_to_sg(pt), 4); |
| 478 | 2210 | $('#brew_fermenter_sg').val(dataRecord.brew_fermenter_sg); |
| 2211 | // color | |
| 2212 | if (dataRecord.color_method == 4) { | |
| 2213 | dataRecord.brew_fermenter_color = Math.round(((pt / 8.6) * colorn) + (dataRecord.boil_time / 60)); | |
| 2214 | } else if (dataRecord.color_method == 3) { | |
| 2215 | dataRecord.brew_fermenter_color = Math.round((4.46 * bv * sr) / (aboil_volume + topw) * colorh); | |
| 2216 | } else { | |
| 2217 | cw = colort / (aboil_volume + topw) * 8.34436; | |
| 2218 | dataRecord.brew_fermenter_color = kw_to_ebc(dataRecord.color_method, cw); | |
| 2219 | } | |
| 2220 | $('#brew_fermenter_color').val(dataRecord.brew_fermenter_color); | |
| 2221 | scolor = ebc_to_color(dataRecord.brew_fermenter_color); | |
| 2222 | $('#bcolorf').show(); | |
| 2223 | document.getElementById('bcolorf').style.background = scolor; | |
| 2224 | } | |
| 2225 | } else { | |
| 2226 | // Negative volume | |
| 2227 | dataRecord.brew_fermenter_sg = dataRecord.brew_fermenter_color = 0; | |
| 2228 | $('#brew_fermenter_sg').val(0); | |
| 2229 | $('#brew_fermenter_color').val(0); | |
| 2230 | $('#bcolorf').hide(); | |
| 2231 | } | |
| 2232 | ||
| 2233 | // Color of the wort | |
| 2234 | if (dataRecord.color_method == 4) { | |
| 2235 | color = Math.round(((sg_to_plato(dataRecord.est_og) / 8.6) * colorn) + (dataRecord.boil_time / 60)); | |
| 2236 | } else if (dataRecord.color_method == 3) { // Hans Halberstadt | |
| 2237 | color = Math.round((4.46 * bv * sr) / parseFloat(dataRecord.batch_size) * colorh); | |
| 2238 | } else { | |
| 2239 | cw = colort / parseFloat(dataRecord.batch_size) * 8.34436; | |
| 2240 | color = kw_to_ebc(dataRecord.color_method, cw); | |
| 2241 | } | |
| 2242 | dataRecord.est_color = color; | |
| 2243 | $('#est_color').val(color); | |
| 2244 | $('#est_color2').val(color); | |
| 2245 | scolor = ebc_to_color(color); | |
| 2246 | document.getElementById('bcolor').style.background = scolor; | |
| 2247 | document.getElementById('bcolor2').style.background = scolor; | |
| 2248 | ||
| 2249 | // Progress bars | |
| 2250 | pmalts = mashkg / dataRecord.eq_mash_max * 100; | |
| 2251 | $('#perc_malts').jqxProgressBar('val', pmalts); | |
| 2252 | $('#perc_sugars').jqxProgressBar('val', psugar); | |
| 2253 | $('#perc_cara').jqxProgressBar('val', pcara); | |
| 2254 | calcStage(); | |
| 2255 | ||
| 2256 | // Calculate estimated svg. | |
| 2257 | svg = 0; // default. | |
| 2258 | initcells = 0; | |
| 2259 | rows = $('#yeastGrid').jqxGrid('getrows'); | |
| 2260 | for (i = 0; i < rows.length; i++) { | |
| 2261 | row = rows[i]; | |
| 2262 | if (row.y_use == 0) { // Primary | |
| 2263 | if (parseFloat(row.y_attenuation) > svg) | |
| 2264 | svg = parseFloat(row.y_attenuation); // Take the highest if multiple yeasts. | |
| 2265 | if (row.y_form == 0) | |
| 2266 | initcells += (parseFloat(row.y_cells) / 1000000000) * parseFloat(row.y_amount) * (dataRecord.starter_viability / 100); | |
| 2267 | else | |
|
617
f962f1e5936e
Implemented yeast viability calculation from the yeast production date. Changed the pitchrate logic and added Ale above 1.076 rate of 1.25.
Michiel Broek <mbroek@mbse.eu>
parents:
616
diff
changeset
|
2268 | initcells += (parseFloat(row.y_cells) / 1000000) * parseFloat(row.y_amount) * (dataRecord.starter_viability / 100); |
| 478 | 2269 | } |
| 2270 | // TODO: brett in secondary ?? | |
| 2271 | if ((((dataRecord.inventory_reduced <= 3) && (row.y_use == 0)) || // Primary | |
| 2272 | ((dataRecord.inventory_reduced <= 4) && (row.y_use == 1)) || // Secondary | |
| 2273 | ((dataRecord.inventory_reduced <= 5) && (row.y_use == 2)) || // Tertiary | |
| 2274 | ((dataRecord.inventory_reduced <= 6) && (row.y_use == 3))) && // Bottle | |
| 2275 | (row.y_inventory < row.y_amount)) { | |
| 2276 | ok_yeasts = 0; | |
| 2277 | } | |
| 2278 | } | |
| 2279 | calcSupplies(); | |
| 2280 | if (svg == 0) | |
| 2281 | svg = 77; | |
| 2282 | ||
| 2283 | if ((mashkg > 0) && (mash_infuse > 0) && (mashtime > 0) && (mashtemp > 0)) { | |
| 2284 | dataRecord.est_fg = estimate_fg(psugar, pcara, mash_infuse / mashkg, mashtime, mashtemp, svg, dataRecord.est_og); | |
| 2285 | } else { | |
| 2286 | dataRecord.est_fg = estimate_fg(psugar, pcara, 0, 0, 0, svg, dataRecord.est_og); | |
| 2287 | } | |
| 2288 | $('#est_fg').val(dataRecord.est_fg); | |
| 2289 | $('#est_fg2').val(dataRecord.est_fg); | |
| 2290 | $('#est_fg3').val(dataRecord.est_fg); | |
| 2291 | fig = dataRecord.est_fg; | |
| 2292 | ||
| 2293 | dataRecord.est_abv = abvol(dataRecord.est_og, dataRecord.est_fg); | |
| 2294 | $('#est_abv').val(dataRecord.est_abv); | |
| 2295 | $('#est_abv2').val(dataRecord.est_abv); | |
| 2296 | ||
| 2297 | // Calculate the final svg if available use the real value. | |
| 2298 | if ((dataRecord.stage >= 6) && (dataRecord.fg > 0.990) && (dataRecord.fg < dataRecord.brew_fermenter_sg)) { | |
|
655
f4e00869f39f
Calculate the svg using Brew by the Numbers, Micahel L. Hall.
Michiel Broek <mbroek@mbse.eu>
parents:
651
diff
changeset
|
2299 | svg = calc_svg(dataRecord.brew_fermenter_sg, dataRecord.fg); |
| 478 | 2300 | org = dataRecord.brew_fermenter_sg; |
| 2301 | fig = dataRecord.fg; | |
| 2302 | } | |
| 2303 | ||
| 2304 | $('#yeast_cells').val(initcells); | |
| 2305 | $('#need_cells').val(getNeededYeastCells()); | |
| 2306 | ||
| 2307 | // Calculate the calories in kcal/l (from brouwhulp) | |
| 2308 | alc = 1881.22 * fig * (org - fig) / (1.775 - org); | |
| 2309 | sug = 3550 * fig * (0.1808 * org + 0.8192 * fig - 1.0004); | |
| 2310 | $('#kcal').val(Math.round((alc + sug) / (12 * 0.0295735296))); | |
| 2311 | }; | |
| 2312 | ||
| 2313 | function calcMash() { | |
| 2314 | ||
|
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
|
2315 | var h, m, infused = 0, mashtime = 0, mashvol = 0, vol, i, j, n, a, b, row, 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
|
2316 | 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
|
2317 | 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
|
2318 | var tuntemp = 18.0; |
|
484
2083c274b283
In the product editor mash tab, display the total mash volume and the total mash time.
Michiel Broek <mbroek@mbse.eu>
parents:
479
diff
changeset
|
2319 | |
|
2083c274b283
In the product editor mash tab, display the total mash volume and the total mash time.
Michiel Broek <mbroek@mbse.eu>
parents:
479
diff
changeset
|
2320 | if ((rows = $('#mashGrid').jqxGrid('getrows')) && (mashkg > 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
|
2321 | console.log('calcMash()'); |
|
484
2083c274b283
In the product editor mash tab, display the total mash volume and the total mash time.
Michiel Broek <mbroek@mbse.eu>
parents:
479
diff
changeset
|
2322 | for (i = 0; i < rows.length; i++) { |
|
2083c274b283
In the product editor mash tab, display the total mash volume and the total mash time.
Michiel Broek <mbroek@mbse.eu>
parents:
479
diff
changeset
|
2323 | row = $('#mashGrid').jqxGrid('getrowdata', i); |
|
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
|
2324 | 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
|
2325 | 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
|
2326 | // 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
|
2327 | 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
|
2328 | 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
|
2329 | 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
|
2330 | a = mashkg * graintemp * SpecificHeatMalt + dataRecord.eq_tun_weight * tuntemp * dataRecord.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
|
2331 | b = row.step_temp * (dataRecord.eq_tun_weight * dataRecord.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
|
2332 | 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
|
2333 | 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
|
2334 | } 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
|
2335 | 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
|
2336 | } |
|
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
2337 | 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
|
2338 | 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
|
2339 | } |
|
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
2340 | 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
|
2341 | } 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
|
2342 | // 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
|
2343 | 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
|
2344 | //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
|
2345 | } |
|
484
2083c274b283
In the product editor mash tab, display the total mash volume and the total mash time.
Michiel Broek <mbroek@mbse.eu>
parents:
479
diff
changeset
|
2346 | infused += 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
|
2347 | } 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
|
2348 | 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
|
2349 | 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
|
2350 | 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
|
2351 | } 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
|
2352 | 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
|
2353 | 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
|
2354 | } |
|
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
2355 | 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
|
2356 | //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
|
2357 | lasttemp = row.step_temp; |
|
484
2083c274b283
In the product editor mash tab, display the total mash volume and the total mash time.
Michiel Broek <mbroek@mbse.eu>
parents:
479
diff
changeset
|
2358 | mashtime += row.step_time + row.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
|
2359 | 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
|
2360 | $('#mashGrid').jqxGrid('updaterow', i, row); |
|
484
2083c274b283
In the product editor mash tab, display the total mash volume and the total mash time.
Michiel Broek <mbroek@mbse.eu>
parents:
479
diff
changeset
|
2361 | } |
| 478 | 2362 | } |
|
484
2083c274b283
In the product editor mash tab, display the total mash volume and the total mash time.
Michiel Broek <mbroek@mbse.eu>
parents:
479
diff
changeset
|
2363 | mashvol = mashkg * MaltVolume + infused; |
|
2083c274b283
In the product editor mash tab, display the total mash volume and the total mash time.
Michiel Broek <mbroek@mbse.eu>
parents:
479
diff
changeset
|
2364 | $('#est_mashvol').val(mashvol); |
|
2083c274b283
In the product editor mash tab, display the total mash volume and the total mash time.
Michiel Broek <mbroek@mbse.eu>
parents:
479
diff
changeset
|
2365 | h = Math.floor(mashtime / 60); |
|
2083c274b283
In the product editor mash tab, display the total mash volume and the total mash time.
Michiel Broek <mbroek@mbse.eu>
parents:
479
diff
changeset
|
2366 | m = Math.floor(mashtime - (h * 60)); |
|
2083c274b283
In the product editor mash tab, display the total mash volume and the total mash time.
Michiel Broek <mbroek@mbse.eu>
parents:
479
diff
changeset
|
2367 | if (h < 10) |
|
2083c274b283
In the product editor mash tab, display the total mash volume and the total mash time.
Michiel Broek <mbroek@mbse.eu>
parents:
479
diff
changeset
|
2368 | h = '0' + h; |
|
2083c274b283
In the product editor mash tab, display the total mash volume and the total mash time.
Michiel Broek <mbroek@mbse.eu>
parents:
479
diff
changeset
|
2369 | if (m < 10) |
|
2083c274b283
In the product editor mash tab, display the total mash volume and the total mash time.
Michiel Broek <mbroek@mbse.eu>
parents:
479
diff
changeset
|
2370 | m = '0' + m; |
|
2083c274b283
In the product editor mash tab, display the total mash volume and the total mash time.
Michiel Broek <mbroek@mbse.eu>
parents:
479
diff
changeset
|
2371 | $('#est_mashtime').val(h + ':' + m); |
| 478 | 2372 | } |
| 2373 | ||
| 2374 | /* | |
| 2375 | * Change OG of recipe but keep the water volumes. | |
| 2376 | */ | |
| 2377 | function calcFermentablesFromOG(OG) { | |
| 2378 | ||
| 2379 | console.log('calcFermentablesFromOG(' + OG + ')'); | |
| 2380 | var amount, row, d, i, sug, tot = 0, totmass = 0, rowscount, efficiency = parseFloat($('#efficiency').jqxNumberInput('decimal')); | |
| 2381 | sug = sg_to_plato(OG) * parseFloat($('#batch_size').jqxNumberInput('decimal')) * OG / 100; //total amount of sugars in kg | |
| 2382 | rowscount = $('#fermentableGrid').jqxGrid('getdatainformation').rowscount; | |
| 2383 | ||
| 2384 | for (i = 0; i < rowscount; i++) { | |
| 2385 | row = $('#fermentableGrid').jqxGrid('getrowdata', i); | |
| 2386 | if (row.f_added < 4) { | |
| 2387 | d = row.f_percentage / 100 * (row.f_yield / 100) * (1 - row.f_moisture / 100); | |
| 2388 | if (row.f_added == 0) // Mash | |
| 2389 | d = efficiency / 100 * d; | |
| 2390 | tot += d; | |
| 2391 | } | |
| 2392 | } | |
| 2393 | if (tot) | |
| 2394 | totmass = Round(sug / tot, 3); | |
| 2395 | ||
| 2396 | if (totmass) { | |
| 2397 | for (i = 0; i < rowscount; i++) { | |
| 2398 | row = $('#fermentableGrid').jqxGrid('getrowdata', i); | |
| 2399 | if (row.f_added < 4) { | |
| 2400 | amount = Math.round(row.f_percentage * 10 * totmass) / 1000; | |
| 2401 | $('#fermentableGrid').jqxGrid('setcellvalue', i, 'f_amount', amount); | |
| 2402 | } | |
| 2403 | } | |
| 2404 | } | |
| 2405 | }; | |
| 2406 | ||
| 2407 | function getNeededYeastCells() { | |
| 2408 | ||
| 2409 | var plato, volume, sg = dataRecord.brew_fermenter_sg; | |
| 2410 | if (sg <= 1.0001 && dataRecord.fg > 1.000) | |
| 2411 | sg = dataRecord.fg; | |
| 2412 | else if (sg <= 1.0001) | |
| 2413 | sg = dataRecord.est_og; | |
| 2414 | plato = sg_to_plato(sg); | |
| 2415 | ||
| 2416 | volume = dataRecord.brew_fermenter_volume; | |
| 2417 | if (volume <= 0) | |
| 2418 | volume = dataRecord.batch_size - dataRecord.eq_trub_chiller_loss; | |
| 2419 | ||
|
697
367ae7ff52f0
Version 0.3.34 Changed log messages in the daemon. Added yeast_pitchrate field to the product database. Added yeast pitchrate edit field to the yeast tab. Initial value is guessed. There is also a popup window for predefined values. An finally the value can be edited by the user. All popup windows are initialized together.
Michiel Broek <mbroek@mbse.eu>
parents:
669
diff
changeset
|
2420 | return dataRecord.yeast_pitchrate * volume * plato; |
| 478 | 2421 | } |
| 2422 | ||
| 2423 | function hopFlavourContribution(bt, vol, use, amount) { | |
| 2424 | var result; | |
| 2425 | ||
|
538
41d21817608e
Added the IBU contribution for whirlpool hops.
Michiel Broek <mbroek@mbse.eu>
parents:
525
diff
changeset
|
2426 | if (use == 4 || use == 5) // Whirlpool or Dry-hop |
|
41d21817608e
Added the IBU contribution for whirlpool hops.
Michiel Broek <mbroek@mbse.eu>
parents:
525
diff
changeset
|
2427 | return 0; |
| 478 | 2428 | if (use == 1) { // First wort |
| 2429 | result = 0.15; // assume 15% flavourcontribution for fwh | |
| 2430 | } else if (bt > 50) { | |
| 2431 | result = 0.10; // assume 10% flavourcontribution as a minimum | |
| 2432 | } else { | |
| 2433 | result = 15.25 / (6 * Math.sqrt(2 * Math.PI)) * Math.exp(-0.5 * Math.pow((bt - 21) / 6, 2)); | |
| 2434 | if (result < 0.10) | |
| 2435 | result = 0.10; // assume 10% flavourcontribution as a minimum | |
| 2436 | } | |
| 2437 | return (result * amount * 1000) / vol; | |
| 2438 | } | |
| 2439 | ||
| 2440 | function hopAromaContribution(bt, vol, use, amount) { | |
| 2441 | var result = 0; | |
| 2442 | ||
|
538
41d21817608e
Added the IBU contribution for whirlpool hops.
Michiel Broek <mbroek@mbse.eu>
parents:
525
diff
changeset
|
2443 | if (use == 5) { // Dry hop |
| 478 | 2444 | result = 1.33; |
|
538
41d21817608e
Added the IBU contribution for whirlpool hops.
Michiel Broek <mbroek@mbse.eu>
parents:
525
diff
changeset
|
2445 | } else if (use == 4) { // Whirlpool |
|
41d21817608e
Added the IBU contribution for whirlpool hops.
Michiel Broek <mbroek@mbse.eu>
parents:
525
diff
changeset
|
2446 | if (bt > 30) |
|
41d21817608e
Added the IBU contribution for whirlpool hops.
Michiel Broek <mbroek@mbse.eu>
parents:
525
diff
changeset
|
2447 | bt = 30; // Max 30 minutes |
|
41d21817608e
Added the IBU contribution for whirlpool hops.
Michiel Broek <mbroek@mbse.eu>
parents:
525
diff
changeset
|
2448 | result = 0.62 * bt / 30; |
| 478 | 2449 | } else if (bt > 20) { |
| 2450 | result = 0; | |
| 2451 | } else if (bt > 7.5) { | |
| 2452 | result = 10.03 / (4 * Math.sqrt(2 * Math.PI)) * Math.exp(-0.5 * Math.pow((bt - 7.5) / 4, 2)); | |
| 2453 | } else if (use == 2) { // Boil | |
| 2454 | result = 1; | |
| 2455 | } else if (use == 3) { // Aroma | |
| 2456 | result = 1.2; | |
| 2457 | } | |
|
538
41d21817608e
Added the IBU contribution for whirlpool hops.
Michiel Broek <mbroek@mbse.eu>
parents:
525
diff
changeset
|
2458 | return (result * amount * 1000) / vol; |
| 478 | 2459 | } |
| 2460 | ||
| 2461 | function calcIBUs() { | |
| 2462 | var total_ibus = 0, ferm_ibus = 0, rows = {}, i, row; | |
| 2463 | hop_aroma = hop_flavour = 0; | |
| 2464 | if (!(rows = $('#hopGrid').jqxGrid('getrows'))) { | |
| 2465 | return; | |
| 2466 | } | |
| 2467 | ok_hops = 1; | |
| 2468 | for (i = 0; i < rows.length; i++) { | |
| 2469 | row = rows[i]; | |
| 2470 | total_ibus += toIBU(row.h_useat, row.h_form, preboil_sg, parseFloat(dataRecord.batch_size), | |
|
559
10cc2400b5d5
Backported extra yeast fields and the SO4:Cl ratio changes into the recipes editor.
Michiel Broek <mbroek@mbse.eu>
parents:
557
diff
changeset
|
2471 | parseFloat(row.h_amount), parseFloat(row.h_time), parseFloat(row.h_alpha), dataRecord.ibu_method, |
|
10cc2400b5d5
Backported extra yeast fields and the SO4:Cl ratio changes into the recipes editor.
Michiel Broek <mbroek@mbse.eu>
parents:
557
diff
changeset
|
2472 | dataRecord.brew_whirlpool9, dataRecord.brew_whirlpool7, dataRecord.brew_whirlpool6); |
| 478 | 2473 | ferm_ibus += toIBU(row.h_useat, row.h_form, preboil_sg, |
|
559
10cc2400b5d5
Backported extra yeast fields and the SO4:Cl ratio changes into the recipes editor.
Michiel Broek <mbroek@mbse.eu>
parents:
557
diff
changeset
|
2474 | parseFloat(dataRecord.brew_fermenter_volume) + parseFloat(dataRecord.brew_fermenter_tcloss), |
|
10cc2400b5d5
Backported extra yeast fields and the SO4:Cl ratio changes into the recipes editor.
Michiel Broek <mbroek@mbse.eu>
parents:
557
diff
changeset
|
2475 | parseFloat(row.h_amount), parseFloat(row.h_time), parseFloat(row.h_alpha), dataRecord.ibu_method, |
|
10cc2400b5d5
Backported extra yeast fields and the SO4:Cl ratio changes into the recipes editor.
Michiel Broek <mbroek@mbse.eu>
parents:
557
diff
changeset
|
2476 | dataRecord.brew_whirlpool9, dataRecord.brew_whirlpool7, dataRecord.brew_whirlpool6); |
|
10cc2400b5d5
Backported extra yeast fields and the SO4:Cl ratio changes into the recipes editor.
Michiel Broek <mbroek@mbse.eu>
parents:
557
diff
changeset
|
2477 | hop_flavour += hopFlavourContribution(parseFloat(row.h_time), parseFloat(dataRecord.batch_size), row.h_useat, parseFloat(row.h_amount)); |
|
10cc2400b5d5
Backported extra yeast fields and the SO4:Cl ratio changes into the recipes editor.
Michiel Broek <mbroek@mbse.eu>
parents:
557
diff
changeset
|
2478 | hop_aroma += hopAromaContribution(parseFloat(row.h_time), parseFloat(dataRecord.batch_size), row.h_useat, parseFloat(row.h_amount)); |
| 478 | 2479 | if ((((dataRecord.inventory_reduced <= 2) && (row.h_useat <= 4)) || // Mash, FW, Boil, Aroma, Whirlpool |
| 2480 | ((dataRecord.inventory_reduced <= 6) && (row.h_useat == 5))) && // Dry-hop | |
| 2481 | (row.h_inventory < row.h_amount)) | |
| 2482 | ok_hops = 0; | |
| 2483 | } | |
| 557 | 2484 | total_ibus = Round(total_ibus, 1); |
| 2485 | ferm_ibus = Round(ferm_ibus, 1); | |
| 2486 | hop_flavour = Round(hop_flavour * 100 / 5, 1); | |
| 2487 | hop_aroma = Round(hop_aroma * 100 / 6, 1); | |
| 478 | 2488 | if (hop_flavour > 100) |
| 2489 | hop_flavour = 100; | |
| 2490 | if (hop_aroma > 100) | |
| 2491 | hop_aroma = 100; | |
| 2492 | console.log('calcIBUs(): ' + total_ibus + ' flavour: ' + hop_flavour + ' aroma: ' + hop_aroma + | |
| 2493 | ' fermenter:' + ferm_ibus + ' supplies:' + ok_hops); | |
| 2494 | dataRecord.est_ibu = total_ibus; | |
| 2495 | $('#est_ibu').val(total_ibus); | |
| 2496 | $('#est_ibu2').val(total_ibus); | |
| 2497 | $('#hop_flavour').jqxProgressBar('val', hop_flavour); | |
| 2498 | $('#hop_aroma').jqxProgressBar('val', hop_aroma); | |
| 2499 | $('#brew_fermenter_ibu').val(ferm_ibus); | |
| 2500 | calcStage(); | |
| 2501 | calcSupplies(); | |
| 2502 | }; | |
| 2503 | ||
| 2504 | /* | |
| 2505 | * http://braukaiser.com/blog/blog/2012/11/03/estimating-yeast-growth/ | |
| 2506 | * | |
| 2507 | * stype: 0=stirred, 1=shaken, 2=simple | |
| 2508 | * totcells: initial cells | |
| 2509 | * egrams: gram extract | |
| 2510 | */ | |
| 2511 | function getGrowthRate(stype, totcells, egrams) { | |
| 2512 | ||
| 2513 | /* Cells per grams extract (B/g) */ | |
| 2514 | var cpe = totcells / egrams; | |
| 2515 | ||
| 2516 | if (cpe > 3.5) | |
| 2517 | return 0; // no growth | |
| 2518 | if (stype == 2) | |
| 2519 | return 0.4; // simple starter | |
| 2520 | if (stype == 1) | |
| 2521 | return 0.62; // shaken starter | |
| 2522 | if (cpe <= 1.4) // stirred starter | |
| 2523 | return 1.4; | |
| 2524 | return 2.33 - (.67 * cpe); | |
| 2525 | }; | |
| 2526 | ||
| 2527 | function calcStep(svol, stype, start) { | |
| 2528 | ||
| 2529 | var gperpoint = 2.72715, //number of grams of extract per point of starter gravity per liter | |
| 2530 | prate = start / svol * 1000, | |
| 2531 | irate = Round(prate, 1), | |
| 2532 | egrams = (dataRecord.starter_sg - 1) * svol * gperpoint, | |
| 2533 | grate = getGrowthRate(stype, start, egrams), | |
| 2534 | ncells = Round(egrams * grate, 1), | |
| 2535 | totcells = parseFloat(ncells) + start; | |
| 2536 | ||
| 2537 | return { | |
| 2538 | svol: svol, | |
| 2539 | irate: irate, | |
| 2540 | prate: Round(prate, 1), | |
| 2541 | ncells: ncells, | |
| 2542 | totcells: totcells, | |
| 2543 | growf: Round(ncells / start, 2) | |
| 2544 | }; | |
| 2545 | } | |
| 2546 | ||
|
649
52053730f6e1
Yeast starter now automatic adds or removes step lines as they are needed.
Michiel Broek <mbroek@mbse.eu>
parents:
648
diff
changeset
|
2547 | function killstep2() { |
|
52053730f6e1
Yeast starter now automatic adds or removes step lines as they are needed.
Michiel Broek <mbroek@mbse.eu>
parents:
648
diff
changeset
|
2548 | |
|
52053730f6e1
Yeast starter now automatic adds or removes step lines as they are needed.
Michiel Broek <mbroek@mbse.eu>
parents:
648
diff
changeset
|
2549 | dataRecord.prop2_volume = 0; |
|
52053730f6e1
Yeast starter now automatic adds or removes step lines as they are needed.
Michiel Broek <mbroek@mbse.eu>
parents:
648
diff
changeset
|
2550 | $('#prop2_volume').val(0); |
|
52053730f6e1
Yeast starter now automatic adds or removes step lines as they are needed.
Michiel Broek <mbroek@mbse.eu>
parents:
648
diff
changeset
|
2551 | $('#prop2_tcells').val(0); |
|
52053730f6e1
Yeast starter now automatic adds or removes step lines as they are needed.
Michiel Broek <mbroek@mbse.eu>
parents:
648
diff
changeset
|
2552 | $('#prop2_type,#prop2_volume,#prop2_irate,#prop2_ncells,#prop2_tcells,#prop2_growf').hide(); |
|
52053730f6e1
Yeast starter now automatic adds or removes step lines as they are needed.
Michiel Broek <mbroek@mbse.eu>
parents:
648
diff
changeset
|
2553 | $('#r2_pmpt').show(); |
|
52053730f6e1
Yeast starter now automatic adds or removes step lines as they are needed.
Michiel Broek <mbroek@mbse.eu>
parents:
648
diff
changeset
|
2554 | } |
|
52053730f6e1
Yeast starter now automatic adds or removes step lines as they are needed.
Michiel Broek <mbroek@mbse.eu>
parents:
648
diff
changeset
|
2555 | |
|
52053730f6e1
Yeast starter now automatic adds or removes step lines as they are needed.
Michiel Broek <mbroek@mbse.eu>
parents:
648
diff
changeset
|
2556 | function killstep3() { |
|
52053730f6e1
Yeast starter now automatic adds or removes step lines as they are needed.
Michiel Broek <mbroek@mbse.eu>
parents:
648
diff
changeset
|
2557 | |
|
52053730f6e1
Yeast starter now automatic adds or removes step lines as they are needed.
Michiel Broek <mbroek@mbse.eu>
parents:
648
diff
changeset
|
2558 | dataRecord.prop3_volume = 0; |
|
52053730f6e1
Yeast starter now automatic adds or removes step lines as they are needed.
Michiel Broek <mbroek@mbse.eu>
parents:
648
diff
changeset
|
2559 | $('#prop3_volume').val(0); |
|
52053730f6e1
Yeast starter now automatic adds or removes step lines as they are needed.
Michiel Broek <mbroek@mbse.eu>
parents:
648
diff
changeset
|
2560 | $('#prop3_tcells').val(0); |
|
52053730f6e1
Yeast starter now automatic adds or removes step lines as they are needed.
Michiel Broek <mbroek@mbse.eu>
parents:
648
diff
changeset
|
2561 | $('#prop3_type,#prop3_volume,#prop3_irate,#prop3_ncells,#prop3_tcells,#prop3_growf').hide(); |
|
52053730f6e1
Yeast starter now automatic adds or removes step lines as they are needed.
Michiel Broek <mbroek@mbse.eu>
parents:
648
diff
changeset
|
2562 | $('#r3_pmpt').show(); |
|
52053730f6e1
Yeast starter now automatic adds or removes step lines as they are needed.
Michiel Broek <mbroek@mbse.eu>
parents:
648
diff
changeset
|
2563 | } |
|
52053730f6e1
Yeast starter now automatic adds or removes step lines as they are needed.
Michiel Broek <mbroek@mbse.eu>
parents:
648
diff
changeset
|
2564 | |
|
52053730f6e1
Yeast starter now automatic adds or removes step lines as they are needed.
Michiel Broek <mbroek@mbse.eu>
parents:
648
diff
changeset
|
2565 | function killstep4() { |
|
52053730f6e1
Yeast starter now automatic adds or removes step lines as they are needed.
Michiel Broek <mbroek@mbse.eu>
parents:
648
diff
changeset
|
2566 | |
|
52053730f6e1
Yeast starter now automatic adds or removes step lines as they are needed.
Michiel Broek <mbroek@mbse.eu>
parents:
648
diff
changeset
|
2567 | dataRecord.prop4_volume = 0; |
|
52053730f6e1
Yeast starter now automatic adds or removes step lines as they are needed.
Michiel Broek <mbroek@mbse.eu>
parents:
648
diff
changeset
|
2568 | $('#prop4_volume').val(0); |
|
52053730f6e1
Yeast starter now automatic adds or removes step lines as they are needed.
Michiel Broek <mbroek@mbse.eu>
parents:
648
diff
changeset
|
2569 | $('#prop4_tcells').val(0); |
|
52053730f6e1
Yeast starter now automatic adds or removes step lines as they are needed.
Michiel Broek <mbroek@mbse.eu>
parents:
648
diff
changeset
|
2570 | $('#prop4_type,#prop4_volume,#prop4_irate,#prop4_ncells,#prop4_tcells,#prop4_growf').hide(); |
|
52053730f6e1
Yeast starter now automatic adds or removes step lines as they are needed.
Michiel Broek <mbroek@mbse.eu>
parents:
648
diff
changeset
|
2571 | $('#r4_pmpt').show(); |
|
52053730f6e1
Yeast starter now automatic adds or removes step lines as they are needed.
Michiel Broek <mbroek@mbse.eu>
parents:
648
diff
changeset
|
2572 | } |
|
52053730f6e1
Yeast starter now automatic adds or removes step lines as they are needed.
Michiel Broek <mbroek@mbse.eu>
parents:
648
diff
changeset
|
2573 | |
| 478 | 2574 | /* |
| 2575 | * Calculate all starter steps. | |
| 2576 | * stype: final starter type: 0 = stirred, 1 = shaked, 2 = simple. | |
| 2577 | * start: initial cells in billions | |
| 2578 | * needed: needed cells in billions | |
| 2579 | * | |
| 2580 | * result: all values updated. | |
| 2581 | */ | |
| 2582 | function calcSteps(stype, start, needed) { | |
| 2583 | ||
| 2584 | var uvols = [20, 40, 60, 80, 100, 150, 200, 250, 375, 500, 625, 750, 875, 1000, 1250, 1500, 2000, 2500, 3000, 4000, 5000], | |
| 2585 | mvols = uvols.length, svol = 0, lasti = 0, result = {}, i; | |
| 2586 | ||
| 2587 | /* | |
| 2588 | * If no values are set, auto calculate the starter. | |
| 2589 | */ | |
| 2590 | if ((parseFloat($('#prop1_volume').jqxNumberInput('decimal')) + parseFloat($('#prop2_volume').jqxNumberInput('decimal')) + | |
| 2591 | parseFloat($('#prop3_volume').jqxNumberInput('decimal')) + parseFloat($('#prop4_volume').jqxNumberInput('decimal'))) == 0) { | |
| 2592 | // clear by default | |
| 2593 | for (i = 1; i < 5; i++) { | |
|
633
ec4601ab3ed2
Fixed loading of the product edit page. A bit faster loading.
Michiel Broek <mbroek@mbse.eu>
parents:
623
diff
changeset
|
2594 | $('#prop' + i + '_type,#prop' + i + '_volume,#prop' + i + '_irate,#prop' + i + '_ncells,#prop' + i + '_tcells,#prop' + i + '_growf').hide(); |
| 478 | 2595 | $('#r' + i + '_pmpt').show(); |
| 2596 | $('#prop' + i + '_type').val(stype); | |
| 2597 | $('#prop' + i + '_volume').val(0); | |
| 2598 | } | |
| 2599 | if (start > needed) { | |
| 2600 | return; // no starter needed | |
| 2601 | } | |
|
633
ec4601ab3ed2
Fixed loading of the product edit page. A bit faster loading.
Michiel Broek <mbroek@mbse.eu>
parents:
623
diff
changeset
|
2602 | $('#prop1_type,#prop1_volume,#prop1_irate,#prop1_ncells,#prop1_tcells,#prop1_growf').show(); |
| 478 | 2603 | $('#r1_pmpt').hide(); |
| 2604 | for (i = lasti; i <= mvols; i++) { | |
| 2605 | lasti = i; | |
| 2606 | svol = uvols[lasti]; | |
| 2607 | result = calcStep(svol, stype, start); | |
| 2608 | if (result.irate < 25) { | |
| 2609 | // inocculation rate too low, backup one step and break out. | |
| 2610 | lasti = i - 1; | |
| 2611 | svol = uvols[lasti]; | |
| 2612 | result = calcStep(svol, stype, start); | |
| 2613 | break; | |
| 2614 | } | |
| 2615 | if (result.totcells > needed || i == mvols) { // hit the target or loops done | |
| 2616 | break; | |
| 2617 | } | |
| 2618 | } | |
| 2619 | $('#prop1_volume').val(result.svol / 1000); // to liters | |
| 2620 | $('#prop1_irate').val(result.prate); | |
| 2621 | $('#prop1_ncells').val(result.ncells); | |
| 2622 | $('#prop1_tcells').val(result.totcells); | |
| 2623 | $('#prop1_growf').val(result.growf); | |
| 2624 | if (result.totcells > needed) | |
| 2625 | return; // hit the target | |
| 2626 | ||
| 2627 | // second stage | |
| 2628 | $('#r2_pmpt').hide(); | |
| 2629 | $('#prop2_type').val(stype); | |
|
633
ec4601ab3ed2
Fixed loading of the product edit page. A bit faster loading.
Michiel Broek <mbroek@mbse.eu>
parents:
623
diff
changeset
|
2630 | $('#prop2_type,#prop2_volume,#prop2_irate,#prop2_ncells,#prop2_tcells,#prop2_growf').show(); |
| 478 | 2631 | for (i = lasti; i <= mvols; i++) { |
| 2632 | lasti = i; | |
| 2633 | svol = uvols[lasti]; | |
| 2634 | result = calcStep(svol, stype, $('#prop1_tcells').val()); | |
| 2635 | if (result.irate < 25) { | |
| 2636 | lasti = i - 1; | |
| 2637 | svol = uvols[lasti]; | |
| 2638 | result = calcStep(svol, stype, $('#prop1_tcells').val()); | |
| 2639 | break; | |
| 2640 | } | |
| 2641 | if (result.totcells > needed || i == mvols) { // hit the target or loops done | |
| 2642 | break; | |
| 2643 | } | |
| 2644 | } | |
| 2645 | $('#prop2_volume').val(result.svol / 1000); // to liters | |
| 2646 | $('#prop2_irate').val(result.prate); | |
| 2647 | $('#prop2_ncells').val(result.ncells); | |
| 2648 | $('#prop2_tcells').val(result.totcells); | |
| 2649 | $('#prop2_growf').val(result.growf); | |
| 2650 | if (result.totcells > needed) | |
| 2651 | return; // hit the target | |
| 2652 | ||
| 2653 | // third stage | |
| 2654 | $('#r3_pmpt').hide(); | |
| 2655 | $('#prop3_type').val(stype); | |
|
633
ec4601ab3ed2
Fixed loading of the product edit page. A bit faster loading.
Michiel Broek <mbroek@mbse.eu>
parents:
623
diff
changeset
|
2656 | $('#prop3_type,#prop3_volume,#prop3_irate,#prop3_ncells,#prop3_tcells,#prop3_growf').show(); |
| 478 | 2657 | for (i = lasti; i <= mvols; i++) { |
| 2658 | lasti = i; | |
| 2659 | svol = uvols[lasti]; | |
| 2660 | result = calcStep(svol, stype, $('#prop2_tcells').val()); | |
| 2661 | if (result.irate < 25) { | |
| 2662 | lasti = i - 1; | |
| 2663 | svol = uvols[lasti]; | |
| 2664 | result = calcStep(svol, stype, $('#prop2_tcells').val()); | |
| 2665 | break; | |
| 2666 | } | |
| 2667 | if (result.totcells > needed || i == mvols) { // hit the target or loops done | |
| 2668 | break; | |
| 2669 | } | |
| 2670 | } | |
| 2671 | $('#prop3_volume').val(result.svol / 1000); // to liters | |
| 2672 | $('#prop3_irate').val(result.prate); | |
| 2673 | $('#prop3_ncells').val(result.ncells); | |
| 2674 | $('#prop3_tcells').val(result.totcells); | |
| 2675 | $('#prop3_growf').val(result.growf); | |
| 2676 | if (result.totcells > needed) | |
| 2677 | return; // hit the target | |
| 2678 | ||
| 2679 | // fourth stage | |
| 2680 | $('#r4_pmpt').hide(); | |
| 2681 | $('#prop4_type').val(stype); | |
|
633
ec4601ab3ed2
Fixed loading of the product edit page. A bit faster loading.
Michiel Broek <mbroek@mbse.eu>
parents:
623
diff
changeset
|
2682 | $('#prop4_type,#prop4_volume,#prop4_irate,#prop4_ncells,#prop4_tcells,#prop4_growf').show(); |
| 478 | 2683 | for (i = lasti; i <= mvols; i++) { |
| 2684 | lasti = i; | |
| 2685 | svol = uvols[lasti]; | |
| 2686 | result = calcStep(svol, stype, $('#prop3_tcells').val()); | |
| 2687 | if (result.totcells > needed || i == mvols) { // hit the target or loops done | |
| 2688 | $('#prop4_volume').val(result.svol / 1000); // to liters | |
| 2689 | $('#prop4_irate').val(result.prate); | |
| 2690 | $('#prop4_ncells').val(result.ncells); | |
| 2691 | $('#prop4_tcells').val(result.totcells); | |
| 2692 | $('#prop4_growf').val(result.growf); | |
| 2693 | return; | |
| 2694 | } | |
| 2695 | } | |
| 2696 | } else { | |
| 2697 | // recalculate | |
| 2698 | if (dataRecord.prop1_volume > 0) { | |
| 2699 | $('#r1_pmpt').hide(); | |
|
633
ec4601ab3ed2
Fixed loading of the product edit page. A bit faster loading.
Michiel Broek <mbroek@mbse.eu>
parents:
623
diff
changeset
|
2700 | $('#prop1_type,#prop1_volume,#prop1_irate,#prop1_ncells,#prop1_tcells,#prop1_growf').show(); |
| 478 | 2701 | result = calcStep($('#prop1_volume').val() * 1000, dataRecord.prop1_type, start); |
| 2702 | $('#prop1_irate').val(result.prate); | |
| 2703 | $('#prop1_ncells').val(result.ncells); | |
| 2704 | $('#prop1_tcells').val(result.totcells); | |
| 2705 | $('#prop1_growf').val(result.growf); | |
|
649
52053730f6e1
Yeast starter now automatic adds or removes step lines as they are needed.
Michiel Broek <mbroek@mbse.eu>
parents:
648
diff
changeset
|
2706 | if (result.totcells > needed) { |
|
52053730f6e1
Yeast starter now automatic adds or removes step lines as they are needed.
Michiel Broek <mbroek@mbse.eu>
parents:
648
diff
changeset
|
2707 | killstep2(); |
|
52053730f6e1
Yeast starter now automatic adds or removes step lines as they are needed.
Michiel Broek <mbroek@mbse.eu>
parents:
648
diff
changeset
|
2708 | killstep3(); |
|
52053730f6e1
Yeast starter now automatic adds or removes step lines as they are needed.
Michiel Broek <mbroek@mbse.eu>
parents:
648
diff
changeset
|
2709 | killstep4(); |
|
52053730f6e1
Yeast starter now automatic adds or removes step lines as they are needed.
Michiel Broek <mbroek@mbse.eu>
parents:
648
diff
changeset
|
2710 | } else if (dataRecord.prop2_volume == 0) { |
|
52053730f6e1
Yeast starter now automatic adds or removes step lines as they are needed.
Michiel Broek <mbroek@mbse.eu>
parents:
648
diff
changeset
|
2711 | dataRecord.prop2_volume = dataRecord.prop1_volume; /* Extra step needed, start with the same size */ |
|
52053730f6e1
Yeast starter now automatic adds or removes step lines as they are needed.
Michiel Broek <mbroek@mbse.eu>
parents:
648
diff
changeset
|
2712 | dataRecord.prop2_type = dataRecord.prop1_type; |
|
52053730f6e1
Yeast starter now automatic adds or removes step lines as they are needed.
Michiel Broek <mbroek@mbse.eu>
parents:
648
diff
changeset
|
2713 | $('#prop2_volume').val(dataRecord.prop2_volume); |
|
52053730f6e1
Yeast starter now automatic adds or removes step lines as they are needed.
Michiel Broek <mbroek@mbse.eu>
parents:
648
diff
changeset
|
2714 | $('#prop2_type').val(dataRecord.prop2_type); |
|
52053730f6e1
Yeast starter now automatic adds or removes step lines as they are needed.
Michiel Broek <mbroek@mbse.eu>
parents:
648
diff
changeset
|
2715 | } |
| 478 | 2716 | } |
| 2717 | if (dataRecord.prop2_volume > 0) { | |
| 2718 | $('#r2_pmpt').hide(); | |
|
633
ec4601ab3ed2
Fixed loading of the product edit page. A bit faster loading.
Michiel Broek <mbroek@mbse.eu>
parents:
623
diff
changeset
|
2719 | $('#prop2_type,#prop2_volume,#prop2_irate,#prop2_ncells,#prop2_tcells,#prop2_growf').show(); |
| 478 | 2720 | result = calcStep($('#prop2_volume').val() * 1000, dataRecord.prop2_type, $('#prop1_tcells').val()); |
| 2721 | $('#prop2_irate').val(result.prate); | |
| 2722 | $('#prop2_ncells').val(result.ncells); | |
| 2723 | $('#prop2_tcells').val(result.totcells); | |
| 2724 | $('#prop2_growf').val(result.growf); | |
|
649
52053730f6e1
Yeast starter now automatic adds or removes step lines as they are needed.
Michiel Broek <mbroek@mbse.eu>
parents:
648
diff
changeset
|
2725 | if (result.totcells > needed) { |
|
52053730f6e1
Yeast starter now automatic adds or removes step lines as they are needed.
Michiel Broek <mbroek@mbse.eu>
parents:
648
diff
changeset
|
2726 | killstep3(); |
|
52053730f6e1
Yeast starter now automatic adds or removes step lines as they are needed.
Michiel Broek <mbroek@mbse.eu>
parents:
648
diff
changeset
|
2727 | killstep4(); |
|
52053730f6e1
Yeast starter now automatic adds or removes step lines as they are needed.
Michiel Broek <mbroek@mbse.eu>
parents:
648
diff
changeset
|
2728 | } else if (dataRecord.prop3_volume == 0) { |
|
52053730f6e1
Yeast starter now automatic adds or removes step lines as they are needed.
Michiel Broek <mbroek@mbse.eu>
parents:
648
diff
changeset
|
2729 | dataRecord.prop3_volume = dataRecord.prop2_volume; /* Extra step needed, start with the same size */ |
|
52053730f6e1
Yeast starter now automatic adds or removes step lines as they are needed.
Michiel Broek <mbroek@mbse.eu>
parents:
648
diff
changeset
|
2730 | dataRecord.prop3_type = dataRecord.prop2_type; |
|
52053730f6e1
Yeast starter now automatic adds or removes step lines as they are needed.
Michiel Broek <mbroek@mbse.eu>
parents:
648
diff
changeset
|
2731 | $('#prop3_volume').val(dataRecord.prop3_volume); |
|
52053730f6e1
Yeast starter now automatic adds or removes step lines as they are needed.
Michiel Broek <mbroek@mbse.eu>
parents:
648
diff
changeset
|
2732 | $('#prop3_type').val(dataRecord.prop3_type); |
|
52053730f6e1
Yeast starter now automatic adds or removes step lines as they are needed.
Michiel Broek <mbroek@mbse.eu>
parents:
648
diff
changeset
|
2733 | } |
| 478 | 2734 | } |
| 2735 | if (dataRecord.prop3_volume > 0) { | |
| 2736 | $('#r3_pmpt').hide(); | |
|
633
ec4601ab3ed2
Fixed loading of the product edit page. A bit faster loading.
Michiel Broek <mbroek@mbse.eu>
parents:
623
diff
changeset
|
2737 | $('#prop3_type,#prop3_volume,#prop3_irate,#prop3_ncells,#prop3_tcells,#prop3_growf').show(); |
| 478 | 2738 | result = calcStep($('#prop3_volume').val() * 1000, dataRecord.prop3_type, $('#prop2_tcells').val()); |
| 2739 | $('#prop3_irate').val(result.prate); | |
| 2740 | $('#prop3_ncells').val(result.ncells); | |
| 2741 | $('#prop3_tcells').val(result.totcells); | |
| 2742 | $('#prop3_growf').val(result.growf); | |
|
649
52053730f6e1
Yeast starter now automatic adds or removes step lines as they are needed.
Michiel Broek <mbroek@mbse.eu>
parents:
648
diff
changeset
|
2743 | if (result.totcells > needed) { |
|
52053730f6e1
Yeast starter now automatic adds or removes step lines as they are needed.
Michiel Broek <mbroek@mbse.eu>
parents:
648
diff
changeset
|
2744 | killstep4(); |
|
52053730f6e1
Yeast starter now automatic adds or removes step lines as they are needed.
Michiel Broek <mbroek@mbse.eu>
parents:
648
diff
changeset
|
2745 | } else if (dataRecord.prop4_volume == 0) { |
|
52053730f6e1
Yeast starter now automatic adds or removes step lines as they are needed.
Michiel Broek <mbroek@mbse.eu>
parents:
648
diff
changeset
|
2746 | dataRecord.prop4_volume = dataRecord.prop3_volume; /* Extra step needed, start with the same size */ |
|
52053730f6e1
Yeast starter now automatic adds or removes step lines as they are needed.
Michiel Broek <mbroek@mbse.eu>
parents:
648
diff
changeset
|
2747 | dataRecord.prop4_type = dataRecord.prop3_type; |
|
52053730f6e1
Yeast starter now automatic adds or removes step lines as they are needed.
Michiel Broek <mbroek@mbse.eu>
parents:
648
diff
changeset
|
2748 | $('#prop4_volume').val(dataRecord.prop4_volume); |
|
52053730f6e1
Yeast starter now automatic adds or removes step lines as they are needed.
Michiel Broek <mbroek@mbse.eu>
parents:
648
diff
changeset
|
2749 | $('#prop4_type').val(dataRecord.prop4_type); |
|
52053730f6e1
Yeast starter now automatic adds or removes step lines as they are needed.
Michiel Broek <mbroek@mbse.eu>
parents:
648
diff
changeset
|
2750 | } |
| 478 | 2751 | } |
| 2752 | if (dataRecord.prop4_volume > 0) { | |
| 2753 | $('#r4_pmpt').hide(); | |
|
633
ec4601ab3ed2
Fixed loading of the product edit page. A bit faster loading.
Michiel Broek <mbroek@mbse.eu>
parents:
623
diff
changeset
|
2754 | $('#prop4_type,#prop4_volume,#prop4_irate,#prop4_ncells,#prop4_tcells,#prop4_growf').show(); |
| 478 | 2755 | result = calcStep($('#prop4_volume').val() * 1000, dataRecord.prop4_type, $('#prop3_tcells').val()); |
| 2756 | $('#prop4_irate').val(result.prate); | |
| 2757 | $('#prop4_ncells').val(result.ncells); | |
| 2758 | $('#prop4_tcells').val(result.totcells); | |
| 2759 | $('#prop4_growf').val(result.growf); | |
| 2760 | } | |
| 2761 | } | |
| 2762 | } | |
| 2763 | ||
| 2764 | function calcYeast() { | |
| 2765 | ||
| 2766 | // Calculate needed cells. | |
| 2767 | var plato, volume, rows, rowscount, row, i, needed, use_cells, sg = dataRecord.brew_fermenter_sg; | |
|
726
872a3635e4ef
Changed dry-yeast calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
723
diff
changeset
|
2768 | |
| 478 | 2769 | if (sg <= 1.0001 && dataRecord.fg > 1.000) |
| 2770 | sg = dataRecord.fg; | |
| 2771 | else if (sg <= 1.0001) | |
| 2772 | sg = dataRecord.est_og; | |
| 2773 | plato = sg_to_plato(sg); | |
| 2774 | ||
| 2775 | volume = dataRecord.brew_fermenter_volume; | |
| 2776 | if (volume > 0) { | |
| 2777 | if (dataRecord.brew_fermenter_extrawater > 0) | |
| 2778 | volume += dataRecord.brew_fermenter_extrawater; | |
| 2779 | } else { | |
| 2780 | volume = dataRecord.batch_size - dataRecord.eq_trub_chiller_loss; | |
| 2781 | } | |
| 2782 | ||
| 2783 | // Also in calcFermentables() | |
| 2784 | $('#yeast_cells').val(initcells); | |
| 2785 | ||
| 2786 | if (!(rows = $('#yeastGrid').jqxGrid('getrows'))) { | |
| 2787 | return; // grid not yet loaded. | |
| 2788 | } | |
| 2789 | rowscount = $('#yeastGrid').jqxGrid('getdatainformation').rowscount; | |
| 2790 | if (rowscount == 0) | |
| 2791 | return; // no yeast in recipe | |
| 2792 | ||
|
726
872a3635e4ef
Changed dry-yeast calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
723
diff
changeset
|
2793 | $('.primary_dry').hide(); |
|
872a3635e4ef
Changed dry-yeast calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
723
diff
changeset
|
2794 | $('.primary_liquid').hide(); |
|
872a3635e4ef
Changed dry-yeast calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
723
diff
changeset
|
2795 | |
|
620
5dae36a2d5be
Automatic starter enable/disable
Michiel Broek <mbroek@mbse.eu>
parents:
619
diff
changeset
|
2796 | var maybe_starter = 0; |
|
697
367ae7ff52f0
Version 0.3.34 Changed log messages in the daemon. Added yeast_pitchrate field to the product database. Added yeast pitchrate edit field to the yeast tab. Initial value is guessed. There is also a popup window for predefined values. An finally the value can be edited by the user. All popup windows are initialized together.
Michiel Broek <mbroek@mbse.eu>
parents:
669
diff
changeset
|
2797 | var pitchrate = 0.75; // Yeast pitch rate default |
| 478 | 2798 | for (i = 0; i < rowscount; i++) { |
| 2799 | row = $('#yeastGrid').jqxGrid('getrowdata', i); | |
| 2800 | if (row.y_use == 0) { // primary | |
|
726
872a3635e4ef
Changed dry-yeast calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
723
diff
changeset
|
2801 | if (row.y_form == 1) { |
|
872a3635e4ef
Changed dry-yeast calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
723
diff
changeset
|
2802 | // Dry yeast |
|
872a3635e4ef
Changed dry-yeast calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
723
diff
changeset
|
2803 | $('.primary_dry').show(); |
|
872a3635e4ef
Changed dry-yeast calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
723
diff
changeset
|
2804 | console.log('dry yeast: ' + row.y_gr_hl_lo + '@' + row.y_sg_lo + ' ' + row.y_gr_hl_hi + '@' + row.y_sg_hi); |
|
872a3635e4ef
Changed dry-yeast calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
723
diff
changeset
|
2805 | // Build the formule with the yeast parameters. |
|
872a3635e4ef
Changed dry-yeast calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
723
diff
changeset
|
2806 | // Based on https://www.lallemandbrewing.com/en/canada/brewers-corner/brewing-tools/pitching-rate-calculator/ |
|
872a3635e4ef
Changed dry-yeast calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
723
diff
changeset
|
2807 | var og = row.y_sg_lo; |
|
872a3635e4ef
Changed dry-yeast calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
723
diff
changeset
|
2808 | var f1 = row.y_gr_hl_lo / 100; |
|
872a3635e4ef
Changed dry-yeast calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
723
diff
changeset
|
2809 | var f2 = Round(f1 / 5, 6); |
|
872a3635e4ef
Changed dry-yeast calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
723
diff
changeset
|
2810 | // After a lot of try and error, study, the best thing to increase the pitch amount is actually |
|
872a3635e4ef
Changed dry-yeast calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
723
diff
changeset
|
2811 | // use this simple formula by Lallemand. This is about the same as sugar weight increment in the wort. |
|
872a3635e4ef
Changed dry-yeast calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
723
diff
changeset
|
2812 | var multiplier = (sg <= og) ? f1 : (f1 + f2 * (sg - og) / 0.008); |
|
872a3635e4ef
Changed dry-yeast calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
723
diff
changeset
|
2813 | console.log('sg: ' + sg + ' og: ' + og + ' f1: ' + f1 + ' f2: ' + f2 + ' multiplier: ' + multiplier); |
|
872a3635e4ef
Changed dry-yeast calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
723
diff
changeset
|
2814 | // dataRecord.starter_viability |
|
872a3635e4ef
Changed dry-yeast calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
723
diff
changeset
|
2815 | var yeast_grams = Round(volume * multiplier * (100 / dataRecord.starter_viability), 2); |
|
872a3635e4ef
Changed dry-yeast calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
723
diff
changeset
|
2816 | $('#yeast_grams').val(yeast_grams); |
|
872a3635e4ef
Changed dry-yeast calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
723
diff
changeset
|
2817 | var yeast_gr_hl = Round(yeast_grams / (volume * 0.01), 2); |
|
872a3635e4ef
Changed dry-yeast calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
723
diff
changeset
|
2818 | $('#yeast_gr_hl').val(yeast_gr_hl); |
|
872a3635e4ef
Changed dry-yeast calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
723
diff
changeset
|
2819 | console.log('need ' + yeast_grams + ' grams, gr/hl: ' + yeast_gr_hl); |
|
872a3635e4ef
Changed dry-yeast calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
723
diff
changeset
|
2820 | // obj.initgram = Round(obj.volume * multiplier_yeast_needed * (100 / obj.yeastviability), 2); |
|
872a3635e4ef
Changed dry-yeast calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
723
diff
changeset
|
2821 | |
|
617
f962f1e5936e
Implemented yeast viability calculation from the yeast production date. Changed the pitchrate logic and added Ale above 1.076 rate of 1.25.
Michiel Broek <mbroek@mbse.eu>
parents:
616
diff
changeset
|
2822 | } else { |
|
726
872a3635e4ef
Changed dry-yeast calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
723
diff
changeset
|
2823 | // Liquid yeast |
|
872a3635e4ef
Changed dry-yeast calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
723
diff
changeset
|
2824 | $('.primary_liquid').show(); |
|
872a3635e4ef
Changed dry-yeast calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
723
diff
changeset
|
2825 | // pitchrate see https://www.brewersfriend.com/yeast-pitch-rate-and-starter-calculator/ |
|
872a3635e4ef
Changed dry-yeast calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
723
diff
changeset
|
2826 | // and http://braukaiser.com/blog/blog/2012/11/03/estimating-yeast-growth/ |
|
872a3635e4ef
Changed dry-yeast calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
723
diff
changeset
|
2827 | if (row.y_type == 0) { // lager yeast |
|
872a3635e4ef
Changed dry-yeast calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
723
diff
changeset
|
2828 | pitchrate = 1.5; |
|
872a3635e4ef
Changed dry-yeast calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
723
diff
changeset
|
2829 | if (dataRecord.est_og > 1.060) |
|
872a3635e4ef
Changed dry-yeast calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
723
diff
changeset
|
2830 | pitchrate = 2.0; |
|
872a3635e4ef
Changed dry-yeast calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
723
diff
changeset
|
2831 | } else if (row.y_type == 6) { // Kveik |
|
872a3635e4ef
Changed dry-yeast calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
723
diff
changeset
|
2832 | pitchrate = 0.075; |
|
872a3635e4ef
Changed dry-yeast calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
723
diff
changeset
|
2833 | } else { |
|
872a3635e4ef
Changed dry-yeast calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
723
diff
changeset
|
2834 | pitchrate = 0.75; |
|
872a3635e4ef
Changed dry-yeast calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
723
diff
changeset
|
2835 | if (dataRecord.est_og > 1.060) |
|
872a3635e4ef
Changed dry-yeast calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
723
diff
changeset
|
2836 | pitchrate = 1.0; |
|
872a3635e4ef
Changed dry-yeast calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
723
diff
changeset
|
2837 | } |
|
872a3635e4ef
Changed dry-yeast calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
723
diff
changeset
|
2838 | if (dataRecord.yeast_pitchrate < 0.01) { |
|
872a3635e4ef
Changed dry-yeast calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
723
diff
changeset
|
2839 | dataRecord.yeast_pitchrate = pitchrate; |
|
872a3635e4ef
Changed dry-yeast calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
723
diff
changeset
|
2840 | $('#yeast_pitchrate').val(pitchrate); |
|
872a3635e4ef
Changed dry-yeast calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
723
diff
changeset
|
2841 | } |
|
620
5dae36a2d5be
Automatic starter enable/disable
Michiel Broek <mbroek@mbse.eu>
parents:
619
diff
changeset
|
2842 | maybe_starter = 1; |
|
5dae36a2d5be
Automatic starter enable/disable
Michiel Broek <mbroek@mbse.eu>
parents:
619
diff
changeset
|
2843 | } |
| 478 | 2844 | } |
| 2845 | } | |
|
620
5dae36a2d5be
Automatic starter enable/disable
Michiel Broek <mbroek@mbse.eu>
parents:
619
diff
changeset
|
2846 | |
|
697
367ae7ff52f0
Version 0.3.34 Changed log messages in the daemon. Added yeast_pitchrate field to the product database. Added yeast pitchrate edit field to the yeast tab. Initial value is guessed. There is also a popup window for predefined values. An finally the value can be edited by the user. All popup windows are initialized together.
Michiel Broek <mbroek@mbse.eu>
parents:
669
diff
changeset
|
2847 | needed = Round(dataRecord.yeast_pitchrate * volume * plato, 1); |
| 478 | 2848 | $('#need_cells').val(needed); |
| 2849 | use_cells = initcells; | |
|
620
5dae36a2d5be
Automatic starter enable/disable
Michiel Broek <mbroek@mbse.eu>
parents:
619
diff
changeset
|
2850 | if (needed <= initcells) |
|
5dae36a2d5be
Automatic starter enable/disable
Michiel Broek <mbroek@mbse.eu>
parents:
619
diff
changeset
|
2851 | maybe_starter = 0; |
|
697
367ae7ff52f0
Version 0.3.34 Changed log messages in the daemon. Added yeast_pitchrate field to the product database. Added yeast pitchrate edit field to the yeast tab. Initial value is guessed. There is also a popup window for predefined values. An finally the value can be edited by the user. All popup windows are initialized together.
Michiel Broek <mbroek@mbse.eu>
parents:
669
diff
changeset
|
2852 | console.log('calcYeast() pitchrate:' + dataRecord.yeast_pitchrate + ' start:' + initcells + ' needed:' + needed + ' volume:' + volume + ' maybe_starter:' + maybe_starter); |
|
620
5dae36a2d5be
Automatic starter enable/disable
Michiel Broek <mbroek@mbse.eu>
parents:
619
diff
changeset
|
2853 | |
|
5dae36a2d5be
Automatic starter enable/disable
Michiel Broek <mbroek@mbse.eu>
parents:
619
diff
changeset
|
2854 | if (maybe_starter != dataRecord.starter_enable) { |
|
5dae36a2d5be
Automatic starter enable/disable
Michiel Broek <mbroek@mbse.eu>
parents:
619
diff
changeset
|
2855 | dataRecord.starter_enable = maybe_starter; |
|
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:
641
diff
changeset
|
2856 | showStarter(); |
|
620
5dae36a2d5be
Automatic starter enable/disable
Michiel Broek <mbroek@mbse.eu>
parents:
619
diff
changeset
|
2857 | } |
| 478 | 2858 | |
| 2859 | if (dataRecord.starter_enable) { | |
| 2860 | calcSteps(dataRecord.starter_type, initcells, needed); | |
| 2861 | ||
| 2862 | for (i = 1; i < 5; i++) { | |
| 2863 | $('#r' + i + '_irate').html(''); | |
| 2864 | $('#r' + i + '_growf').html(''); | |
| 2865 | $('#r' + i + '_tcells').html(''); | |
| 2866 | if (parseFloat($('#prop' + i + '_volume').val()) > 0) { | |
| 2867 | if ((parseFloat($('#prop' + i + '_irate').val()) < 25) || (parseFloat($('#prop' + i + '_irate').val()) > 100)) { | |
| 2868 | $('#r' + i + '_irate').html("<img src='images/dialog-error.png'>"); | |
| 2869 | } else { | |
| 2870 | $('#r' + i + '_irate').html("<img src='images/dialog-ok-apply.png'>"); | |
| 2871 | } | |
| 2872 | if (parseFloat($('#prop' + i + '_growf').val()) < 1) | |
| 2873 | $('#r' + i + '_growf').html("<img src='images/dialog-error.png'>"); | |
| 2874 | if (($('#prop' + i + '_type').val() > 0) && (parseFloat($('#prop' + i + '_growf').val()) > 3)) | |
| 2875 | $('#r' + i + '_growf').html("<img src='images/dialog-error.png'>"); | |
| 2876 | if (parseFloat($('#prop' + i + '_tcells').val()) > needed) | |
| 2877 | $('#r' + i + '_tcells').html("<img src='images/dialog-ok-apply.png'>"); | |
| 2878 | use_cells = parseFloat($('#prop' + i + '_tcells').val()); | |
| 2879 | } else { | |
| 2880 | $('#r' + i + '_irate').html(''); | |
| 2881 | } | |
| 2882 | } | |
| 2883 | } | |
| 2884 | $('#plato_cells').val(parseFloat(use_cells / (volume * plato))); | |
| 2885 | }; | |
| 2886 | ||
| 2887 | function adjustHops(factor) { | |
| 2888 | ||
| 2889 | console.log('adjustHops(' + factor + ')'); | |
| 2890 | var row, i, amount, rowscount = $('#hopGrid').jqxGrid('getdatainformation').rowscount; | |
| 2891 | if (rowscount == 0) | |
| 2892 | return; | |
| 2893 | for (i = 0; i < rowscount; i++) { | |
| 2894 | row = $('#hopGrid').jqxGrid('getrowdata', i); | |
| 2895 | amount = row.h_amount * factor; | |
| 2896 | $('#hopGrid').jqxGrid('setcellvalue', i, 'h_amount', amount); | |
| 2897 | } | |
| 2898 | }; | |
| 2899 | ||
|
538
41d21817608e
Added the IBU contribution for whirlpool hops.
Michiel Broek <mbroek@mbse.eu>
parents:
525
diff
changeset
|
2900 | function whirlpoolHops() { |
|
41d21817608e
Added the IBU contribution for whirlpool hops.
Michiel Broek <mbroek@mbse.eu>
parents:
525
diff
changeset
|
2901 | var row, i, time, rowscount; |
|
539
fe9ac6d49c4f
Printed outputs have IBUs for whirlpool hops. Removed some debug console logs.
Michiel Broek <mbroek@mbse.eu>
parents:
538
diff
changeset
|
2902 | if (!(rowscount = $('#hopGrid').jqxGrid('getdatainformation').rowscount)) |
|
538
41d21817608e
Added the IBU contribution for whirlpool hops.
Michiel Broek <mbroek@mbse.eu>
parents:
525
diff
changeset
|
2903 | return; |
|
41d21817608e
Added the IBU contribution for whirlpool hops.
Michiel Broek <mbroek@mbse.eu>
parents:
525
diff
changeset
|
2904 | if (rowscount == 0) |
|
41d21817608e
Added the IBU contribution for whirlpool hops.
Michiel Broek <mbroek@mbse.eu>
parents:
525
diff
changeset
|
2905 | return; |
|
41d21817608e
Added the IBU contribution for whirlpool hops.
Michiel Broek <mbroek@mbse.eu>
parents:
525
diff
changeset
|
2906 | for (i = 0; i < rowscount; i++) { |
|
41d21817608e
Added the IBU contribution for whirlpool hops.
Michiel Broek <mbroek@mbse.eu>
parents:
525
diff
changeset
|
2907 | row = $('#hopGrid').jqxGrid('getrowdata', i); |
|
41d21817608e
Added the IBU contribution for whirlpool hops.
Michiel Broek <mbroek@mbse.eu>
parents:
525
diff
changeset
|
2908 | if (row.h_useat == 4) { |
|
41d21817608e
Added the IBU contribution for whirlpool hops.
Michiel Broek <mbroek@mbse.eu>
parents:
525
diff
changeset
|
2909 | time = parseFloat(dataRecord.brew_whirlpool9) + parseFloat(dataRecord.brew_whirlpool7) + parseFloat(dataRecord.brew_whirlpool6); |
|
41d21817608e
Added the IBU contribution for whirlpool hops.
Michiel Broek <mbroek@mbse.eu>
parents:
525
diff
changeset
|
2910 | $('#hopGrid').jqxGrid('setcellvalue', i, 'h_time', time); |
|
41d21817608e
Added the IBU contribution for whirlpool hops.
Michiel Broek <mbroek@mbse.eu>
parents:
525
diff
changeset
|
2911 | } |
|
41d21817608e
Added the IBU contribution for whirlpool hops.
Michiel Broek <mbroek@mbse.eu>
parents:
525
diff
changeset
|
2912 | } |
|
41d21817608e
Added the IBU contribution for whirlpool hops.
Michiel Broek <mbroek@mbse.eu>
parents:
525
diff
changeset
|
2913 | }; |
|
41d21817608e
Added the IBU contribution for whirlpool hops.
Michiel Broek <mbroek@mbse.eu>
parents:
525
diff
changeset
|
2914 | |
| 478 | 2915 | function calcMiscs() { |
| 2916 | ||
| 2917 | ok_miscs = 1; | |
| 2918 | var row, i, rowscount = $('#miscGrid').jqxGrid('getdatainformation').rowscount; | |
| 2919 | if (rowscount == 0) | |
| 2920 | return; | |
| 2921 | for (i = 0; i < rowscount; i++) { | |
| 2922 | row = $('#miscGrid').jqxGrid('getrowdata', i); | |
| 2923 | if ((((dataRecord.inventory_reduced <= 2) && (row.m_use_use <= 2)) || // Starter, Mash, Boil | |
| 2924 | ((dataRecord.inventory_reduced <= 3) && (row.m_use_use == 3)) || // Primary | |
| 2925 | ((dataRecord.inventory_reduced <= 5) && (row.m_use_use == 4)) || // Secondary, Teriary | |
| 2926 | ((dataRecord.inventory_reduced <= 6) && (row.m_use_use == 5))) && // Bottle | |
| 2927 | (row.m_inventory < row.m_amount)) { | |
| 2928 | ok_miscs = 0; | |
| 2929 | } | |
| 2930 | } | |
| 2931 | calcSupplies(); | |
| 2932 | }; | |
| 2933 | ||
| 2934 | function adjustMiscs(factor) { | |
| 2935 | ||
| 2936 | console.log('adjustMiscs(' + factor + ')'); | |
| 2937 | var row, i, amount, rowscount = $('#miscGrid').jqxGrid('getdatainformation').rowscount; | |
| 2938 | if (rowscount == 0) | |
| 2939 | return; | |
| 2940 | for (i = 0; i < rowscount; i++) { | |
| 2941 | row = $('#miscGrid').jqxGrid('getrowdata', i); | |
| 2942 | amount = row.m_amount * factor; | |
| 2943 | $('#miscGrid').jqxGrid('setcellvalue', i, 'm_amount', amount); | |
| 2944 | switch (row.m_name) { | |
| 2945 | case 'CaCl2': | |
| 2946 | $('#wa_cacl2').val(row.m_amount * 1000); | |
| 2947 | break; | |
| 2948 | case 'CaSO4': | |
| 2949 | $('#wa_caso4').val(row.m_amount * 1000); | |
| 2950 | break; | |
| 2951 | case 'MgSO4': | |
| 2952 | $('#wa_mgso4').val(row.m_amount * 1000); | |
| 2953 | break; | |
| 2954 | case 'NaCl': | |
| 2955 | $('#wa_nacl').val(row.m_amount * 1000); | |
| 2956 | break; | |
| 2957 | case 'Melkzuur': | |
| 2958 | case 'Zoutzuur': | |
| 2959 | case 'Fosforzuur': | |
| 2960 | case 'Zwavelzuur': | |
| 2961 | $('#wa_acid').val(row.m_amount * 1000); | |
| 2962 | break; | |
| 2963 | case 'NaHCO3': | |
| 2964 | case 'Na2CO3': | |
| 2965 | case 'CaCO3': | |
| 2966 | case 'Ca(OH)2': | |
| 2967 | $('#wa_base').val(row.m_amount * 1000); | |
| 2968 | break; | |
| 2969 | } | |
| 2970 | } | |
| 2971 | }; | |
| 2972 | ||
| 2973 | function adjustYeasts(factor) { | |
| 2974 | ||
| 2975 | console.log('adjustYeasts(' + factor + ')'); | |
| 2976 | var row, i, amount, rowscount = $('#yeastGrid').jqxGrid('getdatainformation').rowscount; | |
| 2977 | if (rowscount == 0) | |
| 2978 | return; | |
| 2979 | for (i = 0; i < rowscount; i++) { | |
| 2980 | row = $('#yeastGrid').jqxGrid('getrowdata', i); | |
|
515
9d771385a8a0
Added dried yeast form. Pitch rate for Kveik initially set at 0.25. Dried Kveik cells set to 9000000000 cells/gram.
Michiel Broek <mbroek@mbse.eu>
parents:
500
diff
changeset
|
2981 | if (! dataRecord.starter_enable) { // Only adjust without a starter |
| 478 | 2982 | amount = row.y_amount * factor; |
| 2983 | $('#yeastGrid').jqxGrid('setcellvalue', i, 'y_amount', amount); | |
| 2984 | } | |
| 2985 | } | |
| 2986 | calcYeast(); | |
| 2987 | }; | |
| 2988 | ||
| 2989 | function adjustWaters(factor) { | |
| 2990 | ||
| 2991 | console.log('adjustWaters(' + factor + ')'); | |
| 2992 | var amount, row, i, rowscount = $('#mashGrid').jqxGrid('getdatainformation').rowscount; | |
| 2993 | if (rowscount == 0) | |
| 2994 | return; | |
| 2995 | mash_infuse = 0; | |
| 2996 | for (i = 0; i < rowscount; i++) { | |
| 2997 | row = $('#mashGrid').jqxGrid('getrowdata', i); | |
| 2998 | if (row.step_type == 0) { // Infusion | |
|
612
576128de01e3
Fixed mash infuse amount division
Michiel Broek <mbroek@mbse.eu>
parents:
610
diff
changeset
|
2999 | amount = Round(parseFloat(row.step_infuse_amount) * factor, 1); |
| 478 | 3000 | $('#mashGrid').jqxGrid('setcellvalue', i, 'step_infuse_amount', amount); |
| 3001 | mash_infuse += amount; | |
| 3002 | } | |
| 3003 | } | |
| 3004 | if (dataRecord.w2_amount == 0) { | |
| 3005 | dataRecord.w1_amount = mash_infuse; | |
| 3006 | $('#w1_amount').val(mash_infuse); | |
| 3007 | } else { | |
|
612
576128de01e3
Fixed mash infuse amount division
Michiel Broek <mbroek@mbse.eu>
parents:
610
diff
changeset
|
3008 | var w1_amount = (dataRecord.w1_amount / (dataRecord.w1_amount + dataRecord.w2_amount)) * mash_infuse; |
|
576128de01e3
Fixed mash infuse amount division
Michiel Broek <mbroek@mbse.eu>
parents:
610
diff
changeset
|
3009 | var w2_amount = (dataRecord.w2_amount / (dataRecord.w1_amount + dataRecord.w2_amount)) * mash_infuse; |
|
576128de01e3
Fixed mash infuse amount division
Michiel Broek <mbroek@mbse.eu>
parents:
610
diff
changeset
|
3010 | dataRecord.w1_amount = Round(w1_amount, 3); |
|
576128de01e3
Fixed mash infuse amount division
Michiel Broek <mbroek@mbse.eu>
parents:
610
diff
changeset
|
3011 | dataRecord.w2_amount = Round(w2_amount, 3); |
| 478 | 3012 | $('#w1_amount').val(dataRecord.w1_amount); |
| 3013 | $('#w2_amount').val(dataRecord.w2_amount); | |
| 3014 | } | |
| 3015 | $('#wg_amount').val(mash_infuse); | |
| 3016 | }; | |
| 3017 | ||
| 3018 | function calcMashEfficiency() { | |
| 3019 | var c, m; | |
| 3020 | if (parseFloat($('#brew_mash_sg').jqxNumberInput('decimal')) < 1.002) | |
| 3021 | return; | |
| 3022 | c = sg_to_plato(est_mash_sg); | |
| 3023 | m = sg_to_plato(parseFloat($('#brew_mash_sg').jqxNumberInput('decimal'))); | |
| 3024 | if (c > 0.5) | |
| 3025 | $('#brew_mash_efficiency').val(100 * m / c); | |
| 3026 | else | |
| 3027 | $('#brew_mash_efficiency').val(0); | |
| 3028 | }; | |
| 3029 | ||
| 3030 | function calcEfficiencyBeforeBoil() { | |
| 3031 | var m = 0, rows = {}, i, row, tot, result = 0; | |
| 3032 | if (!(rows = $('#fermentableGrid').jqxGrid('getrows'))) { | |
| 3033 | return; // grid not yet loaded. | |
| 3034 | } | |
| 3035 | for (i = 0; i < rows.length; i++) { | |
| 3036 | row = rows[i]; | |
| 3037 | if (row.f_added == 0) { // Mash | |
| 3038 | m += row.f_amount * (row.f_yield / 100) * (1 - row.f_moisture / 100); | |
| 3039 | } | |
| 3040 | } | |
| 3041 | tot = sg_to_plato(dataRecord.brew_preboil_sg) * (dataRecord.brew_preboil_volume / 1.04) * dataRecord.brew_preboil_sg * 10 / 1000; | |
| 3042 | if (m > 0) | |
| 3043 | result = Round((tot / m * 100), 1); | |
| 3044 | if (result < 0) | |
| 3045 | result = 0; | |
| 3046 | $('#brew_preboil_efficiency').val(result); | |
| 3047 | } | |
| 3048 | ||
| 3049 | function calcEfficiencyAfterBoil() { | |
| 3050 | var m = 0, // Sugars added at mash | |
| 3051 | b = 0, // Sugars added at boil | |
| 3052 | rows = {}, i, row, tot, result = 0; | |
| 3053 | if (!(rows = $('#fermentableGrid').jqxGrid('getrows'))) { | |
| 3054 | return; // grid not yet loaded. | |
| 3055 | } | |
| 3056 | for (i = 0; i < rows.length; i++) { | |
| 3057 | row = rows[i]; | |
| 3058 | if (row.f_added == 0) { // Mash | |
| 3059 | m += row.f_amount * (row.f_yield / 100) * (1 - row.f_moisture / 100); | |
| 3060 | } else if (row.f_added == 1) { // Boil | |
| 3061 | b += row.f_amount * (row.f_yield / 100) * (1 - row.f_moisture / 100); | |
| 3062 | } | |
| 3063 | } | |
| 3064 | tot = sg_to_plato(dataRecord.brew_aboil_sg) * (dataRecord.brew_aboil_volume / 1.04) * dataRecord.brew_aboil_sg * 10 / 1000; | |
| 3065 | tot -= b; // total sugars in wort minus added sugars. | |
| 3066 | if (m > 0) | |
| 3067 | result = Round((tot / m * 100), 1); | |
| 3068 | if (result < 0) | |
| 3069 | result = 0; | |
| 3070 | dataRecord.brew_aboil_efficiency = result; | |
| 3071 | $('#brew_aboil_efficiency').val(result); | |
| 3072 | } | |
| 3073 | ||
| 3074 | function GetBUGU() { | |
| 3075 | var gu = (dataRecord.est_og - 1) * 1000; | |
| 3076 | if (gu > 0) | |
| 3077 | return dataRecord.est_ibu / gu; | |
| 3078 | else | |
| 3079 | return 0.5; | |
| 3080 | } | |
| 3081 | ||
|
552
ee0db754111e
In calcWater() the optimum SO4:Cl ratio is taken from the target profile if set, else it's calculated from the BUGU value. Swapped Cl:SO4 to SO4:Cl ratio presentation. Added remark text next to the Optimal SO4:Cl ratio.
Michiel Broek <mbroek@mbse.eu>
parents:
545
diff
changeset
|
3082 | function GetOptSO4Clratio() { |
|
ee0db754111e
In calcWater() the optimum SO4:Cl ratio is taken from the target profile if set, else it's calculated from the BUGU value. Swapped Cl:SO4 to SO4:Cl ratio presentation. Added remark text next to the Optimal SO4:Cl ratio.
Michiel Broek <mbroek@mbse.eu>
parents:
545
diff
changeset
|
3083 | if (parseFloat($('#pr_sulfate').jqxNumberInput('decimal')) > 0 && parseFloat($('#pr_chloride').jqxNumberInput('decimal'))) { |
|
ee0db754111e
In calcWater() the optimum SO4:Cl ratio is taken from the target profile if set, else it's calculated from the BUGU value. Swapped Cl:SO4 to SO4:Cl ratio presentation. Added remark text next to the Optimal SO4:Cl ratio.
Michiel Broek <mbroek@mbse.eu>
parents:
545
diff
changeset
|
3084 | return (parseFloat($('#pr_sulfate').jqxNumberInput('decimal')) / parseFloat($('#pr_chloride').jqxNumberInput('decimal'))); |
|
ee0db754111e
In calcWater() the optimum SO4:Cl ratio is taken from the target profile if set, else it's calculated from the BUGU value. Swapped Cl:SO4 to SO4:Cl ratio presentation. Added remark text next to the Optimal SO4:Cl ratio.
Michiel Broek <mbroek@mbse.eu>
parents:
545
diff
changeset
|
3085 | } else { |
|
ee0db754111e
In calcWater() the optimum SO4:Cl ratio is taken from the target profile if set, else it's calculated from the BUGU value. Swapped Cl:SO4 to SO4:Cl ratio presentation. Added remark text next to the Optimal SO4:Cl ratio.
Michiel Broek <mbroek@mbse.eu>
parents:
545
diff
changeset
|
3086 | var BUGU = GetBUGU(); |
|
ee0db754111e
In calcWater() the optimum SO4:Cl ratio is taken from the target profile if set, else it's calculated from the BUGU value. Swapped Cl:SO4 to SO4:Cl ratio presentation. Added remark text next to the Optimal SO4:Cl ratio.
Michiel Broek <mbroek@mbse.eu>
parents:
545
diff
changeset
|
3087 | return (1.0 / (-1.2 * BUGU + 1.4)); |
|
ee0db754111e
In calcWater() the optimum SO4:Cl ratio is taken from the target profile if set, else it's calculated from the BUGU value. Swapped Cl:SO4 to SO4:Cl ratio presentation. Added remark text next to the Optimal SO4:Cl ratio.
Michiel Broek <mbroek@mbse.eu>
parents:
545
diff
changeset
|
3088 | } |
| 478 | 3089 | } |
| 3090 | ||
| 3091 | function setWaterAgent(name, amount) { | |
| 3092 | var row, i, id, found = false, miscs, rows = $('#miscGrid').jqxGrid('getrows'); | |
| 3093 | if (amount == 0) { | |
| 3094 | for (i = 0; i < rows.length; i++) { | |
| 3095 | row = rows[i]; | |
| 3096 | if (row.m_name == name) { | |
| 3097 | id = $('#miscGrid').jqxGrid('getrowid', i); | |
| 3098 | $('#miscGrid').jqxGrid('deleterow', id); | |
| 3099 | } | |
| 3100 | } | |
| 3101 | } else { | |
| 3102 | for (i = 0; i < rows.length; i++) { | |
| 3103 | row = rows[i]; | |
| 3104 | if (row.m_name == name) { | |
| 3105 | found = true; | |
| 3106 | $('#miscGrid').jqxGrid('setcellvalue', i, 'm_amount', amount / 1000); | |
| 3107 | break; | |
| 3108 | } | |
| 3109 | } | |
| 3110 | if (! found) { | |
| 3111 | miscs = new $.jqx.dataAdapter(miscInvSource, { | |
| 3112 | loadComplete: function() { | |
| 3113 | var record, i, row = {}, records = miscs.records; | |
| 3114 | for (i = 0; i < records.length; i++) { | |
| 3115 | record = records[i]; | |
| 3116 | if (record.name == name) { | |
| 3117 | row['m_name'] = record.name; | |
| 3118 | row['m_amount'] = amount / 1000; | |
| 3119 | row['m_cost'] = record.cost; | |
| 3120 | row['m_type'] = record.type; | |
| 3121 | row['m_use_use'] = record.use_use; | |
| 3122 | row['m_time'] = 0; | |
| 3123 | row['m_amount_is_weight'] = record.amount_is_weight; | |
| 3124 | row['m_inventory'] = record.inventory; | |
| 3125 | row['m_avail'] = 1; | |
| 3126 | $('#miscGrid').jqxGrid('addrow', null, row); | |
| 3127 | } | |
| 3128 | } | |
| 3129 | } | |
| 3130 | }); | |
| 3131 | miscs.dataBind(); | |
| 3132 | return; | |
| 3133 | } | |
| 3134 | } | |
| 3135 | } | |
| 3136 | ||
| 3137 | function setRangeIndicator(ion, rangeCode) { | |
| 3138 | if ((rangeCode == 'laag') || (rangeCode == 'hoog')) | |
| 3139 | $('#wr_' + ion).html("<img src='images/dialog-error.png'><span style='vertical-align: top; font-size: 10px; font-style: italic;'>" + rangeCode + '</span>'); | |
| 3140 | else | |
| 3141 | $('#wr_' + ion).html("<img src='images/dialog-ok-apply.png'>"); | |
| 3142 | } | |
| 3143 | ||
| 3144 | function mix(v1, v2, c1, c2) { | |
| 3145 | if ((v1 + v2) > 0) { | |
| 3146 | return ((v1 * c1) + (v2 * c2)) / (v1 + v2); | |
| 3147 | } | |
| 3148 | return 0; | |
| 3149 | } | |
| 3150 | ||
| 3151 | function PartCO3(pH) { | |
| 3152 | var H = Math.pow(10, -pH); | |
| 3153 | return 100 * Ka1 * Ka2 / (H * H + H * Ka1 + Ka1 * Ka2); | |
| 3154 | } | |
| 3155 | ||
| 3156 | function PartHCO3(pH) { | |
| 3157 | var H = Math.pow(10, -pH); | |
| 3158 | return 100 * Ka1 * H / (H * H + H * Ka1 + Ka1 * Ka2); | |
| 3159 | } | |
| 3160 | ||
| 3161 | function Charge(pH) { | |
| 3162 | return (-2 * PartCO3(pH) - PartHCO3(pH)); | |
| 3163 | } | |
| 3164 | ||
| 3165 | //Z alkalinity is the amount of acid (in mEq/l) needed to bring water to the target pH (Z pH) | |
| 3166 | function ZAlkalinity(pHZ) { | |
| 3167 | var C43 = Charge(4.3), | |
| 3168 | Cw = Charge(parseFloat($('#wg_ph').jqxNumberInput('decimal'))), | |
| 3169 | Cz = Charge(pHZ), | |
| 3170 | DeltaCNaught = -C43 + Cw, | |
| 3171 | CT = parseFloat($('#wg_total_alkalinity').jqxNumberInput('decimal')) / 50 / DeltaCNaught, | |
| 3172 | DeltaCZ = -Cz + Cw; | |
| 3173 | return CT * DeltaCZ; | |
| 3174 | } | |
| 3175 | ||
| 3176 | //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) | |
| 3177 | function ZRA(pHZ) { | |
| 3178 | ||
| 3179 | var Magn, Z, Calc = parseFloat($('#wg_calcium').jqxNumberInput('decimal')) / (MMCa / 2); | |
| 3180 | Magn = parseFloat($('#wg_magnesium').jqxNumberInput('decimal')) / (MMMg / 2); | |
| 3181 | Z = ZAlkalinity(pHZ); | |
| 3182 | return Z - (Calc / 3.5 + Magn / 7); | |
| 3183 | } | |
| 3184 | ||
|
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
|
3185 | 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
|
3186 | 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
|
3187 | 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
|
3188 | 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
|
3189 | } else { |
|
622
39902353b159
Workaround for hang during startup. Changed order of displayed fields on the yeast tab. Tooltip text changes. More decimals on the checklist for misc ingredients. More decimals for the starter on product print.
Michiel Broek <mbroek@mbse.eu>
parents:
621
diff
changeset
|
3190 | // If the acid_to_ph_5.7 is unknown from the maltster, guess the required 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
|
3191 | switch (graintype) { |
|
622
39902353b159
Workaround for hang during startup. Changed order of displayed fields on the yeast tab. Tooltip text changes. More decimals on the checklist for misc ingredients. More decimals for the starter on product print.
Michiel Broek <mbroek@mbse.eu>
parents:
621
diff
changeset
|
3192 | case 0: // Base, Special, Kilned |
|
39902353b159
Workaround for hang during startup. Changed order of displayed fields on the yeast tab. Tooltip text changes. More decimals on the checklist for misc ingredients. More decimals for the starter on product print.
Michiel Broek <mbroek@mbse.eu>
parents:
621
diff
changeset
|
3193 | case 3: |
|
39902353b159
Workaround for hang during startup. Changed order of displayed fields on the yeast tab. Tooltip text changes. More decimals on the checklist for misc ingredients. More decimals for the starter on product print.
Michiel Broek <mbroek@mbse.eu>
parents:
621
diff
changeset
|
3194 | case 5: C1 = 0.014 * ebc - 34.192; |
|
39902353b159
Workaround for hang during startup. Changed order of displayed fields on the yeast tab. Tooltip text changes. More decimals on the checklist for misc ingredients. More decimals for the starter on product print.
Michiel Broek <mbroek@mbse.eu>
parents:
621
diff
changeset
|
3195 | break; |
|
39902353b159
Workaround for hang during startup. Changed order of displayed fields on the yeast tab. Tooltip text changes. More decimals on the checklist for misc ingredients. More decimals for the starter on product print.
Michiel Broek <mbroek@mbse.eu>
parents:
621
diff
changeset
|
3196 | case 2: C1 = -0.0597 * ebc - 32.457; // Crystal |
|
39902353b159
Workaround for hang during startup. Changed order of displayed fields on the yeast tab. Tooltip text changes. More decimals on the checklist for misc ingredients. More decimals for the starter on product print.
Michiel Broek <mbroek@mbse.eu>
parents:
621
diff
changeset
|
3197 | break; |
|
39902353b159
Workaround for hang during startup. Changed order of displayed fields on the yeast tab. Tooltip text changes. More decimals on the checklist for misc ingredients. More decimals for the starter on product print.
Michiel Broek <mbroek@mbse.eu>
parents:
621
diff
changeset
|
3198 | case 1: C1 = 0.0107 * ebc - 54.768; // Roast |
|
39902353b159
Workaround for hang during startup. Changed order of displayed fields on the yeast tab. Tooltip text changes. More decimals on the checklist for misc ingredients. More decimals for the starter on product print.
Michiel Broek <mbroek@mbse.eu>
parents:
621
diff
changeset
|
3199 | break; |
|
39902353b159
Workaround for hang during startup. Changed order of displayed fields on the yeast tab. Tooltip text changes. More decimals on the checklist for misc ingredients. More decimals for the starter on product print.
Michiel Broek <mbroek@mbse.eu>
parents:
621
diff
changeset
|
3200 | case 4: C1 = -149; // Sour malt |
|
39902353b159
Workaround for hang during startup. Changed order of displayed fields on the yeast tab. Tooltip text changes. More decimals on the checklist for misc ingredients. More decimals for the starter on product print.
Michiel Broek <mbroek@mbse.eu>
parents:
621
diff
changeset
|
3201 | break; |
|
39902353b159
Workaround for hang during startup. Changed order of displayed fields on the yeast tab. Tooltip text changes. More decimals on the checklist for misc ingredients. More decimals for the starter on product print.
Michiel Broek <mbroek@mbse.eu>
parents:
621
diff
changeset
|
3202 | } |
|
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
|
3203 | } |
|
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
|
3204 | 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
|
3205 | } |
|
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
|
3206 | |
|
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
|
3207 | function ProtonDeficit(pHZ) { |
|
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
|
3208 | |
|
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
|
3209 | var rows, i, C1, x, Result = ZRA(pHZ) * parseFloat($('#wg_amount').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
|
3210 | // proton deficit for the grist |
|
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
|
3211 | 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
|
3212 | 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
|
3213 | 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
|
3214 | 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
|
3215 | C1 = BufferCapacity(row.f_di_ph, row.f_acid_to_ph_57, row.f_color, row.f_graintype); |
|
622
39902353b159
Workaround for hang during startup. Changed order of displayed fields on the yeast tab. Tooltip text changes. More decimals on the checklist for misc ingredients. More decimals for the starter on product print.
Michiel Broek <mbroek@mbse.eu>
parents:
621
diff
changeset
|
3216 | x = C1 * (pHZ - row.f_di_ph); // AcidRequired(ZpH) |
|
39902353b159
Workaround for hang during startup. Changed order of displayed fields on the yeast tab. Tooltip text changes. More decimals on the checklist for misc ingredients. More decimals for the starter on product print.
Michiel Broek <mbroek@mbse.eu>
parents:
621
diff
changeset
|
3217 | Result += x * row.f_amount; |
| 478 | 3218 | } |
| 3219 | } | |
|
622
39902353b159
Workaround for hang during startup. Changed order of displayed fields on the yeast tab. Tooltip text changes. More decimals on the checklist for misc ingredients. More decimals for the starter on product print.
Michiel Broek <mbroek@mbse.eu>
parents:
621
diff
changeset
|
3220 | } else { |
|
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:
641
diff
changeset
|
3221 | error_count++; |
|
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:
641
diff
changeset
|
3222 | if (error_count < 5) |
|
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:
641
diff
changeset
|
3223 | console.log('ProtonDeficit(' + pHZ + ') invalid grist, return ' + Result); |
| 478 | 3224 | } |
| 3225 | return Result; | |
| 3226 | } | |
| 3227 | ||
| 3228 | function MashpH() { | |
|
643
9ac2fb6b1311
Added failsave starting calcWater() when the main data is not yet loaded.
Michiel Broek <mbroek@mbse.eu>
parents:
642
diff
changeset
|
3229 | |
| 478 | 3230 | var n = 0, pH = 5.4, deltapH = 0.001, deltapd = 0.1, pd = ProtonDeficit(pH); |
| 3231 | while (((pd < -deltapd) || (pd > deltapd)) && (n < 2000)) { | |
| 3232 | n++; | |
| 3233 | if (pd < -deltapd) | |
| 3234 | pH -= deltapH; | |
| 3235 | else if (pd > deltapd) | |
| 3236 | pH += deltapH; | |
| 3237 | pd = ProtonDeficit(pH); | |
| 3238 | } | |
|
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
|
3239 | pH = Round(pH, 6); |
|
644
4654b8ee4690
Version 0.3.30 Code and logging cleanup.
Michiel Broek <mbroek@mbse.eu>
parents:
643
diff
changeset
|
3240 | //console.log('MashpH() n: ' + n + ' pH: ' + pH); |
| 478 | 3241 | return pH; |
| 3242 | } | |
| 3243 | ||
| 3244 | function calcWater() { | |
| 3245 | ||
|
644
4654b8ee4690
Version 0.3.30 Code and logging cleanup.
Michiel Broek <mbroek@mbse.eu>
parents:
643
diff
changeset
|
3246 | /* Can be called during loading and building the screens */ |
|
643
9ac2fb6b1311
Added failsave starting calcWater() when the main data is not yet loaded.
Michiel Broek <mbroek@mbse.eu>
parents:
642
diff
changeset
|
3247 | if (! data_loaded) { |
|
644
4654b8ee4690
Version 0.3.30 Code and logging cleanup.
Michiel Broek <mbroek@mbse.eu>
parents:
643
diff
changeset
|
3248 | 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
|
3249 | return; |
|
9ac2fb6b1311
Added failsave starting calcWater() when the main data is not yet loaded.
Michiel Broek <mbroek@mbse.eu>
parents:
642
diff
changeset
|
3250 | } |
|
9ac2fb6b1311
Added failsave starting calcWater() when the main data is not yet loaded.
Michiel Broek <mbroek@mbse.eu>
parents:
642
diff
changeset
|
3251 | |
| 478 | 3252 | var liters = 0, |
| 3253 | calcium = 0, | |
| 3254 | magnesium = 0, | |
| 3255 | sodium = 0, | |
| 3256 | total_alkalinity = 0, | |
| 3257 | chloride = 0, | |
| 3258 | sulfate = 0, | |
| 3259 | ph = 0, | |
| 3260 | RA = 0, | |
| 3261 | frac = 0, | |
| 3262 | TpH = 0, | |
| 3263 | 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
|
3264 | AT, BT, |
| 478 | 3265 | r1d, r2d, f1d, f2d, f3d, |
| 3266 | 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
|
3267 | Res; |
| 478 | 3268 | |
| 3269 | if (dataRecord.w1_name == '') { | |
| 3270 | return; | |
| 3271 | } | |
| 3272 | ||
| 3273 | // If there is a dillute water source, mix the waters. | |
| 3274 | if (dataRecord.w2_name != '') { | |
| 3275 | liters = dataRecord.w1_amount + dataRecord.w2_amount; | |
| 3276 | calcium = mix(dataRecord.w1_amount, dataRecord.w2_amount, dataRecord.w1_calcium, dataRecord.w2_calcium); | |
| 3277 | magnesium = mix(dataRecord.w1_amount, dataRecord.w2_amount, dataRecord.w1_magnesium, dataRecord.w2_magnesium); | |
| 3278 | sodium = mix(dataRecord.w1_amount, dataRecord.w2_amount, dataRecord.w1_sodium, dataRecord.w2_sodium); | |
| 3279 | chloride = mix(dataRecord.w1_amount, dataRecord.w2_amount, dataRecord.w1_chloride, dataRecord.w2_chloride); | |
| 3280 | sulfate = mix(dataRecord.w1_amount, dataRecord.w2_amount, dataRecord.w1_sulfate, dataRecord.w2_sulfate); | |
| 3281 | total_alkalinity = mix(dataRecord.w1_amount, dataRecord.w2_amount, dataRecord.w1_total_alkalinity, dataRecord.w2_total_alkalinity); | |
| 3282 | ph = -Math.log10(((Math.pow(10, -dataRecord.w1_ph) * dataRecord.w1_amount) + (Math.pow(10, -dataRecord.w2_ph) * dataRecord.w2_amount)) / liters); | |
| 3283 | } else { | |
| 3284 | liters = dataRecord.w1_amount; | |
| 3285 | calcium = dataRecord.w1_calcium; | |
| 3286 | magnesium = dataRecord.w1_magnesium; | |
| 3287 | sodium = dataRecord.w1_sodium; | |
| 3288 | chloride = dataRecord.w1_chloride; | |
| 3289 | sulfate = dataRecord.w1_sulfate; | |
| 3290 | total_alkalinity = dataRecord.w1_total_alkalinity; | |
| 3291 | ph = dataRecord.w1_ph; | |
| 3292 | } | |
|
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
|
3293 | 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
|
3294 | |
|
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
|
3295 | /* 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
|
3296 | 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
|
3297 | 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
|
3298 | 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
|
3299 | 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
|
3300 | 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
|
3301 | var wg_bicarbonate = bicarbonate; |
|
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
|
3302 | |
| 478 | 3303 | $('#wg_amount').val(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
|
3304 | $('#wg_calcium').val(Round(calcium, 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
|
3305 | $('#wg_magnesium').val(Round(magnesium, 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
|
3306 | $('#wg_sodium').val(Round(sodium, 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
|
3307 | $('#wg_total_alkalinity').val(Round(total_alkalinity, 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
|
3308 | $('#wg_chloride').val(Round(chloride, 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
|
3309 | $('#wg_sulfate').val(Round(sulfate, 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
|
3310 | $('#wg_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
|
3311 | |
|
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
|
3312 | 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
|
3313 | console.log('Distilled water mash pH: ' + mash_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
|
3314 | |
|
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
|
3315 | /* 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
|
3316 | 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
|
3317 | calcium += (parseFloat($('#wa_cacl2').jqxNumberInput('decimal')) * MMCa / MMCaCl2 * 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
|
3318 | parseFloat($('#wa_caso4').jqxNumberInput('decimal')) * MMCa / MMCaSO4 * 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
|
3319 | magnesium += (parseFloat($('#wa_mgso4').jqxNumberInput('decimal')) * MMMg / 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
|
3320 | sodium += (parseFloat($('#wa_nacl').jqxNumberInput('decimal')) * MMNa / MMNaCl * 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
|
3321 | parseFloat($('#wa_base').jqxNumberInput('decimal')) * MMNa / MMNaHCO3 * 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
|
3322 | 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
|
3323 | 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
|
3324 | chloride += (2 * parseFloat($('#wa_cacl2').jqxNumberInput('decimal')) * MMCl / MMCaCl2 * 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
|
3325 | parseFloat($('#wa_nacl').jqxNumberInput('decimal')) * MMCl / MMNaCl * 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
|
3326 | } |
|
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
|
3327 | |
|
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
|
3328 | if (dataRecord.wa_acid_name < 0 || dataRecord,wa_acid_name >= AcidTypeData.length) { |
| 478 | 3329 | $('#wa_acid_name').val(0); |
| 3330 | 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
|
3331 | 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
|
3332 | $('#wa_acid_perc').val(AcidTypeData[0].AcidPrc); |
| 478 | 3333 | } |
| 3334 | 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
|
3335 | last_acid = AcidTypeData[dataRecord.wa_acid_name].nl; |
|
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
|
3336 | |
|
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
|
3337 | 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
|
3338 | 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
|
3339 | $('#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
|
3340 | } |
|
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
|
3341 | |
|
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
|
3342 | if (dataRecord.wa_base_name < 0 || dataRecord.wa_base_name > 3) { |
| 478 | 3343 | $('#wa_base_name').val(0); |
| 3344 | dataRecord.wa_base_name = 0; | |
| 3345 | } | |
| 3346 | if (last_base == '') | |
|
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
|
3347 | last_base = BaseTypeData[dataRecord.wa_base_name].nl; |
| 478 | 3348 | |
| 3349 | AT = dataRecord.wa_acid_name; | |
| 3350 | BT = dataRecord.wa_base_name; | |
| 3351 | ||
|
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
|
3352 | /* 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
|
3353 | This pH change is at most 0.1 pH and is a minor difference in Acid amount. */ |
| 478 | 3354 | |
| 3355 | 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
|
3356 | /* Auto 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
|
3357 | $('.c_mashph').show(); |
| 478 | 3358 | TpH = parseFloat(dataRecord.mash_ph); |
| 3359 | protonDeficit = ProtonDeficit(TpH); | |
|
644
4654b8ee4690
Version 0.3.30 Code and logging cleanup.
Michiel Broek <mbroek@mbse.eu>
parents:
643
diff
changeset
|
3360 | //console.log('calc_acid tgt: ' + TpH + ' protonDeficit: ' + protonDeficit); |
| 478 | 3361 | if (protonDeficit > 0) { // Add acid |
| 3362 | $('#wa_base').val(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
|
3363 | dataRecord.wa_base = 0; |
| 478 | 3364 | setWaterAgent(last_base, 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
|
3365 | frac = CalcFrac(TpH, AcidTypeData[AT].pK1, AcidTypeData[AT].pK2, AcidTypeData[AT].pK3); |
| 478 | 3366 | 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
|
3367 | Acid *= AcidTypeData[AT].MolWt; // mg |
| 478 | 3368 | 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
|
3369 | 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
|
3370 | 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
|
3371 | console.log('Mash auto Acid final ml: ' + Acid); |
|
495
fdbb6bfae569
Disabled some console.log items.
Michiel Broek <mbroek@mbse.eu>
parents:
490
diff
changeset
|
3372 | $('#wa_acid').val(Acid); |
|
fdbb6bfae569
Disabled some console.log items.
Michiel Broek <mbroek@mbse.eu>
parents:
490
diff
changeset
|
3373 | setWaterAgent(AcidTypeData[AT].nl, Acid); |
| 478 | 3374 | |
| 3375 | bicarbonate = bicarbonate - protonDeficit * frac / liters; | |
| 3376 | total_alkalinity = bicarbonate * 50 / 61; | |
| 3377 | } else if (protonDeficit < 0) { //Add base | |
| 3378 | $('#wa_acid').val(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
|
3379 | dataRecord.wa_acid = 0; |
| 478 | 3380 | setWaterAgent(last_acid, 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
|
3381 | r1d = Math.pow(10, (TpH - 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
|
3382 | r2d = Math.pow(10, (TpH - 10.33)); |
| 478 | 3383 | f1d = 1 / (1 + r1d + r1d * r2d); |
| 3384 | f2d = f1d * r1d; | |
| 3385 | f3d = f2d * r2d; | |
| 3386 | switch (BT) { | |
| 3387 | case 0: | |
| 3388 | RA = -protonDeficit / (f1d - f3d); // Sodiumbicarbonate, mmol totaal | |
| 3389 | RA = RA * MMNaHCO3 / 1000; //gram | |
| 3390 | $('#wa_base').val(Round(RA, 2)); | |
| 3391 | setWaterAgent('NaHCO3', Round(RA, 2)); | |
| 3392 | if (liters > 0) { | |
| 3393 | // Na | |
|
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
|
3394 | RA = (parseFloat($('#wa_nacl').jqxNumberInput('decimal')) * MMNa / MMNaCl * 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
|
3395 | parseFloat($('#wa_base').jqxNumberInput('decimal')) * MMNa / MMNaHCO3 * 1000) / liters; |
| 478 | 3396 | sodium = wg_sodium + RA; |
| 3397 | // HCO3 | |
|
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
|
3398 | RA = (parseFloat($('#wa_base').jqxNumberInput('decimal')) * MMHCO3 / MMNaHCO3 * 1000) / liters; |
| 478 | 3399 | bicarbonate = wg_bicarbonate + RA; |
| 3400 | total_alkalinity = bicarbonate * 50 / 61; | |
| 3401 | } | |
| 3402 | break; | |
| 3403 | case 1: | |
| 3404 | RA = -protonDeficit / (2 * f1d + f2d); // Sodiumcarbonate, mmol totaal | |
| 3405 | RA = RA * MMNa2CO3 / 1000; //gram | |
| 3406 | $('#wa_base').val(Round(RA, 2)); | |
| 3407 | setWaterAgent('Na2CO3', Round(RA, 2)); | |
| 3408 | if (liters > 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
|
3409 | RA = (parseFloat($('#wa_nacl').jqxNumberInput('decimal')) * MMNa / MMNaCl * 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
|
3410 | parseFloat($('#wa_base').jqxNumberInput('decimal')) * 2 * MMNa / MMNa2CO3 * 1000) / liters; |
| 478 | 3411 | sodium = wg_sodium + RA; |
| 3412 | // HCO3 | |
|
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
|
3413 | RA = (parseFloat($('#wa_base').jqxNumberInput('decimal')) * MMHCO3 / MMNa2CO3 * 1000) / liters; |
| 478 | 3414 | bicarbonate = wg_bicarbonate + RA; |
| 3415 | total_alkalinity = bicarbonate * 50 / 61; | |
| 3416 | } | |
| 3417 | break; | |
| 3418 | case 2: | |
| 3419 | RA = -protonDeficit * (f1d - f3d); // Calciumcarbonate, mmol totaal | |
| 3420 | RA = RA * MMCaCO3 / 1000; //gram | |
| 3421 | //but only 1/3 is effective, so add 3 times as much | |
| 3422 | RA = 3 * RA; | |
| 3423 | $('#wa_base').val(Round(RA, 2)); | |
| 3424 | setWaterAgent('CaCO3', Round(RA, 2)); | |
| 3425 | if (liters > 0) { | |
| 3426 | //Bicarbonate | |
|
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
|
3427 | RA = (parseFloat($('#wa_base').jqxNumberInput('decimal')) / 3 * MMHCO3 / MMCaCO3 * 1000) / liters; |
| 478 | 3428 | bicarbonate = wg_bicarbonate + RA; |
| 3429 | total_alkalinity = bicarbonate * 50 / 61; | |
| 3430 | //Ca precipitates out as Ca10(PO4)6(OH)2 | |
|
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
|
3431 | RA = (parseFloat($('#wa_cacl2').jqxNumberInput('decimal')) * MMCa / MMCaCl2 * 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
|
3432 | parseFloat($('#wa_caso4').jqxNumberInput('decimal')) * MMCa / 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
|
3433 | parseFloat($('#wa_base').jqxNumberInput('decimal')) * MMCa / MMCaCO3 * 1000) / liters; |
| 478 | 3434 | calcium = wg_calcium + RA; |
| 3435 | } | |
| 3436 | break; | |
| 3437 | case 3: | |
| 3438 | RA = -protonDeficit / 19.3; // Calciumhydroxide | |
| 3439 | $('#wa_base').val(Round(RA, 2)); | |
| 3440 | setWaterAgent('Ca(OH)2', Round(RA, 2)); | |
| 3441 | if (liters > 0) { | |
| 3442 | // Bicarbonate | |
| 3443 | RA = -protonDeficit / liters; | |
| 3444 | total_alkalinity = wg_total_alkalinity + RA; | |
| 3445 | bicarbonate = total_alkalinity * 61 / 50; | |
| 3446 | // Calcium | |
|
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
|
3447 | RA = (parseFloat($('#wa_cacl2').jqxNumberInput('decimal')) * MMCa / MMCaCl2 * 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
|
3448 | parseFloat($('#wa_caso4').jqxNumberInput('decimal')) * MMCa / 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
|
3449 | parseFloat($('#wa_base').jqxNumberInput('decimal')) * MMCa / MMCaOH2 * 1000) / liters; |
| 478 | 3450 | calcium = wg_calcium + RA; |
| 3451 | } | |
| 3452 | break; | |
| 3453 | } | |
| 3454 | } | |
| 3455 | 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
|
3456 | $('#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
|
3457 | $('#est_mash_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
|
3458 | } 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
|
3459 | /* 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
|
3460 | $('.c_mashph').hide(); |
| 478 | 3461 | 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
|
3462 | if (parseFloat($('#wa_base').jqxNumberInput('decimal')) > 0 && 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
|
3463 | /* First add the base 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
|
3464 | switch (BT) { |
|
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
|
3465 | case 0: // Sodiumbicarbonate, Na |
|
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
|
3466 | RA = (parseFloat($('#wa_nacl').jqxNumberInput('decimal')) * MMNa / MMNaCl * 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
|
3467 | parseFloat($('#wa_base').jqxNumberInput('decimal')) * MMNa / MMNaHCO3 * 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
|
3468 | sodium = wg_sodium + 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
|
3469 | // HCO3 |
|
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
|
3470 | RA = (parseFloat($('#wa_base').jqxNumberInput('decimal')) * MMHCO3 / MMNaHCO3 * 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
|
3471 | bicarbonate = wg_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
|
3472 | total_alkalinity = bicarbonate * 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
|
3473 | 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
|
3474 | case 1: // Sodiumcarbonate |
|
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
|
3475 | RA = (parseFloat($('#wa_nacl').jqxNumberInput('decimal')) * MMNa / MMNaCl * 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
|
3476 | parseFloat($('#wa_base').jqxNumberInput('decimal')) * 2 * MMNa / MMNa2CO3 * 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
|
3477 | sodium = wg_sodium + 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
|
3478 | // HCO3 |
|
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
|
3479 | RA = (parseFloat($('#wa_base').jqxNumberInput('decimal')) * MMHCO3 / MMNa2CO3 * 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
|
3480 | bicarbonate = wg_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
|
3481 | total_alkalinity = bicarbonate * 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
|
3482 | 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
|
3483 | case 2: // Calciumcarbonate: Bicarbonate |
|
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
|
3484 | RA = (parseFloat($('#wa_base').jqxNumberInput('decimal')) / 3 * MMHCO3 * 1000 / MMCaCO3) / 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
|
3485 | bicarbonate = wg_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
|
3486 | total_alkalinity = bicarbonate * 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
|
3487 | // Ca |
|
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
|
3488 | RA = (parseFloat($('#wa_cacl2').jqxNumberInput('decimal')) * MMCa * 1000 / MMCaCl2 + |
|
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
|
3489 | parseFloat($('#wa_caso4').jqxNumberInput('decimal')) * MMCa * 1000 / MMCaSO4 + |
|
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
|
3490 | parseFloat($('#wa_base').jqxNumberInput('decimal')) * MMCa * 1000/ MMCaCO3) / 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
|
3491 | calcium = wg_calcium + 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
|
3492 | break; |
| 478 | 3493 | } |
| 3494 | } | |
| 3495 | ||
|
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
|
3496 | 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
|
3497 | // 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
|
3498 | 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
|
3499 | 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
|
3500 | 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
|
3501 | 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
|
3502 | Acidmg = 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
|
3503 | |
|
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
|
3504 | //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
|
3505 | 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
|
3506 | 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
|
3507 | //console.log('protonDeficit Acid: ' + protonDeficit + ' frac: ' + frac + ' 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
|
3508 | |
|
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
|
3509 | 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
|
3510 | 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
|
3511 | 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
|
3512 | 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
|
3513 | while (((pd < (protonDeficit - deltapd)) || (pd > (protonDeficit + deltapd))) && (n < 4000)) { |
| 478 | 3514 | n++; |
| 3515 | if (pd < (protonDeficit - deltapd)) | |
| 3516 | pHa -= deltapH; | |
| 3517 | else if (pd > (protonDeficit + deltapd)) | |
| 3518 | 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
|
3519 | frac = CalcFrac(pHa, AcidTypeData[AT].pK1, AcidTypeData[AT].pK2, AcidTypeData[AT].pK3); |
| 478 | 3520 | protonDeficit = Acid * frac; |
| 3521 | pd = ProtonDeficit(pHa); | |
| 3522 | } | |
|
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
|
3523 | //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
|
3524 | 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
|
3525 | 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
|
3526 | 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
|
3527 | 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
|
3528 | $('#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
|
3529 | $('#est_mash_ph').val(Round(ph, 2)); |
| 478 | 3530 | } |
| 3531 | ||
|
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
|
3532 | if ((AT == 3) && (liters > 0)) { // Sulfuric / Zwavelzuur |
| 478 | 3533 | RA = parseFloat($('#wa_caso4').jqxNumberInput('decimal')) * MMSO4 / MMCaSO4 + |
| 3534 | parseFloat($('#wa_mgso4').jqxNumberInput('decimal')) * MMSO4 / MMMgSO4 + | |
| 3535 | Acidmg / 1000 * MMSO4 / (MMSO4 + 2); | |
| 3536 | RA = 1000 * RA / liters; | |
| 3537 | sulfate = wg_sulfate + RA; // Not add to sulfate?? | |
| 3538 | } else if ((AT == 1) && (liters > 0)) { // Hydrochloric, Zoutzuur | |
| 3539 | RA = parseFloat($('#wa_cacl2').jqxNumberInput('decimal')) * MMCl / MMCaCl2 + | |
| 3540 | parseFloat($('#wa_nacl').jqxNumberInput('decimal')) * MMCl / MMNaCl + | |
| 3541 | Acidmg / 1000 * MMCl / (MMCl + 1); | |
| 3542 | RA = 1000 * RA / liters; | |
| 3543 | chloride = wg_chloride + RA; | |
| 3544 | } | |
| 3545 | ||
|
555
7c4f34b7e16f
A bit of code optimization in calcWater()
Michiel Broek <mbroek@mbse.eu>
parents:
554
diff
changeset
|
3546 | var BUGU = GetBUGU(); |
|
7c4f34b7e16f
A bit of code optimization in calcWater()
Michiel Broek <mbroek@mbse.eu>
parents:
554
diff
changeset
|
3547 | $('#tgt_bu').val(Round(BUGU, 2)); |
| 478 | 3548 | // From brouwhulp. |
|
555
7c4f34b7e16f
A bit of code optimization in calcWater()
Michiel Broek <mbroek@mbse.eu>
parents:
554
diff
changeset
|
3549 | if (BUGU < 0.32) |
| 478 | 3550 | $('#wr_bu').html("<span style='vertical-align: top; font-size: 14px; font-style: italic;'>Zeer moutig en zoet</span>"); |
|
555
7c4f34b7e16f
A bit of code optimization in calcWater()
Michiel Broek <mbroek@mbse.eu>
parents:
554
diff
changeset
|
3551 | else if (BUGU < 0.43) |
| 478 | 3552 | $('#wr_bu').html("<span style='vertical-align: top; font-size: 14px; font-style: italic;'>Moutig, zoet</span>"); |
|
555
7c4f34b7e16f
A bit of code optimization in calcWater()
Michiel Broek <mbroek@mbse.eu>
parents:
554
diff
changeset
|
3553 | else if (BUGU < 0.52) |
| 478 | 3554 | $('#wr_bu').html("<span style='vertical-align: top; font-size: 14px; font-style: italic;'>Evenwichtig</span>"); |
|
555
7c4f34b7e16f
A bit of code optimization in calcWater()
Michiel Broek <mbroek@mbse.eu>
parents:
554
diff
changeset
|
3555 | else if (BUGU < 0.63) |
| 478 | 3556 | $('#wr_bu').html("<span style='vertical-align: top; font-size: 14px; font-style: italic;'>Licht hoppig, bitter</span>"); |
| 3557 | else | |
| 3558 | $('#wr_bu').html("<span style='vertical-align: top; font-size: 14px; font-style: italic;'>Extra hoppig, zeer bitter</span>"); | |
|
552
ee0db754111e
In calcWater() the optimum SO4:Cl ratio is taken from the target profile if set, else it's calculated from the BUGU value. Swapped Cl:SO4 to SO4:Cl ratio presentation. Added remark text next to the Optimal SO4:Cl ratio.
Michiel Broek <mbroek@mbse.eu>
parents:
545
diff
changeset
|
3559 | |
|
ee0db754111e
In calcWater() the optimum SO4:Cl ratio is taken from the target profile if set, else it's calculated from the BUGU value. Swapped Cl:SO4 to SO4:Cl ratio presentation. Added remark text next to the Optimal SO4:Cl ratio.
Michiel Broek <mbroek@mbse.eu>
parents:
545
diff
changeset
|
3560 | // Sulfate to Chloride ratio (Palmer). |
|
555
7c4f34b7e16f
A bit of code optimization in calcWater()
Michiel Broek <mbroek@mbse.eu>
parents:
554
diff
changeset
|
3561 | var OptSO4Clratio = GetOptSO4Clratio(); |
|
7c4f34b7e16f
A bit of code optimization in calcWater()
Michiel Broek <mbroek@mbse.eu>
parents:
554
diff
changeset
|
3562 | $('#tgt_so4_cl').val(Round(OptSO4Clratio, 1)); |
|
7c4f34b7e16f
A bit of code optimization in calcWater()
Michiel Broek <mbroek@mbse.eu>
parents:
554
diff
changeset
|
3563 | if (OptSO4Clratio < 0.4) |
|
552
ee0db754111e
In calcWater() the optimum SO4:Cl ratio is taken from the target profile if set, else it's calculated from the BUGU value. Swapped Cl:SO4 to SO4:Cl ratio presentation. Added remark text next to the Optimal SO4:Cl ratio.
Michiel Broek <mbroek@mbse.eu>
parents:
545
diff
changeset
|
3564 | $('#wrt_so4_cl').html("<span style='vertical-align: top; font-size: 14px; font-style: italic;'>Te moutig</span>"); |
|
555
7c4f34b7e16f
A bit of code optimization in calcWater()
Michiel Broek <mbroek@mbse.eu>
parents:
554
diff
changeset
|
3565 | else if (OptSO4Clratio < 0.6) |
|
552
ee0db754111e
In calcWater() the optimum SO4:Cl ratio is taken from the target profile if set, else it's calculated from the BUGU value. Swapped Cl:SO4 to SO4:Cl ratio presentation. Added remark text next to the Optimal SO4:Cl ratio.
Michiel Broek <mbroek@mbse.eu>
parents:
545
diff
changeset
|
3566 | $('#wrt_so4_cl').html("<span style='vertical-align: top; font-size: 14px; font-style: italic;'>Zeer moutig</span>"); |
|
555
7c4f34b7e16f
A bit of code optimization in calcWater()
Michiel Broek <mbroek@mbse.eu>
parents:
554
diff
changeset
|
3567 | else if (OptSO4Clratio < 0.8) |
|
552
ee0db754111e
In calcWater() the optimum SO4:Cl ratio is taken from the target profile if set, else it's calculated from the BUGU value. Swapped Cl:SO4 to SO4:Cl ratio presentation. Added remark text next to the Optimal SO4:Cl ratio.
Michiel Broek <mbroek@mbse.eu>
parents:
545
diff
changeset
|
3568 | $('#wrt_so4_cl').html("<span style='vertical-align: top; font-size: 14px; font-style: italic;'>Moutig</span>"); |
|
555
7c4f34b7e16f
A bit of code optimization in calcWater()
Michiel Broek <mbroek@mbse.eu>
parents:
554
diff
changeset
|
3569 | else if (OptSO4Clratio < 1.5) |
|
552
ee0db754111e
In calcWater() the optimum SO4:Cl ratio is taken from the target profile if set, else it's calculated from the BUGU value. Swapped Cl:SO4 to SO4:Cl ratio presentation. Added remark text next to the Optimal SO4:Cl ratio.
Michiel Broek <mbroek@mbse.eu>
parents:
545
diff
changeset
|
3570 | $('#wrt_so4_cl').html("<span style='vertical-align: top; font-size: 14px; font-style: italic;'>Gebalanceerd</span>"); |
|
555
7c4f34b7e16f
A bit of code optimization in calcWater()
Michiel Broek <mbroek@mbse.eu>
parents:
554
diff
changeset
|
3571 | else if (OptSO4Clratio < 2.0) |
|
552
ee0db754111e
In calcWater() the optimum SO4:Cl ratio is taken from the target profile if set, else it's calculated from the BUGU value. Swapped Cl:SO4 to SO4:Cl ratio presentation. Added remark text next to the Optimal SO4:Cl ratio.
Michiel Broek <mbroek@mbse.eu>
parents:
545
diff
changeset
|
3572 | $('#wrt_so4_cl').html("<span style='vertical-align: top; font-size: 14px; font-style: italic;'>Licht bitter</span>"); |
|
555
7c4f34b7e16f
A bit of code optimization in calcWater()
Michiel Broek <mbroek@mbse.eu>
parents:
554
diff
changeset
|
3573 | else if (OptSO4Clratio < 4.0) |
|
552
ee0db754111e
In calcWater() the optimum SO4:Cl ratio is taken from the target profile if set, else it's calculated from the BUGU value. Swapped Cl:SO4 to SO4:Cl ratio presentation. Added remark text next to the Optimal SO4:Cl ratio.
Michiel Broek <mbroek@mbse.eu>
parents:
545
diff
changeset
|
3574 | $('#wrt_so4_cl').html("<span style='vertical-align: top; font-size: 14px; font-style: italic;'>Bitter</span>"); |
|
555
7c4f34b7e16f
A bit of code optimization in calcWater()
Michiel Broek <mbroek@mbse.eu>
parents:
554
diff
changeset
|
3575 | else if (OptSO4Clratio < 9.0) |
|
552
ee0db754111e
In calcWater() the optimum SO4:Cl ratio is taken from the target profile if set, else it's calculated from the BUGU value. Swapped Cl:SO4 to SO4:Cl ratio presentation. Added remark text next to the Optimal SO4:Cl ratio.
Michiel Broek <mbroek@mbse.eu>
parents:
545
diff
changeset
|
3576 | $('#wrt_so4_cl').html("<span style='vertical-align: top; font-size: 14px; font-style: italic;'>Zeer bitter</span>"); |
|
ee0db754111e
In calcWater() the optimum SO4:Cl ratio is taken from the target profile if set, else it's calculated from the BUGU value. Swapped Cl:SO4 to SO4:Cl ratio presentation. Added remark text next to the Optimal SO4:Cl ratio.
Michiel Broek <mbroek@mbse.eu>
parents:
545
diff
changeset
|
3577 | else |
|
ee0db754111e
In calcWater() the optimum SO4:Cl ratio is taken from the target profile if set, else it's calculated from the BUGU value. Swapped Cl:SO4 to SO4:Cl ratio presentation. Added remark text next to the Optimal SO4:Cl ratio.
Michiel Broek <mbroek@mbse.eu>
parents:
545
diff
changeset
|
3578 | $('#wrt_so4_cl').html("<span style='vertical-align: top; font-size: 14px; font-style: italic;'>Te bitter</span>"); |
|
ee0db754111e
In calcWater() the optimum SO4:Cl ratio is taken from the target profile if set, else it's calculated from the BUGU value. Swapped Cl:SO4 to SO4:Cl ratio presentation. Added remark text next to the Optimal SO4:Cl ratio.
Michiel Broek <mbroek@mbse.eu>
parents:
545
diff
changeset
|
3579 | if (chloride > 0) |
|
ee0db754111e
In calcWater() the optimum SO4:Cl ratio is taken from the target profile if set, else it's calculated from the BUGU value. Swapped Cl:SO4 to SO4:Cl ratio presentation. Added remark text next to the Optimal SO4:Cl ratio.
Michiel Broek <mbroek@mbse.eu>
parents:
545
diff
changeset
|
3580 | RA = sulfate / chloride; |
| 478 | 3581 | else |
| 3582 | RA = 10; | |
|
552
ee0db754111e
In calcWater() the optimum SO4:Cl ratio is taken from the target profile if set, else it's calculated from the BUGU value. Swapped Cl:SO4 to SO4:Cl ratio presentation. Added remark text next to the Optimal SO4:Cl ratio.
Michiel Broek <mbroek@mbse.eu>
parents:
545
diff
changeset
|
3583 | $('#got_so4_cl').val(Round(RA, 1)); |
| 478 | 3584 | Res = 'normaal'; |
|
555
7c4f34b7e16f
A bit of code optimization in calcWater()
Michiel Broek <mbroek@mbse.eu>
parents:
554
diff
changeset
|
3585 | if (RA < (0.8 * OptSO4Clratio)) |
| 478 | 3586 | Res = 'laag'; |
|
555
7c4f34b7e16f
A bit of code optimization in calcWater()
Michiel Broek <mbroek@mbse.eu>
parents:
554
diff
changeset
|
3587 | else if (RA > (1.2 * OptSO4Clratio)) |
| 478 | 3588 | Res = 'hoog'; |
|
552
ee0db754111e
In calcWater() the optimum SO4:Cl ratio is taken from the target profile if set, else it's calculated from the BUGU value. Swapped Cl:SO4 to SO4:Cl ratio presentation. Added remark text next to the Optimal SO4:Cl ratio.
Michiel Broek <mbroek@mbse.eu>
parents:
545
diff
changeset
|
3589 | setRangeIndicator('so4_cl', Res); |
| 478 | 3590 | |
| 3591 | $('#wb_calcium').val(Round(calcium, 1)); | |
| 3592 | $('#wb_magnesium').val(Round(magnesium, 1)); | |
| 3593 | $('#wb_sodium').val(Round(sodium, 1)); | |
| 3594 | $('#wb_sulfate').val(Round(sulfate, 1)); | |
| 3595 | $('#wb_chloride').val(Round(chloride, 1)); | |
| 3596 | $('#wb_total_alkalinity').val(Round(total_alkalinity, 1)); | |
| 3597 | ||
| 3598 | if (calcium < 40) { | |
| 3599 | setRangeIndicator('calcium', 'laag'); | |
| 3600 | } else if (calcium > 150) { | |
| 3601 | setRangeIndicator('calcium', 'hoog'); | |
| 3602 | } else { | |
| 3603 | setRangeIndicator('calcium', 'normaal'); | |
| 3604 | } | |
|
607
0efba09a694c
Added low limit for magnesium of 10 ppm
Michiel Broek <mbroek@mbse.eu>
parents:
602
diff
changeset
|
3605 | if (magnesium < 10) { |
|
0efba09a694c
Added low limit for magnesium of 10 ppm
Michiel Broek <mbroek@mbse.eu>
parents:
602
diff
changeset
|
3606 | setRangeIndicator('magnesium', 'laag'); |
|
0efba09a694c
Added low limit for magnesium of 10 ppm
Michiel Broek <mbroek@mbse.eu>
parents:
602
diff
changeset
|
3607 | } else if (magnesium > 30) { |
|
0efba09a694c
Added low limit for magnesium of 10 ppm
Michiel Broek <mbroek@mbse.eu>
parents:
602
diff
changeset
|
3608 | setRangeIndicator('magnesium', 'hoog'); |
|
0efba09a694c
Added low limit for magnesium of 10 ppm
Michiel Broek <mbroek@mbse.eu>
parents:
602
diff
changeset
|
3609 | } else { |
| 478 | 3610 | setRangeIndicator('magnesium', 'normaal'); |
| 3611 | } | |
| 3612 | if (sodium <= 150) { | |
| 3613 | setRangeIndicator('sodium', 'normaal'); | |
| 3614 | } else { | |
| 3615 | setRangeIndicator('sodium', 'hoog'); | |
| 3616 | } | |
| 3617 | // Both chloride and sulfate should be above 50 according to | |
| 3618 | // John Palmer. So the Cl/SO4 ratio calculation will work. | |
| 3619 | if (chloride <= 50) { | |
| 3620 | setRangeIndicator('chloride', 'laag'); | |
| 3621 | } else if (chloride <= 100) { | |
| 3622 | setRangeIndicator('chloride', 'normaal'); | |
| 3623 | } else { | |
| 3624 | setRangeIndicator('chloride', 'hoog'); | |
| 3625 | } | |
| 3626 | if (sulfate <= 50) { | |
| 3627 | setRangeIndicator('sulfate', 'laag'); | |
| 3628 | } else if (sulfate <= 350) { | |
| 3629 | setRangeIndicator('sulfate', 'normaal'); | |
| 3630 | } else { | |
| 3631 | setRangeIndicator('sulfate', 'hoog'); | |
| 3632 | } | |
| 3633 | if (ph < 5.2) { | |
| 3634 | setRangeIndicator('ph', 'laag'); | |
| 3635 | } else if (ph > 5.6) { | |
| 3636 | setRangeIndicator('ph', 'hoog'); | |
| 3637 | } else { | |
| 3638 | setRangeIndicator('ph', 'normaal'); | |
| 3639 | } | |
| 3640 | calcSparge(); | |
| 3641 | calcMiscs(); | |
| 3642 | calcSupplies(); | |
| 3643 | } | |
| 3644 | ||
| 3645 | function calcSparge() { | |
| 3646 | ||
|
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
|
3647 | /* 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
|
3648 | 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
|
3649 | 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
|
3650 | var Source_alkalinity = dataRecord.w1_total_alkalinity; |
| 478 | 3651 | // Select watersource or fallback to the first source. |
| 3652 | if (dataRecord.sparge_source == 1) { // Source 2 | |
| 3653 | if (dataRecord.w2_ph > 0.0) { | |
| 3654 | Source_pH = dataRecord.w2_ph; | |
| 3655 | Source_alkalinity = dataRecord.w2_total_alkalinity; | |
| 3656 | } else { | |
| 3657 | dataRecord.sparge_source = 0; // Source 1 | |
| 3658 | $('#sparge_source').val(0); | |
| 3659 | } | |
| 3660 | } else if (dataRecord.sparge_source == 2) { // Mixed | |
| 3661 | if (dataRecord.w2_ph > 0.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
|
3662 | Source_pH = parseFloat(dataRecord.wg_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
|
3663 | Source_alkalinity = parseFloat(dataRecord.wg_total_alkalinity); |
| 478 | 3664 | } else { |
| 3665 | dataRecord.sparge_source = 0; | |
| 3666 | $('#sparge_source').val(0); | |
| 3667 | } | |
| 3668 | } | |
| 3669 | ||
|
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
|
3670 | // Step 1: Compute the mole fractions of carbonic (f1) and carbonate(f3) at the source 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
|
3671 | 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
|
3672 | 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
|
3673 | 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
|
3674 | 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
|
3675 | var f3 = r1 * r2 / d; |
| 478 | 3676 | |
| 3677 | //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
|
3678 | 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
|
3679 | 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
|
3680 | 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
|
3681 | 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
|
3682 | var f343 = r143 * r243 / d43; |
| 478 | 3683 | |
| 3684 | //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
|
3685 | var Ct = Source_alkalinity / 50 / ((f143 - f1) + (f3 - f343)); |
| 478 | 3686 | |
| 3687 | //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
|
3688 | 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
|
3689 | 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
|
3690 | 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
|
3691 | 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
|
3692 | var f3g = r1g * r2g / dg; |
| 478 | 3693 | |
| 3694 | //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
|
3695 | var Acid = Ct * ((f1g - f1) + (f3 - f3g)) + Math.pow(10, -TargetpH) - Math.pow(10, -Source_pH); //mEq/l |
| 478 | 3696 | Acid += 0.01; // Add acid that would be required for distilled water. |
|
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
|
3697 | |
|
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
|
3698 | //Step 8. Get the acid data. |
|
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
|
3699 | var AT = dataRecord.sparge_acid_type; |
|
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
|
3700 | 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
|
3701 | AT = 0; |
| 478 | 3702 | dataRecord.sparge_acid_type = 0; |
| 3703 | $('#sparge_acid_type').val(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
|
3704 | 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
|
3705 | $('#sparge_acid_perc').val(dataRecord.sparge_acid_perc); |
| 478 | 3706 | } |
|
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
|
3707 | var fract = CalcFrac(TargetpH, AcidTypeData[AT].pK1, AcidTypeData[AT].pK2, AcidTypeData[AT].pK3); |
| 478 | 3708 | |
| 3709 | //Step 9. Now divide the mEq required by the "fraction". This is the required number of moles of acid. | |
| 3710 | Acid /= fract; | |
| 3711 | ||
| 3712 | //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
|
3713 | 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
|
3714 | |
|
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
|
3715 | //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
|
3716 | 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
|
3717 | Acid *= dataRecord.sparge_volume; //ml acid total |
| 478 | 3718 | Acid = Round(Acid, 2); |
| 3719 | dataRecord.sparge_acid_amount = Acid / 1000; | |
| 3720 | $('#sparge_acid_amount').val(Acid); | |
| 3721 | } | |
| 3722 | ||
| 3723 | function calcFermentation() { | |
| 3724 | var primary_svg, secondary_svg, final_svg, ABV; | |
| 3725 | if (dataRecord.brew_fermenter_sg < 1.020) | |
| 3726 | return; | |
| 3727 | if ((dataRecord.primary_end_sg > 0.990) && (dataRecord.primary_end_sg < dataRecord.brew_fermenter_sg)) { | |
|
655
f4e00869f39f
Calculate the svg using Brew by the Numbers, Micahel L. Hall.
Michiel Broek <mbroek@mbse.eu>
parents:
651
diff
changeset
|
3728 | primary_svg = Round(calc_svg(dataRecord.brew_fermenter_sg, dataRecord.primary_end_sg), 1); |
| 478 | 3729 | $('#primary_svg').val(primary_svg); |
| 3730 | if ((dataRecord.secondary_end_sg > 0.990) && (dataRecord.secondary_end_sg < dataRecord.brew_fermenter_sg)) { | |
|
655
f4e00869f39f
Calculate the svg using Brew by the Numbers, Micahel L. Hall.
Michiel Broek <mbroek@mbse.eu>
parents:
651
diff
changeset
|
3731 | secondary_svg = Round(calc_svg(dataRecord.brew_fermenter_sg, dataRecord.secondary_end_sg), 1); |
| 478 | 3732 | $('#secondary_svg').val(secondary_svg); |
| 3733 | if ((dataRecord.fg > 0.990) && (dataRecord.fg < dataRecord.brew_fermenter_sg)) { | |
|
655
f4e00869f39f
Calculate the svg using Brew by the Numbers, Micahel L. Hall.
Michiel Broek <mbroek@mbse.eu>
parents:
651
diff
changeset
|
3734 | final_svg = Round(calc_svg(dataRecord.brew_fermenter_sg, dataRecord.fg), 1); |
| 478 | 3735 | $('#final_svg').val(final_svg); |
| 3736 | ABV = Round(abvol(dataRecord.brew_fermenter_sg, dataRecord.fg), 2); | |
| 3737 | $('#final_abv').val(ABV); | |
| 3738 | } | |
| 3739 | } | |
| 3740 | } | |
| 3741 | } | |
| 3742 | ||
|
651
6e89cb158153
Changed priming sugar calculation to Brew by the Numbers by Michael L. Hall. This gives a bit higher and better amount of sugar to use. Removed dead parameter from the ResCO2 function.
Michiel Broek <mbroek@mbse.eu>
parents:
649
diff
changeset
|
3743 | function ResCO2(T) { |
| 478 | 3744 | var F = T * 1.8 + 32; |
|
651
6e89cb158153
Changed priming sugar calculation to Brew by the Numbers by Michael L. Hall. This gives a bit higher and better amount of sugar to use. Removed dead parameter from the ResCO2 function.
Michiel Broek <mbroek@mbse.eu>
parents:
649
diff
changeset
|
3745 | return Round(3.0378 - 0.050062 * F + 0.00026555 * F * F, 6); |
| 478 | 3746 | } |
| 3747 | ||
| 3748 | function CarbCO2toS(CO2, T, SFactor) { | |
|
651
6e89cb158153
Changed priming sugar calculation to Brew by the Numbers by Michael L. Hall. This gives a bit higher and better amount of sugar to use. Removed dead parameter from the ResCO2 function.
Michiel Broek <mbroek@mbse.eu>
parents:
649
diff
changeset
|
3749 | //var sugar = SFactor * (CO2 - ResCO2(CO2, T)) / 0.286; |
|
6e89cb158153
Changed priming sugar calculation to Brew by the Numbers by Michael L. Hall. This gives a bit higher and better amount of sugar to use. Removed dead parameter from the ResCO2 function.
Michiel Broek <mbroek@mbse.eu>
parents:
649
diff
changeset
|
3750 | var sugar = Round(SFactor * (CO2 - ResCO2(T)) * 4.014094, 6); |
| 478 | 3751 | if (sugar < 0) |
| 3752 | sugar = 0; | |
| 3753 | return Round(sugar, 3); | |
| 3754 | } | |
| 3755 | ||
| 3756 | function GetPressure(CO2, T1, T2) { | |
|
651
6e89cb158153
Changed priming sugar calculation to Brew by the Numbers by Michael L. Hall. This gives a bit higher and better amount of sugar to use. Removed dead parameter from the ResCO2 function.
Michiel Broek <mbroek@mbse.eu>
parents:
649
diff
changeset
|
3757 | var P, V = CO2 - ResCO2(T1); |
|
609
e9b108569818
Testing, bottle carbonation pressure display without residential pressure
Michiel Broek <mbroek@mbse.eu>
parents:
607
diff
changeset
|
3758 | V = CO2; // TODO: temp only total pressure, testing |
| 478 | 3759 | if (V < 0) |
| 3760 | return 0; | |
| 3761 | P = -1.09145427669121 + 0.00800006989646477 * T2 + 0.000260276315484684 * T2 * T2 + 0.0215142075945119 * T2 * V + | |
| 3762 | 0.674996600795854 * V + -0.00471757220150754 * V * V; | |
| 3763 | if (P < 0) | |
| 3764 | P = 0; | |
|
609
e9b108569818
Testing, bottle carbonation pressure display without residential pressure
Michiel Broek <mbroek@mbse.eu>
parents:
607
diff
changeset
|
3765 | P = Round(P * 1.01325, 2); // atm to bar |
|
651
6e89cb158153
Changed priming sugar calculation to Brew by the Numbers by Michael L. Hall. This gives a bit higher and better amount of sugar to use. Removed dead parameter from the ResCO2 function.
Michiel Broek <mbroek@mbse.eu>
parents:
649
diff
changeset
|
3766 | console.log("GetPressure(" + CO2 + ", " + T1 + ", " + T2 + ") V:" + V + " Bar: " + P + " ignored ResCO2: " + ResCO2(T1)); |
|
609
e9b108569818
Testing, bottle carbonation pressure display without residential pressure
Michiel Broek <mbroek@mbse.eu>
parents:
607
diff
changeset
|
3767 | return P; |
| 478 | 3768 | } |
| 3769 | ||
| 3770 | function CarbCO2ToPressure(CO2, T) { | |
| 3771 | return (CO2 - (-0.000005594056 * Math.pow(T, 4) + 0.000144357886 * Math.pow(T, 3) + | |
| 3772 | 0.000362999168 * T * T - 0.064872987645 * T + 1.641145175049)) / | |
| 3773 | (0.00000498031 * Math.pow(T, 4) - 0.00024358267 * Math.pow(T, 3) + 0.00385867329 * T * T - 0.05671206825 * T + 1.53801423376); | |
| 3774 | } | |
| 3775 | ||
| 3776 | function calcCarbonation() { | |
| 3777 | ||
| 3778 | var TSec, ABV, bvol, balc, babv, mvol, malc, tvol, talc, i, row, SFactor, pvol, pabv, Pressure, kabv; | |
| 3779 | ||
| 3780 | TSec = dataRecord.secondary_temp; | |
| 3781 | if (TSec < 1) | |
| 3782 | TSec = dataRecord.primary_end_temp; | |
| 3783 | if (TSec < 1) | |
| 3784 | TSec = 18; | |
| 3785 | ||
| 3786 | if (dataRecord.fg == 0.000) | |
| 3787 | ABV = abvol(dataRecord.brew_fermenter_sg, parseFloat($('#est_fg').jqxNumberInput('decimal'))); | |
| 3788 | else | |
| 3789 | ABV = abvol(dataRecord.brew_fermenter_sg, dataRecord.fg); | |
| 3790 | ||
| 3791 | /* Calculate new volume and alcohol. */ | |
| 3792 | bvol = dataRecord.package_volume - (ABV * dataRecord.package_volume) / 100; | |
| 3793 | balc = dataRecord.package_volume - bvol; | |
| 3794 | mvol = dataRecord.package_infuse_amount - (dataRecord.package_infuse_abv * dataRecord.package_infuse_amount) / 100; | |
| 3795 | malc = dataRecord.package_infuse_amount - mvol; | |
| 3796 | talc = balc + malc; | |
| 3797 | tvol = bvol + mvol; | |
| 3798 | ABV = Round(talc / (tvol + talc) * 100, 2); | |
| 3799 | dataRecord.package_abv = ABV; | |
| 3800 | $('#package_abv').val(ABV); | |
| 3801 | ||
| 3802 | //console.log("calcCarbonation() TSec:"+TSec+" ABV:"+ABV); | |
| 3803 | if (!(rows = $('#fermentableGrid').jqxGrid('getrows'))) { | |
| 3804 | return; | |
| 3805 | } | |
| 3806 | ||
| 3807 | // Bottles | |
| 3808 | dataRecord.bottle_priming_amount = 0; | |
| 3809 | dataRecord.bottle_priming_total = 0; | |
| 3810 | for (i = 0; i < rows.length; i++) { | |
| 3811 | row = rows[i]; | |
| 3812 | if (row.f_added == 4) { | |
| 3813 | SFactor = 1 / ((row.f_yield / 100) * (1 - row.f_moisture / 100)); | |
| 3814 | dataRecord.bottle_priming_amount = CarbCO2toS(dataRecord.bottle_carbonation, TSec, SFactor); | |
| 3815 | dataRecord.bottle_priming_total = Round(dataRecord.bottle_amount * dataRecord.bottle_priming_amount, 2); | |
| 3816 | $('#fermentableGrid').jqxGrid('setcellvalue', i, 'f_amount', dataRecord.bottle_priming_total / 1000); | |
| 3817 | } | |
| 3818 | } | |
| 3819 | $('#bottle_priming_amount').val(Round(dataRecord.bottle_priming_amount, 1)); | |
| 3820 | $('#bottle_priming_total').val(dataRecord.bottle_priming_total); | |
| 3821 | pabv = ABV + dataRecord.bottle_priming_amount * 0.47 / 7.907; | |
| 3822 | pvol = dataRecord.bottle_amount - (pabv * dataRecord.bottle_amount) / 100; | |
| 3823 | talc = dataRecord.bottle_amount - pvol; | |
| 3824 | tvol = pvol + dataRecord.bottle_priming_water; | |
| 3825 | babv = Round(talc / (tvol + talc) * 100, 2); | |
| 3826 | //console.log("bottle pabv:"+pabv+" pvol:"+pvol+" wvol:"+dataRecord.bottle_priming_water+" tvol:"+tvol+" talc:"+talc+" abv:"+babv); | |
| 3827 | $('#bottle_abv').val(babv); | |
| 3828 | $('#bottle_pressure').val(GetPressure(dataRecord.bottle_carbonation, TSec, dataRecord.bottle_carbonation_temp)); | |
| 3829 | ||
| 3830 | // Kegs | |
| 3831 | Pressure = CarbCO2ToPressure(dataRecord.keg_carbonation, dataRecord.keg_carbonation_temp); | |
| 3832 | if (Pressure < 0) | |
| 557 | 3833 | Pressure = 0; |
| 478 | 3834 | dataRecord.keg_pressure = Pressure; |
| 3835 | $('#keg_pressure').val(Round(Pressure, 1)); | |
| 3836 | ||
| 3837 | dataRecord.keg_priming_amount = 0; | |
| 3838 | dataRecord.keg_priming_total = 0; | |
| 3839 | if (!dataRecord.keg_forced_carb) { | |
| 557 | 3840 | for (i = 0; i < rows.length; i++) { |
| 3841 | row = rows[i]; | |
| 3842 | if (row.f_added == 5) { | |
| 3843 | SFactor = 1 / ((row.f_yield / 100) * (1 - row.f_moisture / 100)); | |
| 3844 | dataRecord.keg_priming_amount = CarbCO2toS(dataRecord.keg_carbonation, TSec, SFactor); | |
| 3845 | dataRecord.keg_priming_total = Round(dataRecord.keg_amount * dataRecord.keg_priming_amount, 2); | |
| 3846 | $('#fermentableGrid').jqxGrid('setcellvalue', i, 'f_amount', dataRecord.keg_priming_total / 1000); | |
| 3847 | } | |
| 3848 | } | |
| 3849 | $('#keg_priming_amount').val(Round(dataRecord.keg_priming_amount, 1)); | |
| 3850 | $('#keg_priming_total').val(dataRecord.keg_priming_total); | |
| 3851 | pabv = ABV + dataRecord.keg_priming_amount * 0.47 / 7.907; | |
| 3852 | pvol = dataRecord.keg_amount - (pabv * dataRecord.keg_amount) / 100; | |
| 3853 | talc = dataRecord.keg_amount - pvol; | |
| 3854 | tvol = pvol + dataRecord.keg_priming_water; | |
| 3855 | kabv = Round(talc / (tvol + talc) * 100, 2); | |
| 3856 | //console.log("kegs pabv:"+pabv+" pvol:"+pvol+" wvol:"+dataRecord.keg_priming_water+" tvol:"+tvol+" talc:"+talc+" abv:"+kabv); | |
| 3857 | $('#keg_abv').val(kabv); | |
| 478 | 3858 | } else { |
| 557 | 3859 | $('#keg_priming_amount').val(0); |
| 3860 | $('#keg_priming_total').val(0); | |
| 3861 | $('#keg_abv').val(ABV); | |
| 478 | 3862 | } |
| 3863 | } | |
| 3864 | ||
|
723
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
3865 | function en_stage_equipment(state) { |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
3866 | $('#equipmentSelect').jqxDropDownList({ disabled: (state) ? true:false }); |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
3867 | $('#Delete').jqxButton({ disabled: (state) ? true:false }); |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
3868 | } |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
3869 | |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
3870 | function en_stage_brewday(state) { |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
3871 | $('#jqxTabs').jqxTabs((state) ? 'disableAt':'enableAt', 8); // Brewday tab |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
3872 | } |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
3873 | |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
3874 | function en_stage_afterbrew(state) { |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
3875 | |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
3876 | var onval = { disabled: (state) ? true:false }; |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
3877 | var spinstate = { spinButtons: (state) ? false:true, readOnly: (state) ? true:false, width: (state) ? 90:110 }; |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
3878 | var spinsmall = { spinButtons: (state) ? false:true, readOnly: (state) ? true:false, width: (state) ? 70:90 }; |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
3879 | |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
3880 | $('#jqxTabs').jqxTabs((state) ? 'enableAt':'disableAt', 9); // Fermentation tab |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
3881 | $('#name').jqxInput(onval); |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
3882 | $('#code').jqxInput(onval); |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
3883 | $('#batch_size').jqxNumberInput(spinstate); |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
3884 | $('#boil_size').jqxNumberInput(spinstate); |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
3885 | $('#boil_time').jqxNumberInput(spinstate); |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
3886 | $('#efficiency').jqxNumberInput(spinstate); |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
3887 | $('#est_og').jqxNumberInput(spinstate); |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
3888 | $('#type').jqxDropDownList(onval); |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
3889 | $('#styleSelect').jqxDropDownList(onval); |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
3890 | $('#color_method').jqxDropDownList(onval); |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
3891 | $('#ibu_method').jqxDropDownList(onval); |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
3892 | $('#mash_select').jqxDropDownList(onval); |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
3893 | $('#w1_name').jqxDropDownList(onval); |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
3894 | $('#w2_name').jqxDropDownList(onval); |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
3895 | $('#w2_amount').jqxNumberInput(onval); |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
3896 | $('#pr_name').jqxDropDownList(onval); |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
3897 | $('#wa_cacl2').jqxNumberInput(spinstate); |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
3898 | $('#wa_caso4').jqxNumberInput(spinstate); |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
3899 | $('#wa_mgso4').jqxNumberInput(spinstate); |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
3900 | $('#wa_nacl').jqxNumberInput(spinstate); |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
3901 | $('#mash_ph').jqxNumberInput(spinstate); |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
3902 | $('#calc_acid').jqxCheckBox(onval); |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
3903 | $('#wa_base_name').jqxDropDownList(onval); |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
3904 | $('#wa_base').jqxNumberInput(spinstate); |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
3905 | $('#wa_acid_name').jqxDropDownList(onval); |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
3906 | $('#wa_acid').jqxNumberInput(spinstate); |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
3907 | $('#wa_acid_perc').jqxNumberInput(spinsmall); |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
3908 | $('#sparge_temp').jqxNumberInput(spinstate); |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
3909 | $('#sparge_volume').jqxNumberInput(spinstate); |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
3910 | $('#sparge_ph').jqxNumberInput(spinstate); |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
3911 | $('#sparge_source').jqxDropDownList(onval); |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
3912 | $('#sparge_acid_type').jqxDropDownList(onval); |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
3913 | $('#sparge_acid_perc').jqxNumberInput(spinstate); |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
3914 | $('#starter_type').jqxDropDownList(onval); |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
3915 | $('#starter_try').jqxButton(onval); |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
3916 | $('#starter_sg').jqxNumberInput(spinstate); |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
3917 | $('#yeast_prod_date').jqxDateTimeInput(onval); |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
3918 | $('#yeast_pitchrate').jqxNumberInput(spinstate); |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
3919 | $('#but_pickpitchrate').jqxButton(onval); |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
3920 | } |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
3921 | |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
3922 | function en_stage_afterprimary(istate) { |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
3923 | |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
3924 | var state = istate; |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
3925 | var onval = { disabled: (state) ? true:false }; |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
3926 | var spinstate = { spinButtons: (state) ? false:true, readOnly: (state) ? true:false, width: (state) ? 90:110 }; |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
3927 | |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
3928 | $('#brew_date_start').jqxDateTimeInput(onval); |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
3929 | $('#brew_date_end').jqxDateTimeInput(onval); |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
3930 | $('#brew_mash_ph').jqxNumberInput(spinstate); |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
3931 | $('#brew_mash_sg').jqxNumberInput(spinstate); |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
3932 | $('#brew_whirlpool9').jqxNumberInput(spinstate); |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
3933 | $('#brew_cooling_to').jqxNumberInput(spinstate); |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
3934 | $('#brew_whirlpool7').jqxNumberInput(spinstate); |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
3935 | $('#brew_cooling_method').jqxDropDownList(onval); |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
3936 | $('#brew_whirlpool6').jqxNumberInput(spinstate); |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
3937 | $('#brew_cooling_time').jqxNumberInput(spinstate); |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
3938 | $('#brew_sparge_ph').jqxNumberInput(spinstate); |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
3939 | $('#brew_whirlpool2').jqxNumberInput(spinstate); |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
3940 | $('#brew_aeration_type').jqxDropDownList(onval); |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
3941 | $('#brew_fermenter_tcloss').jqxNumberInput(spinstate); |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
3942 | $('#brew_aeration_time').jqxNumberInput(spinstate); |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
3943 | $('#brew_fermenter_extrawater').jqxNumberInput(spinstate); |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
3944 | $('#brew_aeration_speed').jqxNumberInput(spinstate); |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
3945 | |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
3946 | if (! state) { |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
3947 | state = (dataRecord.boil_time == 0); |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
3948 | } |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
3949 | onval = { disabled: (state) ? true:false }; |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
3950 | spinstate = { spinButtons: (state) ? false:true, readOnly: (state) ? true:false, width: (state) ? 90:110 }; |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
3951 | $('#brew_preboil_ph').jqxNumberInput(spinstate); |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
3952 | $('#brew_aboil_ph').jqxNumberInput(spinstate); |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
3953 | $('#brew_preboil_sg').jqxNumberInput(spinstate); |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
3954 | $('#brew_aboil_sg').jqxNumberInput(spinstate); |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
3955 | $('#brew_preboil_volume').jqxNumberInput(spinstate); |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
3956 | $('#brew_aboil_volume').jqxNumberInput(spinstate); |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
3957 | $('#but_pre_boil').jqxButton(onval); |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
3958 | $('#but_after_boil').jqxButton(onval); |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
3959 | } |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
3960 | |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
3961 | function en_stage_tertiary(state) { |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
3962 | $('#package_date').jqxDateTimeInput({ disabled: (state) ? false:true }); |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
3963 | } |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
3964 | |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
3965 | function en_stage_aftertertiary(state) { |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
3966 | |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
3967 | var spinstate = { spinButtons: (state) ? false:true, readOnly: (state) ? true:false, width: (state) ? 90:110 }; |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
3968 | |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
3969 | $('#primary_start_temp').jqxNumberInput(spinstate); |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
3970 | $('#primary_max_temp').jqxNumberInput(spinstate); |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
3971 | $('#primary_end_temp').jqxNumberInput(spinstate); |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
3972 | $('#primary_end_sg').jqxNumberInput(spinstate); |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
3973 | $('#primary_end_brix').jqxNumberInput(spinstate); |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
3974 | $('#primary_end_date').jqxDateTimeInput({ disabled: (state) ? true:false }); |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
3975 | } |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
3976 | |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
3977 | function en_stage_afterpackaging(state) { |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
3978 | |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
3979 | var onval = { disabled: (state) ? true:false }; |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
3980 | var spinstate = { spinButtons: (state) ? false:true, readOnly: (state) ? true:false, width: (state) ? 90:110 }; |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
3981 | |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
3982 | $('#secondary_temp').jqxNumberInput(spinstate); |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
3983 | $('#secondary_end_sg').jqxNumberInput(spinstate); |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
3984 | $('#secondary_end_date').jqxDateTimeInput(onval); |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
3985 | $('#secondary_end_brix').jqxNumberInput(spinstate); |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
3986 | $('#tertiary_temp').jqxNumberInput(spinstate); |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
3987 | $('#fg').jqxNumberInput(spinstate); |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
3988 | $('#final_brix').jqxNumberInput(spinstate); |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
3989 | $('#package_date').jqxDateTimeInput(onval); |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
3990 | $('#package_volume').jqxNumberInput(spinstate); |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
3991 | $('#package_infuse_amount').jqxNumberInput(spinstate); |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
3992 | $('#package_infuse_abv').jqxNumberInput(spinstate); |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
3993 | $('#package_infuse_notes').jqxInput(onval); |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
3994 | $('#package_ph').jqxNumberInput(spinstate); |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
3995 | $('#bottle_amount').jqxNumberInput(spinstate); |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
3996 | $('#bottle_priming_water').jqxNumberInput(spinstate); |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
3997 | $('#keg_priming_water').jqxNumberInput(spinstate); |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
3998 | $('#keg_amount').jqxNumberInput(spinstate); |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
3999 | $('#bottle_carbonation').jqxNumberInput(spinstate); |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
4000 | $('#keg_carbonation').jqxNumberInput(spinstate); |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
4001 | $('#bottle_priming_sugar').jqxDropDownList(onval); |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
4002 | $('#keg_priming_sugar').jqxDropDownList(onval); |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
4003 | $('#keg_forced_carb').jqxCheckBox(onval); |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
4004 | $('#bottle_carbonation_temp').jqxNumberInput(spinstate); |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
4005 | $('#keg_carbonation_temp').jqxNumberInput(spinstate); |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
4006 | } |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
4007 | |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
4008 | function en_stage_b4taste(state) { |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
4009 | $('#jqxTabs').jqxTabs((state) ? 'disableAt':'enableAt', 11); // Tasting tab |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
4010 | } |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
4011 | |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
4012 | function en_stage_locked(state) { |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
4013 | |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
4014 | var onval = { disabled: (state) ? true:false }; |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
4015 | |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
4016 | $('#taste_date').jqxDateTimeInput(onval); |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
4017 | $('#taste_rate').jqxNumberInput({ spinButtons: (state) ? false:true, readOnly: (state) ? true:false, width: (state) ? 90:110 }); |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
4018 | $('#taste_color').jqxInput(onval); |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
4019 | $('#taste_transparency').jqxInput(onval); |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
4020 | $('#taste_head').jqxInput(onval); |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
4021 | $('#taste_aroma').jqxInput(onval); |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
4022 | $('#taste_taste').jqxInput(onval); |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
4023 | $('#taste_aftertaste').jqxInput(onval); |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
4024 | $('#taste_mouthfeel').jqxInput(onval); |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
4025 | $('#taste_notes').jqxInput(onval); |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
4026 | $('#notes').jqxInput(onval); |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
4027 | } |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
4028 | |
| 478 | 4029 | function calcStage() { |
| 4030 | ||
| 4031 | var newstage = dataRecord.stage, d, date1, date2, date1_unixtime, date2_unixtime, timeDifference, timeDifferenceInDays; | |
| 4032 | ||
| 4033 | if (newstage == 0 && dataRecord.est_og > 1.005 && dataRecord.est_color > 3 && dataRecord.est_ibu > 3) | |
| 4034 | newstage = 1; | |
| 4035 | if (newstage == 1 && parseFloat($('#brew_date_start').val()) > 2000) | |
| 4036 | newstage = 2; // Brewday | |
| 4037 | if (newstage == 2 && ($('#brew_date_start').val() == '')) | |
| 4038 | newstage = 1; // No brewday | |
| 4039 | if (newstage == 2 && parseFloat($('#brew_date_end').val()) > 2000) | |
| 4040 | newstage = 3; // Primary | |
| 4041 | if (newstage == 3 && parseFloat($('#primary_end_date').val()) > 2000) | |
| 4042 | newstage = 4; // Secondary | |
| 4043 | if (newstage == 4 && parseFloat($('#secondary_end_date').val()) > 2000) | |
| 4044 | newstage = 5; // Tertiary | |
| 4045 | if (newstage == 5 && parseFloat($('#package_date').val()) > 2000) | |
| 4046 | newstage = 6; // Package | |
| 4047 | if (newstage >= 6 && newstage < 9) { | |
| 4048 | d = new Date(); | |
| 4049 | date2 = $('#package_date').val(); | |
| 4050 | date2 = date2.split('-'); | |
| 4051 | // Now we convert the array to a Date object | |
| 4052 | date1 = new Date(d.getFullYear(), d.getMonth(), d.getDate()); | |
| 4053 | date2 = new Date(date2[0], date2[1] - 1, date2[2]); | |
| 4054 | // We use the getTime() method and get the unixtime | |
| 4055 | date1_unixtime = parseInt(date1.getTime() / 1000); | |
| 4056 | date2_unixtime = parseInt(date2.getTime() / 1000); | |
| 4057 | // This is the calculated difference in seconds | |
| 4058 | timeDifference = date1_unixtime - date2_unixtime; | |
| 4059 | timeDifferenceInDays = timeDifference / 60 / 60 / 24; | |
| 4060 | if (timeDifferenceInDays > 0) { // At least one day | |
| 4061 | if (timeDifferenceInDays >= 42) // 6 weeks | |
| 4062 | newstage = 9; // Ready to taste | |
| 4063 | else if (timeDifferenceInDays >= 14) // 14 days | |
| 4064 | newstage = 8; // Mature | |
| 4065 | else | |
| 4066 | newstage = 7; // Carbonation | |
| 4067 | } | |
| 4068 | } | |
| 4069 | if (newstage == 9 && parseFloat($('#taste_date').val()) > 2000) | |
| 4070 | newstage = 10; // Ready | |
| 4071 | ||
| 4072 | if (newstage != dataRecord.stage) { | |
| 4073 | console.log('calcStage() old: ' + dataRecord.stage + ' new: ' + newstage); | |
| 4074 | dataRecord.stage = newstage; | |
| 4075 | } | |
| 4076 | ||
| 4077 | /* | |
| 4078 | * Set stage and enable or disable parts of the screens. | |
| 4079 | */ | |
| 4080 | $('#stage').val(StageData[dataRecord.stage].nl); | |
| 4081 | if (dataRecord.stage >= 10) { | |
| 4082 | $('#locked').jqxCheckBox({ disabled: false }); | |
| 4083 | } | |
| 4084 | ||
| 4085 | /* | |
|
723
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
4086 | * Enable or disable parts of the screens. |
| 478 | 4087 | */ |
|
723
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
4088 | en_stage_equipment(dataRecord.stage > 1); // When the brew is in progress or done |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
4089 | en_stage_brewday(dataRecord.stage < 1); // Planning, no ingredients |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
4090 | en_stage_afterbrew(dataRecord.stage > 2); // After the brew |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
4091 | en_stage_afterprimary(dataRecord.stage > 3); // Primary fermentation done |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
4092 | en_stage_tertiary(dataRecord.stage == 5); // Tertiary, allow packaging |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
4093 | en_stage_aftertertiary(dataRecord.stage >= 5); // After all fermentation steps |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
4094 | en_stage_afterpackaging(dataRecord.stage >= 6); // After packaging |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
4095 | en_stage_b4taste(dataRecord.stage < 9); // Taste when at least Mature. |
|
3a837905bbce
Prepared the edit fields for dynamic enable/disable during split batches.
Michiel Broek <mbroek@mbse.eu>
parents:
721
diff
changeset
|
4096 | en_stage_locked(dataRecord.stage == 11); // Locked. |
| 478 | 4097 | } |
| 4098 | ||
| 4099 | function showStarter() { | |
| 4100 | ||
| 4101 | if (dataRecord.starter_enable) { | |
| 4102 | $('#propagator').show(); | |
| 4103 | $('#starter_type').jqxDropDownList({ disabled: false }); | |
| 4104 | $('#starter_try').jqxButton({ disabled: false }); | |
| 4105 | $('#starter_sg').jqxNumberInput({ spinButtons: true, readOnly: false, width: 110 }); | |
| 4106 | } else { | |
| 4107 | $('#propagator').hide(); | |
| 4108 | $('#starter_type').jqxDropDownList({ disabled: true }); | |
| 4109 | $('#starter_try').jqxButton({ disabled: true }); | |
| 4110 | $('#starter_sg').jqxNumberInput({ spinButtons: false, readOnly: true, width: 90 }); | |
| 4111 | } | |
| 4112 | } | |
| 4113 | ||
| 4114 | function calcInit() { | |
| 4115 | ||
| 4116 | calcMashEfficiency(); | |
| 4117 | calcEfficiencyBeforeBoil(); | |
| 4118 | calcEfficiencyAfterBoil(); | |
| 4119 | ||
| 4120 | $('#starter_try').click(function() { | |
|
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:
641
diff
changeset
|
4121 | $('#prop1_volume').val(0); |
|
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:
641
diff
changeset
|
4122 | $('#prop2_volume').val(0); |
|
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:
641
diff
changeset
|
4123 | $('#prop3_volume').val(0); |
|
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:
641
diff
changeset
|
4124 | $('#prop4_volume').val(0); |
|
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:
641
diff
changeset
|
4125 | dataRecord.prop1_volume = dataRecord.prop2_volume = dataRecord.prop3_volume = dataRecord.prop4_volume = 0; |
| 478 | 4126 | calcYeast(); |
| 4127 | }); | |
|
649
52053730f6e1
Yeast starter now automatic adds or removes step lines as they are needed.
Michiel Broek <mbroek@mbse.eu>
parents:
648
diff
changeset
|
4128 | $('#starter_type').on('change', function(event) { |
| 478 | 4129 | if (event.args) { |
| 4130 | dataRecord.starter_type = event.args.index; | |
| 4131 | calcYeast(); | |
| 4132 | } | |
| 4133 | }); | |
| 4134 | $('#starter_sg').on('change', function(event) { | |
| 4135 | if (event.args) { | |
| 4136 | dataRecord.starter_sg = event.args.value; | |
| 4137 | calcYeast(); | |
| 4138 | } | |
| 4139 | }); | |
|
649
52053730f6e1
Yeast starter now automatic adds or removes step lines as they are needed.
Michiel Broek <mbroek@mbse.eu>
parents:
648
diff
changeset
|
4140 | $('#prop1_type').on('change', function(event) { |
| 478 | 4141 | if (event.args) { |
| 4142 | dataRecord.prop1_type = event.args.index; | |
| 4143 | calcYeast(); | |
| 4144 | } | |
| 4145 | }); | |
| 4146 | $('#prop1_volume').on('change', function(event) { | |
| 4147 | if (event.args) { | |
| 4148 | dataRecord.prop1_volume = event.args.value; | |
| 4149 | calcYeast(); | |
| 4150 | } | |
| 4151 | }); | |
|
649
52053730f6e1
Yeast starter now automatic adds or removes step lines as they are needed.
Michiel Broek <mbroek@mbse.eu>
parents:
648
diff
changeset
|
4152 | $('#prop2_type').on('change', function(event) { |
| 478 | 4153 | if (event.args) { |
| 4154 | dataRecord.prop2_type = event.args.index; | |
| 4155 | calcYeast(); | |
| 4156 | } | |
| 4157 | }); | |
| 4158 | $('#prop2_volume').on('change', function(event) { | |
| 4159 | if (event.args) { | |
| 4160 | dataRecord.prop2_volume = event.args.value; | |
| 4161 | calcYeast(); | |
| 4162 | } | |
| 4163 | }); | |
|
649
52053730f6e1
Yeast starter now automatic adds or removes step lines as they are needed.
Michiel Broek <mbroek@mbse.eu>
parents:
648
diff
changeset
|
4164 | $('#prop3_type').on('change', function(event) { |
| 478 | 4165 | if (event.args) { |
| 4166 | dataRecord.prop3_type = event.args.index; | |
| 4167 | calcYeast(); | |
| 4168 | } | |
| 4169 | }); | |
| 4170 | $('#prop3_volume').on('change', function(event) { | |
| 4171 | if (event.args) { | |
| 4172 | dataRecord.prop3_volume = event.args.value; | |
| 4173 | calcYeast(); | |
| 4174 | } | |
| 4175 | }); | |
|
649
52053730f6e1
Yeast starter now automatic adds or removes step lines as they are needed.
Michiel Broek <mbroek@mbse.eu>
parents:
648
diff
changeset
|
4176 | $('#prop4_type').on('change', function(event) { |
| 478 | 4177 | if (event.args) { |
| 4178 | dataRecord.prop4_type = event.args.index; | |
| 4179 | calcYeast(); | |
| 4180 | } | |
| 4181 | }); | |
| 4182 | $('#prop4_volume').on('change', function(event) { | |
| 4183 | if (event.args) { | |
| 4184 | dataRecord.prop4_volume = event.args.value; | |
| 4185 | calcYeast(); | |
| 4186 | } | |
| 4187 | }); | |
| 4188 | ||
| 4189 | $('#calc_acid').on('checked', function(event) { | |
| 4190 | dataRecord.calc_acid = 1; | |
| 4191 | calcWater(); | |
| 4192 | }); | |
| 4193 | $('#calc_acid').on('unchecked', function(event) { | |
| 4194 | dataRecord.calc_acid = 0; | |
| 4195 | calcWater(); | |
| 4196 | }); | |
| 4197 | $('#w1_name').jqxDropDownList('selectItem', dataRecord.w1_name); | |
| 4198 | $('#w2_name').jqxDropDownList('selectItem', dataRecord.w2_name); | |
| 4199 | // Fix tap water if zero using mash infuse amount. | |
| 4200 | if (parseFloat($('#w1_amount').jqxNumberInput('decimal')) == 0 && mash_infuse > 0) { | |
| 4201 | $('#w1_amount').val(mash_infuse); | |
| 4202 | dataRecord.w1_amount = mash_infuse; | |
| 4203 | $('#wg_amount').val(mash_infuse); | |
| 4204 | $('#w2_amount').val(0); | |
| 4205 | dataRecord.w2_amount = 0; | |
| 4206 | } | |
| 4207 | calcWater(); | |
| 4208 | $('#w2_amount').on('change', function(event) { | |
| 4209 | var newval = parseFloat(event.args.value); | |
| 4210 | ||
| 4211 | if (newval > mash_infuse) { | |
| 4212 | $('#w2_amount').val(dataRecord.w2_amount); | |
| 4213 | return; | |
| 4214 | } | |
| 4215 | dataRecord.w1_amount = parseFloat($('#wg_amount').jqxNumberInput('decimal')) - newval; | |
| 4216 | $('#w1_amount').val(dataRecord.w1_amount); | |
| 4217 | dataRecord.w2_amount = newval; | |
| 4218 | console.log('new: ' + event.args.value + ' w1: ' + dataRecord.w1_amount + ' w2: ' + dataRecord.w2_amount); | |
| 4219 | calcWater(); | |
| 4220 | }); | |
| 4221 | $('#wa_cacl2').on('change', function(event) { | |
| 4222 | if (event.args) { | |
|
633
ec4601ab3ed2
Fixed loading of the product edit page. A bit faster loading.
Michiel Broek <mbroek@mbse.eu>
parents:
623
diff
changeset
|
4223 | setWaterAgent('CaCl2', 0); // This prevents double entries. |
| 478 | 4224 | setWaterAgent('CaCl2', event.args.value); |
| 4225 | calcWater(); | |
| 4226 | } | |
| 4227 | }); | |
| 4228 | $('#wa_caso4').on('change', function(event) { | |
| 4229 | if (event.args) { | |
| 4230 | setWaterAgent('CaSO4', 0); | |
| 4231 | setWaterAgent('CaSO4', event.args.value); | |
| 4232 | calcWater(); | |
| 4233 | } | |
| 4234 | }); | |
| 4235 | $('#wa_mgso4').on('change', function(event) { | |
| 4236 | if (event.args) { | |
| 4237 | setWaterAgent('MgSO4', 0); | |
| 4238 | setWaterAgent('MgSO4', event.args.value); | |
| 4239 | calcWater(); | |
| 4240 | } | |
| 4241 | }); | |
| 4242 | $('#wa_nacl').on('change', function(event) { | |
| 4243 | if (event.args) { | |
| 4244 | setWaterAgent('NaCl', 0); | |
| 4245 | setWaterAgent('NaCl', event.args.value); | |
| 4246 | calcWater(); | |
| 4247 | } | |
| 4248 | }); | |
|
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:
641
diff
changeset
|
4249 | $('#wa_base_name').on('select', function(event) { |
| 478 | 4250 | if (event.args) { |
| 4251 | var index = event.args.index; | |
| 4252 | console.log('wa_base_name ' + index); | |
| 4253 | setWaterAgent(last_base, 0); | |
| 4254 | last_base = BaseTypeData[index].nl; | |
| 4255 | setWaterAgent(last_base, parseFloat($('#wa_base').jqxNumberInput('decimal'))); | |
| 4256 | dataRecord.wa_base_name = index; | |
| 4257 | calcWater(); | |
| 4258 | } | |
| 4259 | }); | |
| 4260 | $('#wa_base').on('change', function(event) { | |
| 4261 | var name = BaseTypeData[$('#wa_base_name').val()].nl; | |
| 4262 | setWaterAgent(name, parseFloat(event.args.value)); | |
| 4263 | calcWater(); | |
| 4264 | }); | |
|
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:
641
diff
changeset
|
4265 | $('#wa_acid_name').on('select', function(event) { |
| 478 | 4266 | if (event.args) { |
| 4267 | var index = event.args.index; | |
|
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
|
4268 | console.log('wa_acid_name ' + index + ' last_acid: ' + last_acid); |
| 478 | 4269 | setWaterAgent(last_acid, 0); |
| 4270 | last_acid = AcidTypeData[index].nl; | |
|
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
|
4271 | dataRecord.wa_acid_name = index; |
|
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
|
4272 | dataRecord.wa_acid_perc = AcidTypeData[index].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
|
4273 | $('#wa_acid_perc').val(dataRecord.wa_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
|
4274 | calcWater(); |
| 478 | 4275 | setWaterAgent(last_acid, parseFloat($('#wa_acid').jqxNumberInput('decimal'))); |
| 4276 | } | |
| 4277 | }); | |
| 4278 | $('#wa_acid').on('change', function(event) { | |
|
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
|
4279 | var name = AcidTypeData[dataRecord.wa_acid_name].nl; |
| 478 | 4280 | setWaterAgent(name, parseFloat(event.args.value)); |
| 4281 | calcWater(); | |
| 4282 | }); | |
|
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
|
4283 | $('#wa_acid_perc').on('change', function(event) { |
|
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
|
4284 | dataRecord.wa_acid_perc = parseFloat(event.args.value); |
|
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
|
4285 | calcWater(); |
|
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
|
4286 | }); |
| 478 | 4287 | |
|
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:
641
diff
changeset
|
4288 | $('#color_method').on('select', function(event) { |
| 478 | 4289 | dataRecord.color_method = event.args.index; |
| 4290 | calcFermentables(); | |
| 4291 | }); | |
|
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:
641
diff
changeset
|
4292 | $('#ibu_method').on('select', function(event) { |
| 478 | 4293 | dataRecord.ibu_method = event.args.index; |
| 4294 | calcFermentables(); | |
| 4295 | calcIBUs(); | |
| 4296 | }); | |
| 4297 | ||
| 4298 | $('#batch_size').on('change', function(event) { | |
| 4299 | console.log('batch_size change:' + event.args.value + ' old:' + dataRecord.batch_size); | |
| 4300 | $('#est_a_vol').val(event.args.value * 1.04); | |
|
660
0e9a725354ac
Fixed bugs in calculation of boil volume/batch or boiltime changes.
Michiel Broek <mbroek@mbse.eu>
parents:
658
diff
changeset
|
4301 | var evap = parseFloat($('#eq_evap_rate').jqxNumberInput('decimal')) * dataRecord.boil_time / 60; |
|
0e9a725354ac
Fixed bugs in calculation of boil volume/batch or boiltime changes.
Michiel Broek <mbroek@mbse.eu>
parents:
658
diff
changeset
|
4302 | 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:
658
diff
changeset
|
4303 | 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:
658
diff
changeset
|
4304 | $('#boil_size').val(Round(dataRecord.boil_size, 2)); |
|
0e9a725354ac
Fixed bugs in calculation of boil volume/batch or boiltime changes.
Michiel Broek <mbroek@mbse.eu>
parents:
658
diff
changeset
|
4305 | $('#est_pre_vol').val(Round(dataRecord.boil_size * 1.04, 2)); |
| 478 | 4306 | dataRecord.sparge_volume *= factor; |
| 4307 | $('#sparge_volume').val(dataRecord.sparge_volume); | |
| 4308 | $('#brew_sparge_volume').val(dataRecord.sparge_volume); | |
| 4309 | dataRecord.batch_size = parseFloat(event.args.value); | |
| 4310 | calcFermentablesFromOG(parseFloat($('#est_og').jqxNumberInput('decimal'))); // Keep the OG | |
| 4311 | adjustWaters(factor); | |
| 4312 | calcFermentables(); | |
| 4313 | adjustHops(factor); | |
| 4314 | adjustMiscs(factor); | |
| 4315 | adjustYeasts(factor); | |
| 4316 | calcIBUs(); | |
| 4317 | calcWater(); | |
| 4318 | calcSparge(); | |
| 4319 | calcMash(); | |
| 4320 | }); | |
| 4321 | $('#boil_time').on('change', function(event) { | |
|
660
0e9a725354ac
Fixed bugs in calculation of boil volume/batch or boiltime changes.
Michiel Broek <mbroek@mbse.eu>
parents:
658
diff
changeset
|
4322 | var new_time, old_time, new_evap; |
|
658
945d5eba869a
Implemented no-boil products.
Michiel Broek <mbroek@mbse.eu>
parents:
655
diff
changeset
|
4323 | old_time = parseFloat(dataRecord.boil_time); |
|
945d5eba869a
Implemented no-boil products.
Michiel Broek <mbroek@mbse.eu>
parents:
655
diff
changeset
|
4324 | new_time = parseFloat(event.args.value); |
|
660
0e9a725354ac
Fixed bugs in calculation of boil volume/batch or boiltime changes.
Michiel Broek <mbroek@mbse.eu>
parents:
658
diff
changeset
|
4325 | console.log('boil_time change:' + new_time + ' old:' + old_time); |
|
0e9a725354ac
Fixed bugs in calculation of boil volume/batch or boiltime changes.
Michiel Broek <mbroek@mbse.eu>
parents:
658
diff
changeset
|
4326 | new_evap = parseFloat($('#eq_evap_rate').jqxNumberInput('decimal')) * new_time / 60; |
|
0e9a725354ac
Fixed bugs in calculation of boil volume/batch or boiltime changes.
Michiel Broek <mbroek@mbse.eu>
parents:
658
diff
changeset
|
4327 | dataRecord.boil_size = parseFloat(dataRecord.batch_size) + new_evap; |
|
0e9a725354ac
Fixed bugs in calculation of boil volume/batch or boiltime changes.
Michiel Broek <mbroek@mbse.eu>
parents:
658
diff
changeset
|
4328 | dataRecord.boil_time = new_time; |
|
0e9a725354ac
Fixed bugs in calculation of boil volume/batch or boiltime changes.
Michiel Broek <mbroek@mbse.eu>
parents:
658
diff
changeset
|
4329 | $('#est_pre_vol').val(Round(dataRecord.boil_size * 1.04, 2)); |
|
0e9a725354ac
Fixed bugs in calculation of boil volume/batch or boiltime changes.
Michiel Broek <mbroek@mbse.eu>
parents:
658
diff
changeset
|
4330 | $('#boil_size').val(Round(dataRecord.boil_size, 2)); |
| 478 | 4331 | calcFermentables(); |
| 4332 | calcIBUs(); | |
| 4333 | calcYeast(); | |
|
658
945d5eba869a
Implemented no-boil products.
Michiel Broek <mbroek@mbse.eu>
parents:
655
diff
changeset
|
4334 | calcStage(); |
|
945d5eba869a
Implemented no-boil products.
Michiel Broek <mbroek@mbse.eu>
parents:
655
diff
changeset
|
4335 | kookTijd(); |
| 478 | 4336 | }); |
| 4337 | $('#efficiency').on('change', function(event) { | |
| 4338 | var estog = parseFloat($('#est_og').jqxNumberInput('decimal')); | |
| 4339 | dataRecord.efficiency = parseFloat(event.args.value); | |
| 4340 | console.log('efficiency change:' + dataRecord.efficiency + ' est_og:' + estog); | |
| 4341 | calcFermentablesFromOG(estog); // Keep the OG | |
| 4342 | calcFermentables(); | |
| 4343 | calcIBUs(); | |
| 4344 | calcYeast(); | |
| 4345 | }); | |
| 4346 | $('#est_og').on('change', function(event) { | |
| 4347 | dataRecord.est_og = parseFloat(event.args.value); | |
| 4348 | console.log('est_og change:' + dataRecord.est_og); | |
| 4349 | $('#est_og2').val(dataRecord.est_og); | |
| 4350 | calcFermentablesFromOG(dataRecord.est_og); // Adjust fermentables amounts | |
| 4351 | calcFermentables(); // Update the recipe details | |
| 4352 | calcIBUs(); // and the IBU's. | |
| 4353 | calcMash(); | |
| 4354 | calcYeast(); | |
| 4355 | }); | |
| 4356 | $('#mash_ph').on('change', function(event) { | |
| 4357 | dataRecord.mash_ph = parseFloat(event.args.value); | |
| 4358 | calcWater(); | |
| 4359 | }); | |
| 4360 | ||
| 4361 | $('#sparge_ph').on('change', function(event) { | |
| 4362 | dataRecord.sparge_ph = parseFloat(event.args.value); | |
| 4363 | calcSparge(); | |
| 4364 | }); | |
| 4365 | $('#sparge_volume').on('change', function(event) { | |
| 4366 | dataRecord.sparge_volume = parseFloat(event.args.value); | |
| 4367 | $('#brew_sparge_volume').val(dataRecord.sparge_volume); | |
| 4368 | calcSparge(); | |
| 4369 | }); | |
| 4370 | $('#sparge_temp').on('change', function(event) { | |
| 4371 | dataRecord.sparge_temp = parseFloat(event.args.value); | |
| 4372 | $('#brew_sparge_temperature').val(dataRecord.sparge_temp); | |
| 4373 | }); | |
|
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:
641
diff
changeset
|
4374 | $('#sparge_source').on('select', function(event) { |
| 478 | 4375 | if (event.args) { |
| 4376 | dataRecord.sparge_source = event.args.index; | |
| 4377 | calcSparge(); | |
| 4378 | } | |
| 4379 | }); | |
|
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:
641
diff
changeset
|
4380 | $('#sparge_acid_type').on('select', function(event) { |
| 478 | 4381 | if (event.args) { |
| 4382 | dataRecord.sparge_acid_type = event.args.index; | |
| 4383 | console.log('new sparge_acid_type: ' + 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
|
4384 | dataRecord.sparge_acid_perc = AcidTypeData[event.args.index].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
|
4385 | $('#sparge_acid_perc').val(dataRecord.sparge_acid_perc); |
| 478 | 4386 | calcSparge(); |
| 4387 | } | |
| 4388 | }); | |
| 4389 | $('#sparge_acid_perc').on('change', function(event) { | |
| 4390 | dataRecord.sparge_acid_perc = parseFloat(event.args.value); | |
| 4391 | calcSparge(); | |
| 4392 | }); | |
| 4393 | ||
| 4394 | calcFermentation(); | |
| 4395 | calcCarbonation(); | |
| 4396 | $('#package_volume').on('change', function(event) { | |
| 4397 | var diff, tnew, told = dataRecord.package_volume + dataRecord.package_infuse_amount; | |
| 4398 | dataRecord.package_volume = parseFloat(event.args.value); | |
| 4399 | if (dataRecord.package_volume > dataRecord.brew_fermenter_volume) { | |
| 4400 | dataRecord.package_volume = dataRecord.brew_fermenter_volume; | |
| 4401 | $('#package_volume').val(dataRecord.package_volume); | |
| 4402 | } | |
| 4403 | tnew = dataRecord.package_volume + dataRecord.package_infuse_amount; | |
|
613
26a7a04acef3
Fixed package bottles and kegs amount settings.
Michiel Broek <mbroek@mbse.eu>
parents:
612
diff
changeset
|
4404 | diff = Round(tnew - told, 3); |
| 478 | 4405 | if (told > 0) { |
|
613
26a7a04acef3
Fixed package bottles and kegs amount settings.
Michiel Broek <mbroek@mbse.eu>
parents:
612
diff
changeset
|
4406 | dataRecord.bottle_amount = Round(dataRecord.bottle_amount + ((dataRecord.bottle_amount / told) * diff), 3); |
|
26a7a04acef3
Fixed package bottles and kegs amount settings.
Michiel Broek <mbroek@mbse.eu>
parents:
612
diff
changeset
|
4407 | dataRecord.keg_amount = Round(dataRecord.keg_amount + ((dataRecord.keg_amount / told) * diff), 3); |
| 478 | 4408 | } else { |
| 4409 | dataRecord.bottle_amount = tnew; | |
| 4410 | dataRecord.keg_amount = 0; | |
| 4411 | } | |
|
613
26a7a04acef3
Fixed package bottles and kegs amount settings.
Michiel Broek <mbroek@mbse.eu>
parents:
612
diff
changeset
|
4412 | $('#bottle_amount').val(parseFloat(dataRecord.bottle_amount)); |
|
26a7a04acef3
Fixed package bottles and kegs amount settings.
Michiel Broek <mbroek@mbse.eu>
parents:
612
diff
changeset
|
4413 | $('#keg_amount').val(parseFloat(dataRecord.keg_amount)); |
| 478 | 4414 | calcCarbonation(); |
| 4415 | }); | |
| 4416 | $('#package_infuse_amount').on('change', function(event) { | |
| 4417 | var diff, tnew, told = dataRecord.package_volume + dataRecord.package_infuse_amount; | |
| 4418 | dataRecord.package_infuse_amount = parseFloat(event.args.value); | |
| 4419 | tnew = dataRecord.package_volume + dataRecord.package_infuse_amount; | |
|
613
26a7a04acef3
Fixed package bottles and kegs amount settings.
Michiel Broek <mbroek@mbse.eu>
parents:
612
diff
changeset
|
4420 | diff = Round(tnew - told, 3); |
| 478 | 4421 | if (told > 0) { |
|
613
26a7a04acef3
Fixed package bottles and kegs amount settings.
Michiel Broek <mbroek@mbse.eu>
parents:
612
diff
changeset
|
4422 | dataRecord.bottle_amount = Round(dataRecord.bottle_amount + ((dataRecord.bottle_amount / told) * diff), 3); |
|
26a7a04acef3
Fixed package bottles and kegs amount settings.
Michiel Broek <mbroek@mbse.eu>
parents:
612
diff
changeset
|
4423 | dataRecord.keg_amount = Round(dataRecord.keg_amount + ((dataRecord.keg_amount / told) * diff), 3); |
| 478 | 4424 | } else { |
| 4425 | dataRecord.bottle_amount = tnew; | |
| 4426 | dataRecord.keg_amount = 0; | |
| 4427 | } | |
|
613
26a7a04acef3
Fixed package bottles and kegs amount settings.
Michiel Broek <mbroek@mbse.eu>
parents:
612
diff
changeset
|
4428 | $('#bottle_amount').val(parseFloat(dataRecord.bottle_amount)); |
|
26a7a04acef3
Fixed package bottles and kegs amount settings.
Michiel Broek <mbroek@mbse.eu>
parents:
612
diff
changeset
|
4429 | $('#keg_amount').val(parseFloat(dataRecord.keg_amount)); |
| 478 | 4430 | calcCarbonation(); |
| 4431 | }); | |
| 4432 | $('#package_infuse_abv').on('change', function(event) { | |
| 4433 | dataRecord.package_infuse_abv = parseFloat(event.args.value); | |
| 4434 | calcCarbonation(); | |
| 4435 | }); | |
| 4436 | $('#bottle_amount').on('change', function(event) { | |
|
613
26a7a04acef3
Fixed package bottles and kegs amount settings.
Michiel Broek <mbroek@mbse.eu>
parents:
612
diff
changeset
|
4437 | var vtot, vnew = parseFloat(event.args.value); |
|
26a7a04acef3
Fixed package bottles and kegs amount settings.
Michiel Broek <mbroek@mbse.eu>
parents:
612
diff
changeset
|
4438 | vtot = Round(dataRecord.package_volume + dataRecord.package_infuse_amount - dataRecord.keg_amount, 3); |
| 478 | 4439 | if (vnew > vtot) |
| 4440 | vnew = vtot; | |
|
613
26a7a04acef3
Fixed package bottles and kegs amount settings.
Michiel Broek <mbroek@mbse.eu>
parents:
612
diff
changeset
|
4441 | dataRecord.bottle_amount = Round(vnew, 3); |
| 478 | 4442 | $('#bottle_amount').val(parseFloat(dataRecord.bottle_amount)); |
|
613
26a7a04acef3
Fixed package bottles and kegs amount settings.
Michiel Broek <mbroek@mbse.eu>
parents:
612
diff
changeset
|
4443 | console.log('vtot:' + vtot + ' vnew:' + vnew + ' bottle:' + dataRecord.bottle_amount + ' keg:' + dataRecord.keg_amount); |
| 478 | 4444 | calcCarbonation(); |
| 4445 | }); | |
| 4446 | $('#bottle_priming_water').on('change', function(event) { | |
| 4447 | dataRecord.bottle_priming_water = parseFloat(event.args.value); | |
| 4448 | calcCarbonation(); | |
| 4449 | }); | |
| 4450 | $('#keg_amount').on('change', function(event) { | |
|
613
26a7a04acef3
Fixed package bottles and kegs amount settings.
Michiel Broek <mbroek@mbse.eu>
parents:
612
diff
changeset
|
4451 | var vtot, vnew = parseFloat(event.args.value); |
|
26a7a04acef3
Fixed package bottles and kegs amount settings.
Michiel Broek <mbroek@mbse.eu>
parents:
612
diff
changeset
|
4452 | vtot = Round(dataRecord.package_volume + dataRecord.package_infuse_amount - dataRecord.bottle_amount, 3); |
| 478 | 4453 | if (vnew > vtot) |
| 4454 | vnew = vtot; | |
|
613
26a7a04acef3
Fixed package bottles and kegs amount settings.
Michiel Broek <mbroek@mbse.eu>
parents:
612
diff
changeset
|
4455 | dataRecord.keg_amount = Round(vnew, 3); |
| 478 | 4456 | $('#keg_amount').val(parseFloat(dataRecord.keg_amount)); |
|
613
26a7a04acef3
Fixed package bottles and kegs amount settings.
Michiel Broek <mbroek@mbse.eu>
parents:
612
diff
changeset
|
4457 | console.log('vtot:' + vtot + ' vnew:' + vnew + ' bottle:' + dataRecord.bottle_amount + ' keg:' + dataRecord.keg_amount); |
| 478 | 4458 | calcCarbonation(); |
| 4459 | }); | |
| 4460 | $('#keg_priming_water').on('change', function(event) { | |
| 4461 | dataRecord.keg_priming_water = parseFloat(event.args.value); | |
| 4462 | calcCarbonation(); | |
| 4463 | }); | |
| 4464 | $('#bottle_carbonation').on('change', function(event) { | |
| 4465 | dataRecord.bottle_carbonation = parseFloat(event.args.value); | |
| 4466 | calcCarbonation(); | |
| 4467 | }); | |
| 4468 | $('#bottle_carbonation_temp').on('change', function(event) { | |
| 4469 | dataRecord.bottle_carbonation_temp = parseFloat(event.args.value); | |
| 4470 | calcCarbonation(); | |
| 4471 | }); | |
| 4472 | $('#keg_carbonation').on('change', function(event) { | |
| 4473 | dataRecord.keg_carbonation = parseFloat(event.args.value); | |
| 4474 | calcCarbonation(); | |
| 4475 | }); | |
| 4476 | $('#keg_forced_carb').on('checked', function(event) { | |
| 4477 | dataRecord.keg_forced_carb = 1; | |
| 4478 | calcCarbonation(); | |
| 4479 | }); | |
| 4480 | $('#keg_forced_carb').on('unchecked', function(event) { | |
| 4481 | dataRecord.keg_forced_carb = 0; | |
| 4482 | calcCarbonation(); | |
| 4483 | }); | |
| 4484 | $('#keg_carbonation_temp').on('change', function(event) { | |
| 4485 | dataRecord.keg_carbonation_temp = parseFloat(event.args.value); | |
| 4486 | calcCarbonation(); | |
| 4487 | }); | |
| 4488 | ||
| 4489 | $('#brew_fermenter_extrawater').on('change', function(event) { | |
| 4490 | dataRecord.brew_fermenter_extrawater = parseFloat(event.args.value); | |
| 4491 | calcFermentables(); | |
| 4492 | calcIBUs(); | |
| 4493 | calcYeast(); | |
| 4494 | }); | |
| 4495 | $('#brew_fermenter_tcloss').on('change', function(event) { | |
| 4496 | dataRecord.brew_fermenter_tcloss = parseFloat(event.args.value); | |
| 4497 | calcFermentables(); | |
| 4498 | calcIBUs(); | |
| 4499 | calcYeast(); | |
| 4500 | }); | |
| 4501 | $('#primary_end_sg').on('change', function(event) { | |
| 4502 | dataRecord.primary_end_sg = parseFloat(event.args.value); | |
| 4503 | calcFermentation(); | |
| 4504 | }); | |
| 4505 | $('#primary_end_brix').on('change', function(event) { | |
| 4506 | var OBrix, FBrix, FG; | |
| 4507 | if (dataRecord.brew_fermenter_sg >= 1.020) { | |
|
721
4d7394ced1c3
Better FG calculation from the refractometer reading. Now using the Petr Novotny formula.
Michiel Broek <mbroek@mbse.eu>
parents:
714
diff
changeset
|
4508 | OBrix = sg_to_plato(dataRecord.brew_fermenter_sg); |
| 478 | 4509 | FBrix = parseFloat(event.args.value); |
|
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:
560
diff
changeset
|
4510 | FG = brix_to_fg(OBrix, FBrix); |
| 478 | 4511 | if (FBrix > 0.05) { |
|
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:
560
diff
changeset
|
4512 | $('#primary_end_sg').val(FG); |
|
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:
560
diff
changeset
|
4513 | dataRecord.primary_end_sg = FG; |
| 478 | 4514 | } |
| 4515 | calcFermentation(); | |
| 4516 | } | |
| 4517 | }); | |
| 4518 | $('#secondary_end_sg').on('change', function(event) { | |
| 4519 | dataRecord.secondary_end_sg = parseFloat(event.args.value); | |
| 4520 | calcFermentation(); | |
| 4521 | }); | |
| 4522 | $('#secondary_end_brix').on('change', function(event) { | |
| 4523 | var OBrix, FBrix, FG; | |
| 4524 | if (dataRecord.brew_fermenter_sg >= 1.020) { | |
|
721
4d7394ced1c3
Better FG calculation from the refractometer reading. Now using the Petr Novotny formula.
Michiel Broek <mbroek@mbse.eu>
parents:
714
diff
changeset
|
4525 | OBrix = sg_to_plato(dataRecord.brew_fermenter_sg); |
| 478 | 4526 | FBrix = parseFloat(event.args.value); |
|
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:
560
diff
changeset
|
4527 | FG = brix_to_fg(OBrix, FBrix); |
| 478 | 4528 | if (FBrix > 0.05) { |
|
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:
560
diff
changeset
|
4529 | $('#secondary_end_sg').val(FG); |
|
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:
560
diff
changeset
|
4530 | dataRecord.secondary_end_sg = FG; |
| 478 | 4531 | } |
| 4532 | calcFermentation(); | |
| 4533 | } | |
| 4534 | }); | |
| 4535 | $('#final_brix').on('change', function(event) { | |
| 4536 | var OBrix, FBrix, FG; | |
| 4537 | if (dataRecord.brew_fermenter_sg >= 1.020) { | |
|
721
4d7394ced1c3
Better FG calculation from the refractometer reading. Now using the Petr Novotny formula.
Michiel Broek <mbroek@mbse.eu>
parents:
714
diff
changeset
|
4538 | OBrix = sg_to_plato(dataRecord.brew_fermenter_sg); |
|
560
850e82c1021d
Switched FG calculations from Brix to the new cubic method from http://seanterrill.com. This includes the brix correction factor and seems better then the Brouwhulp formula.
Michiel Broek <mbroek@mbse.eu>
parents:
559
diff
changeset
|
4539 | FBrix = parseFloat(event.args.value); |
|
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:
560
diff
changeset
|
4540 | FG = brix_to_fg(OBrix, FBrix); |
|
560
850e82c1021d
Switched FG calculations from Brix to the new cubic method from http://seanterrill.com. This includes the brix correction factor and seems better then the Brouwhulp formula.
Michiel Broek <mbroek@mbse.eu>
parents:
559
diff
changeset
|
4541 | if (FBrix > 0.05) { |
|
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:
560
diff
changeset
|
4542 | $('#fg').val(FG); |
|
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:
560
diff
changeset
|
4543 | dataRecord.fg = FG; |
| 478 | 4544 | } |
| 4545 | calcFermentation(); | |
| 4546 | } | |
| 4547 | }); | |
| 4548 | $('#fg').on('change', function(event) { | |
| 4549 | dataRecord.fg = parseFloat(event.args.value); | |
| 4550 | calcFermentation(); | |
| 4551 | }); | |
|
538
41d21817608e
Added the IBU contribution for whirlpool hops.
Michiel Broek <mbroek@mbse.eu>
parents:
525
diff
changeset
|
4552 | $('#brew_whirlpool9').on('valueChanged', function(event) { |
|
41d21817608e
Added the IBU contribution for whirlpool hops.
Michiel Broek <mbroek@mbse.eu>
parents:
525
diff
changeset
|
4553 | dataRecord.brew_whirlpool9 = event.args.value; |
|
41d21817608e
Added the IBU contribution for whirlpool hops.
Michiel Broek <mbroek@mbse.eu>
parents:
525
diff
changeset
|
4554 | whirlpoolHops(); |
|
41d21817608e
Added the IBU contribution for whirlpool hops.
Michiel Broek <mbroek@mbse.eu>
parents:
525
diff
changeset
|
4555 | calcIBUs(); |
|
41d21817608e
Added the IBU contribution for whirlpool hops.
Michiel Broek <mbroek@mbse.eu>
parents:
525
diff
changeset
|
4556 | }); |
|
41d21817608e
Added the IBU contribution for whirlpool hops.
Michiel Broek <mbroek@mbse.eu>
parents:
525
diff
changeset
|
4557 | $('#brew_whirlpool7').on('valueChanged', function(event) { |
|
41d21817608e
Added the IBU contribution for whirlpool hops.
Michiel Broek <mbroek@mbse.eu>
parents:
525
diff
changeset
|
4558 | dataRecord.brew_whirlpool7 = event.args.value; |
|
41d21817608e
Added the IBU contribution for whirlpool hops.
Michiel Broek <mbroek@mbse.eu>
parents:
525
diff
changeset
|
4559 | whirlpoolHops(); |
|
41d21817608e
Added the IBU contribution for whirlpool hops.
Michiel Broek <mbroek@mbse.eu>
parents:
525
diff
changeset
|
4560 | calcIBUs(); |
|
41d21817608e
Added the IBU contribution for whirlpool hops.
Michiel Broek <mbroek@mbse.eu>
parents:
525
diff
changeset
|
4561 | }); |
|
41d21817608e
Added the IBU contribution for whirlpool hops.
Michiel Broek <mbroek@mbse.eu>
parents:
525
diff
changeset
|
4562 | $('#brew_whirlpool6').on('valueChanged', function(event) { |
|
41d21817608e
Added the IBU contribution for whirlpool hops.
Michiel Broek <mbroek@mbse.eu>
parents:
525
diff
changeset
|
4563 | dataRecord.brew_whirlpool6 = event.args.value; |
|
41d21817608e
Added the IBU contribution for whirlpool hops.
Michiel Broek <mbroek@mbse.eu>
parents:
525
diff
changeset
|
4564 | whirlpoolHops(); |
|
41d21817608e
Added the IBU contribution for whirlpool hops.
Michiel Broek <mbroek@mbse.eu>
parents:
525
diff
changeset
|
4565 | calcIBUs(); |
|
41d21817608e
Added the IBU contribution for whirlpool hops.
Michiel Broek <mbroek@mbse.eu>
parents:
525
diff
changeset
|
4566 | }); |
| 478 | 4567 | $('#BLog').jqxButton({ disabled: (dataRecord.log_brew) ? false : true}); |
| 4568 | $('#FLog').jqxButton({ disabled: (dataRecord.log_fermentation) ? false : true}); | |
|
602
10b61aacb1c1
New products field log_ispindel. Add check for ispindel log to crontasks.php Added log_ispindel to prod_edit, pprod_divide, prod_new and prod_duplicate. Renamed some log_fermentation vergisting names into klimaatkast.
Michiel Broek <mbroek@mbse.eu>
parents:
586
diff
changeset
|
4569 | $('#ILog').jqxButton({ disabled: (dataRecord.log_ispindel) ? false : true}); |
|
615
9034e65b0d7a
Added CO2 carbonation log to the products database. Added button in the packaging tab.
Michiel Broek <mbroek@mbse.eu>
parents:
613
diff
changeset
|
4570 | $('#CLog').jqxButton({ disabled: (dataRecord.log_co2pressure) ? false : true}); |
| 478 | 4571 | } |
| 4572 | ||
| 4573 | $('#styleSelect').jqxDropDownList({ | |
| 4574 | placeHolder: 'Kies bierstijl:', | |
| 4575 | theme: theme, | |
| 4576 | source: styleslist, | |
| 4577 | displayMember: 'name', | |
| 4578 | width: 180, | |
| 4579 | height: 23, | |
| 4580 | dropDownVerticalAlignment: 'top', | |
| 4581 | dropDownWidth: 500, | |
| 4582 | dropDownHeight: 380, | |
| 4583 | renderer: function(index, label, value) { | |
| 4584 | var datarecord = styleslist.records[index]; | |
| 4585 | return datarecord.style_guide + ' ' + datarecord.style_letter + ' ' + datarecord.name; | |
| 4586 | } | |
| 4587 | }); | |
| 4588 | $('#styleSelect').on('select', function(event) { | |
| 4589 | if (event.args) { | |
| 4590 | var datarecord, index = event.args.index; | |
| 4591 | datarecord = styleslist.records[index]; | |
| 4592 | $('#st_name').val(datarecord.name); | |
| 4593 | $('#st_category').val(datarecord.category); | |
| 4594 | $('#st_category_number').val(datarecord.category_number); | |
| 4595 | $('#st_letter').val(datarecord.style_letter); | |
| 4596 | $('#st_guide').val(datarecord.style_guide); | |
| 4597 | $('#st_type').val(StyleTypeData[datarecord.type].nl); | |
| 4598 | $('#st_og_min').val(datarecord.og_min); | |
| 4599 | $('#st_og_max').val(datarecord.og_max); | |
| 4600 | $('#st_fg_min').val(datarecord.fg_min); | |
| 4601 | $('#st_fg_max').val(datarecord.fg_max); | |
| 4602 | $('#st_ibu_min').val(datarecord.ibu_min); | |
| 4603 | $('#st_ibu_max').val(datarecord.ibu_max); | |
| 4604 | $('#st_color_min').val(datarecord.color_min); | |
| 4605 | $('#st_color_max').val(datarecord.color_max); | |
| 4606 | $('#st_carb_min').val(datarecord.carb_min); | |
| 4607 | $('#st_carb_min2').val(datarecord.carb_min); | |
| 4608 | $('#st_carb_max').val(datarecord.carb_max); | |
| 4609 | $('#st_carb_max2').val(datarecord.carb_max); | |
| 4610 | $('#st_abv_min').val(datarecord.abv_min); | |
| 4611 | $('#st_abv_max').val(datarecord.abv_max); | |
| 4612 | } | |
| 4613 | }); | |
| 4614 | ||
| 4615 | // Equipemnt dropdown list | |
| 4616 | $('#equipmentSelect').jqxDropDownList({ | |
| 4617 | placeHolder: 'Kies apparatuur:', | |
| 4618 | theme: theme, | |
| 4619 | source: equipmentlist, | |
| 4620 | displayMember: 'name', | |
| 4621 | width: 170, | |
| 4622 | height: 23, | |
| 4623 | dropDownWidth: 300, | |
| 4624 | renderer: function(index, label, value) { | |
| 4625 | var datarecord = equipmentlist.records[index]; | |
| 4626 | return datarecord.batch_size + ' liter ' + datarecord.name; | |
| 4627 | } | |
| 4628 | }); | |
| 4629 | $('#equipmentSelect').on('select', function(event) { | |
| 4630 | if (event.args) { | |
| 4631 | var datarecord, factor, index = event.args.index; | |
| 4632 | datarecord = equipmentlist.records[index]; | |
| 4633 | factor = datarecord.batch_size / dataRecord.batch_size; | |
| 4634 | $('#eq_name').val(datarecord.name); | |
| 4635 | $('#eq_boil_size').val(datarecord.boil_size); | |
| 4636 | dataRecord.boil_size = datarecord.boil_size; | |
| 4637 | $('#boil_size').val(datarecord.boil_size); | |
| 4638 | $('#eq_batch_size').val(datarecord.batch_size); | |
| 4639 | dataRecord.batch_size = datarecord.batch_size; | |
| 4640 | $('#batch_size').val(datarecord.batch_size); | |
| 4641 | $('#est_a_vol').val(datarecord.batch_size * 1.04); | |
| 4642 | $('#eq_tun_volume').val(datarecord.tun_volume); | |
| 4643 | dataRecord.eq_tun_weight = datarecord.tun_weight; | |
| 4644 | dataRecord.eq_tun_specific_heat = datarecord.tun_specific_heat; | |
| 4645 | dataRecord.eq_tun_material = datarecord.tun_material; | |
| 4646 | dataRecord.eq_tun_height = datarecord.tun_height / 100.0; | |
| 4647 | $('#eq_top_up_water').val(datarecord.top_up_water); | |
| 4648 | dataRecord.eq_trub_chiller_loss = datarecord.trub_chiller_loss; | |
| 4649 | $('#eq_trub_chiller_loss').val(datarecord.trub_chiller_loss); | |
| 4650 | $('#eq_evap_rate').val(datarecord.evap_rate); | |
| 4651 | $('#eq_boil_time').val(datarecord.boil_time); | |
| 4652 | dataRecord.eq_calc_boil_volume = datarecord.calc_boil_volume; | |
| 4653 | $('#eq_top_up_kettle').val(datarecord.top_up_kettle); | |
| 4654 | $('#eq_hop_utilization').val(datarecord.hop_utilization); | |
| 4655 | $('#eq_notes').val(datarecord.notes); | |
| 4656 | $('#eq_lauter_volume').val(datarecord.lauter_volume); | |
| 4657 | dataRecord.eq_lauter_height = datarecord.lauter_height / 100.0; | |
| 4658 | $('#eq_lauter_deadspace').val(datarecord.lauter_deadspace); | |
| 4659 | $('#eq_kettle_volume').val(datarecord.kettle_volume); | |
| 4660 | dataRecord.eq_kettle_height = datarecord.kettle_height / 100.0; | |
| 4661 | $('#eq_mash_volume').val(datarecord.mash_volume); | |
| 4662 | $('#eq_mash_max').val(datarecord.mash_max); | |
| 4663 | dataRecord.eq_mash_max = datarecord.mash_max; | |
| 4664 | $('#mash_max').val(datarecord.mash_max); | |
| 4665 | $('#eq_efficiency').val(datarecord.efficiency); | |
| 4666 | dataRecord.efficiency = datarecord.efficiency; | |
| 4667 | $('#efficiency').val(datarecord.efficiency); | |
| 4668 | ||
| 4669 | dataRecord.sparge_volume = Math.round(datarecord.boil_size * 5) / 10; | |
| 4670 | $('#sparge_volume').val(dataRecord.sparge_volume); | |
| 4671 | $('#brew_sparge_volume').val(dataRecord.sparge_volume); | |
| 4672 | $('#est_pre_vol').val(datarecord.boil_size * 1.04); | |
| 4673 | calcFermentablesFromOG(parseFloat($('#est_og').jqxNumberInput('decimal'))); // Keep the OG | |
| 4674 | adjustWaters(factor); | |
| 4675 | calcFermentables(); | |
| 4676 | adjustHops(factor); | |
| 4677 | adjustMiscs(factor); | |
| 4678 | adjustYeasts(factor); | |
| 4679 | calcIBUs(); | |
| 4680 | calcWater(); | |
| 4681 | calcSparge(); | |
| 4682 | } | |
| 4683 | }); | |
| 4684 | ||
|
489
18e5cfe5d126
Load new url in database write callback
Michiel Broek <mbroek@mbse.eu>
parents:
484
diff
changeset
|
4685 | function saveRecord(goback) { |
| 478 | 4686 | var row = { |
| 4687 | record: my_record, | |
| 4688 | uuid: dataRecord.uuid, | |
| 4689 | name: $('#name').val(), | |
| 4690 | code: $('#code').val(), | |
| 4691 | birth: $('#birth').val(), | |
| 4692 | stage: dataRecord.stage, | |
| 4693 | notes: $('#notes').val(), | |
| 4694 | log_brew: dataRecord.log_brew, | |
| 4695 | log_fermentation: dataRecord.log_fermentation, | |
|
602
10b61aacb1c1
New products field log_ispindel. Add check for ispindel log to crontasks.php Added log_ispindel to prod_edit, pprod_divide, prod_new and prod_duplicate. Renamed some log_fermentation vergisting names into klimaatkast.
Michiel Broek <mbroek@mbse.eu>
parents:
586
diff
changeset
|
4696 | log_ispindel: dataRecord.log_ispindel, |
|
615
9034e65b0d7a
Added CO2 carbonation log to the products database. Added button in the packaging tab.
Michiel Broek <mbroek@mbse.eu>
parents:
613
diff
changeset
|
4697 | log_co2pressure: dataRecord.log_co2pressure, |
| 478 | 4698 | inventory_reduced: dataRecord.inventory_reduced, |
| 4699 | locked: dataRecord.locked, | |
| 4700 | eq_name: $('#eq_name').val(), | |
| 4701 | eq_boil_size: parseFloat($('#eq_boil_size').jqxNumberInput('decimal')), | |
| 4702 | eq_batch_size: parseFloat($('#eq_batch_size').jqxNumberInput('decimal')), | |
| 4703 | eq_tun_volume: parseFloat($('#eq_tun_volume').jqxNumberInput('decimal')), | |
| 4704 | eq_tun_weight: dataRecord.eq_tun_weight, | |
| 4705 | eq_tun_specific_heat: dataRecord.eq_tun_specific_heat, | |
| 4706 | eq_tun_material: dataRecord.eq_tun_material, | |
| 4707 | eq_tun_height: dataRecord.eq_tun_height, | |
| 4708 | eq_top_up_water: parseFloat($('#eq_top_up_water').jqxNumberInput('decimal')), | |
| 4709 | eq_trub_chiller_loss: parseFloat($('#eq_trub_chiller_loss').jqxNumberInput('decimal')), | |
| 4710 | eq_evap_rate: parseFloat($('#eq_evap_rate').jqxNumberInput('decimal')), | |
| 4711 | eq_boil_time: parseFloat($('#eq_boil_time').jqxNumberInput('decimal')), | |
| 4712 | eq_calc_boil_volume: dataRecord.eq_calc_boil_volume, | |
| 4713 | eq_top_up_kettle: parseFloat($('#eq_top_up_kettle').jqxNumberInput('decimal')), | |
| 4714 | eq_hop_utilization: parseFloat($('#eq_hop_utilization').jqxNumberInput('decimal')), | |
| 4715 | eq_notes: $('#eq_notes').val(), | |
| 4716 | eq_lauter_volume: parseFloat($('#eq_lauter_volume').jqxNumberInput('decimal')), | |
| 4717 | eq_lauter_height: dataRecord.eq_lauter_height, | |
| 4718 | eq_lauter_deadspace: parseFloat($('#eq_lauter_deadspace').jqxNumberInput('decimal')), | |
| 4719 | eq_kettle_volume: parseFloat($('#eq_kettle_volume').jqxNumberInput('decimal')), | |
| 4720 | eq_kettle_height: dataRecord.eq_kettle_height, | |
| 4721 | eq_mash_volume: parseFloat($('#eq_mash_volume').jqxNumberInput('decimal')), | |
| 4722 | eq_mash_max: parseFloat($('#eq_mash_max').jqxNumberInput('decimal')), | |
| 4723 | eq_efficiency: parseFloat($('#eq_efficiency').jqxNumberInput('decimal')), | |
| 4724 | brew_date_start: $('#brew_date_start').val(), | |
| 4725 | brew_mash_ph: parseFloat($('#brew_mash_ph').jqxNumberInput('decimal')), | |
| 4726 | brew_mash_sg: parseFloat($('#brew_mash_sg').jqxNumberInput('decimal')), | |
| 4727 | brew_mash_efficiency: parseFloat($('#brew_mash_efficiency').jqxNumberInput('decimal')), | |
| 4728 | brew_sparge_est: parseFloat($('#brew_sparge_est').jqxNumberInput('decimal')), | |
| 4729 | brew_sparge_ph: parseFloat($('#brew_sparge_ph').jqxNumberInput('decimal')), | |
| 4730 | brew_preboil_volume: parseFloat($('#brew_preboil_volume').jqxNumberInput('decimal')), | |
| 4731 | brew_preboil_sg: parseFloat($('#brew_preboil_sg').jqxNumberInput('decimal')), | |
| 4732 | brew_preboil_ph: parseFloat($('#brew_preboil_ph').jqxNumberInput('decimal')), | |
| 4733 | brew_preboil_efficiency: parseFloat($('#brew_preboil_efficiency').jqxNumberInput('decimal')), | |
| 4734 | brew_aboil_volume: parseFloat($('#brew_aboil_volume').jqxNumberInput('decimal')), | |
| 4735 | brew_aboil_sg: parseFloat($('#brew_aboil_sg').jqxNumberInput('decimal')), | |
| 4736 | brew_aboil_ph: parseFloat($('#brew_aboil_ph').jqxNumberInput('decimal')), | |
| 4737 | brew_aboil_efficiency: parseFloat($('#brew_aboil_efficiency').jqxNumberInput('decimal')), | |
| 4738 | brew_cooling_method: $('#brew_cooling_method').val(), | |
| 4739 | brew_cooling_time: parseFloat($('#brew_cooling_time').jqxNumberInput('decimal')), | |
| 4740 | brew_cooling_to: parseFloat($('#brew_cooling_to').jqxNumberInput('decimal')), | |
| 4741 | brew_whirlpool9: parseFloat($('#brew_whirlpool9').jqxNumberInput('decimal')), | |
| 4742 | brew_whirlpool7: parseFloat($('#brew_whirlpool7').jqxNumberInput('decimal')), | |
| 4743 | brew_whirlpool6: parseFloat($('#brew_whirlpool6').jqxNumberInput('decimal')), | |
| 4744 | brew_whirlpool2: parseFloat($('#brew_whirlpool2').jqxNumberInput('decimal')), | |
| 4745 | brew_fermenter_volume: parseFloat($('#brew_fermenter_volume').jqxNumberInput('decimal')), | |
| 4746 | brew_fermenter_extrawater: parseFloat($('#brew_fermenter_extrawater').jqxNumberInput('decimal')), | |
| 4747 | brew_fermenter_tcloss: parseFloat($('#brew_fermenter_tcloss').jqxNumberInput('decimal')), | |
| 4748 | brew_aeration_time: parseFloat($('#brew_aeration_time').jqxNumberInput('decimal')), | |
| 4749 | brew_aeration_speed: parseFloat($('#brew_aeration_speed').jqxNumberInput('decimal')), | |
| 4750 | brew_aeration_type: $('#brew_aeration_type').val(), | |
| 4751 | brew_fermenter_sg: parseFloat($('#brew_fermenter_sg').jqxNumberInput('decimal')), | |
| 4752 | brew_fermenter_ibu: parseFloat($('#brew_fermenter_ibu').jqxNumberInput('decimal')), | |
| 4753 | brew_fermenter_color: parseFloat($('#brew_fermenter_color').jqxNumberInput('decimal')), | |
| 4754 | brew_date_end: $('#brew_date_end').val(), | |
| 4755 | og: dataRecord.og, | |
| 4756 | fg: parseFloat($('#fg').jqxNumberInput('decimal')), | |
| 4757 | primary_start_temp: parseFloat($('#primary_start_temp').jqxNumberInput('decimal')), | |
| 4758 | primary_max_temp: parseFloat($('#primary_max_temp').jqxNumberInput('decimal')), | |
| 4759 | primary_end_temp: parseFloat($('#primary_end_temp').jqxNumberInput('decimal')), | |
| 4760 | primary_end_sg: parseFloat($('#primary_end_sg').jqxNumberInput('decimal')), | |
| 4761 | primary_end_date: $('#primary_end_date').val(), | |
| 4762 | secondary_temp: parseFloat($('#secondary_temp').jqxNumberInput('decimal')), | |
| 4763 | secondary_end_sg: parseFloat($('#secondary_end_sg').jqxNumberInput('decimal')), | |
| 4764 | secondary_end_date: $('#secondary_end_date').val(), | |
| 4765 | tertiary_temp: parseFloat($('#tertiary_temp').jqxNumberInput('decimal')), | |
| 4766 | package_date: $('#package_date').val(), | |
| 4767 | package_volume: parseFloat($('#package_volume').jqxNumberInput('decimal')), | |
| 4768 | package_infuse_amount: parseFloat($('#package_infuse_amount').jqxNumberInput('decimal')), | |
| 4769 | package_infuse_abv: parseFloat($('#package_infuse_abv').jqxNumberInput('decimal')), | |
| 4770 | package_infuse_notes: $('#package_infuse_notes').val(), | |
| 4771 | package_abv: parseFloat($('#package_abv').jqxNumberInput('decimal')), | |
| 4772 | package_ph: parseFloat($('#package_ph').jqxNumberInput('decimal')), | |
| 4773 | bottle_amount: parseFloat($('#bottle_amount').jqxNumberInput('decimal')), | |
| 4774 | bottle_carbonation: parseFloat($('#bottle_carbonation').jqxNumberInput('decimal')), | |
| 4775 | bottle_priming_water: parseFloat($('#bottle_priming_water').jqxNumberInput('decimal')), | |
| 4776 | bottle_priming_amount: parseFloat($('#bottle_priming_amount').jqxNumberInput('decimal')), | |
| 4777 | bottle_carbonation_temp: parseFloat($('#bottle_carbonation_temp').jqxNumberInput('decimal')), | |
| 4778 | keg_amount: parseFloat($('#keg_amount').jqxNumberInput('decimal')), | |
| 4779 | keg_carbonation: parseFloat($('#keg_carbonation').jqxNumberInput('decimal')), | |
| 4780 | keg_priming_water: parseFloat($('#keg_priming_water').jqxNumberInput('decimal')), | |
| 4781 | keg_priming_amount: parseFloat($('#keg_priming_amount').jqxNumberInput('decimal')), | |
| 4782 | keg_carbonation_temp: parseFloat($('#keg_carbonation_temp').jqxNumberInput('decimal')), | |
| 4783 | keg_forced_carb: dataRecord.keg_forced_carb, | |
| 4784 | keg_pressure: parseFloat($('#keg_pressure').jqxNumberInput('decimal')), | |
| 4785 | taste_notes: $('#taste_notes').val(), | |
| 4786 | taste_rate: parseFloat($('#taste_rate').jqxNumberInput('decimal')), | |
| 4787 | taste_date: $('#taste_date').val(), | |
| 4788 | taste_color: $('#taste_color').val(), | |
| 4789 | taste_transparency: $('#taste_transparency').val(), | |
| 4790 | taste_head: $('#taste_head').val(), | |
| 4791 | taste_aroma: $('#taste_aroma').val(), | |
| 4792 | taste_taste: $('#taste_taste').val(), | |
| 4793 | taste_mouthfeel: $('#taste_mouthfeel').val(), | |
| 4794 | taste_aftertaste: $('#taste_aftertaste').val(), | |
| 4795 | st_name: $('#st_name').val(), | |
| 4796 | st_letter: $('#st_letter').val(), | |
| 4797 | st_guide: $('#st_guide').val(), | |
| 4798 | st_type: dataRecord.st_type, | |
| 4799 | st_category: $('#st_category').val(), | |
|
706
12f9316de113
Less logging in the db_product interface. Fixed some empty default values that bugged the newer php and mariadb versions.
Michiel Broek <mbroek@mbse.eu>
parents:
697
diff
changeset
|
4800 | st_category_number: $('#st_category_number').val(), |
| 478 | 4801 | st_og_min: parseFloat($('#st_og_min').jqxNumberInput('decimal')), |
| 4802 | st_og_max: parseFloat($('#st_og_max').jqxNumberInput('decimal')), | |
| 4803 | st_fg_min: parseFloat($('#st_fg_min').jqxNumberInput('decimal')), | |
| 4804 | st_fg_max: parseFloat($('#st_fg_max').jqxNumberInput('decimal')), | |
| 4805 | st_ibu_min: parseFloat($('#st_ibu_min').jqxNumberInput('decimal')), | |
| 4806 | st_ibu_max: parseFloat($('#st_ibu_max').jqxNumberInput('decimal')), | |
| 4807 | st_color_min: parseFloat($('#st_color_min').jqxNumberInput('decimal')), | |
| 4808 | st_color_max: parseFloat($('#st_color_max').jqxNumberInput('decimal')), | |
| 4809 | st_carb_min: parseFloat($('#st_carb_min').jqxNumberInput('decimal')), | |
| 4810 | st_carb_max: parseFloat($('#st_carb_max').jqxNumberInput('decimal')), | |
| 4811 | st_abv_min: parseFloat($('#st_abv_min').jqxNumberInput('decimal')), | |
| 4812 | st_abv_max: parseFloat($('#st_abv_max').jqxNumberInput('decimal')), | |
| 4813 | type: $('#type').val(), | |
| 4814 | batch_size: parseFloat($('#batch_size').jqxNumberInput('decimal')), | |
| 4815 | boil_size: parseFloat($('#boil_size').jqxNumberInput('decimal')), | |
| 4816 | boil_time: parseFloat($('#boil_time').jqxNumberInput('decimal')), | |
| 4817 | efficiency: parseFloat($('#efficiency').jqxNumberInput('decimal')), | |
| 4818 | est_og: parseFloat($('#est_og').jqxNumberInput('decimal')), | |
|
616
2cbf21bb9bdc
Added est_og3 field in the products database so that the checklist can use it.
Michiel Broek <mbroek@mbse.eu>
parents:
615
diff
changeset
|
4819 | est_og3: parseFloat($('#est_og3').jqxNumberInput('decimal')), |
| 478 | 4820 | est_fg: parseFloat($('#est_fg').jqxNumberInput('decimal')), |
| 4821 | est_abv: parseFloat($('#est_abv').jqxNumberInput('decimal')), | |
| 4822 | est_color: parseFloat($('#est_color').jqxNumberInput('decimal')), | |
| 4823 | color_method: $('#color_method').val(), | |
| 4824 | est_ibu: parseFloat($('#est_ibu').jqxNumberInput('decimal')), | |
| 4825 | ibu_method: $('#ibu_method').val(), | |
| 4826 | est_carb: parseFloat($('#est_carb').jqxNumberInput('decimal')), | |
| 4827 | mash_name: $('#mash_name').val(), | |
| 4828 | mash_ph: parseFloat($('#mash_ph').jqxNumberInput('decimal')), | |
| 4829 | sparge_temp: parseFloat($('#sparge_temp').jqxNumberInput('decimal')), | |
| 4830 | sparge_ph: parseFloat($('#sparge_ph').jqxNumberInput('decimal')), | |
| 4831 | sparge_volume: parseFloat($('#sparge_volume').jqxNumberInput('decimal')), | |
| 4832 | sparge_source: $('#sparge_source').val(), | |
| 4833 | sparge_acid_type: $('#sparge_acid_type').val(), | |
| 4834 | sparge_acid_perc: parseFloat($('#sparge_acid_perc').jqxNumberInput('decimal')), | |
| 4835 | sparge_acid_amount: dataRecord.sparge_acid_amount, | |
| 4836 | calc_acid: dataRecord.calc_acid, | |
| 4837 | w1_name: $('#w1_name').val(), | |
| 4838 | w1_amount: parseFloat($('#w1_amount').jqxNumberInput('decimal')), | |
| 4839 | w1_calcium: parseFloat($('#w1_calcium').jqxNumberInput('decimal')), | |
| 4840 | w1_sulfate: parseFloat($('#w1_sulfate').jqxNumberInput('decimal')), | |
| 4841 | w1_chloride: parseFloat($('#w1_chloride').jqxNumberInput('decimal')), | |
| 4842 | w1_sodium: parseFloat($('#w1_sodium').jqxNumberInput('decimal')), | |
| 4843 | w1_magnesium: parseFloat($('#w1_magnesium').jqxNumberInput('decimal')), | |
| 4844 | w1_total_alkalinity: parseFloat($('#w1_total_alkalinity').jqxNumberInput('decimal')), | |
| 4845 | w1_ph: parseFloat($('#w1_ph').jqxNumberInput('decimal')), | |
| 4846 | w1_cost: dataRecord.w1_cost, | |
| 4847 | w2_name: $('#w2_name').val(), | |
| 4848 | w2_amount: parseFloat($('#w2_amount').jqxNumberInput('decimal')), | |
| 4849 | w2_calcium: parseFloat($('#w2_calcium').jqxNumberInput('decimal')), | |
| 4850 | w2_sulfate: parseFloat($('#w2_sulfate').jqxNumberInput('decimal')), | |
| 4851 | w2_chloride: parseFloat($('#w2_chloride').jqxNumberInput('decimal')), | |
| 4852 | w2_sodium: parseFloat($('#w2_sodium').jqxNumberInput('decimal')), | |
| 4853 | w2_magnesium: parseFloat($('#w2_magnesium').jqxNumberInput('decimal')), | |
| 4854 | w2_total_alkalinity: parseFloat($('#w2_total_alkalinity').jqxNumberInput('decimal')), | |
| 4855 | w2_ph: parseFloat($('#w2_ph').jqxNumberInput('decimal')), | |
| 4856 | w2_cost: dataRecord.w2_cost, | |
| 4857 | wg_amount: parseFloat($('#wg_amount').jqxNumberInput('decimal')), | |
| 4858 | wg_calcium: parseFloat($('#wg_calcium').jqxNumberInput('decimal')), | |
| 4859 | wg_sulfate: parseFloat($('#wg_sulfate').jqxNumberInput('decimal')), | |
| 4860 | wg_chloride: parseFloat($('#wg_chloride').jqxNumberInput('decimal')), | |
| 4861 | wg_sodium: parseFloat($('#wg_sodium').jqxNumberInput('decimal')), | |
| 4862 | wg_magnesium: parseFloat($('#wg_magnesium').jqxNumberInput('decimal')), | |
| 4863 | wg_total_alkalinity: parseFloat($('#wg_total_alkalinity').jqxNumberInput('decimal')), | |
| 4864 | wg_ph: parseFloat($('#wg_ph').jqxNumberInput('decimal')), | |
| 4865 | wb_calcium: parseFloat($('#wb_calcium').jqxNumberInput('decimal')), | |
| 4866 | wb_sulfate: parseFloat($('#wb_sulfate').jqxNumberInput('decimal')), | |
| 4867 | wb_chloride: parseFloat($('#wb_chloride').jqxNumberInput('decimal')), | |
| 4868 | wb_sodium: parseFloat($('#wb_sodium').jqxNumberInput('decimal')), | |
| 4869 | wb_magnesium: parseFloat($('#wb_magnesium').jqxNumberInput('decimal')), | |
| 4870 | wb_total_alkalinity: parseFloat($('#wb_total_alkalinity').jqxNumberInput('decimal')), | |
| 4871 | wb_ph: parseFloat($('#wb_ph').jqxNumberInput('decimal')), | |
|
638
736c8d29bc87
Binding the data earlier to try to prevent a race condition.
Michiel Broek <mbroek@mbse.eu>
parents:
637
diff
changeset
|
4872 | wa_acid_name: parseInt($('#wa_acid_name').val()), |
| 478 | 4873 | wa_acid_perc: parseFloat($('#wa_acid_perc').jqxNumberInput('decimal')), |
|
638
736c8d29bc87
Binding the data earlier to try to prevent a race condition.
Michiel Broek <mbroek@mbse.eu>
parents:
637
diff
changeset
|
4874 | wa_base_name: parseInt($('#wa_base_name').val()), |
| 478 | 4875 | starter_enable: dataRecord.starter_enable, |
| 4876 | starter_type: $('#starter_type').val(), | |
| 4877 | starter_sg: parseFloat($('#starter_sg').jqxNumberInput('decimal')), | |
| 4878 | starter_viability: parseFloat($('#starter_viability').jqxNumberInput('decimal')), | |
|
617
f962f1e5936e
Implemented yeast viability calculation from the yeast production date. Changed the pitchrate logic and added Ale above 1.076 rate of 1.25.
Michiel Broek <mbroek@mbse.eu>
parents:
616
diff
changeset
|
4879 | yeast_prod_date: $('#yeast_prod_date').val(), |
|
697
367ae7ff52f0
Version 0.3.34 Changed log messages in the daemon. Added yeast_pitchrate field to the product database. Added yeast pitchrate edit field to the yeast tab. Initial value is guessed. There is also a popup window for predefined values. An finally the value can be edited by the user. All popup windows are initialized together.
Michiel Broek <mbroek@mbse.eu>
parents:
669
diff
changeset
|
4880 | yeast_pitchrate: parseFloat($('#yeast_pitchrate').jqxNumberInput('decimal')), |
| 478 | 4881 | prop1_type: $('#prop1_type').val(), |
| 4882 | prop1_volume: parseFloat($('#prop1_volume').jqxNumberInput('decimal')), | |
| 4883 | prop2_type: $('#prop2_type').val(), | |
| 4884 | prop2_volume: parseFloat($('#prop2_volume').jqxNumberInput('decimal')), | |
| 4885 | prop3_type: $('#prop3_type').val(), | |
| 4886 | prop3_volume: parseFloat($('#prop3_volume').jqxNumberInput('decimal')), | |
| 4887 | prop4_type: $('#prop4_type').val(), | |
| 4888 | prop4_volume: parseFloat($('#prop4_volume').jqxNumberInput('decimal')), | |
|
497
0fe366d953ab
Prepare screens for product divide batch.
Michiel Broek <mbroek@mbse.eu>
parents:
495
diff
changeset
|
4889 | divide_type: dataRecord.divide_type, |
|
0fe366d953ab
Prepare screens for product divide batch.
Michiel Broek <mbroek@mbse.eu>
parents:
495
diff
changeset
|
4890 | divide_size: dataRecord.divide_size, |
|
533
be8691b7d634
Added the product divide scripts. All parts have all the volumes and weights divided, including the master record. Splitted batches have their own records with the product code formatted as code-n. From this design, we can rebuild the print and checklist.
Michiel Broek <mbroek@mbse.eu>
parents:
525
diff
changeset
|
4891 | divide_factor: dataRecord.divide_factor, |
|
497
0fe366d953ab
Prepare screens for product divide batch.
Michiel Broek <mbroek@mbse.eu>
parents:
495
diff
changeset
|
4892 | divide_parts: dataRecord.divide_parts, |
|
533
be8691b7d634
Added the product divide scripts. All parts have all the volumes and weights divided, including the master record. Splitted batches have their own records with the product code formatted as code-n. From this design, we can rebuild the print and checklist.
Michiel Broek <mbroek@mbse.eu>
parents:
525
diff
changeset
|
4893 | divide_part: dataRecord.divide_part, |
| 478 | 4894 | fermentables: $('#fermentableGrid').jqxGrid('getrows'), |
| 4895 | hops: $('#hopGrid').jqxGrid('getrows'), | |
| 4896 | miscs: $('#miscGrid').jqxGrid('getrows'), | |
| 4897 | yeasts: $('#yeastGrid').jqxGrid('getrows'), | |
| 4898 | mashs: $('#mashGrid').jqxGrid('getrows') | |
| 4899 | }, | |
| 4900 | data = 'update=true&' + $.param(row); | |
| 4901 | $.ajax({ | |
| 4902 | dataType: 'json', | |
| 4903 | url: url, | |
| 4904 | cache: false, | |
| 4905 | data: data, | |
| 4906 | async: false, | |
| 4907 | type: 'POST', | |
| 4908 | success: function(data, status, xhr) { | |
|
489
18e5cfe5d126
Load new url in database write callback
Michiel Broek <mbroek@mbse.eu>
parents:
484
diff
changeset
|
4909 | console.log('saveRecord(' + goback + ') success'); |
|
18e5cfe5d126
Load new url in database write callback
Michiel Broek <mbroek@mbse.eu>
parents:
484
diff
changeset
|
4910 | if (goback) |
|
18e5cfe5d126
Load new url in database write callback
Michiel Broek <mbroek@mbse.eu>
parents:
484
diff
changeset
|
4911 | window.location.href = my_return; |
|
18e5cfe5d126
Load new url in database write callback
Michiel Broek <mbroek@mbse.eu>
parents:
484
diff
changeset
|
4912 | else |
|
18e5cfe5d126
Load new url in database write callback
Michiel Broek <mbroek@mbse.eu>
parents:
484
diff
changeset
|
4913 | window.location.href = |
|
497
0fe366d953ab
Prepare screens for product divide batch.
Michiel Broek <mbroek@mbse.eu>
parents:
495
diff
changeset
|
4914 | 'prod_export.php?record=' + my_record + '&return=' + my_return + '&select=' + my_select + '&code=' + dataRecord.code + '&name=' + dataRecord.name + |
|
0fe366d953ab
Prepare screens for product divide batch.
Michiel Broek <mbroek@mbse.eu>
parents:
495
diff
changeset
|
4915 | '&stage=' + dataRecord.stage + '&split=' + dataRecord.divide_type; |
| 478 | 4916 | }, |
| 4917 | error: function(jqXHR, textStatus, errorThrown) { | |
|
489
18e5cfe5d126
Load new url in database write callback
Michiel Broek <mbroek@mbse.eu>
parents:
484
diff
changeset
|
4918 | console.log('saveRecord() ' + textStatus); |
| 478 | 4919 | } |
| 4920 | }); | |
| 4921 | }; | |
| 4922 | ||
| 4923 | // initialize the input fields. | |
| 4924 | // Tab 1, Algemeen | |
| 4925 | $('#name').jqxTooltip({ content: 'De naam voor dit product.' }); | |
| 4926 | $('#code').jqxTooltip({ content: 'Product code nummer.' }); | |
| 4927 | $('#birth').jqxTooltip({ content: 'De ontwerp datum van dit product.' }); | |
| 4928 | $('#stage').jqxTooltip({ content: 'De productie fase van dit product.' }); | |
|
633
ec4601ab3ed2
Fixed loading of the product edit page. A bit faster loading.
Michiel Broek <mbroek@mbse.eu>
parents:
623
diff
changeset
|
4929 | $('#divide_batch').jqxTooltip({ content: 'Het aantal extra gesplitste batches.' }); |
|
ec4601ab3ed2
Fixed loading of the product edit page. A bit faster loading.
Michiel Broek <mbroek@mbse.eu>
parents:
623
diff
changeset
|
4930 | $('#divide_type').jqxTooltip({ content: 'Het splitsing moment in het productie proces.' }); |
|
ec4601ab3ed2
Fixed loading of the product edit page. A bit faster loading.
Michiel Broek <mbroek@mbse.eu>
parents:
623
diff
changeset
|
4931 | $('#notes').jqxTooltip({ content: 'De uitgebreide opmerkingen over dit product.' }); |
|
ec4601ab3ed2
Fixed loading of the product edit page. A bit faster loading.
Michiel Broek <mbroek@mbse.eu>
parents:
623
diff
changeset
|
4932 | $('#type').jqxTooltip({ content: 'Het brouw type van dit recept.' }); |
|
ec4601ab3ed2
Fixed loading of the product edit page. A bit faster loading.
Michiel Broek <mbroek@mbse.eu>
parents:
623
diff
changeset
|
4933 | $('#efficiency').jqxTooltip({ content: 'Het rendement van maischen en koken.' }); |
|
ec4601ab3ed2
Fixed loading of the product edit page. A bit faster loading.
Michiel Broek <mbroek@mbse.eu>
parents:
623
diff
changeset
|
4934 | $('#batch_size').jqxTooltip({ content: 'Het volume van het gekoelde wort na het koken.' }); |
|
ec4601ab3ed2
Fixed loading of the product edit page. A bit faster loading.
Michiel Broek <mbroek@mbse.eu>
parents:
623
diff
changeset
|
4935 | $('#boil_time').jqxTooltip({ content: 'De kooktijd in minuten.' }); |
|
ec4601ab3ed2
Fixed loading of the product edit page. A bit faster loading.
Michiel Broek <mbroek@mbse.eu>
parents:
623
diff
changeset
|
4936 | $('#boil_size').jqxTooltip({ content: 'Het volume van het wort voor het koken.' }); |
|
ec4601ab3ed2
Fixed loading of the product edit page. A bit faster loading.
Michiel Broek <mbroek@mbse.eu>
parents:
623
diff
changeset
|
4937 | $('#st_guide').jqxTooltip({ content: 'De bierstijl gids voor dit recept.'}); |
|
ec4601ab3ed2
Fixed loading of the product edit page. A bit faster loading.
Michiel Broek <mbroek@mbse.eu>
parents:
623
diff
changeset
|
4938 | $('#st_name').jqxTooltip({ content: 'De bierstijl naam voor dit recept.'}); |
|
ec4601ab3ed2
Fixed loading of the product edit page. A bit faster loading.
Michiel Broek <mbroek@mbse.eu>
parents:
623
diff
changeset
|
4939 | $('#st_letter').jqxTooltip({ content: 'De bierstijl letter voor dit recept.'}); |
|
ec4601ab3ed2
Fixed loading of the product edit page. A bit faster loading.
Michiel Broek <mbroek@mbse.eu>
parents:
623
diff
changeset
|
4940 | $('#st_letter').jqxInput({ theme: theme, width: 90, height: 23 }); |
|
ec4601ab3ed2
Fixed loading of the product edit page. A bit faster loading.
Michiel Broek <mbroek@mbse.eu>
parents:
623
diff
changeset
|
4941 | $('#st_type').jqxTooltip({ content: 'Het bierstijl type.'}); |
|
ec4601ab3ed2
Fixed loading of the product edit page. A bit faster loading.
Michiel Broek <mbroek@mbse.eu>
parents:
623
diff
changeset
|
4942 | $('#st_category').jqxTooltip({ content: 'De Amerikaanse bierstijl categorie.'}); |
|
ec4601ab3ed2
Fixed loading of the product edit page. A bit faster loading.
Michiel Broek <mbroek@mbse.eu>
parents:
623
diff
changeset
|
4943 | $('#st_category_number').jqxTooltip({ content: 'De Amerikaanse bierstijl categorie sub nummer.'}); |
|
ec4601ab3ed2
Fixed loading of the product edit page. A bit faster loading.
Michiel Broek <mbroek@mbse.eu>
parents:
623
diff
changeset
|
4944 | $('#est_og').jqxTooltip({ content: 'Het begin SG wat je wilt bereiken. De moutstort wordt automatisch herberekend.' }); |
|
ec4601ab3ed2
Fixed loading of the product edit page. A bit faster loading.
Michiel Broek <mbroek@mbse.eu>
parents:
623
diff
changeset
|
4945 | $('#st_og_min').jqxTooltip({ content: 'Het minimum begin SG voor deze bierstijl.'}); |
|
ec4601ab3ed2
Fixed loading of the product edit page. A bit faster loading.
Michiel Broek <mbroek@mbse.eu>
parents:
623
diff
changeset
|
4946 | $('#st_og_max').jqxTooltip({ content: 'Het maximum begin SG voor deze bierstijl.'}); |
|
ec4601ab3ed2
Fixed loading of the product edit page. A bit faster loading.
Michiel Broek <mbroek@mbse.eu>
parents:
623
diff
changeset
|
4947 | $('#est_fg').jqxTooltip({ content: 'Het verwachte eind SG. Dit wordt automatisch berekend.' }); |
|
ec4601ab3ed2
Fixed loading of the product edit page. A bit faster loading.
Michiel Broek <mbroek@mbse.eu>
parents:
623
diff
changeset
|
4948 | $('#st_fg_min').jqxTooltip({ content: 'Het minimum eind SG voor deze bierstijl.'}); |
|
ec4601ab3ed2
Fixed loading of the product edit page. A bit faster loading.
Michiel Broek <mbroek@mbse.eu>
parents:
623
diff
changeset
|
4949 | $('#st_fg_max').jqxTooltip({ content: 'Het maximum eind SG voor deze bierstijl.'}); |
|
ec4601ab3ed2
Fixed loading of the product edit page. A bit faster loading.
Michiel Broek <mbroek@mbse.eu>
parents:
623
diff
changeset
|
4950 | $('#est_abv').jqxTooltip({ content: 'Alcohol volume %. Dit wordt automatisch berekend.' }); |
|
ec4601ab3ed2
Fixed loading of the product edit page. A bit faster loading.
Michiel Broek <mbroek@mbse.eu>
parents:
623
diff
changeset
|
4951 | $('#st_abv_min').jqxTooltip({ content: 'Het minimum alcohol volume % voor deze bierstijl.'}); |
|
ec4601ab3ed2
Fixed loading of the product edit page. A bit faster loading.
Michiel Broek <mbroek@mbse.eu>
parents:
623
diff
changeset
|
4952 | $('#st_abv_max').jqxTooltip({ content: 'Het maximum alcohol volume % voor deze bierstijl.'}); |
|
ec4601ab3ed2
Fixed loading of the product edit page. A bit faster loading.
Michiel Broek <mbroek@mbse.eu>
parents:
623
diff
changeset
|
4953 | $('#est_color').jqxTooltip({ content: 'De kleur in EBC. Dit wordt automatisch berekend.' }); |
|
ec4601ab3ed2
Fixed loading of the product edit page. A bit faster loading.
Michiel Broek <mbroek@mbse.eu>
parents:
623
diff
changeset
|
4954 | $('#st_color_min').jqxTooltip({ content: 'De minimum kleur voor deze bierstijl.'}); |
|
ec4601ab3ed2
Fixed loading of the product edit page. A bit faster loading.
Michiel Broek <mbroek@mbse.eu>
parents:
623
diff
changeset
|
4955 | $('#st_color_max').jqxTooltip({ content: 'De maximum kleur voor deze bierstijl.'}); |
|
ec4601ab3ed2
Fixed loading of the product edit page. A bit faster loading.
Michiel Broek <mbroek@mbse.eu>
parents:
623
diff
changeset
|
4956 | $('#est_ibu').jqxTooltip({ content: 'De bitterheid in IBU. Dit wordt automatisch berekend.' }); |
|
ec4601ab3ed2
Fixed loading of the product edit page. A bit faster loading.
Michiel Broek <mbroek@mbse.eu>
parents:
623
diff
changeset
|
4957 | $('#st_ibu_min').jqxTooltip({ content: 'De minimum bitterheid voor deze bierstijl.'}); |
|
ec4601ab3ed2
Fixed loading of the product edit page. A bit faster loading.
Michiel Broek <mbroek@mbse.eu>
parents:
623
diff
changeset
|
4958 | $('#st_ibu_max').jqxTooltip({ content: 'De maximum bitterheid voor deze bierstijl.'}); |
|
ec4601ab3ed2
Fixed loading of the product edit page. A bit faster loading.
Michiel Broek <mbroek@mbse.eu>
parents:
623
diff
changeset
|
4959 | $('#kcal').jqxTooltip({ content: 'Energie-inhoud in kcal/liter.' }); |
|
ec4601ab3ed2
Fixed loading of the product edit page. A bit faster loading.
Michiel Broek <mbroek@mbse.eu>
parents:
623
diff
changeset
|
4960 | $('#est_carb').jqxTooltip({ content: 'Koolzuur volume. Dit wordt automatisch berekend.' }); |
|
ec4601ab3ed2
Fixed loading of the product edit page. A bit faster loading.
Michiel Broek <mbroek@mbse.eu>
parents:
623
diff
changeset
|
4961 | $('#st_carb_min').jqxTooltip({ content: 'Het minimum koolzuur volume voor deze bierstijl.'}); |
|
ec4601ab3ed2
Fixed loading of the product edit page. A bit faster loading.
Michiel Broek <mbroek@mbse.eu>
parents:
623
diff
changeset
|
4962 | $('#st_carb_max').jqxTooltip({ content: 'Het maximum koolzuur volume voor deze bierstijl.'}); |
|
ec4601ab3ed2
Fixed loading of the product edit page. A bit faster loading.
Michiel Broek <mbroek@mbse.eu>
parents:
623
diff
changeset
|
4963 | |
|
ec4601ab3ed2
Fixed loading of the product edit page. A bit faster loading.
Michiel Broek <mbroek@mbse.eu>
parents:
623
diff
changeset
|
4964 | $('#name').jqxInput({ theme: theme, width: 640, height: 23 }); |
|
ec4601ab3ed2
Fixed loading of the product edit page. A bit faster loading.
Michiel Broek <mbroek@mbse.eu>
parents:
623
diff
changeset
|
4965 | $('#code, #stage').jqxInput({ theme: theme, width: 100, height: 23 }); |
| 478 | 4966 | $('#locked').jqxCheckBox({ theme: theme, width: 120, height: 23, disabled: true }); |
| 4967 | $('#locked').on('checked', function(event) { | |
| 4968 | if (dataRecord.stage >= 10) { | |
| 4969 | dataRecord.locked = 1; | |
| 4970 | dataRecord.stage = 11; | |
| 4971 | calcStage(); | |
| 4972 | } | |
| 4973 | }); | |
| 4974 | $('#locked').on('unchecked', function(event) { | |
| 4975 | if (dataRecord.stage >= 10) { | |
| 4976 | dataRecord.locked = 0; | |
| 4977 | dataRecord.stage = 10; | |
| 4978 | calcStage(); | |
| 4979 | } | |
| 4980 | }); | |
|
633
ec4601ab3ed2
Fixed loading of the product edit page. A bit faster loading.
Michiel Broek <mbroek@mbse.eu>
parents:
623
diff
changeset
|
4981 | $('#birth,#divide_batch,#divide_type').jqxInput({ theme: theme, width: 120, height: 23 }); |
| 478 | 4982 | $('#notes').jqxInput({ theme: theme, width: 960, height: 100 }); |
| 4983 | $('#type').jqxDropDownList({ | |
| 4984 | theme: theme, | |
| 4985 | source: RecipeTypeAdapter, | |
| 4986 | valueMember: 'id', | |
| 4987 | displayMember: 'nl', | |
| 4988 | width: 180, | |
| 4989 | height: 23, | |
| 4990 | autoDropDownHeight: true | |
| 4991 | }); | |
| 4992 | $('#efficiency').jqxNumberInput(Perc1dec); | |
| 4993 | $('#batch_size').jqxNumberInput(Spin1dec); | |
| 4994 | $('#batch_size').jqxNumberInput({ min: 4 }); | |
| 4995 | $('#boil_time').jqxNumberInput(PosInt); | |
|
658
945d5eba869a
Implemented no-boil products.
Michiel Broek <mbroek@mbse.eu>
parents:
655
diff
changeset
|
4996 | $('#boil_time').jqxNumberInput({ min: 0, max: 360 }); |
| 478 | 4997 | $('#boil_size').jqxNumberInput({ inputMode: 'simple', theme: theme, width: 90, height: 23, decimalDigits: 2, readOnly: true }); |
| 610 | 4998 | $('#st_guide,#st_name,#st_type,#st_category').jqxInput({ theme: theme, width: 250, height: 23 }); |
| 478 | 4999 | $('#est_og').jqxNumberInput(SGopts); |
| 5000 | $('#est_fg').jqxNumberInput(Show3dec); | |
| 610 | 5001 | $('#st_og_min,#st_og_max,#st_fg_min,#st_fg_max').jqxNumberInput({ inputMode: 'simple', theme: theme, width: 50, height: 23, decimalDigits: 3, readOnly: true }); |
|
633
ec4601ab3ed2
Fixed loading of the product edit page. A bit faster loading.
Michiel Broek <mbroek@mbse.eu>
parents:
623
diff
changeset
|
5002 | $('#est_ibu,#est_color').jqxNumberInput(Show0dec); |
| 478 | 5003 | $('#color_method').jqxDropDownList({ |
| 5004 | theme: theme, | |
| 5005 | source: ColorMethodAdapter, | |
| 5006 | valueMember: 'id', | |
| 5007 | displayMember: 'nl', | |
| 5008 | width: 180, | |
| 5009 | height: 23, | |
| 5010 | autoDropDownHeight: true | |
| 5011 | }); | |
|
633
ec4601ab3ed2
Fixed loading of the product edit page. A bit faster loading.
Michiel Broek <mbroek@mbse.eu>
parents:
623
diff
changeset
|
5012 | $('#st_color_min,#st_color_max,#st_category_number,#st_ibu_min,#st_ibu_max,#kcal').jqxNumberInput(Smal0dec); |
| 478 | 5013 | $('#ibu_method').jqxDropDownList({ |
| 5014 | theme: theme, | |
| 5015 | source: IBUmethodAdapter, | |
| 5016 | valueMember: 'id', | |
| 5017 | displayMember: 'nl', | |
| 5018 | width: 180, | |
| 5019 | height: 23, | |
| 5020 | autoDropDownHeight: true, | |
| 5021 | dropDownVerticalAlignment: 'top' | |
| 5022 | }); | |
|
633
ec4601ab3ed2
Fixed loading of the product edit page. A bit faster loading.
Michiel Broek <mbroek@mbse.eu>
parents:
623
diff
changeset
|
5023 | $('#est_abv,#st_abv_min,#st_abv_max,#est_carb,#st_carb_min,#st_carb_max').jqxNumberInput(Smal1dec); |
| 478 | 5024 | |
| 5025 | // Tab 2, Equipment | |
| 5026 | $('#eq_name').jqxTooltip({ content: 'De naam van deze brouw apparatuur.' }); | |
| 5027 | $('#eq_boil_size').jqxTooltip({ content: 'Normaal kook volume in liters' }); | |
| 5028 | $('#eq_batch_size').jqxTooltip({ content: 'Berekende batch grootte in liters aan het eind van de kook.' }); | |
| 5029 | $('#eq_tun_volume').jqxTooltip({ content: 'Maisch ketel volume.' }); | |
| 5030 | $('#eq_top_up_water').jqxTooltip({ content: 'Extra water in het gistvat.' }); | |
| 5031 | $('#eq_trub_chiller_loss').jqxTooltip({ content: 'Standaard verlies bij het overbrengen naar het gistvat.' }); | |
| 5032 | $('#eq_evap_rate').jqxTooltip({ content: 'Verdamping in liters per uur.' }); | |
|
658
945d5eba869a
Implemented no-boil products.
Michiel Broek <mbroek@mbse.eu>
parents:
655
diff
changeset
|
5033 | $('#eq_boil_time').jqxTooltip({ content: 'Normale kooktijd in minuten, 0 voor no-boil recepten.' }); |
| 478 | 5034 | $('#eq_top_up_kettle').jqxTooltip({ content: 'Extra water toevoegen tijdens de kook.' }); |
| 5035 | $('#eq_hop_utilization').jqxTooltip({ content: '100% voor kleine installaties, hoger voor grote brouwerijen.' }); | |
| 5036 | $('#eq_notes').jqxTooltip({ content: 'Opmerkingen over deze apparatuur.' }); | |
| 5037 | $('#eq_lauter_volume').jqxTooltip({ content: 'Filterkuip volume.' }); | |
| 5038 | $('#eq_lauter_deadspace').jqxTooltip({ content: 'Filterkuip verlies in liters.' }); | |
| 5039 | $('#eq_kettle_volume').jqxTooltip({ content: 'Kook ketel volume in liters.' }); | |
| 5040 | $('#eq_mash_volume').jqxTooltip({ content: 'Maisch water voor de eerste stap.' }); | |
| 5041 | $('#eq_mash_max').jqxTooltip({ content: 'De maximale moutstort in Kg.' }); | |
| 5042 | $('#eq_efficiency').jqxTooltip({ content: 'Gemiddeld brouwzaal rendement.' }); | |
|
633
ec4601ab3ed2
Fixed loading of the product edit page. A bit faster loading.
Michiel Broek <mbroek@mbse.eu>
parents:
623
diff
changeset
|
5043 | |
|
ec4601ab3ed2
Fixed loading of the product edit page. A bit faster loading.
Michiel Broek <mbroek@mbse.eu>
parents:
623
diff
changeset
|
5044 | $('#eq_name').jqxInput({ theme: theme, width: 250, height: 23 }); |
|
ec4601ab3ed2
Fixed loading of the product edit page. A bit faster loading.
Michiel Broek <mbroek@mbse.eu>
parents:
623
diff
changeset
|
5045 | $('#eq_evap_rate').jqxNumberInput(Show2dec); |
|
ec4601ab3ed2
Fixed loading of the product edit page. A bit faster loading.
Michiel Broek <mbroek@mbse.eu>
parents:
623
diff
changeset
|
5046 | $('#eq_boil_time,#eq_hop_utilization').jqxNumberInput(Show0dec); |
|
ec4601ab3ed2
Fixed loading of the product edit page. A bit faster loading.
Michiel Broek <mbroek@mbse.eu>
parents:
623
diff
changeset
|
5047 | $('#eq_notes').jqxInput({ theme: theme, width: 960, height: 200 }); |
| 610 | 5048 | $('#eq_boil_size,#eq_batch_size,#eq_tun_volume,#eq_top_up_water,#eq_trub_chiller_loss,#eq_top_up_kettle').jqxNumberInput(Show1dec); |
| 5049 | $('#eq_lauter_volume,#eq_lauter_deadspace,#eq_kettle_volume,#eq_mash_volume,#eq_mash_max,#eq_efficiency').jqxNumberInput(Show1dec); | |
| 478 | 5050 | |
| 5051 | // Tab 3, Fermentables | |
| 5052 | $('#est_color2').jqxTooltip({ content: 'De kleur in EBC. Dit wordt automatisch berekend.' }); | |
| 5053 | $('#est_og2').jqxTooltip({ content: 'Het geschatte begin SG van dit product.' }); | |
| 5054 | $('#mash_kg').jqxTooltip({ content: 'Het gewicht van alle mouten in de maisch.' }); | |
|
633
ec4601ab3ed2
Fixed loading of the product edit page. A bit faster loading.
Michiel Broek <mbroek@mbse.eu>
parents:
623
diff
changeset
|
5055 | |
|
ec4601ab3ed2
Fixed loading of the product edit page. A bit faster loading.
Michiel Broek <mbroek@mbse.eu>
parents:
623
diff
changeset
|
5056 | $('#est_color2').jqxNumberInput(Show0dec); |
| 610 | 5057 | $('#est_og2,#mash_kg').jqxNumberInput(Show3dec); |
|
633
ec4601ab3ed2
Fixed loading of the product edit page. A bit faster loading.
Michiel Broek <mbroek@mbse.eu>
parents:
623
diff
changeset
|
5058 | |
| 478 | 5059 | $('#perc_malts').jqxProgressBar({ |
|
633
ec4601ab3ed2
Fixed loading of the product edit page. A bit faster loading.
Michiel Broek <mbroek@mbse.eu>
parents:
623
diff
changeset
|
5060 | width: 300, height: 23, theme: theme, showText: true, max: 120, animationDuration: 0, |
|
ec4601ab3ed2
Fixed loading of the product edit page. A bit faster loading.
Michiel Broek <mbroek@mbse.eu>
parents:
623
diff
changeset
|
5061 | colorRanges: [{ stop: 90, color: '#008C00' },{ stop: 100, color: '#EB7331' },{ stop: 120, color: '#FF0000' }], |
|
ec4601ab3ed2
Fixed loading of the product edit page. A bit faster loading.
Michiel Broek <mbroek@mbse.eu>
parents:
623
diff
changeset
|
5062 | renderText: function(text) { return (Math.round(parseInt(text) * 1.2)) + '%'; } |
| 478 | 5063 | }); |
| 5064 | $('#perc_sugars').jqxProgressBar({ | |
|
633
ec4601ab3ed2
Fixed loading of the product edit page. A bit faster loading.
Michiel Broek <mbroek@mbse.eu>
parents:
623
diff
changeset
|
5065 | width: 300, height: 23, theme: theme, showText: true, max: 50, animationDuration: 0, |
|
ec4601ab3ed2
Fixed loading of the product edit page. A bit faster loading.
Michiel Broek <mbroek@mbse.eu>
parents:
623
diff
changeset
|
5066 | colorRanges: [{ stop: 20, color: '#008C00' },{ stop: 50, color: '#FF0000' }], |
|
ec4601ab3ed2
Fixed loading of the product edit page. A bit faster loading.
Michiel Broek <mbroek@mbse.eu>
parents:
623
diff
changeset
|
5067 | renderText: function(text) { return (Math.round(parseInt(text) * 5) / 10) + '%'; } |
| 478 | 5068 | }); |
| 5069 | $('#perc_cara').jqxProgressBar({ | |
|
633
ec4601ab3ed2
Fixed loading of the product edit page. A bit faster loading.
Michiel Broek <mbroek@mbse.eu>
parents:
623
diff
changeset
|
5070 | width: 300, height: 23, theme: theme, showText: true, max: 50, animationDuration: 0, |
|
ec4601ab3ed2
Fixed loading of the product edit page. A bit faster loading.
Michiel Broek <mbroek@mbse.eu>
parents:
623
diff
changeset
|
5071 | colorRanges: [{ stop: 25, color: '#008C00' },{ stop: 50, color: '#FF0000' }], |
|
ec4601ab3ed2
Fixed loading of the product edit page. A bit faster loading.
Michiel Broek <mbroek@mbse.eu>
parents:
623
diff
changeset
|
5072 | renderText: function(text) { return (Math.round(parseInt(text) * 5) / 10) + '%'; } |
| 478 | 5073 | }); |
| 5074 | $('#ferm_lintner').jqxProgressBar({ | |
|
633
ec4601ab3ed2
Fixed loading of the product edit page. A bit faster loading.
Michiel Broek <mbroek@mbse.eu>
parents:
623
diff
changeset
|
5075 | width: 300, height: 23, theme: theme, showText: true, max: 200, animationDuration: 0, |
|
ec4601ab3ed2
Fixed loading of the product edit page. A bit faster loading.
Michiel Broek <mbroek@mbse.eu>
parents:
623
diff
changeset
|
5076 | colorRanges: [{ stop: 30, color: '#FF0000' },{ stop: 40, color: '#EB7331' },{ stop: 200, color: '#008C00' }], |
|
ec4601ab3ed2
Fixed loading of the product edit page. A bit faster loading.
Michiel Broek <mbroek@mbse.eu>
parents:
623
diff
changeset
|
5077 | renderText: function(text) { return (parseInt(text) * 2) + ' lintner'; } |
| 478 | 5078 | }); |
| 5079 | $('#FermentableReady').jqxButton({ template: 'success', width: '90px', theme: theme }); | |
| 5080 | $('#FermentableReady').click(function() { | |
| 5081 | var row, rowID = $('#fermentableGrid').jqxGrid('getrowid', fermentableRow); | |
| 5082 | console.log('FermentableReady row:' + fermentableRow + ' ID:' + rowID); | |
| 5083 | row = { | |
| 5084 | f_name: fermentableData.f_name, | |
| 5085 | f_origin: fermentableData.f_origin, | |
| 5086 | f_supplier: fermentableData.f_supplier, | |
| 5087 | f_amount: fermentableData.f_amount, | |
| 5088 | f_cost: fermentableData.f_cost, | |
| 5089 | f_type: fermentableData.f_type, | |
| 5090 | f_yield: fermentableData.f_yield, | |
| 5091 | f_color: fermentableData.f_color, | |
| 5092 | f_coarse_fine_diff: fermentableData.f_coarse_fine_diff, | |
| 5093 | f_moisture: fermentableData.f_moisture, | |
| 5094 | f_diastatic_power: fermentableData.f_diastatic_power, | |
| 5095 | f_protein: fermentableData.f_protein, | |
| 5096 | f_max_in_batch: fermentableData.f_max_in_batch, | |
| 5097 | f_graintype: fermentableData.f_graintype, | |
| 5098 | f_added: fermentableData.f_added, | |
| 5099 | f_dissolved_protein: fermentableData.f_dissolved_protein, | |
| 5100 | f_recommend_mash: fermentableData.f_recommend_mash, | |
| 5101 | f_add_after_boil: fermentableData.f_add_after_boil, | |
| 5102 | f_adjust_to_total_100: fermentableData.f_adjust_to_total_100, | |
| 5103 | f_percentage: fermentableData.f_percentage, | |
| 5104 | f_di_ph: fermentableData.f_di_ph, | |
| 5105 | f_acid_to_ph_57: fermentableData.f_acid_to_ph_57, | |
| 5106 | f_inventory: fermentableData.f_inventory, | |
| 5107 | f_avail: fermentableData.f_avail | |
| 5108 | }; | |
| 5109 | $('#fermentableGrid').jqxGrid('updaterow', rowID, row); | |
| 5110 | calcPercentages(); | |
| 5111 | calcFermentables(); | |
| 5112 | calcIBUs(); | |
| 5113 | calcMash(); | |
| 5114 | // Waters: yes there is impact. | |
| 5115 | }); | |
| 5116 | $('#wf_name').jqxInput({ theme: theme, width: 320, height: 23 }); | |
| 5117 | $('#wf_instock').jqxCheckBox({ theme: theme, height: 23 }); | |
| 5118 | $('#wf_instock').on('change', function(event) { | |
| 5119 | fermentableinstock = event.args.checked; | |
| 5120 | fermentablelist.dataBind(); | |
| 5121 | }); | |
| 5122 | $('#wf_select').jqxDropDownList({ | |
| 5123 | placeHolder: 'Kies mout:', | |
| 5124 | theme: theme, | |
| 5125 | source: fermentablelist, | |
| 5126 | displayMember: 'name', | |
| 5127 | width: 150, | |
| 5128 | height: 23, | |
| 5129 | dropDownWidth: 500, | |
| 5130 | dropDownHeight: 500, | |
| 5131 | renderer: function(index, label, value) { | |
| 5132 | var datarecord = fermentablelist.records[index]; | |
| 5133 | return datarecord.supplier + ' / ' + datarecord.name + ' (' + datarecord.color + ' EBC)'; | |
| 5134 | } | |
| 5135 | }); | |
| 5136 | $('#wf_select').on('select', function(event) { | |
| 5137 | if (event.args) { | |
| 5138 | var datarecord, index = event.args.index; | |
| 5139 | datarecord = fermentablelist.records[index]; | |
| 5140 | $('#wf_name').val(datarecord.name); | |
| 5141 | fermentableData.f_name = datarecord.name; | |
| 5142 | fermentableData.f_origin = datarecord.origin; | |
| 5143 | fermentableData.f_supplier = datarecord.supplier; | |
| 5144 | fermentableData.f_type = datarecord.type; | |
| 5145 | fermentableData.f_cost = datarecord.cost; | |
| 5146 | fermentableData.f_yield = datarecord.yield; | |
| 5147 | fermentableData.f_color = datarecord.color; | |
| 5148 | fermentableData.f_coarse_fine_diff = datarecord.coarse_fine_diff; | |
| 5149 | fermentableData.f_moisture = datarecord.moisture; | |
| 5150 | fermentableData.f_diastatic_power = datarecord.diastatic_power; | |
| 5151 | fermentableData.f_protein = datarecord.protein; | |
| 5152 | fermentableData.f_max_in_batch = datarecord.max_in_batch; | |
| 5153 | fermentableData.f_graintype = datarecord.graintype; | |
| 5154 | fermentableData.f_dissolved_protein = datarecord.dissolved_protein; | |
| 5155 | fermentableData.f_recommend_mash = datarecord.recommend_mash; | |
| 5156 | fermentableData.f_add_after_boil = datarecord.add_after_boil; | |
| 5157 | fermentableData.f_di_ph = datarecord.di_ph; | |
| 5158 | fermentableData.f_acid_to_ph_57 = datarecord.acid_to_ph_57; | |
| 5159 | fermentableData.f_inventory = datarecord.inventory; | |
| 5160 | } | |
| 5161 | }); | |
| 5162 | $('#wf_amount').jqxNumberInput(Spin3dec); | |
| 5163 | $('#wf_amount').on('change', function(event) { | |
| 5164 | console.log('amount changed: ' + event.args.value); | |
| 5165 | $('#fermentableGrid').jqxGrid('setcellvalue', fermentableRow, 'f_amount', event.args.value); | |
| 5166 | fermentableData.f_amount = event.args.value; | |
| 5167 | if (! to_100) { | |
| 5168 | calcPercentages(); | |
| 5169 | calcFermentables(); | |
| 5170 | calcIBUs(); | |
| 5171 | calcMash(); | |
| 5172 | } | |
| 5173 | }); | |
| 5174 | $('#wf_percentage').jqxNumberInput(Perc1dec); | |
| 5175 | $('#wf_percentage').on('change', function(event) { | |
| 5176 | var newvalue, rowscount, rowdata, diff, tw, damount, namount, nw, newperc, | |
| 5177 | oldvalue = Math.round(fermentableData.f_percentage * 10) / 10.0; | |
| 5178 | newvalue = event.args.value; | |
| 5179 | console.log('percentage changed: ' + newvalue + ' old: ' + oldvalue); | |
| 5180 | fermentableData.f_percent = newvalue; | |
| 5181 | rowscount = $('#fermentableGrid').jqxGrid('getdatainformation').rowscount; | |
| 5182 | if ((oldvalue != newvalue) && (rowscount > 1)) { | |
| 5183 | rowdata = $('#fermentableGrid').jqxGrid('getrowdata', fermentableRow); | |
| 5184 | if (rowdata.f_adjust_to_total_100) { | |
| 5185 | $('#wf_percentage').val(oldvalue); | |
| 5186 | } else { | |
| 5187 | diff = newvalue - oldvalue; | |
| 5188 | tw = 0; // total weight | |
| 5189 | for (i = 0; i < rowscount; i++) { | |
| 5190 | rowdata = $('#fermentableGrid').jqxGrid('getrowdata', i); | |
| 5191 | if (rowdata.f_added < 4) | |
| 5192 | tw += Math.round(rowdata.f_amount * 1000) / 1000; | |
| 5193 | } | |
| 5194 | tw = Math.round(tw * 1000) / 1000; | |
| 5195 | if (to_100) { | |
| 5196 | // Adjust this row and the 100% row. | |
| 5197 | damount = Math.round(tw * diff * 10) / 1000; | |
| 5198 | rowdata = $('#fermentableGrid').jqxGrid('getrowdata', fermentableRow); | |
| 5199 | namount = Round(rowdata.f_amount + damount, 3); | |
| 5200 | $('#fermentableGrid').jqxGrid('setcellvalue', fermentableRow, 'f_amount', namount); | |
| 5201 | $('#wf_amount').val(namount); | |
| 5202 | $('#fermentableGrid').jqxGrid('setcellvalue', fermentableRow, 'f_percentage', rowdata.f_percentage + diff); | |
| 5203 | for (i = 0; i < rowscount; i++) { | |
| 5204 | rowdata = $('#fermentableGrid').jqxGrid('getrowdata', i); | |
| 5205 | if (rowdata.f_adjust_to_total_100) { | |
| 5206 | namount = rowdata.f_amount - damount; | |
| 5207 | $('#fermentableGrid').jqxGrid('setcellvalue', i, 'f_percentage', rowdata.f_percentage - diff); | |
| 5208 | $('#fermentableGrid').jqxGrid('setcellvalue', i, 'f_amount', namount); | |
| 5209 | } | |
| 5210 | } | |
| 5211 | calcFermentables(); | |
| 5212 | calcIBUs(); | |
| 5213 | calcMash(); | |
| 5214 | } else { | |
| 5215 | // Adjust all the rows. | |
| 5216 | nw = tw * diff / 100; | |
| 5217 | for (i = 0; i < rowscount; i++) { | |
| 5218 | rowdata = $('#fermentableGrid').jqxGrid('getrowdata', i); | |
| 5219 | if (rowdata.f_added < 4) { | |
| 5220 | if (i == fermentableRow) { | |
| 5221 | namount = Math.round((rowdata.f_amount + nw) * 1000) / 1000; | |
| 5222 | $('#fermentableGrid').jqxGrid('setcellvalue', i, 'f_amount', namount); | |
| 5223 | // $('#wf_amount').val(namount); // Will crash the script. | |
| 5224 | $('#fermentableGrid').jqxGrid('setcellvalue', i, 'f_percentage', newvalue); | |
| 5225 | } else { | |
| 5226 | namount = Math.round((rowdata.f_amount - (nw / (rowscount - 1))) * 1000) / 1000; | |
| 5227 | newperc = Math.round((namount / tw) * 1000) / 10.0; | |
| 5228 | $('#fermentableGrid').jqxGrid('setcellvalue', i, 'f_amount', namount); | |
| 5229 | $('#fermentableGrid').jqxGrid('setcellvalue', i, 'f_percentage', newperc); | |
| 5230 | } | |
| 5231 | } else { | |
| 5232 | $('#fermentableGrid').jqxGrid('setcellvalue', i, 'f_percentage', 0); | |
| 5233 | } | |
| 5234 | } | |
| 5235 | calcFermentables(); | |
| 5236 | calcIBUs(); | |
| 5237 | calcMash(); | |
| 5238 | } | |
| 5239 | } | |
| 5240 | } | |
| 5241 | }); | |
| 5242 | $('#wf_max_in_batch').jqxNumberInput(Show1dec); | |
| 5243 | $('#wf_adjust_to_total_100').jqxCheckBox({ theme: theme, width: 120, height: 23 }); | |
| 5244 | $('#wf_adjust_to_total_100').on('checked', function(event) { | |
| 5245 | if (fermentableData.f_adjust_to_total_100 == 0) { | |
| 5246 | if (to_100) { | |
| 5247 | // Reset other flag first. | |
| 5248 | var i, rowscount = $('#fermentableGrid').jqxGrid('getdatainformation').rowscount; | |
| 5249 | for (i = 0; i < rowscount; i++) { | |
| 5250 | if (i != fermentableRow) { | |
| 5251 | $('#fermentableGrid').jqxGrid('setcellvalue', i, 'f_adjust_to_total_100', 0); | |
| 5252 | } | |
| 5253 | } | |
| 5254 | } | |
| 5255 | $('#fermentableGrid').jqxGrid('setcellvalue', fermentableRow, 'f_adjust_to_total_100', 1); | |
| 5256 | calcFermentables(); | |
| 5257 | } | |
| 5258 | }); | |
| 5259 | $('#wf_adjust_to_total_100').on('unchecked', function(event) { | |
| 5260 | if (fermentableData.f_adjust_to_total_100 != 0) { | |
| 5261 | $('#fermentableGrid').jqxGrid('setcellvalue', fermentableRow, 'f_adjust_to_total_100', 0); | |
| 5262 | calcFermentables(); | |
| 5263 | } | |
| 5264 | }); | |
| 5265 | $('#wf_added').jqxDropDownList({ | |
| 5266 | theme: theme, | |
| 5267 | source: AddedAdapter, | |
| 5268 | valueMember: 'id', | |
| 5269 | displayMember: 'nl', | |
| 5270 | width: 180, | |
| 5271 | height: 23, | |
| 5272 | autoDropDownHeight: true, | |
| 5273 | dropDownVerticalAlignment: 'top' | |
| 5274 | }); | |
| 5275 | $('#wf_added').on('select', function(event) { | |
| 5276 | if (event.args) { | |
| 5277 | var index = event.args.index; | |
| 5278 | $('#fermentableGrid').jqxGrid('setcellvalue', fermentableRow, 'f_added', index); | |
| 5279 | calcFermentables(); | |
| 5280 | calcIBUs(); | |
| 5281 | calcMash(); | |
| 5282 | } | |
| 5283 | }); | |
| 5284 | ||
| 5285 | // Tab 4, Hops | |
| 5286 | $('#est_ibu2').jqxTooltip({ content: 'De bitterheid in IBU. Dit wordt automatisch berekend.' }); | |
| 5287 | $('#est_ibu2').jqxNumberInput(Smal0dec); | |
| 5288 | $('#hop_flavour').jqxProgressBar({ | |
|
633
ec4601ab3ed2
Fixed loading of the product edit page. A bit faster loading.
Michiel Broek <mbroek@mbse.eu>
parents:
623
diff
changeset
|
5289 | width: 300, height: 23, theme: theme, showText: true, animationDuration: 0, |
| 478 | 5290 | colorRanges: [ |
| 5291 | { stop: 20, color: '#004D00' }, | |
| 5292 | { stop: 40, color: '#008C00' }, | |
| 5293 | { stop: 60, color: '#00BF00' }, | |
| 5294 | { stop: 80, color: '#00FF00' }, | |
| 5295 | { stop: 100, color: '#80FF80' } | |
| 5296 | ], | |
| 5297 | renderText: function(text) { | |
| 5298 | var val = parseInt(text); | |
| 5299 | if (val < 20) | |
| 5300 | return 'Weinig'; | |
| 5301 | else if (val < 40) | |
| 5302 | return 'Matig'; | |
| 5303 | else if (val < 60) | |
| 5304 | return 'Redelijk'; | |
| 5305 | else if (val < 80) | |
| 5306 | return 'Veel'; | |
| 5307 | else | |
| 5308 | return 'Zeer veel'; | |
| 5309 | } | |
| 5310 | }); | |
| 5311 | $('#hop_aroma').jqxProgressBar({ | |
|
633
ec4601ab3ed2
Fixed loading of the product edit page. A bit faster loading.
Michiel Broek <mbroek@mbse.eu>
parents:
623
diff
changeset
|
5312 | width: 300, height: 23, theme: theme, showText: true, animationDuration: 0, |
| 478 | 5313 | colorRanges: [ |
| 5314 | { stop: 20, color: '#004D00' }, | |
| 5315 | { stop: 40, color: '#008C00' }, | |
| 5316 | { stop: 60, color: '#00BF00' }, | |
| 5317 | { stop: 80, color: '#00FF00' }, | |
| 5318 | { stop: 100, color: '#80FF80' } | |
| 5319 | ], | |
| 5320 | renderText: function(text) { | |
| 5321 | var val = parseInt(text); | |
| 5322 | if (val < 20) | |
| 5323 | return 'Weinig'; | |
| 5324 | else if (val < 40) | |
| 5325 | return 'Matig'; | |
| 5326 | else if (val < 60) | |
| 5327 | return 'Redelijk'; | |
| 5328 | else if (val < 80) | |
| 5329 | return 'Veel'; | |
| 5330 | else | |
| 5331 | return 'Zeer veel'; | |
| 5332 | } | |
| 5333 | }); | |
| 5334 | $('#HopReady').jqxButton({ template: 'success', width: '90px', theme: theme }); | |
| 5335 | $('#HopReady').click(function() { | |
| 5336 | var row, rowID = $('#hopGrid').jqxGrid('getrowid', hopRow); | |
| 5337 | row = { | |
| 5338 | h_name: $('#wh_name').val(), | |
| 5339 | h_origin: hopData.h_origin, | |
| 5340 | h_amount: parseFloat($('#wh_amount').jqxNumberInput('decimal')) / 1000, | |
| 5341 | h_cost: hopData.h_cost, | |
| 5342 | h_type: hopData.h_type, | |
| 5343 | h_form: hopData.h_form, | |
| 5344 | h_useat: $('#wh_useat').val(), | |
| 5345 | h_time: hopData.h_time, | |
| 5346 | h_alpha: hopData.h_alpha, | |
| 5347 | h_beta: hopData.h_beta, | |
| 5348 | h_hsi: hopData.h_hsi, | |
| 5349 | h_humulene: hopData.h_humulene, | |
| 5350 | h_caryophyllene: hopData.h_caryophyllene, | |
| 5351 | h_cohumulone: hopData.h_cohumulone, | |
| 5352 | h_myrcene: hopData.h_myrcene, | |
| 5353 | h_total_oil: hopData.h_total_oil, | |
| 5354 | h_inventory: hopData.h_inventory, | |
| 5355 | h_avail: hopData.h_avail | |
| 5356 | }; | |
| 5357 | $('#hopGrid').jqxGrid('updaterow', rowID, row); | |
| 5358 | calcIBUs(); | |
| 5359 | }); | |
| 5360 | $('#wh_name').jqxInput({ theme: theme, width: 320, height: 23 }); | |
| 5361 | $('#wh_instock').jqxCheckBox({ theme: theme, height: 23 }); | |
| 5362 | $('#wh_instock').on('change', function(event) { | |
| 5363 | hopinstock = event.args.checked; | |
| 5364 | hoplist.dataBind(); | |
| 5365 | }); | |
| 5366 | $('#wh_select').jqxDropDownList({ | |
| 5367 | placeHolder: 'Kies hop:', | |
| 5368 | theme: theme, | |
| 5369 | source: hoplist, | |
| 5370 | displayMember: 'name', | |
| 5371 | width: 150, | |
| 5372 | height: 23, | |
| 5373 | dropDownWidth: 500, | |
| 5374 | dropDownHeight: 500, | |
| 5375 | renderer: function(index, label, value) { | |
| 5376 | var datarecord = hoplist.records[index]; | |
| 5377 | return datarecord.origin + ' - ' + datarecord.name + ' / ' + HopFormData[datarecord.form].nl + ' (' + datarecord.alpha + ' % α)'; | |
| 5378 | } | |
| 5379 | }); | |
| 5380 | $('#wh_select').on('select', function(event) { | |
| 5381 | if (event.args) { | |
| 5382 | var datarecord, index = event.args.index; | |
| 5383 | datarecord = hoplist.records[index]; | |
| 5384 | $('#wh_name').val(datarecord.name); | |
| 5385 | hopData.h_name = datarecord.name; | |
| 5386 | hopData.h_origin = datarecord.origin; | |
| 5387 | hopData.h_cost = datarecord.cost; | |
| 5388 | hopData.h_type = datarecord.type; | |
| 5389 | hopData.h_form = datarecord.form; | |
| 5390 | hopData.h_alpha = datarecord.alpha; | |
| 5391 | hopData.h_beta = datarecord.beta; | |
| 5392 | hopData.h_hsi = datarecord.hsi; | |
| 5393 | hopData.h_humulene = datarecord.humulene; | |
| 5394 | hopData.h_caryophyllene = datarecord.caryophyllene; | |
| 5395 | hopData.h_cohumulone = datarecord.cohumulone; | |
| 5396 | hopData.h_myrcene = datarecord.myrcene; | |
| 5397 | hopData.h_total_oil = datarecord.total_oil; | |
| 5398 | hopData.h_inventory = datarecord.inventory; | |
| 5399 | } | |
| 5400 | }); | |
| 5401 | $('#wh_amount').jqxNumberInput(Spin1dec); | |
| 5402 | $('#wh_amount').on('change', function(event) { | |
| 5403 | console.log('amount changed: ' + event.args.value + ' time:' + hopData.h_time + ' alpha:' + hopData.h_alpha); | |
| 5404 | var ibu, amount = parseFloat(event.args.value) / 1000; | |
| 5405 | ibu = toIBU(hopData.h_useat, hopData.h_form, preboil_sg, parseFloat($('#batch_size').jqxNumberInput('decimal')), | |
|
538
41d21817608e
Added the IBU contribution for whirlpool hops.
Michiel Broek <mbroek@mbse.eu>
parents:
525
diff
changeset
|
5406 | amount, parseFloat(hopData.h_time), parseFloat(hopData.h_alpha), $('#ibu_method').val(), |
|
41d21817608e
Added the IBU contribution for whirlpool hops.
Michiel Broek <mbroek@mbse.eu>
parents:
525
diff
changeset
|
5407 | dataRecord.brew_whirlpool9, dataRecord.brew_whirlpool7, dataRecord.brew_whirlpool6 |
| 478 | 5408 | ); |
| 5409 | hopData.h_amount = amount; | |
| 5410 | $('#wh_ibu').val(ibu); | |
| 5411 | }); | |
| 5412 | $('#wh_ibu').jqxNumberInput(Show1dec); | |
| 5413 | $('#wh_time').jqxNumberInput(PosInt); | |
| 5414 | $('#wh_time').on('change', function(event) { | |
| 5415 | var ibu, newtime = parseFloat(event.args.value); | |
| 5416 | // Check limits and correct | |
| 5417 | if (hopData.h_useat == 2) { // Boil | |
| 5418 | if (newtime > parseFloat($('#boil_time').jqxNumberInput('decimal'))) { | |
| 5419 | newtime = parseFloat($('#boil_time').jqxNumberInput('decimal')); | |
| 5420 | $('#wh_time').val(newtime); | |
| 5421 | } | |
| 5422 | hopData.h_time = newtime; | |
| 5423 | } else if (hopData.h_useat == 5) { // Dry hop | |
| 5424 | if (newtime > 21) { | |
| 5425 | newtime = 21; | |
| 5426 | $('#wh_time').val(newtime); | |
| 5427 | } | |
| 5428 | hopData.h_time = newtime * 1440; | |
| 5429 | } | |
| 5430 | ibu = toIBU(hopData.h_useat, hopData.h_form, preboil_sg, parseFloat($('#batch_size').jqxNumberInput('decimal')), | |
|
538
41d21817608e
Added the IBU contribution for whirlpool hops.
Michiel Broek <mbroek@mbse.eu>
parents:
525
diff
changeset
|
5431 | parseFloat(hopData.h_amount), parseFloat(hopData.h_time), parseFloat(hopData.h_alpha), $('#ibu_method').val(), |
|
41d21817608e
Added the IBU contribution for whirlpool hops.
Michiel Broek <mbroek@mbse.eu>
parents:
525
diff
changeset
|
5432 | dataRecord.brew_whirlpool9, dataRecord.brew_whirlpool7, dataRecord.brew_whirlpool6); |
| 478 | 5433 | $('#wh_ibu').val(ibu); |
| 5434 | }); | |
| 5435 | $('#wh_useat').jqxDropDownList({ | |
| 5436 | theme: theme, | |
| 5437 | source: HopUseAdapter, | |
| 5438 | valueMember: 'id', | |
| 5439 | displayMember: 'nl', | |
| 5440 | width: 180, | |
| 5441 | height: 23, | |
| 5442 | autoDropDownHeight: true, | |
| 5443 | dropDownVerticalAlignment: 'top' | |
| 5444 | }); | |
| 5445 | $('#wh_useat').on('select', function(event) { | |
| 5446 | if (event.args) { | |
| 5447 | var index = event.args.index; | |
| 5448 | hopData.h_useat = index; | |
| 5449 | if ((index == 0) || (index == 1)) { // Mashhop or First wort hop | |
| 5450 | hopData.h_time = parseFloat(dataRecord.boil_time); | |
| 5451 | $('#wh_time').jqxNumberInput({ spinButtons: false, readOnly: true, width: 90 }); | |
| 5452 | $('#wh_time').val(hopData.h_time); | |
| 5453 | } else if (index == 3) { // Aroma | |
| 5454 | hopData.h_time = 0; | |
| 5455 | $('#wh_time').jqxNumberInput({ spinButtons: false, readOnly: true, width: 90 }); | |
| 5456 | $('#wh_time').val(0); | |
|
538
41d21817608e
Added the IBU contribution for whirlpool hops.
Michiel Broek <mbroek@mbse.eu>
parents:
525
diff
changeset
|
5457 | } else if (index == 4) { // Whirlpool |
|
41d21817608e
Added the IBU contribution for whirlpool hops.
Michiel Broek <mbroek@mbse.eu>
parents:
525
diff
changeset
|
5458 | hopData.h_time = (parseFloat(dataRecord.brew_whirlpool9) + parseFloat(dataRecord.brew_whirlpool7) + parseFloat(dataRecord.brew_whirlpool6)); |
|
41d21817608e
Added the IBU contribution for whirlpool hops.
Michiel Broek <mbroek@mbse.eu>
parents:
525
diff
changeset
|
5459 | $('#wh_time').jqxNumberInput({ spinButtons: false, readOnly: true, width: 90 }); |
|
41d21817608e
Added the IBU contribution for whirlpool hops.
Michiel Broek <mbroek@mbse.eu>
parents:
525
diff
changeset
|
5460 | $('#wh_time').val(hopData.h_time); |
|
41d21817608e
Added the IBU contribution for whirlpool hops.
Michiel Broek <mbroek@mbse.eu>
parents:
525
diff
changeset
|
5461 | } else { // Boil, Dry hop |
| 478 | 5462 | $('#wh_time').jqxNumberInput({ spinButtons: true, readOnly: false, width: 110 }); |
| 5463 | } | |
| 5464 | if (index == 5) // Dry hop | |
| 5465 | $('#wh_pmpt_time').html('Tijd in dagen'); | |
| 5466 | else | |
| 5467 | $('#wh_pmpt_time').html('Tijd in minuten'); | |
| 5468 | } | |
| 5469 | }); | |
| 5470 | ||
| 5471 | // Tab 5, Miscs | |
| 5472 | $('#MiscReady').jqxButton({ template: 'success', width: '90px', theme: theme }); | |
| 5473 | $('#MiscReady').click(function() { | |
| 5474 | var row, rowID = $('#miscGrid').jqxGrid('getrowid', miscRow); | |
| 5475 | console.log('MiscReady row:' + miscRow + ' ID:' + rowID); | |
| 5476 | row = { | |
| 5477 | m_name: miscData.m_name, | |
| 5478 | m_amount: miscData.m_amount, | |
| 5479 | m_cost: miscData.m_cost, | |
| 5480 | m_type: miscData.m_type, | |
| 5481 | m_use_use: miscData.m_use_use, | |
| 5482 | m_time: miscData.m_time, | |
| 5483 | m_amount_is_weight: miscData.m_amount_is_weight, | |
| 5484 | m_inventory: miscData.m_inventory, | |
| 5485 | m_avail: miscData.m_avail | |
| 5486 | }; | |
| 5487 | $('#miscGrid').jqxGrid('updaterow', rowID, row); | |
| 5488 | calcMiscs(); | |
| 5489 | }); | |
| 5490 | $('#wm_name').jqxInput({ theme: theme, width: 320, height: 23 }); | |
| 5491 | $('#wm_instock').jqxCheckBox({ theme: theme, height: 23 }); | |
| 5492 | $('#wm_instock').on('change', function(event) { | |
| 5493 | miscinstock = event.args.checked; | |
| 5494 | misclist.dataBind(); | |
| 5495 | }); | |
| 5496 | $('#wm_select').jqxDropDownList({ | |
| 5497 | placeHolder: 'Kies ingrediënt:', | |
| 5498 | theme: theme, | |
| 5499 | source: misclist, | |
| 5500 | displayMember: 'name', | |
| 5501 | width: 150, | |
| 5502 | height: 23, | |
| 5503 | dropDownWidth: 500, | |
| 5504 | dropDownHeight: 500 | |
| 5505 | }); | |
| 5506 | $('#wm_select').on('select', function(event) { | |
| 5507 | if (event.args) { | |
| 5508 | var datarecord, index = event.args.index; | |
| 5509 | datarecord = misclist.records[index]; | |
| 5510 | $('#wm_name').val(datarecord.name); | |
| 5511 | miscData.m_name = datarecord.name; | |
| 5512 | miscData.m_cost = datarecord.cost; | |
| 5513 | miscData.m_type = datarecord.type; | |
| 5514 | miscData.m_use_use = datarecord.use_use; | |
| 5515 | miscData.m_amount_is_weight = datarecord.amount_is_weight; | |
| 5516 | miscData.m_inventory = datarecord.inventory; | |
| 5517 | } | |
| 5518 | }); | |
| 5519 | $('#wm_amount').jqxNumberInput(Spin2dec); | |
| 5520 | $('#wm_amount').on('change', function(event) { | |
| 5521 | console.log('amount changed: ' + event.args.value); | |
| 5522 | miscData.m_amount = parseFloat(event.args.value) / 1000; | |
| 5523 | }); | |
| 5524 | $('#wm_time').jqxNumberInput(PosInt); | |
| 5525 | $('#wm_time').on('change', function(event) { | |
| 5526 | var newtime = parseFloat(event.args.value); | |
| 5527 | ||
| 5528 | if (miscData.m_use_use == 2) { // Boil | |
| 5529 | if (newtime > parseFloat($('#boil_time').jqxNumberInput('decimal'))) { | |
| 5530 | newtime = parseFloat($('#boil_time').jqxNumberInput('decimal')); | |
| 5531 | $('#wm_time').val(newtime); | |
| 5532 | } | |
| 5533 | miscData.m_time = newtime; | |
| 5534 | } else if ((miscData.m_use_use == 3) || (miscData.m_use_use == 4)) { // Primary or Secondary | |
| 5535 | if (newtime > 21) { | |
| 5536 | newtime = 21; | |
| 5537 | $('#wm_time').val(newtime); | |
| 5538 | } | |
| 5539 | miscData.m_time = newtime * 1440; | |
| 5540 | } | |
| 5541 | }); | |
| 5542 | $('#wm_use_use').jqxDropDownList({ | |
| 5543 | theme: theme, | |
| 5544 | source: MiscUseAdapter, | |
| 5545 | valueMember: 'id', | |
| 5546 | displayMember: 'nl', | |
| 5547 | width: 180, | |
| 5548 | height: 23, | |
| 5549 | autoDropDownHeight: true, | |
| 5550 | dropDownVerticalAlignment: 'top' | |
| 5551 | }); | |
| 5552 | $('#wm_use_use').on('select', function(event) { | |
| 5553 | if (event.args) { | |
| 5554 | var index = event.args.index; | |
| 5555 | miscData.m_use_use = index; | |
| 5556 | if ((index == 2) || (index == 3) || (index == 4)) { // Boil, Primary or Secondary | |
| 5557 | $('#wm_time').jqxNumberInput({ spinButtons: true, readOnly: false, width: 110 }); | |
| 5558 | } else { | |
| 5559 | $('#wm_time').jqxNumberInput({ spinButtons: false, readOnly: true, width: 90 }); | |
| 5560 | $('#wm_time').val(0); | |
| 5561 | miscData.m_time = 0; | |
| 5562 | } | |
| 5563 | } | |
| 5564 | }); | |
| 5565 | ||
| 5566 | // Tab 6, Yeasts | |
| 5567 | $('#est_fg2').jqxTooltip({ content: 'Het verwachte eind SG. Dit wordt automatisch berekend.' }); | |
|
622
39902353b159
Workaround for hang during startup. Changed order of displayed fields on the yeast tab. Tooltip text changes. More decimals on the checklist for misc ingredients. More decimals for the starter on product print.
Michiel Broek <mbroek@mbse.eu>
parents:
621
diff
changeset
|
5568 | $('#est_abv2').jqxTooltip({ content: 'Verwacht alcohol volume %. Dit wordt automatisch berekend.' }); |
|
726
872a3635e4ef
Changed dry-yeast calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
723
diff
changeset
|
5569 | $('#yeast_grams').jqxTooltip({ content: 'De gewenste totale hoeveelheid droge gist voor dit bier.' }); |
|
872a3635e4ef
Changed dry-yeast calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
723
diff
changeset
|
5570 | $('#yeast_gr_hl').jqxTooltip({ content: 'De werkelijke hoeveelheid gist per hectoliter.' }); |
|
622
39902353b159
Workaround for hang during startup. Changed order of displayed fields on the yeast tab. Tooltip text changes. More decimals on the checklist for misc ingredients. More decimals for the starter on product print.
Michiel Broek <mbroek@mbse.eu>
parents:
621
diff
changeset
|
5571 | $('#yeast_cells').jqxTooltip({ content: 'Het aantal miljard beschikbare gistcellen zonder eventuele starter.' }); |
|
39902353b159
Workaround for hang during startup. Changed order of displayed fields on the yeast tab. Tooltip text changes. More decimals on the checklist for misc ingredients. More decimals for the starter on product print.
Michiel Broek <mbroek@mbse.eu>
parents:
621
diff
changeset
|
5572 | $('#need_cells').jqxTooltip({ content: 'Het aantal miljard nodige cellen is afhankelijk van het begin SG, biertype en volume.' }); |
|
39902353b159
Workaround for hang during startup. Changed order of displayed fields on the yeast tab. Tooltip text changes. More decimals on the checklist for misc ingredients. More decimals for the starter on product print.
Michiel Broek <mbroek@mbse.eu>
parents:
621
diff
changeset
|
5573 | $('#plato_cells').jqxTooltip({ content: 'De berekende pitchrate in miljard cellen per ml per graad Plato.' }); |
|
617
f962f1e5936e
Implemented yeast viability calculation from the yeast production date. Changed the pitchrate logic and added Ale above 1.076 rate of 1.25.
Michiel Broek <mbroek@mbse.eu>
parents:
616
diff
changeset
|
5574 | $('#yeast_prod_date').jqxTooltip({ content: 'Bij korrelgisten is meestal "best voor" datum op het zakje gedrukt.<br>Gebruik die datum maar dan twee jaar eerder als productie datum.<br>Bij White Labs is de productie datum vier maanden voor de "Best by" datum die geprint op het buisje.<br>Bij Wyeast is dit de "manufacture date" die op het pak geprint is.<br>Voor schuine buis, slurry, opkweek en gedroogd is dit de datum dat je de gist geoogst hebt.' }); |
|
697
367ae7ff52f0
Version 0.3.34 Changed log messages in the daemon. Added yeast_pitchrate field to the product database. Added yeast pitchrate edit field to the yeast tab. Initial value is guessed. There is also a popup window for predefined values. An finally the value can be edited by the user. All popup windows are initialized together.
Michiel Broek <mbroek@mbse.eu>
parents:
669
diff
changeset
|
5575 | $('#yeast_pitchrate').jqxTooltip({ content: 'De gewenste pitchrate in miljard cellen per ml per graad Plato voor de vergisting van dit bier.' }); |
|
633
ec4601ab3ed2
Fixed loading of the product edit page. A bit faster loading.
Michiel Broek <mbroek@mbse.eu>
parents:
623
diff
changeset
|
5576 | |
|
ec4601ab3ed2
Fixed loading of the product edit page. A bit faster loading.
Michiel Broek <mbroek@mbse.eu>
parents:
623
diff
changeset
|
5577 | $('#est_fg2,#plato_cells').jqxNumberInput(Show3dec); |
|
697
367ae7ff52f0
Version 0.3.34 Changed log messages in the daemon. Added yeast_pitchrate field to the product database. Added yeast pitchrate edit field to the yeast tab. Initial value is guessed. There is also a popup window for predefined values. An finally the value can be edited by the user. All popup windows are initialized together.
Michiel Broek <mbroek@mbse.eu>
parents:
669
diff
changeset
|
5578 | $('#est_fg2').jqxNumberInput({ width: 70 }); |
|
633
ec4601ab3ed2
Fixed loading of the product edit page. A bit faster loading.
Michiel Broek <mbroek@mbse.eu>
parents:
623
diff
changeset
|
5579 | $('#est_abv2').jqxNumberInput(Show2dec); |
|
697
367ae7ff52f0
Version 0.3.34 Changed log messages in the daemon. Added yeast_pitchrate field to the product database. Added yeast pitchrate edit field to the yeast tab. Initial value is guessed. There is also a popup window for predefined values. An finally the value can be edited by the user. All popup windows are initialized together.
Michiel Broek <mbroek@mbse.eu>
parents:
669
diff
changeset
|
5580 | $('#est_abv2').jqxNumberInput({ width: 70, symbol: '%', symbolPosition: 'right' }); |
|
726
872a3635e4ef
Changed dry-yeast calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
723
diff
changeset
|
5581 | $('#yeast_grams').jqxNumberInput(Show1dec); |
|
872a3635e4ef
Changed dry-yeast calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
723
diff
changeset
|
5582 | $('#yeast_gr_hl').jqxNumberInput(Show1dec); |
|
633
ec4601ab3ed2
Fixed loading of the product edit page. A bit faster loading.
Michiel Broek <mbroek@mbse.eu>
parents:
623
diff
changeset
|
5583 | $('#yeast_cells,#need_cells').jqxNumberInput(Show1dec); |
|
617
f962f1e5936e
Implemented yeast viability calculation from the yeast production date. Changed the pitchrate logic and added Ale above 1.076 rate of 1.25.
Michiel Broek <mbroek@mbse.eu>
parents:
616
diff
changeset
|
5584 | $('#yeast_prod_date').jqxDateTimeInput(Dateopts); |
|
f962f1e5936e
Implemented yeast viability calculation from the yeast production date. Changed the pitchrate logic and added Ale above 1.076 rate of 1.25.
Michiel Broek <mbroek@mbse.eu>
parents:
616
diff
changeset
|
5585 | $('#yeast_prod_date').on('close', function(event) { |
|
f962f1e5936e
Implemented yeast viability calculation from the yeast production date. Changed the pitchrate logic and added Ale above 1.076 rate of 1.25.
Michiel Broek <mbroek@mbse.eu>
parents:
616
diff
changeset
|
5586 | calcViability(); |
|
f962f1e5936e
Implemented yeast viability calculation from the yeast production date. Changed the pitchrate logic and added Ale above 1.076 rate of 1.25.
Michiel Broek <mbroek@mbse.eu>
parents:
616
diff
changeset
|
5587 | calcFermentables(); |
|
f962f1e5936e
Implemented yeast viability calculation from the yeast production date. Changed the pitchrate logic and added Ale above 1.076 rate of 1.25.
Michiel Broek <mbroek@mbse.eu>
parents:
616
diff
changeset
|
5588 | calcYeast(); |
|
f962f1e5936e
Implemented yeast viability calculation from the yeast production date. Changed the pitchrate logic and added Ale above 1.076 rate of 1.25.
Michiel Broek <mbroek@mbse.eu>
parents:
616
diff
changeset
|
5589 | }); |
|
697
367ae7ff52f0
Version 0.3.34 Changed log messages in the daemon. Added yeast_pitchrate field to the product database. Added yeast pitchrate edit field to the yeast tab. Initial value is guessed. There is also a popup window for predefined values. An finally the value can be edited by the user. All popup windows are initialized together.
Michiel Broek <mbroek@mbse.eu>
parents:
669
diff
changeset
|
5590 | $('#yeast_pitchrate').jqxNumberInput(Spin3dec); |
|
367ae7ff52f0
Version 0.3.34 Changed log messages in the daemon. Added yeast_pitchrate field to the product database. Added yeast pitchrate edit field to the yeast tab. Initial value is guessed. There is also a popup window for predefined values. An finally the value can be edited by the user. All popup windows are initialized together.
Michiel Broek <mbroek@mbse.eu>
parents:
669
diff
changeset
|
5591 | $('#yeast_pitchrate').on('change', function(event) { |
|
367ae7ff52f0
Version 0.3.34 Changed log messages in the daemon. Added yeast_pitchrate field to the product database. Added yeast pitchrate edit field to the yeast tab. Initial value is guessed. There is also a popup window for predefined values. An finally the value can be edited by the user. All popup windows are initialized together.
Michiel Broek <mbroek@mbse.eu>
parents:
669
diff
changeset
|
5592 | dataRecord.yeast_pitchrate = parseFloat(event.args.value); |
|
367ae7ff52f0
Version 0.3.34 Changed log messages in the daemon. Added yeast_pitchrate field to the product database. Added yeast pitchrate edit field to the yeast tab. Initial value is guessed. There is also a popup window for predefined values. An finally the value can be edited by the user. All popup windows are initialized together.
Michiel Broek <mbroek@mbse.eu>
parents:
669
diff
changeset
|
5593 | calcViability(); |
|
367ae7ff52f0
Version 0.3.34 Changed log messages in the daemon. Added yeast_pitchrate field to the product database. Added yeast pitchrate edit field to the yeast tab. Initial value is guessed. There is also a popup window for predefined values. An finally the value can be edited by the user. All popup windows are initialized together.
Michiel Broek <mbroek@mbse.eu>
parents:
669
diff
changeset
|
5594 | calcFermentables(); |
|
367ae7ff52f0
Version 0.3.34 Changed log messages in the daemon. Added yeast_pitchrate field to the product database. Added yeast pitchrate edit field to the yeast tab. Initial value is guessed. There is also a popup window for predefined values. An finally the value can be edited by the user. All popup windows are initialized together.
Michiel Broek <mbroek@mbse.eu>
parents:
669
diff
changeset
|
5595 | calcYeast(); |
|
367ae7ff52f0
Version 0.3.34 Changed log messages in the daemon. Added yeast_pitchrate field to the product database. Added yeast pitchrate edit field to the yeast tab. Initial value is guessed. There is also a popup window for predefined values. An finally the value can be edited by the user. All popup windows are initialized together.
Michiel Broek <mbroek@mbse.eu>
parents:
669
diff
changeset
|
5596 | }); |
|
367ae7ff52f0
Version 0.3.34 Changed log messages in the daemon. Added yeast_pitchrate field to the product database. Added yeast pitchrate edit field to the yeast tab. Initial value is guessed. There is also a popup window for predefined values. An finally the value can be edited by the user. All popup windows are initialized together.
Michiel Broek <mbroek@mbse.eu>
parents:
669
diff
changeset
|
5597 | $('#but_pickpitchrate').jqxButton({ template: 'success', width: '23px', height: 23, theme: theme }); |
|
367ae7ff52f0
Version 0.3.34 Changed log messages in the daemon. Added yeast_pitchrate field to the product database. Added yeast pitchrate edit field to the yeast tab. Initial value is guessed. There is also a popup window for predefined values. An finally the value can be edited by the user. All popup windows are initialized together.
Michiel Broek <mbroek@mbse.eu>
parents:
669
diff
changeset
|
5598 | $('#but_pickpitchrate').bind('click', function() { |
|
367ae7ff52f0
Version 0.3.34 Changed log messages in the daemon. Added yeast_pitchrate field to the product database. Added yeast pitchrate edit field to the yeast tab. Initial value is guessed. There is also a popup window for predefined values. An finally the value can be edited by the user. All popup windows are initialized together.
Michiel Broek <mbroek@mbse.eu>
parents:
669
diff
changeset
|
5599 | $('#pick_pitchrate').val(0); // Set default pick incase no perfect match. |
|
367ae7ff52f0
Version 0.3.34 Changed log messages in the daemon. Added yeast_pitchrate field to the product database. Added yeast pitchrate edit field to the yeast tab. Initial value is guessed. There is also a popup window for predefined values. An finally the value can be edited by the user. All popup windows are initialized together.
Michiel Broek <mbroek@mbse.eu>
parents:
669
diff
changeset
|
5600 | $('#pick_pitchrate').val(dataRecord.yeast_pitchrate); |
|
367ae7ff52f0
Version 0.3.34 Changed log messages in the daemon. Added yeast_pitchrate field to the product database. Added yeast pitchrate edit field to the yeast tab. Initial value is guessed. There is also a popup window for predefined values. An finally the value can be edited by the user. All popup windows are initialized together.
Michiel Broek <mbroek@mbse.eu>
parents:
669
diff
changeset
|
5601 | $('#pitchrateWindow').jqxWindow('open'); |
|
367ae7ff52f0
Version 0.3.34 Changed log messages in the daemon. Added yeast_pitchrate field to the product database. Added yeast pitchrate edit field to the yeast tab. Initial value is guessed. There is also a popup window for predefined values. An finally the value can be edited by the user. All popup windows are initialized together.
Michiel Broek <mbroek@mbse.eu>
parents:
669
diff
changeset
|
5602 | }); |
|
367ae7ff52f0
Version 0.3.34 Changed log messages in the daemon. Added yeast_pitchrate field to the product database. Added yeast pitchrate edit field to the yeast tab. Initial value is guessed. There is also a popup window for predefined values. An finally the value can be edited by the user. All popup windows are initialized together.
Michiel Broek <mbroek@mbse.eu>
parents:
669
diff
changeset
|
5603 | $('#pick_pitchrate').jqxDropDownList({ |
| 478 | 5604 | theme: theme, |
|
697
367ae7ff52f0
Version 0.3.34 Changed log messages in the daemon. Added yeast_pitchrate field to the product database. Added yeast pitchrate edit field to the yeast tab. Initial value is guessed. There is also a popup window for predefined values. An finally the value can be edited by the user. All popup windows are initialized together.
Michiel Broek <mbroek@mbse.eu>
parents:
669
diff
changeset
|
5605 | source: PitchrateAdapter, |
|
367ae7ff52f0
Version 0.3.34 Changed log messages in the daemon. Added yeast_pitchrate field to the product database. Added yeast pitchrate edit field to the yeast tab. Initial value is guessed. There is also a popup window for predefined values. An finally the value can be edited by the user. All popup windows are initialized together.
Michiel Broek <mbroek@mbse.eu>
parents:
669
diff
changeset
|
5606 | valueMember: 'rate', |
|
367ae7ff52f0
Version 0.3.34 Changed log messages in the daemon. Added yeast_pitchrate field to the product database. Added yeast pitchrate edit field to the yeast tab. Initial value is guessed. There is also a popup window for predefined values. An finally the value can be edited by the user. All popup windows are initialized together.
Michiel Broek <mbroek@mbse.eu>
parents:
669
diff
changeset
|
5607 | displayMember: 'nl', |
|
367ae7ff52f0
Version 0.3.34 Changed log messages in the daemon. Added yeast_pitchrate field to the product database. Added yeast pitchrate edit field to the yeast tab. Initial value is guessed. There is also a popup window for predefined values. An finally the value can be edited by the user. All popup windows are initialized together.
Michiel Broek <mbroek@mbse.eu>
parents:
669
diff
changeset
|
5608 | width: 275, |
|
367ae7ff52f0
Version 0.3.34 Changed log messages in the daemon. Added yeast_pitchrate field to the product database. Added yeast pitchrate edit field to the yeast tab. Initial value is guessed. There is also a popup window for predefined values. An finally the value can be edited by the user. All popup windows are initialized together.
Michiel Broek <mbroek@mbse.eu>
parents:
669
diff
changeset
|
5609 | height: 23, |
|
367ae7ff52f0
Version 0.3.34 Changed log messages in the daemon. Added yeast_pitchrate field to the product database. Added yeast pitchrate edit field to the yeast tab. Initial value is guessed. There is also a popup window for predefined values. An finally the value can be edited by the user. All popup windows are initialized together.
Michiel Broek <mbroek@mbse.eu>
parents:
669
diff
changeset
|
5610 | autoDropDownHeight: true, |
|
367ae7ff52f0
Version 0.3.34 Changed log messages in the daemon. Added yeast_pitchrate field to the product database. Added yeast pitchrate edit field to the yeast tab. Initial value is guessed. There is also a popup window for predefined values. An finally the value can be edited by the user. All popup windows are initialized together.
Michiel Broek <mbroek@mbse.eu>
parents:
669
diff
changeset
|
5611 | dropDownVerticalAlignment: 'top' |
|
367ae7ff52f0
Version 0.3.34 Changed log messages in the daemon. Added yeast_pitchrate field to the product database. Added yeast pitchrate edit field to the yeast tab. Initial value is guessed. There is also a popup window for predefined values. An finally the value can be edited by the user. All popup windows are initialized together.
Michiel Broek <mbroek@mbse.eu>
parents:
669
diff
changeset
|
5612 | }); |
|
367ae7ff52f0
Version 0.3.34 Changed log messages in the daemon. Added yeast_pitchrate field to the product database. Added yeast pitchrate edit field to the yeast tab. Initial value is guessed. There is also a popup window for predefined values. An finally the value can be edited by the user. All popup windows are initialized together.
Michiel Broek <mbroek@mbse.eu>
parents:
669
diff
changeset
|
5613 | $('#pitchrateReady').jqxButton({ template: 'success', width: '90px', theme: theme }); |
|
367ae7ff52f0
Version 0.3.34 Changed log messages in the daemon. Added yeast_pitchrate field to the product database. Added yeast pitchrate edit field to the yeast tab. Initial value is guessed. There is also a popup window for predefined values. An finally the value can be edited by the user. All popup windows are initialized together.
Michiel Broek <mbroek@mbse.eu>
parents:
669
diff
changeset
|
5614 | $('#pitchrateReady').click(function() { |
|
367ae7ff52f0
Version 0.3.34 Changed log messages in the daemon. Added yeast_pitchrate field to the product database. Added yeast pitchrate edit field to the yeast tab. Initial value is guessed. There is also a popup window for predefined values. An finally the value can be edited by the user. All popup windows are initialized together.
Michiel Broek <mbroek@mbse.eu>
parents:
669
diff
changeset
|
5615 | console.log('pitchrateReady ' + $('#pick_pitchrate').val() ); |
|
367ae7ff52f0
Version 0.3.34 Changed log messages in the daemon. Added yeast_pitchrate field to the product database. Added yeast pitchrate edit field to the yeast tab. Initial value is guessed. There is also a popup window for predefined values. An finally the value can be edited by the user. All popup windows are initialized together.
Michiel Broek <mbroek@mbse.eu>
parents:
669
diff
changeset
|
5616 | dataRecord.yeast_pitchrate = parseFloat($('#pick_pitchrate').val()); |
|
367ae7ff52f0
Version 0.3.34 Changed log messages in the daemon. Added yeast_pitchrate field to the product database. Added yeast pitchrate edit field to the yeast tab. Initial value is guessed. There is also a popup window for predefined values. An finally the value can be edited by the user. All popup windows are initialized together.
Michiel Broek <mbroek@mbse.eu>
parents:
669
diff
changeset
|
5617 | $('#yeast_pitchrate').val(dataRecord.yeast_pitchrate); |
|
367ae7ff52f0
Version 0.3.34 Changed log messages in the daemon. Added yeast_pitchrate field to the product database. Added yeast pitchrate edit field to the yeast tab. Initial value is guessed. There is also a popup window for predefined values. An finally the value can be edited by the user. All popup windows are initialized together.
Michiel Broek <mbroek@mbse.eu>
parents:
669
diff
changeset
|
5618 | calcViability(); |
|
367ae7ff52f0
Version 0.3.34 Changed log messages in the daemon. Added yeast_pitchrate field to the product database. Added yeast pitchrate edit field to the yeast tab. Initial value is guessed. There is also a popup window for predefined values. An finally the value can be edited by the user. All popup windows are initialized together.
Michiel Broek <mbroek@mbse.eu>
parents:
669
diff
changeset
|
5619 | calcFermentables(); |
|
367ae7ff52f0
Version 0.3.34 Changed log messages in the daemon. Added yeast_pitchrate field to the product database. Added yeast pitchrate edit field to the yeast tab. Initial value is guessed. There is also a popup window for predefined values. An finally the value can be edited by the user. All popup windows are initialized together.
Michiel Broek <mbroek@mbse.eu>
parents:
669
diff
changeset
|
5620 | calcYeast(); |
| 478 | 5621 | }); |
| 5622 | $('#YeastReady').jqxButton({ template: 'success', width: '90px', theme: theme }); | |
| 5623 | $('#YeastReady').click(function() { | |
| 5624 | var row, rowID = $('#yeastGrid').jqxGrid('getrowid', yeastRow); | |
| 5625 | console.log('YeastReady row:' + yeastRow + ' ID:' + rowID); | |
| 5626 | row = { | |
| 5627 | y_name: yeastData.y_name, | |
| 5628 | y_laboratory: yeastData.y_laboratory, | |
| 5629 | y_product_id: yeastData.y_product_id, | |
| 5630 | y_amount: yeastData.y_amount, | |
| 5631 | y_cost: yeastData.y_cost, | |
| 5632 | y_type: yeastData.y_type, | |
| 5633 | y_form: yeastData.y_form, | |
| 5634 | y_flocculation: yeastData.y_flocculation, | |
| 5635 | y_min_temperature: yeastData.y_min_temperature, | |
| 5636 | y_max_temperature: yeastData.y_max_temperature, | |
| 5637 | y_attenuation: yeastData.y_attenuation, | |
| 5638 | y_use: yeastData.y_use, | |
| 5639 | y_cells: yeastData.y_cells, | |
| 5640 | y_tolerance: yeastData.y_tolerance, | |
| 5641 | y_inventory: yeastData.y_inventory, | |
|
554
c62ff53cfc3d
Added the new Kveik yeast fields to the product editor. Added auto update when a product is loaded. Added extra lines to the checklist about harvest yeast and pitch temperature.
Michiel Broek <mbroek@mbse.eu>
parents:
552
diff
changeset
|
5642 | y_sta1: yeastData.y_sta1, |
|
c62ff53cfc3d
Added the new Kveik yeast fields to the product editor. Added auto update when a product is loaded. Added extra lines to the checklist about harvest yeast and pitch temperature.
Michiel Broek <mbroek@mbse.eu>
parents:
552
diff
changeset
|
5643 | y_bacteria: yeastData.y_bacteria, |
|
c62ff53cfc3d
Added the new Kveik yeast fields to the product editor. Added auto update when a product is loaded. Added extra lines to the checklist about harvest yeast and pitch temperature.
Michiel Broek <mbroek@mbse.eu>
parents:
552
diff
changeset
|
5644 | y_harvest_top: yeastData.y_harvest_top, |
|
c62ff53cfc3d
Added the new Kveik yeast fields to the product editor. Added auto update when a product is loaded. Added extra lines to the checklist about harvest yeast and pitch temperature.
Michiel Broek <mbroek@mbse.eu>
parents:
552
diff
changeset
|
5645 | y_harvest_time: yeastData.y_harvest_time, |
|
c62ff53cfc3d
Added the new Kveik yeast fields to the product editor. Added auto update when a product is loaded. Added extra lines to the checklist about harvest yeast and pitch temperature.
Michiel Broek <mbroek@mbse.eu>
parents:
552
diff
changeset
|
5646 | y_pitch_temperature: yeastData.y_pitch_temperature, |
|
c62ff53cfc3d
Added the new Kveik yeast fields to the product editor. Added auto update when a product is loaded. Added extra lines to the checklist about harvest yeast and pitch temperature.
Michiel Broek <mbroek@mbse.eu>
parents:
552
diff
changeset
|
5647 | y_pofpos: yeastData.y_pofpos, |
|
c62ff53cfc3d
Added the new Kveik yeast fields to the product editor. Added auto update when a product is loaded. Added extra lines to the checklist about harvest yeast and pitch temperature.
Michiel Broek <mbroek@mbse.eu>
parents:
552
diff
changeset
|
5648 | y_zymocide: yeastData.y_zymocide, |
|
726
872a3635e4ef
Changed dry-yeast calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
723
diff
changeset
|
5649 | y_gr_hl_lo: yeastData.y_gr_hl_lo, |
|
872a3635e4ef
Changed dry-yeast calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
723
diff
changeset
|
5650 | y_sg_lo: yeastData.y_sg_lo, |
|
872a3635e4ef
Changed dry-yeast calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
723
diff
changeset
|
5651 | y_gr_hl_hi: yeastData.y_gr_hl_hi, |
|
872a3635e4ef
Changed dry-yeast calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
723
diff
changeset
|
5652 | y_sg_hi: yeastData.y_sg_hi, |
| 478 | 5653 | y_avail: yeastData.y_avail |
| 5654 | }; | |
| 5655 | $('#yeastGrid').jqxGrid('updaterow', rowID, row); | |
|
617
f962f1e5936e
Implemented yeast viability calculation from the yeast production date. Changed the pitchrate logic and added Ale above 1.076 rate of 1.25.
Michiel Broek <mbroek@mbse.eu>
parents:
616
diff
changeset
|
5656 | calcViability(); |
| 478 | 5657 | calcFermentables(); |
| 5658 | calcYeast(); | |
| 5659 | }); | |
| 610 | 5660 | $('#wy_name,#wy_laboratory,#wy_product_id').jqxInput({ theme: theme, width: 320, height: 23 }); |
| 478 | 5661 | $('#wy_instock').jqxCheckBox({ theme: theme, height: 23 }); |
| 5662 | $('#wy_instock').on('change', function(event) { | |
| 5663 | yeastinstock = event.args.checked; | |
| 5664 | yeastlist.dataBind(); | |
| 5665 | }); | |
| 5666 | $('#wy_select').jqxDropDownList({ | |
| 5667 | placeHolder: 'Kies gist:', | |
| 5668 | theme: theme, | |
| 5669 | source: yeastlist, | |
| 5670 | displayMember: 'name', | |
| 5671 | width: 150, | |
| 5672 | height: 23, | |
| 5673 | dropDownWidth: 500, | |
| 5674 | dropDownHeight: 500, | |
| 5675 | renderer: function(index, label, value) { | |
| 5676 | var datarecord = yeastlist.records[index]; | |
| 5677 | return datarecord.laboratory + ' ' + datarecord.product_id + ' ' + datarecord.name; | |
| 5678 | } | |
| 5679 | }); | |
| 5680 | $('#wy_select').on('select', function(event) { | |
| 5681 | if (event.args) { | |
| 5682 | var datarecord, index = event.args.index; | |
| 5683 | datarecord = yeastlist.records[index]; | |
| 5684 | $('#wy_name').val(datarecord.name); | |
| 5685 | $('#wy_laboratory').val(datarecord.laboratory); | |
| 5686 | $('#wy_product_id').val(datarecord.product_id); | |
| 5687 | yeastData.y_name = datarecord.name; | |
| 5688 | yeastData.y_cost = datarecord.cost; | |
| 5689 | yeastData.y_type = datarecord.type; | |
| 5690 | yeastData.y_form = datarecord.form; | |
| 5691 | yeastData.y_laboratory = datarecord.laboratory; | |
| 5692 | yeastData.y_product_id = datarecord.product_id; | |
| 5693 | yeastData.y_min_temperature = datarecord.min_temperature; | |
| 5694 | yeastData.y_max_temperature = datarecord.max_temperature; | |
| 5695 | yeastData.y_flocculation = datarecord.flocculation; | |
| 5696 | yeastData.y_attenuation = datarecord.attenuation; | |
| 5697 | yeastData.y_cells = datarecord.cells; | |
| 5698 | yeastData.y_inventory = datarecord.inventory; | |
|
554
c62ff53cfc3d
Added the new Kveik yeast fields to the product editor. Added auto update when a product is loaded. Added extra lines to the checklist about harvest yeast and pitch temperature.
Michiel Broek <mbroek@mbse.eu>
parents:
552
diff
changeset
|
5699 | 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:
560
diff
changeset
|
5700 | yeastData.y_bacteria = datarecord.bacteria; |
|
554
c62ff53cfc3d
Added the new Kveik yeast fields to the product editor. Added auto update when a product is loaded. Added extra lines to the checklist about harvest yeast and pitch temperature.
Michiel Broek <mbroek@mbse.eu>
parents:
552
diff
changeset
|
5701 | yeastData.y_harvest_top = datarecord.harvest_top; |
|
c62ff53cfc3d
Added the new Kveik yeast fields to the product editor. Added auto update when a product is loaded. Added extra lines to the checklist about harvest yeast and pitch temperature.
Michiel Broek <mbroek@mbse.eu>
parents:
552
diff
changeset
|
5702 | yeastData.y_harvest_time = datarecord.harvest_time; |
|
c62ff53cfc3d
Added the new Kveik yeast fields to the product editor. Added auto update when a product is loaded. Added extra lines to the checklist about harvest yeast and pitch temperature.
Michiel Broek <mbroek@mbse.eu>
parents:
552
diff
changeset
|
5703 | yeastData.y_pitch_temperature = datarecord.pitch_temperature; |
|
c62ff53cfc3d
Added the new Kveik yeast fields to the product editor. Added auto update when a product is loaded. Added extra lines to the checklist about harvest yeast and pitch temperature.
Michiel Broek <mbroek@mbse.eu>
parents:
552
diff
changeset
|
5704 | yeastData.y_pofpos = datarecord.pofpos; |
|
c62ff53cfc3d
Added the new Kveik yeast fields to the product editor. Added auto update when a product is loaded. Added extra lines to the checklist about harvest yeast and pitch temperature.
Michiel Broek <mbroek@mbse.eu>
parents:
552
diff
changeset
|
5705 | yeastData.y_zymocide = datarecord.zymocide; |
|
726
872a3635e4ef
Changed dry-yeast calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
723
diff
changeset
|
5706 | yeastData.y_gr_hl_lo = datarecord.gr_hl_lo; |
|
872a3635e4ef
Changed dry-yeast calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
723
diff
changeset
|
5707 | yeastData.y_sg_lo = datarecord.sg_lo; |
|
872a3635e4ef
Changed dry-yeast calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
723
diff
changeset
|
5708 | yeastData.y_gr_hl_hi = datarecord.gr_hl_hi; |
|
872a3635e4ef
Changed dry-yeast calculation.
Michiel Broek <mbroek@mbse.eu>
parents:
723
diff
changeset
|
5709 | yeastData.y_sg_hi = datarecord.sg_hi; |
| 478 | 5710 | if (yeastData.y_form == 0) { |
| 5711 | $('#wy_pmpt_amount').html('Pak(ken):'); | |
|
515
9d771385a8a0
Added dried yeast form. Pitch rate for Kveik initially set at 0.25. Dried Kveik cells set to 9000000000 cells/gram.
Michiel Broek <mbroek@mbse.eu>
parents:
500
diff
changeset
|
5712 | } else if (yeastData.y_form == 1 || yeastData.y_form == 6) { |
| 478 | 5713 | $('#wy_pmpt_amount').html('Gewicht gram:'); |
| 5714 | } else { | |
| 5715 | $('#wy_pmpt_amount').html('Volume ml:'); | |
| 5716 | } | |
|
617
f962f1e5936e
Implemented yeast viability calculation from the yeast production date. Changed the pitchrate logic and added Ale above 1.076 rate of 1.25.
Michiel Broek <mbroek@mbse.eu>
parents:
616
diff
changeset
|
5717 | calcViability(); |
| 478 | 5718 | calcFermentables(); |
| 5719 | calcYeast(); | |
| 5720 | } | |
| 5721 | }); | |
| 5722 | $('#wy_amount').jqxNumberInput(Spin1dec); | |
| 5723 | $('#wy_amount').on('change', function(event) { | |
| 5724 | var amount = parseFloat(event.args.value); | |
| 5725 | if (yeastData.y_form != 0) // not Liquid | |
| 5726 | amount = parseFloat(event.args.value) / 1000; | |
| 5727 | yeastData.y_amount = amount; | |
| 5728 | calcFermentables(); | |
| 5729 | calcYeast(); | |
| 5730 | }); | |
| 5731 | $('#wy_use').jqxDropDownList({ | |
| 5732 | theme: theme, | |
| 5733 | source: YeastUseAdapter, | |
| 5734 | valueMember: 'id', | |
| 5735 | displayMember: 'nl', | |
| 5736 | width: 180, | |
| 5737 | height: 23, | |
| 5738 | autoDropDownHeight: true, | |
| 5739 | dropDownVerticalAlignment: 'top' | |
| 5740 | }); | |
| 5741 | $('#wy_use').on('select', function(event) { | |
| 5742 | if (event.args) { | |
| 5743 | var index = event.args.index; | |
| 5744 | yeastData.y_use = index; | |
|
617
f962f1e5936e
Implemented yeast viability calculation from the yeast production date. Changed the pitchrate logic and added Ale above 1.076 rate of 1.25.
Michiel Broek <mbroek@mbse.eu>
parents:
616
diff
changeset
|
5745 | calcViability(); |
| 478 | 5746 | calcFermentables(); |
| 5747 | calcYeast(); | |
| 5748 | } | |
| 5749 | }); | |
| 5750 | for (i = 1; i < 5; i++) { | |
|
633
ec4601ab3ed2
Fixed loading of the product edit page. A bit faster loading.
Michiel Broek <mbroek@mbse.eu>
parents:
623
diff
changeset
|
5751 | $('#prop' + i + '_volume').jqxTooltip({ content: 'Het volume van deze starter stap.' }); |
|
ec4601ab3ed2
Fixed loading of the product edit page. A bit faster loading.
Michiel Broek <mbroek@mbse.eu>
parents:
623
diff
changeset
|
5752 | $('#prop' + i + '_irate').jqxTooltip({ content: 'Voor de beste gistgroei, houd de injectie factor tussen de 25 en 100 miljoen cellen per ml.' }); |
|
ec4601ab3ed2
Fixed loading of the product edit page. A bit faster loading.
Michiel Broek <mbroek@mbse.eu>
parents:
623
diff
changeset
|
5753 | $('#prop' + i + '_ncells').jqxTooltip({ content: 'Het aantal miljard nieuwe gistcellen in deze stap.' }); |
|
ec4601ab3ed2
Fixed loading of the product edit page. A bit faster loading.
Michiel Broek <mbroek@mbse.eu>
parents:
623
diff
changeset
|
5754 | $('#prop' + i + '_tcells').jqxTooltip({ content: 'Het totaal aantal miljard gistcellen na deze stap.' }); |
|
ec4601ab3ed2
Fixed loading of the product edit page. A bit faster loading.
Michiel Broek <mbroek@mbse.eu>
parents:
623
diff
changeset
|
5755 | $('#prop' + i + '_growf').jqxTooltip({ content: 'De groeifactor, minstens 1. Ongeroerde starters komen meestal niet boven de 3.' }); |
|
ec4601ab3ed2
Fixed loading of the product edit page. A bit faster loading.
Michiel Broek <mbroek@mbse.eu>
parents:
623
diff
changeset
|
5756 | |
| 478 | 5757 | $('#prop' + i + '_type').jqxDropDownList({ |
| 5758 | theme: theme, | |
| 5759 | source: StarterTypeAdapter, | |
| 5760 | valueMember: 'id', | |
| 5761 | displayMember: 'nl', | |
| 5762 | width: 120, | |
| 5763 | height: 23, | |
| 5764 | autoDropDownHeight: true | |
| 5765 | }); | |
| 5766 | $('#prop' + i + '_volume').jqxNumberInput(Spin3dec); | |
| 610 | 5767 | $('#prop' + i + '_irate,#prop' + i + '_ncells,#prop' + i + '_tcells').jqxNumberInput(Show1dec); |
| 478 | 5768 | $('#prop' + i + '_growf').jqxNumberInput(Show2dec); |
|
633
ec4601ab3ed2
Fixed loading of the product edit page. A bit faster loading.
Michiel Broek <mbroek@mbse.eu>
parents:
623
diff
changeset
|
5769 | $('#prop' + i + '_type,#prop' + i + '_volume,#prop' + i + '_irate,#prop' + i + '_ncells,#prop' + i + '_tcells,#prop' + i + '_growf').hide(); |
| 478 | 5770 | } |
|
619
4938909df593
Fixed starter production date tooltip. Upgraded jqwidgets from version 8.1.4 to 9.0.0
Michiel Broek <mbroek@mbse.eu>
parents:
618
diff
changeset
|
5771 | $('#starter_type').jqxTooltip({ content: 'starter_type' }); |
| 478 | 5772 | $('#starter_type').jqxDropDownList({ |
| 5773 | theme: theme, | |
| 5774 | source: StarterTypeAdapter, | |
| 5775 | valueMember: 'id', | |
| 5776 | displayMember: 'nl', | |
| 5777 | width: 120, | |
| 5778 | height: 23, | |
| 5779 | autoDropDownHeight: true | |
| 5780 | }); | |
|
518
00e110567fee
The default starter SG changed to 1.037. Added several tooltips on the yeast tab.
Michiel Broek <mbroek@mbse.eu>
parents:
515
diff
changeset
|
5781 | $('#starter_sg').jqxTooltip({ content: 'Het ideale starter SG moet tussen de 1.030 en 1.040 zijn. Optimaal is 1.037.' }); |
| 478 | 5782 | $('#starter_sg').jqxNumberInput(SGopts); |
|
617
f962f1e5936e
Implemented yeast viability calculation from the yeast production date. Changed the pitchrate logic and added Ale above 1.076 rate of 1.25.
Michiel Broek <mbroek@mbse.eu>
parents:
616
diff
changeset
|
5783 | $('#starter_viability').jqxTooltip({ content: 'De gist conditie.' }); |
|
622
39902353b159
Workaround for hang during startup. Changed order of displayed fields on the yeast tab. Tooltip text changes. More decimals on the checklist for misc ingredients. More decimals for the starter on product print.
Michiel Broek <mbroek@mbse.eu>
parents:
621
diff
changeset
|
5784 | $('#starter_viability').jqxNumberInput(Show0dec); |
| 478 | 5785 | $('#starter_try').jqxButton({ template: 'primary', width: '100px', height: 23, theme: theme }); |
| 5786 | ||
| 5787 | // Tab 7, Mashing | |
| 5788 | $('#mash_name').jqxTooltip({ content: 'De omschrijving van dit maisch profiel.' }); | |
| 5789 | $('#mash_name').jqxInput({ theme: theme, width: 320, height: 23 }); | |
| 5790 | $('#mash_select').jqxDropDownList({ | |
| 5791 | placeHolder: 'Kies schema:', | |
| 5792 | theme: theme, | |
| 5793 | source: mashlist, | |
| 5794 | displayMember: 'name', | |
| 5795 | width: 250, | |
| 5796 | height: 23, | |
| 5797 | dropDownWidth: 500, | |
| 5798 | dropDownHeight: 500, | |
| 5799 | dropDownHorizontalAlignment: 'right' | |
| 5800 | }); | |
| 5801 | $('#mash_select').on('select', function(event) { | |
| 5802 | 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
|
5803 | var infused = 0, data, datarecord, rowIDs, rows, i, row, index = event.args.index; |
| 478 | 5804 | // First delete all current steps |
| 5805 | rowIDs = new Array(); | |
| 5806 | rows = $('#mashGrid').jqxGrid('getdisplayrows'); | |
| 5807 | for (i = 0; i < rows.length; i++) { | |
| 5808 | row = rows[i]; | |
| 5809 | rowIDs.push(row.uid); | |
| 5810 | } | |
| 5811 | $('#mashGrid').jqxGrid('deleterow', rowIDs); | |
| 5812 | // Then add the new steps | |
| 5813 | datarecord = mashlist.records[index]; | |
| 5814 | $('#mash_name').val(datarecord.name); | |
| 5815 | for (i = 0; i < datarecord.steps.length; i++) { | |
| 5816 | data = datarecord.steps[i]; | |
| 5817 | row = {}; | |
| 5818 | 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
|
5819 | 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
|
5820 | 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
|
5821 | 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
|
5822 | 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
|
5823 | 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
|
5824 | 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
|
5825 | 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
|
5826 | 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
|
5827 | 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
|
5828 | 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
|
5829 | 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
|
5830 | 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
|
5831 | } 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
|
5832 | 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
|
5833 | } |
|
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
5834 | } |
|
738
11e6bd8d8107
Added mash SG and pH fields. Fixed default Yeast update. Added mash step SG and pH input datafields. Added a Brix input too. The print report shows the mash measurements too. Other brewing results now show expected and measured values and the difference.
Michiel Broek <mbroek@mbse.eu>
parents:
726
diff
changeset
|
5835 | row['step_ph'] = 0.0; |
|
11e6bd8d8107
Added mash SG and pH fields. Fixed default Yeast update. Added mash step SG and pH input datafields. Added a Brix input too. The print report shows the mash measurements too. Other brewing results now show expected and measured values and the difference.
Michiel Broek <mbroek@mbse.eu>
parents:
726
diff
changeset
|
5836 | row['step_sg'] = 0.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
|
5837 | //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
|
5838 | 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
|
5839 | 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
|
5840 | if (mashkg > 0) |
|
740
04c0e444e48e
Upgrade mash steps when loading a product. Mash steps Brix input doesn't need wort correction. Added measure data input on the checklist for the first mash step.
Michiel Broek <mbroek@mbse.eu>
parents:
738
diff
changeset
|
5841 | row['step_wg_ratio'] = Round(parseFloat(mash_infuse / mashkg), 6); |
| 478 | 5842 | else |
|
740
04c0e444e48e
Upgrade mash steps when loading a product. Mash steps Brix input doesn't need wort correction. Added measure data input on the checklist for the first mash step.
Michiel Broek <mbroek@mbse.eu>
parents:
738
diff
changeset
|
5843 | row['step_wg_ratio'] = 0.0; |
| 478 | 5844 | $('#mashGrid').jqxGrid('addrow', null, row); |
| 5845 | } | |
|
490
6c9ad1317f0a
Recalculate mash after changing mash parameters.
Michiel Broek <mbroek@mbse.eu>
parents:
489
diff
changeset
|
5846 | calcMash(); |
| 478 | 5847 | } |
| 5848 | }); | |
|
484
2083c274b283
In the product editor mash tab, display the total mash volume and the total mash time.
Michiel Broek <mbroek@mbse.eu>
parents:
479
diff
changeset
|
5849 | $('#est_mashvol').jqxTooltip({ content: 'Het totale volume van het maishwater en de mout in de maish pan.' }); |
|
2083c274b283
In the product editor mash tab, display the total mash volume and the total mash time.
Michiel Broek <mbroek@mbse.eu>
parents:
479
diff
changeset
|
5850 | $('#est_mashvol').jqxNumberInput(Show1dec); |
|
2083c274b283
In the product editor mash tab, display the total mash volume and the total mash time.
Michiel Broek <mbroek@mbse.eu>
parents:
479
diff
changeset
|
5851 | $('#est_mashtime').jqxTooltip({ content: 'De totale tijdsduur van het maischen.' }); |
|
2083c274b283
In the product editor mash tab, display the total mash volume and the total mash time.
Michiel Broek <mbroek@mbse.eu>
parents:
479
diff
changeset
|
5852 | $('#est_mashtime').jqxInput({ theme: theme, width: 70, height: 23 }); |
| 478 | 5853 | $('#MashReady').jqxButton({ template: 'success', width: '90px', theme: theme }); |
| 5854 | $('#MashReady').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
|
5855 | calcFermentables(); |
|
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
5856 | calcWater(); |
|
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
5857 | calcSparge(); |
| 478 | 5858 | calcMash(); |
| 5859 | }); | |
| 5860 | $('#wstep_name').jqxInput({ theme: theme, width: 320, height: 23 }); | |
| 5861 | $('#wstep_name').on('change', function(event) { | |
| 5862 | 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
|
5863 | rowdata.step_name = $('#wstep_name').val(); |
| 478 | 5864 | }); |
| 5865 | $('#wstep_type').jqxDropDownList({ | |
| 5866 | theme: theme, | |
| 5867 | source: MashStepTypeAdapter, | |
| 5868 | valueMember: 'id', | |
| 5869 | displayMember: 'nl', | |
| 5870 | width: 180, | |
| 5871 | height: 23, | |
| 5872 | autoDropDownHeight: true | |
| 5873 | }); | |
| 5874 | $('#wstep_type').on('select', function(event) { | |
| 5875 | if (event.args) { | |
| 5876 | var rowdata, i, rows, row, index = event.args.index; | |
| 5877 | 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
|
5878 | 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
|
5879 | rowdata.step_type = index; |
| 478 | 5880 | $('#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
|
5881 | $('#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
|
5882 | $('#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
|
5883 | $('#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
|
5884 | 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
|
5885 | 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
|
5886 | $('#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
|
5887 | $('#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
|
5888 | } 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
|
5889 | $('#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
|
5890 | $('#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
|
5891 | } |
|
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
5892 | } |
|
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
5893 | 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
|
5894 | 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
|
5895 | 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
|
5896 | 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
|
5897 | } |
|
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
5898 | 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
|
5899 | 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
|
5900 | 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
|
5901 | 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
|
5902 | 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
|
5903 | } |
|
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
5904 | $('#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
|
5905 | 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
|
5906 | 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
|
5907 | 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
|
5908 | 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
|
5909 | 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
|
5910 | 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
|
5911 | } |
|
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
5912 | calcMash(); |
| 478 | 5913 | } |
| 5914 | } | |
| 5915 | }); | |
| 5916 | $('#wstep_temp').on('change', function(event) { | |
| 5917 | 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
|
5918 | 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
|
5919 | 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
|
5920 | var a = (dataRecord.eq_tun_weight * dataRecord.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
|
5921 | (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
|
5922 | 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
|
5923 | 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
|
5924 | 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
|
5925 | 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
|
5926 | } 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
|
5927 | 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
|
5928 | 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
|
5929 | } 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
|
5930 | 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
|
5931 | } |
| 478 | 5932 | }); |
|
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
|
5933 | $('#wstep_temp,#wend_temp,#wstep_infuse_amount,#wstep_infuse_temp').jqxNumberInput(Spin1dec); |
| 478 | 5934 | $('#wend_temp').on('change', function(event) { |
| 5935 | var rowdata = $('#mashGrid').jqxGrid('getrowdata', mashRow); | |
| 5936 | rowdata.end_temp = parseFloat(event.args.value); | |
| 5937 | }); | |
| 610 | 5938 | $('#wstep_time,#wramp_time').jqxNumberInput(PosInt); |
| 478 | 5939 | $('#wstep_time').on('change', function(event) { |
| 5940 | var rowdata = $('#mashGrid').jqxGrid('getrowdata', mashRow); | |
| 5941 | rowdata.step_time = parseFloat(event.args.value); | |
|
490
6c9ad1317f0a
Recalculate mash after changing mash parameters.
Michiel Broek <mbroek@mbse.eu>
parents:
489
diff
changeset
|
5942 | calcMash(); |
| 478 | 5943 | }); |
|
738
11e6bd8d8107
Added mash SG and pH fields. Fixed default Yeast update. Added mash step SG and pH input datafields. Added a Brix input too. The print report shows the mash measurements too. Other brewing results now show expected and measured values and the difference.
Michiel Broek <mbroek@mbse.eu>
parents:
726
diff
changeset
|
5944 | $('#wstep_ph').jqxNumberInput(Spin2pH); |
|
11e6bd8d8107
Added mash SG and pH fields. Fixed default Yeast update. Added mash step SG and pH input datafields. Added a Brix input too. The print report shows the mash measurements too. Other brewing results now show expected and measured values and the difference.
Michiel Broek <mbroek@mbse.eu>
parents:
726
diff
changeset
|
5945 | $('#wstep_ph').on('change', function(event) { |
|
11e6bd8d8107
Added mash SG and pH fields. Fixed default Yeast update. Added mash step SG and pH input datafields. Added a Brix input too. The print report shows the mash measurements too. Other brewing results now show expected and measured values and the difference.
Michiel Broek <mbroek@mbse.eu>
parents:
726
diff
changeset
|
5946 | var rowdata = $('#mashGrid').jqxGrid('getrowdata', mashRow); |
|
11e6bd8d8107
Added mash SG and pH fields. Fixed default Yeast update. Added mash step SG and pH input datafields. Added a Brix input too. The print report shows the mash measurements too. Other brewing results now show expected and measured values and the difference.
Michiel Broek <mbroek@mbse.eu>
parents:
726
diff
changeset
|
5947 | rowdata.step_ph = parseFloat(event.args.value); |
|
11e6bd8d8107
Added mash SG and pH fields. Fixed default Yeast update. Added mash step SG and pH input datafields. Added a Brix input too. The print report shows the mash measurements too. Other brewing results now show expected and measured values and the difference.
Michiel Broek <mbroek@mbse.eu>
parents:
726
diff
changeset
|
5948 | }); |
|
11e6bd8d8107
Added mash SG and pH fields. Fixed default Yeast update. Added mash step SG and pH input datafields. Added a Brix input too. The print report shows the mash measurements too. Other brewing results now show expected and measured values and the difference.
Michiel Broek <mbroek@mbse.eu>
parents:
726
diff
changeset
|
5949 | $('#wstep_sg').jqxNumberInput(SGopts); |
|
11e6bd8d8107
Added mash SG and pH fields. Fixed default Yeast update. Added mash step SG and pH input datafields. Added a Brix input too. The print report shows the mash measurements too. Other brewing results now show expected and measured values and the difference.
Michiel Broek <mbroek@mbse.eu>
parents:
726
diff
changeset
|
5950 | $('#wstep_sg').on('change', function(event) { |
|
11e6bd8d8107
Added mash SG and pH fields. Fixed default Yeast update. Added mash step SG and pH input datafields. Added a Brix input too. The print report shows the mash measurements too. Other brewing results now show expected and measured values and the difference.
Michiel Broek <mbroek@mbse.eu>
parents:
726
diff
changeset
|
5951 | var rowdata = $('#mashGrid').jqxGrid('getrowdata', mashRow); |
|
11e6bd8d8107
Added mash SG and pH fields. Fixed default Yeast update. Added mash step SG and pH input datafields. Added a Brix input too. The print report shows the mash measurements too. Other brewing results now show expected and measured values and the difference.
Michiel Broek <mbroek@mbse.eu>
parents:
726
diff
changeset
|
5952 | rowdata.step_sg = parseFloat(event.args.value); |
|
11e6bd8d8107
Added mash SG and pH fields. Fixed default Yeast update. Added mash step SG and pH input datafields. Added a Brix input too. The print report shows the mash measurements too. Other brewing results now show expected and measured values and the difference.
Michiel Broek <mbroek@mbse.eu>
parents:
726
diff
changeset
|
5953 | }); |
|
11e6bd8d8107
Added mash SG and pH fields. Fixed default Yeast update. Added mash step SG and pH input datafields. Added a Brix input too. The print report shows the mash measurements too. Other brewing results now show expected and measured values and the difference.
Michiel Broek <mbroek@mbse.eu>
parents:
726
diff
changeset
|
5954 | $('#wstep_brix').jqxNumberInput(Spin1dec); |
|
11e6bd8d8107
Added mash SG and pH fields. Fixed default Yeast update. Added mash step SG and pH input datafields. Added a Brix input too. The print report shows the mash measurements too. Other brewing results now show expected and measured values and the difference.
Michiel Broek <mbroek@mbse.eu>
parents:
726
diff
changeset
|
5955 | $('#wstep_brix').on('change', function(event) { |
|
740
04c0e444e48e
Upgrade mash steps when loading a product. Mash steps Brix input doesn't need wort correction. Added measure data input on the checklist for the first mash step.
Michiel Broek <mbroek@mbse.eu>
parents:
738
diff
changeset
|
5956 | /* Use plato_to_sg at this stage */ |
|
04c0e444e48e
Upgrade mash steps when loading a product. Mash steps Brix input doesn't need wort correction. Added measure data input on the checklist for the first mash step.
Michiel Broek <mbroek@mbse.eu>
parents:
738
diff
changeset
|
5957 | var sg = plato_to_sg(parseFloat(event.args.value)); |
|
738
11e6bd8d8107
Added mash SG and pH fields. Fixed default Yeast update. Added mash step SG and pH input datafields. Added a Brix input too. The print report shows the mash measurements too. Other brewing results now show expected and measured values and the difference.
Michiel Broek <mbroek@mbse.eu>
parents:
726
diff
changeset
|
5958 | console.log('brix: ' + parseFloat(event.args.value) + ' sg: ' + sg); |
|
11e6bd8d8107
Added mash SG and pH fields. Fixed default Yeast update. Added mash step SG and pH input datafields. Added a Brix input too. The print report shows the mash measurements too. Other brewing results now show expected and measured values and the difference.
Michiel Broek <mbroek@mbse.eu>
parents:
726
diff
changeset
|
5959 | if (sg > 1.005) { |
|
11e6bd8d8107
Added mash SG and pH fields. Fixed default Yeast update. Added mash step SG and pH input datafields. Added a Brix input too. The print report shows the mash measurements too. Other brewing results now show expected and measured values and the difference.
Michiel Broek <mbroek@mbse.eu>
parents:
726
diff
changeset
|
5960 | var rowdata = $('#mashGrid').jqxGrid('getrowdata', mashRow); |
|
11e6bd8d8107
Added mash SG and pH fields. Fixed default Yeast update. Added mash step SG and pH input datafields. Added a Brix input too. The print report shows the mash measurements too. Other brewing results now show expected and measured values and the difference.
Michiel Broek <mbroek@mbse.eu>
parents:
726
diff
changeset
|
5961 | rowdata.step_sg = sg; |
|
11e6bd8d8107
Added mash SG and pH fields. Fixed default Yeast update. Added mash step SG and pH input datafields. Added a Brix input too. The print report shows the mash measurements too. Other brewing results now show expected and measured values and the difference.
Michiel Broek <mbroek@mbse.eu>
parents:
726
diff
changeset
|
5962 | $('#wstep_sg').val(sg); |
|
11e6bd8d8107
Added mash SG and pH fields. Fixed default Yeast update. Added mash step SG and pH input datafields. Added a Brix input too. The print report shows the mash measurements too. Other brewing results now show expected and measured values and the difference.
Michiel Broek <mbroek@mbse.eu>
parents:
726
diff
changeset
|
5963 | } |
|
11e6bd8d8107
Added mash SG and pH fields. Fixed default Yeast update. Added mash step SG and pH input datafields. Added a Brix input too. The print report shows the mash measurements too. Other brewing results now show expected and measured values and the difference.
Michiel Broek <mbroek@mbse.eu>
parents:
726
diff
changeset
|
5964 | }); |
| 478 | 5965 | $('#wramp_time').on('change', function(event) { |
| 5966 | var rowdata = $('#mashGrid').jqxGrid('getrowdata', mashRow); | |
| 5967 | rowdata.ramp_time = parseFloat(event.args.value); | |
|
490
6c9ad1317f0a
Recalculate mash after changing mash parameters.
Michiel Broek <mbroek@mbse.eu>
parents:
489
diff
changeset
|
5968 | calcMash(); |
| 478 | 5969 | }); |
| 5970 | $('#wstep_infuse_amount').on('change', function(event) { | |
| 5971 | var row, i, rows, rowdata = $('#mashGrid').jqxGrid('getrowdata', mashRow); | |
| 5972 | 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
|
5973 | 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
|
5974 | 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
|
5975 | 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
|
5976 | 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
|
5977 | 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
|
5978 | 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
|
5979 | 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
|
5980 | 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
|
5981 | } |
|
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
5982 | 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
|
5983 | 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
|
5984 | $('#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
|
5985 | } 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
|
5986 | 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
|
5987 | 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
|
5988 | 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
|
5989 | 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
|
5990 | $('#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
|
5991 | $('#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
|
5992 | } |
|
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
5993 | $('#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
|
5994 | 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
|
5995 | calcWater(); |
|
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
5996 | // calcMash(); |
| 478 | 5997 | } |
|
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
|
5998 | }); |
|
1246550451ca
Removed the last compressed css file. Reworked all mash steps, implemented deconction steps. Added calculations for infuse amounts and decoctions amounts. The mash steps are now manually sorted in the editor grids to have full control over the steps order. Display errors in red in the grid. Updated beerxml export, the product checklist and print output of the products and recipes for all these mash steps changes.
Michiel Broek <mbroek@mbse.eu>
parents:
662
diff
changeset
|
5999 | $('#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
|
6000 | 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
|
6001 | 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
|
6002 | 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
|
6003 | 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
|
6004 | 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
|
6005 | 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
|
6006 | $('#wstep_infuse_amount').val(vol); |
| 478 | 6007 | }); |
| 6008 | ||
| 6009 | // Tab 8, Water | |
| 6010 | $('#tgt_bu').jqxNumberInput(Show2wat); | |
| 610 | 6011 | $('#tgt_so4_cl,#got_so4_cl').jqxNumberInput(Show1wat); |
| 478 | 6012 | |
| 6013 | // Water source 1 | |
| 6014 | $('#w1_name').jqxDropDownList({ | |
| 6015 | placeHolder: 'Kies hoofd water:', | |
| 6016 | theme: theme, | |
| 6017 | source: waterlist, | |
| 6018 | displayMember: 'name', | |
| 6019 | width: 250, | |
| 6020 | height: 27, | |
| 6021 | dropDownWidth: 400, | |
| 6022 | dropDownHeight: 400 | |
| 6023 | }); | |
| 6024 | $('#w1_name').on('select', function(event) { | |
| 6025 | if (event.args) { | |
| 6026 | var datarecord, index = event.args.index; | |
| 6027 | datarecord = waterlist.records[index]; | |
| 6028 | dataRecord.w1_name = datarecord.name; | |
| 6029 | $('#w1_calcium').val(datarecord.calcium); | |
| 6030 | dataRecord.w1_calcium = datarecord.calcium; | |
| 6031 | $('#w1_sulfate').val(datarecord.sulfate); | |
| 6032 | dataRecord.w1_sulfate = datarecord.sulfate; | |
| 6033 | $('#w1_chloride').val(datarecord.chloride); | |
| 6034 | dataRecord.w1_chloride = datarecord.chloride; | |
| 6035 | $('#w1_sodium').val(datarecord.sodium); | |
| 6036 | dataRecord.w1_sodium = datarecord.sodium; | |
| 6037 | $('#w1_magnesium').val(datarecord.magnesium); | |
| 6038 | dataRecord.w1_magnesium = datarecord.magnesium; | |
| 6039 | $('#w1_total_alkalinity').val(datarecord.total_alkalinity); | |
| 6040 | dataRecord.w1_total_alkalinity = datarecord.total_alkalinity; | |
| 6041 | $('#w1_ph').val(datarecord.ph); | |
| 6042 | dataRecord.w1_ph = datarecord.ph; | |
| 6043 | $('#w1_cost').val(datarecord.cost); | |
| 6044 | dataRecord.w1_cost = datarecord.cost; | |
| 6045 | calcWater(); | |
| 6046 | } | |
| 6047 | }); | |
|
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
|
6048 | $('#w1_amount,#w1_calcium,#w1_magnesium,#w1_sodium,#w1_total_alkalinity,#w1_chloride,#w1_sulfate').jqxNumberInput(Show1wat); |
|
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
|
6049 | $('#w1_ph').jqxNumberInput(Show2wat); |
| 478 | 6050 | // Water source 2 |
| 6051 | $('#w2_name').jqxDropDownList({ | |
| 6052 | placeHolder: 'Kies meng water:', | |
| 6053 | theme: theme, | |
|
755
509510586665
Added a empty second water source to the dropdown for water 2. When the empty water is selected, all volumes are reset to a single water source. Don't show the second water in the printed recipe and checklist if there is only one water source.
Michiel Broek <mbroek@mbse.eu>
parents:
752
diff
changeset
|
6054 | source: water2list, |
| 478 | 6055 | displayMember: 'name', |
| 6056 | width: 250, | |
| 6057 | height: 27, | |
| 6058 | dropDownWidth: 400, | |
| 6059 | dropDownHeight: 400 | |
| 6060 | }); | |
| 6061 | $('#w2_name').on('select', function(event) { | |
| 6062 | if (event.args) { | |
| 6063 | var datarecord, index = event.args.index; | |
|
755
509510586665
Added a empty second water source to the dropdown for water 2. When the empty water is selected, all volumes are reset to a single water source. Don't show the second water in the printed recipe and checklist if there is only one water source.
Michiel Broek <mbroek@mbse.eu>
parents:
752
diff
changeset
|
6064 | datarecord = water2list.records[index]; |
|
509510586665
Added a empty second water source to the dropdown for water 2. When the empty water is selected, all volumes are reset to a single water source. Don't show the second water in the printed recipe and checklist if there is only one water source.
Michiel Broek <mbroek@mbse.eu>
parents:
752
diff
changeset
|
6065 | if (index == 0) { |
|
509510586665
Added a empty second water source to the dropdown for water 2. When the empty water is selected, all volumes are reset to a single water source. Don't show the second water in the printed recipe and checklist if there is only one water source.
Michiel Broek <mbroek@mbse.eu>
parents:
752
diff
changeset
|
6066 | dataRecord.w2_amount = 0; |
|
509510586665
Added a empty second water source to the dropdown for water 2. When the empty water is selected, all volumes are reset to a single water source. Don't show the second water in the printed recipe and checklist if there is only one water source.
Michiel Broek <mbroek@mbse.eu>
parents:
752
diff
changeset
|
6067 | $('#w2_amount').val(0); |
|
509510586665
Added a empty second water source to the dropdown for water 2. When the empty water is selected, all volumes are reset to a single water source. Don't show the second water in the printed recipe and checklist if there is only one water source.
Michiel Broek <mbroek@mbse.eu>
parents:
752
diff
changeset
|
6068 | dataRecord.w1_amount = mash_infuse; |
|
509510586665
Added a empty second water source to the dropdown for water 2. When the empty water is selected, all volumes are reset to a single water source. Don't show the second water in the printed recipe and checklist if there is only one water source.
Michiel Broek <mbroek@mbse.eu>
parents:
752
diff
changeset
|
6069 | $('#w1_amount').val(mash_infuse); |
|
509510586665
Added a empty second water source to the dropdown for water 2. When the empty water is selected, all volumes are reset to a single water source. Don't show the second water in the printed recipe and checklist if there is only one water source.
Michiel Broek <mbroek@mbse.eu>
parents:
752
diff
changeset
|
6070 | } |
| 478 | 6071 | dataRecord.w2_name = datarecord.name; |
| 6072 | $('#w2_calcium').val(datarecord.calcium); | |
| 6073 | dataRecord.w2_calcium = datarecord.calcium; | |
| 6074 | $('#w2_sulfate').val(datarecord.sulfate); | |
| 6075 | dataRecord.w2_sulfate = datarecord.sulfate; | |
| 6076 | $('#w2_chloride').val(datarecord.chloride); | |
| 6077 | dataRecord.w2_chloride = datarecord.chloride; | |
| 6078 | $('#w2_sodium').val(datarecord.sodium); | |
| 6079 | dataRecord.w2_sodium = datarecord.sodium; | |
| 6080 | $('#w2_magnesium').val(datarecord.magnesium); | |
| 6081 | dataRecord.w2_magnesium = datarecord.magnesium; | |
| 6082 | $('#w2_total_alkalinity').val(datarecord.total_alkalinity); | |
| 6083 | dataRecord.w2_total_alkalinity = datarecord.total_alkalinity; | |
| 6084 | $('#w2_ph').val(datarecord.ph); | |
| 6085 | dataRecord.w2_ph = datarecord.ph; | |
| 6086 | $('#w2_cost').val(datarecord.cost); | |
| 6087 | dataRecord.w2_cost = datarecord.cost; | |
| 6088 | $('#w2_amount').jqxNumberInput({ max: 100000, readOnly: false }); // Set high max to enable the spinbuttons. | |
| 6089 | calcWater(); | |
| 6090 | } | |
| 6091 | }); | |
| 6092 | $('#w2_amount').jqxTooltip({ content: 'De verdeling van het hoofd en meng water. Het totale maisch water volume blijft gelijk.'}); | |
| 6093 | $('#w2_amount').jqxNumberInput({ | |
| 6094 | inputMode: 'simple', spinMode: 'simple', theme: theme, width: 94, height: 23, min: 0, max: 0, decimalDigits: 1, | |
|
612
576128de01e3
Fixed mash infuse amount division
Michiel Broek <mbroek@mbse.eu>
parents:
610
diff
changeset
|
6095 | spinButtons: true, spinButtonsStep: 0.1, readOnly: true |
| 478 | 6096 | }); |
|
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
|
6097 | $('#w2_calcium,#w2_magnesium,#w2_sodium,#w2_total_alkalinity,#w2_chloride,#w2_sulfate').jqxNumberInput(Show1wat); |
|
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
|
6098 | $('#w2_ph').jqxNumberInput(Show2wat); |
| 478 | 6099 | // Water mixed |
|
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
|
6100 | $('#wg_amount,#wg_calcium,#wg_magnesium,#wg_sodium,#wg_total_alkalinity,#wg_chloride,#wg_sulfate').jqxNumberInput(Show1wat); |
|
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
|
6101 | $('#wg_ph').jqxNumberInput(Show2wat); |
| 478 | 6102 | // Water treated |
| 6103 | $('#wb_calcium').jqxTooltip({ content: 'De ideale hoeveelheid Calcium is tussen 40 en 150.'}); | |
|
607
0efba09a694c
Added low limit for magnesium of 10 ppm
Michiel Broek <mbroek@mbse.eu>
parents:
602
diff
changeset
|
6104 | $('#wb_magnesium').jqxTooltip({ content: 'De ideale hoeveelheid Magnesium is tusse 10 en 30.'}); |
| 478 | 6105 | $('#wb_sodium').jqxTooltip({ content: 'De ideale hoeveelheid Natrium is lager dan 150.'}); |
| 6106 | $('#wb_chloride').jqxTooltip({ content: 'De ideale hoeveelheid Chloride is tussen 50 en 100.'}); | |
| 6107 | $('#wb_sulfate').jqxTooltip({ content: 'De ideale hoeveelheid Sulfaat is tussen 50 en 350.'}); | |
|
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
|
6108 | $('#wb_calcium,#wb_magnesium,#wb_sodium,#wb_total_alkalinity,#wb_chloride,#wb_sulfate').jqxNumberInput(Show1wat); |
|
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
|
6109 | $('#wb_ph').jqxNumberInput(Show2wat); |
| 478 | 6110 | // Water target profile |
| 6111 | $('#pr_name').jqxDropDownList({ | |
| 6112 | placeHolder: 'Kies doel profiel:', | |
| 6113 | theme: theme, | |
| 6114 | source: waterprofiles, | |
| 6115 | displayMember: 'name', | |
| 6116 | width: 250, | |
| 6117 | height: 27, | |
| 6118 | dropDownWidth: 400, | |
| 6119 | dropDownHeight: 300 | |
| 6120 | }); | |
| 6121 | $('#pr_name').on('select', function(event) { | |
| 6122 | if (event.args) { | |
| 6123 | var datarecord, index = event.args.index; | |
| 6124 | datarecord = waterprofiles.records[index]; | |
| 6125 | $('#pr_calcium').val(datarecord.calcium); | |
| 6126 | $('#pr_sulfate').val(datarecord.sulfate); | |
| 6127 | $('#pr_chloride').val(datarecord.chloride); | |
| 6128 | $('#pr_sodium').val(datarecord.sodium); | |
| 6129 | $('#pr_magnesium').val(datarecord.magnesium); | |
| 6130 | $('#pr_total_alkalinity').val(datarecord.total_alkalinity); | |
|
552
ee0db754111e
In calcWater() the optimum SO4:Cl ratio is taken from the target profile if set, else it's calculated from the BUGU value. Swapped Cl:SO4 to SO4:Cl ratio presentation. Added remark text next to the Optimal SO4:Cl ratio.
Michiel Broek <mbroek@mbse.eu>
parents:
545
diff
changeset
|
6131 | calcWater(); |
| 478 | 6132 | } |
| 6133 | }); | |
| 610 | 6134 | $('#pr_calcium,#pr_magnesium,#pr_sodium,#pr_total_alkalinity,#pr_chloride,#pr_sulfate').jqxNumberInput(Show1wat); |
| 478 | 6135 | |
| 6136 | // Water agents | |
| 6137 | $('#wa_cacl2').jqxTooltip({ content: 'Voor het maken van een ander waterprofiel. Voegt calcium en chloride toe. Voor het verbeteren van zoetere bieren.' }); | |
| 6138 | $('#wa_caso4').jqxTooltip({ | |
| 6139 | content: 'Gips. Voor het maken van een ander waterprofiel. Voegt calcium en sulfaat toe. Voor het verbeteren van bittere bieren.' | |
| 6140 | }); | |
| 6141 | $('#wa_mgso4').jqxTooltip({ content: 'Epsom zout. Voor het maken van een ander waterprofiel. Voegt magnesium en sulfaat toe. Gebruik spaarzaam!' }); | |
| 6142 | $('#wa_nacl').jqxTooltip({ | |
| 6143 | content: 'Keukenzout. Voor het maken van een ander waterprofiel. Voegt natrium en chloride toe. ' + | |
| 6144 | 'Voor het accentueren van zoetheid. Bij hoge dosering wordt het bier ziltig.' | |
| 6145 | }); | |
| 610 | 6146 | $('#wa_cacl2,#wa_caso4,#wa_mgso4,#wa_nacl').jqxNumberInput(Spin1dec); |
| 478 | 6147 | $('#mash_ph').jqxTooltip({ content: 'Maisch pH tussen 5.2 en 5.6. Gebruik 5.2 voor lichte en 5.5 voor donkere bieren.'}); |
| 6148 | $('#mash_ph').jqxNumberInput(SpinpH); | |
| 6149 | $('#calc_acid').jqxCheckBox({ theme: theme, width: 120, height: 23 }); | |
| 6150 | $('#wa_base_name').jqxDropDownList({ | |
| 6151 | theme: theme, | |
| 6152 | source: BaseTypeAdapter, | |
| 6153 | valueMember: 'id', | |
| 6154 | displayMember: 'nl', | |
| 6155 | width: 170, | |
| 6156 | height: 23, | |
| 6157 | autoDropDownHeight: true | |
| 6158 | }); | |
|
633
ec4601ab3ed2
Fixed loading of the product edit page. A bit faster loading.
Michiel Broek <mbroek@mbse.eu>
parents:
623
diff
changeset
|
6159 | $('#wa_base,#wa_acid').jqxNumberInput(Spin2dec); |
| 478 | 6160 | $('#wa_base').jqxNumberInput({ symbol: ' gr', symbolPosition: 'right' }); |
| 6161 | $('#wa_acid_name').jqxDropDownList({ | |
| 6162 | theme: theme, | |
| 6163 | source: AcidTypeAdapter, | |
| 6164 | valueMember: 'id', | |
| 6165 | displayMember: 'nl', | |
| 6166 | width: 170, | |
| 6167 | height: 23, | |
| 6168 | autoDropDownHeight: true | |
| 6169 | }); | |
| 6170 | $('#wa_acid').jqxNumberInput({ symbol: ' ml', symbolPosition: 'right' }); | |
|
633
ec4601ab3ed2
Fixed loading of the product edit page. A bit faster loading.
Michiel Broek <mbroek@mbse.eu>
parents:
623
diff
changeset
|
6171 | $('#wa_acid_perc,#sparge_acid_perc').jqxNumberInput(Perc0); |
| 478 | 6172 | $('#wa_acid_perc').jqxNumberInput({ width: 70, symbol: '%', symbolPosition: 'right' }); |
| 6173 | // Sparge water | |
| 610 | 6174 | $('#sparge_temp,#sparge_volume').jqxNumberInput(Spin1dec); |
| 478 | 6175 | $('#sparge_ph').jqxNumberInput(SpinpH); |
| 6176 | $('#sparge_source').jqxDropDownList({ | |
| 6177 | theme: theme, | |
| 6178 | source: SpargeSourceAdapter, | |
| 6179 | valueMember: 'id', | |
| 6180 | displayMember: 'nl', | |
| 6181 | width: 110, | |
| 6182 | height: 23, | |
| 6183 | autoDropDownHeight: true | |
| 6184 | }); | |
| 6185 | $('#sparge_acid_amount').jqxNumberInput(Spin2dec); | |
| 6186 | $('#sparge_acid_amount').jqxNumberInput({ spinButtons: false, readOnly: true, symbol: ' ml', symbolPosition: 'right' }); | |
| 6187 | $('#sparge_acid_type').jqxDropDownList({ | |
| 6188 | theme: theme, | |
| 6189 | source: AcidTypeAdapter, | |
| 6190 | valueMember: 'id', | |
| 6191 | displayMember: 'nl', | |
| 6192 | width: 110, | |
| 6193 | height: 23, | |
| 6194 | autoDropDownHeight: true | |
| 6195 | }); | |
| 6196 | $('#sparge_acid_perc').jqxNumberInput({ symbol: '%', symbolPosition: 'right' }); | |
| 6197 | ||
| 6198 | // Tab 9, Brewday | |
| 6199 | $('#brew_date_start').jqxTooltip({ content: 'Brouw datum en tijd. Voor planning laat de tijd op 00:00:00 staan.' }); | |
| 6200 | $('#brew_date_end').jqxTooltip({ content: 'End datum en tijd van de brouw. Leeg laten als er nog niet gebrouwen is.' }); | |
| 6201 | $('#brew_mash_ph').jqxTooltip({ content: 'De gemeten pH tijdens het maischen eventueel na correctie.' }); | |
| 6202 | $('#est_mash_ph').jqxTooltip({ content: 'De gewenste pH tijdens het maischen.' }); | |
| 6203 | $('#brew_preboil_ph').jqxTooltip({ content: 'De gemeten pH in de kookketel na het spoelen en voor de kook.' }); | |
| 6204 | $('#brew_aboil_ph').jqxTooltip({ content: 'De gemeten pH na het koken.' }); | |
| 6205 | $('#brew_mash_sg').jqxTooltip({ content: 'Het bereikte SG na het maischen.' }); | |
| 6206 | $('#est_mash_sg').jqxTooltip({ content: 'Het berekende verwachte SG na het maischen.' }); | |
| 6207 | $('#brew_preboil_sg').jqxTooltip({ content: 'Het gemeten SG in de kookketel na het spoelen en voor het koken.' }); | |
|
633
ec4601ab3ed2
Fixed loading of the product edit page. A bit faster loading.
Michiel Broek <mbroek@mbse.eu>
parents:
623
diff
changeset
|
6208 | $('#est_pre_sg').jqxTooltip({ content: 'Het berekende SG in de kookketel na het spoelen en voor het koken.' }); |
|
ec4601ab3ed2
Fixed loading of the product edit page. A bit faster loading.
Michiel Broek <mbroek@mbse.eu>
parents:
623
diff
changeset
|
6209 | $('#brew_aboil_sg').jqxTooltip({ content: 'Het gemeten SG in de kookketel na het koken.' }); |
|
ec4601ab3ed2
Fixed loading of the product edit page. A bit faster loading.
Michiel Broek <mbroek@mbse.eu>
parents:
623
diff
changeset
|
6210 | $('#est_og3').jqxTooltip({ content: 'Het gewenste SG in de kookketel na het koken zonder eventuele suikers die tijdens de vergisting toegevoegd worden.' }); |
|
ec4601ab3ed2
Fixed loading of the product edit page. A bit faster loading.
Michiel Broek <mbroek@mbse.eu>
parents:
623
diff
changeset
|
6211 | $('#brew_mash_efficiency').jqxTooltip({ content: 'Het behaalde maisch rendement.' }); |
|
ec4601ab3ed2
Fixed loading of the product edit page. A bit faster loading.
Michiel Broek <mbroek@mbse.eu>
parents:
623
diff
changeset
|
6212 | $('#brew_preboil_volume').jqxTooltip({ content: 'Het gemeten volume van het wort voor het koken.' }); |
|
ec4601ab3ed2
Fixed loading of the product edit page. A bit faster loading.
Michiel Broek <mbroek@mbse.eu>
parents:
623
diff
changeset
|
6213 | $('#est_pre_vol').jqxTooltip({ content: 'Het berekende volume van het wort voor het koken.' }); |
|
ec4601ab3ed2
Fixed loading of the product edit page. A bit faster loading.
Michiel Broek <mbroek@mbse.eu>
parents:
623
diff
changeset
|
6214 | $('#brew_aboil_volume').jqxTooltip({ content: 'Het gemeten volume van het wort na het koken.' }); |
|
ec4601ab3ed2
Fixed loading of the product edit page. A bit faster loading.
Michiel Broek <mbroek@mbse.eu>
parents:
623
diff
changeset
|
6215 | $('#est_a_vol').jqxTooltip({ content: 'Het gewenste volume na het koken.' }); |
|
ec4601ab3ed2
Fixed loading of the product edit page. A bit faster loading.
Michiel Broek <mbroek@mbse.eu>
parents:
623
diff
changeset
|
6216 | $('#brew_preboil_efficiency').jqxTooltip({ content: 'Het berekende rendement voor het koken.' }); |
|
ec4601ab3ed2
Fixed loading of the product edit page. A bit faster loading.
Michiel Broek <mbroek@mbse.eu>
parents:
623
diff
changeset
|
6217 | $('#brew_aboil_efficiency').jqxTooltip({ content: 'Het bereikte rendement na het koken.' }); |
|
ec4601ab3ed2
Fixed loading of the product edit page. A bit faster loading.
Michiel Broek <mbroek@mbse.eu>
parents:
623
diff
changeset
|
6218 | $('#brew_sparge_temperature').jqxTooltip({ content: 'De spoelwater temperatuur, in te stellen in de Water tab.' }); |
|
ec4601ab3ed2
Fixed loading of the product edit page. A bit faster loading.
Michiel Broek <mbroek@mbse.eu>
parents:
623
diff
changeset
|
6219 | $('#brew_sparge_volume').jqxTooltip({ content: 'Het spoelwater voorraad volume, in te stellen in de Water tab.' }); |
|
ec4601ab3ed2
Fixed loading of the product edit page. A bit faster loading.
Michiel Broek <mbroek@mbse.eu>
parents:
623
diff
changeset
|
6220 | $('#brew_date_start,#brew_date_end').jqxDateTimeInput(DateTimeopts); |
|
ec4601ab3ed2
Fixed loading of the product edit page. A bit faster loading.
Michiel Broek <mbroek@mbse.eu>
parents:
623
diff
changeset
|
6221 | $('#brew_date_start,#brew_date_end').on('close', function(event) { calcStage(); }); |
|
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
|
6222 | $('#est_mash_ph').jqxNumberInput(Show2wat); |
|
738
11e6bd8d8107
Added mash SG and pH fields. Fixed default Yeast update. Added mash step SG and pH input datafields. Added a Brix input too. The print report shows the mash measurements too. Other brewing results now show expected and measured values and the difference.
Michiel Broek <mbroek@mbse.eu>
parents:
726
diff
changeset
|
6223 | $('#brew_mash_ph,#brew_preboil_ph,#brew_aboil_ph').jqxNumberInput(Spin2pH); |
|
633
ec4601ab3ed2
Fixed loading of the product edit page. A bit faster loading.
Michiel Broek <mbroek@mbse.eu>
parents:
623
diff
changeset
|
6224 | $('#brew_mash_sg').on('valueChanged', function() { calcMashEfficiency(); }); |
| 478 | 6225 | $('#brew_preboil_sg').on('valueChanged', function(event) { |
| 6226 | dataRecord.brew_preboil_sg = event.args.value; | |
| 6227 | calcEfficiencyBeforeBoil(); | |
| 6228 | }); | |
| 610 | 6229 | $('#brew_mash_sg,#brew_preboil_sg,#brew_aboil_sg').jqxNumberInput(SGopts); |
| 478 | 6230 | $('#brew_aboil_sg').on('valueChanged', function(event) { |
| 6231 | dataRecord.brew_aboil_sg = event.args.value; | |
| 6232 | calcEfficiencyAfterBoil(); | |
| 6233 | calcFermentables(); | |
| 6234 | calcIBUs(); | |
| 6235 | }); | |
| 610 | 6236 | $('#est_mash_sg,#est_pre_sg,#est_og3').jqxNumberInput(Show3wat); |
| 478 | 6237 | $('#brew_mash_efficiency').jqxNumberInput(Show1dec); |
| 6238 | $('#brew_preboil_volume').on('valueChanged', function(event) { | |
| 6239 | dataRecord.brew_preboil_volume = event.args.value; | |
| 6240 | calcEfficiencyBeforeBoil(); | |
| 6241 | }); | |
| 610 | 6242 | $('#brew_preboil_volume,#brew_aboil_volume').jqxNumberInput(Spin1dec); |
| 478 | 6243 | $('#brew_aboil_volume').on('valueChanged', function(event) { |
| 6244 | dataRecord.brew_aboil_volume = event.args.value; | |
| 6245 | calcEfficiencyAfterBoil(); | |
| 6246 | calcFermentables(); | |
| 6247 | calcIBUs(); | |
| 6248 | }); | |
|
646
2246d830a42a
Fixed some html errors. Added volume calculations for the brewday tab using a popup tool.
Michiel Broek <mbroek@mbse.eu>
parents:
644
diff
changeset
|
6249 | $('#ketel_volume').jqxNumberInput(Show1dec); |
|
2246d830a42a
Fixed some html errors. Added volume calculations for the brewday tab using a popup tool.
Michiel Broek <mbroek@mbse.eu>
parents:
644
diff
changeset
|
6250 | $('#ketel_cm').jqxNumberInput(Spin1dec); |
|
2246d830a42a
Fixed some html errors. Added volume calculations for the brewday tab using a popup tool.
Michiel Broek <mbroek@mbse.eu>
parents:
644
diff
changeset
|
6251 | $('#ketel_cm').on('change', function(event) { |
|
2246d830a42a
Fixed some html errors. Added volume calculations for the brewday tab using a popup tool.
Michiel Broek <mbroek@mbse.eu>
parents:
644
diff
changeset
|
6252 | k_cm = parseFloat(event.args.value); |
|
2246d830a42a
Fixed some html errors. Added volume calculations for the brewday tab using a popup tool.
Michiel Broek <mbroek@mbse.eu>
parents:
644
diff
changeset
|
6253 | k_vol = kettle_vol(k_cm, dataRecord.eq_kettle_volume, dataRecord.eq_kettle_height); |
|
2246d830a42a
Fixed some html errors. Added volume calculations for the brewday tab using a popup tool.
Michiel Broek <mbroek@mbse.eu>
parents:
644
diff
changeset
|
6254 | $('#ketel_volume').val(k_vol); |
|
2246d830a42a
Fixed some html errors. Added volume calculations for the brewday tab using a popup tool.
Michiel Broek <mbroek@mbse.eu>
parents:
644
diff
changeset
|
6255 | }); |
|
2246d830a42a
Fixed some html errors. Added volume calculations for the brewday tab using a popup tool.
Michiel Broek <mbroek@mbse.eu>
parents:
644
diff
changeset
|
6256 | $('#volumeReady').jqxButton({ template: 'success', width: '90px', theme: theme }); |
|
2246d830a42a
Fixed some html errors. Added volume calculations for the brewday tab using a popup tool.
Michiel Broek <mbroek@mbse.eu>
parents:
644
diff
changeset
|
6257 | $('#volumeReady').click(function() { |
|
2246d830a42a
Fixed some html errors. Added volume calculations for the brewday tab using a popup tool.
Michiel Broek <mbroek@mbse.eu>
parents:
644
diff
changeset
|
6258 | /* Is it pre or after boil */ |
|
2246d830a42a
Fixed some html errors. Added volume calculations for the brewday tab using a popup tool.
Michiel Broek <mbroek@mbse.eu>
parents:
644
diff
changeset
|
6259 | console.log('volumeReady ' + k_what + ' volume: ' + Round(k_vol, 1)); |
|
2246d830a42a
Fixed some html errors. Added volume calculations for the brewday tab using a popup tool.
Michiel Broek <mbroek@mbse.eu>
parents:
644
diff
changeset
|
6260 | if (k_what == 0) { |
|
2246d830a42a
Fixed some html errors. Added volume calculations for the brewday tab using a popup tool.
Michiel Broek <mbroek@mbse.eu>
parents:
644
diff
changeset
|
6261 | dataRecord.brew_preboil_volume = Round(k_vol, 1); |
|
2246d830a42a
Fixed some html errors. Added volume calculations for the brewday tab using a popup tool.
Michiel Broek <mbroek@mbse.eu>
parents:
644
diff
changeset
|
6262 | $('#brew_preboil_volume').val(Round(k_vol, 1)); |
|
2246d830a42a
Fixed some html errors. Added volume calculations for the brewday tab using a popup tool.
Michiel Broek <mbroek@mbse.eu>
parents:
644
diff
changeset
|
6263 | } else if (k_what == 1) { |
|
2246d830a42a
Fixed some html errors. Added volume calculations for the brewday tab using a popup tool.
Michiel Broek <mbroek@mbse.eu>
parents:
644
diff
changeset
|
6264 | dataRecord.brew_aboil_volume = Round(k_vol, 1); |
|
2246d830a42a
Fixed some html errors. Added volume calculations for the brewday tab using a popup tool.
Michiel Broek <mbroek@mbse.eu>
parents:
644
diff
changeset
|
6265 | $('#brew_aboil_volume').val(Round(k_vol, 1)); |
|
2246d830a42a
Fixed some html errors. Added volume calculations for the brewday tab using a popup tool.
Michiel Broek <mbroek@mbse.eu>
parents:
644
diff
changeset
|
6266 | } |
|
2246d830a42a
Fixed some html errors. Added volume calculations for the brewday tab using a popup tool.
Michiel Broek <mbroek@mbse.eu>
parents:
644
diff
changeset
|
6267 | }); |
|
2246d830a42a
Fixed some html errors. Added volume calculations for the brewday tab using a popup tool.
Michiel Broek <mbroek@mbse.eu>
parents:
644
diff
changeset
|
6268 | $('#but_pre_boil').jqxButton({ template: 'success', width: '23px', height: 23, theme: theme }); |
|
2246d830a42a
Fixed some html errors. Added volume calculations for the brewday tab using a popup tool.
Michiel Broek <mbroek@mbse.eu>
parents:
644
diff
changeset
|
6269 | $('#but_pre_boil').bind('click', function() { |
|
2246d830a42a
Fixed some html errors. Added volume calculations for the brewday tab using a popup tool.
Michiel Broek <mbroek@mbse.eu>
parents:
644
diff
changeset
|
6270 | /* If we already have measured a value, use that. Else use the estimated value. */ |
|
2246d830a42a
Fixed some html errors. Added volume calculations for the brewday tab using a popup tool.
Michiel Broek <mbroek@mbse.eu>
parents:
644
diff
changeset
|
6271 | if (dataRecord.brew_preboil_volume > 0) |
|
2246d830a42a
Fixed some html errors. Added volume calculations for the brewday tab using a popup tool.
Michiel Broek <mbroek@mbse.eu>
parents:
644
diff
changeset
|
6272 | k_cm = kettle_cm(dataRecord.brew_preboil_volume, dataRecord.eq_kettle_volume, dataRecord.eq_kettle_height); |
|
2246d830a42a
Fixed some html errors. Added volume calculations for the brewday tab using a popup tool.
Michiel Broek <mbroek@mbse.eu>
parents:
644
diff
changeset
|
6273 | else |
|
2246d830a42a
Fixed some html errors. Added volume calculations for the brewday tab using a popup tool.
Michiel Broek <mbroek@mbse.eu>
parents:
644
diff
changeset
|
6274 | k_cm = kettle_cm(dataRecord.boil_size * 1.04, dataRecord.eq_kettle_volume, dataRecord.eq_kettle_height); |
|
2246d830a42a
Fixed some html errors. Added volume calculations for the brewday tab using a popup tool.
Michiel Broek <mbroek@mbse.eu>
parents:
644
diff
changeset
|
6275 | k_vol = kettle_vol(k_cm, dataRecord.eq_kettle_volume, dataRecord.eq_kettle_height); |
|
2246d830a42a
Fixed some html errors. Added volume calculations for the brewday tab using a popup tool.
Michiel Broek <mbroek@mbse.eu>
parents:
644
diff
changeset
|
6276 | k_what = 0; |
|
2246d830a42a
Fixed some html errors. Added volume calculations for the brewday tab using a popup tool.
Michiel Broek <mbroek@mbse.eu>
parents:
644
diff
changeset
|
6277 | $('#ketel_cm').val(k_cm); |
|
2246d830a42a
Fixed some html errors. Added volume calculations for the brewday tab using a popup tool.
Michiel Broek <mbroek@mbse.eu>
parents:
644
diff
changeset
|
6278 | $('#ketel_volume').val(k_vol); |
|
2246d830a42a
Fixed some html errors. Added volume calculations for the brewday tab using a popup tool.
Michiel Broek <mbroek@mbse.eu>
parents:
644
diff
changeset
|
6279 | $('#volumeWindow').jqxWindow('open'); |
|
2246d830a42a
Fixed some html errors. Added volume calculations for the brewday tab using a popup tool.
Michiel Broek <mbroek@mbse.eu>
parents:
644
diff
changeset
|
6280 | }); |
|
2246d830a42a
Fixed some html errors. Added volume calculations for the brewday tab using a popup tool.
Michiel Broek <mbroek@mbse.eu>
parents:
644
diff
changeset
|
6281 | $('#but_after_boil').jqxButton({ template: 'success', width: 23, height: 23, theme: theme }); |
|
2246d830a42a
Fixed some html errors. Added volume calculations for the brewday tab using a popup tool.
Michiel Broek <mbroek@mbse.eu>
parents:
644
diff
changeset
|
6282 | $('#but_after_boil').bind('click', function() { |
|
2246d830a42a
Fixed some html errors. Added volume calculations for the brewday tab using a popup tool.
Michiel Broek <mbroek@mbse.eu>
parents:
644
diff
changeset
|
6283 | if (dataRecord.brew_aboil_volume > 0) |
|
2246d830a42a
Fixed some html errors. Added volume calculations for the brewday tab using a popup tool.
Michiel Broek <mbroek@mbse.eu>
parents:
644
diff
changeset
|
6284 | k_cm = kettle_cm(dataRecord.brew_aboil_volume, dataRecord.eq_kettle_volume, dataRecord.eq_kettle_height); |
|
2246d830a42a
Fixed some html errors. Added volume calculations for the brewday tab using a popup tool.
Michiel Broek <mbroek@mbse.eu>
parents:
644
diff
changeset
|
6285 | else |
|
2246d830a42a
Fixed some html errors. Added volume calculations for the brewday tab using a popup tool.
Michiel Broek <mbroek@mbse.eu>
parents:
644
diff
changeset
|
6286 | k_cm = kettle_cm(dataRecord.batch_size * 1.04, dataRecord.eq_kettle_volume, dataRecord.eq_kettle_height); |
|
2246d830a42a
Fixed some html errors. Added volume calculations for the brewday tab using a popup tool.
Michiel Broek <mbroek@mbse.eu>
parents:
644
diff
changeset
|
6287 | k_vol = kettle_vol(k_cm, dataRecord.eq_kettle_volume, dataRecord.eq_kettle_height); |
|
2246d830a42a
Fixed some html errors. Added volume calculations for the brewday tab using a popup tool.
Michiel Broek <mbroek@mbse.eu>
parents:
644
diff
changeset
|
6288 | k_what = 1; |
|
2246d830a42a
Fixed some html errors. Added volume calculations for the brewday tab using a popup tool.
Michiel Broek <mbroek@mbse.eu>
parents:
644
diff
changeset
|
6289 | $('#ketel_cm').val(k_cm); |
|
2246d830a42a
Fixed some html errors. Added volume calculations for the brewday tab using a popup tool.
Michiel Broek <mbroek@mbse.eu>
parents:
644
diff
changeset
|
6290 | $('#ketel_volume').val(k_vol); |
|
2246d830a42a
Fixed some html errors. Added volume calculations for the brewday tab using a popup tool.
Michiel Broek <mbroek@mbse.eu>
parents:
644
diff
changeset
|
6291 | $('#volumeWindow').jqxWindow('open'); |
|
2246d830a42a
Fixed some html errors. Added volume calculations for the brewday tab using a popup tool.
Michiel Broek <mbroek@mbse.eu>
parents:
644
diff
changeset
|
6292 | }); |
| 610 | 6293 | $('#est_pre_vol,#est_a_vol').jqxNumberInput(Show1wat); |
| 6294 | $('#brew_preboil_efficiency,#brew_aboil_efficiency,#brew_sparge_temperature,#brew_sparge_volume,#brew_sparge_est').jqxNumberInput(Show1dec); | |
| 478 | 6295 | $('#brew_cooling_to').jqxNumberInput(Spin1dec); |
|
738
11e6bd8d8107
Added mash SG and pH fields. Fixed default Yeast update. Added mash step SG and pH input datafields. Added a Brix input too. The print report shows the mash measurements too. Other brewing results now show expected and measured values and the difference.
Michiel Broek <mbroek@mbse.eu>
parents:
726
diff
changeset
|
6296 | $('#brew_sparge_ph').jqxNumberInput(Spin2pH); |
| 478 | 6297 | $('#brew_cooling_method').jqxDropDownList({ |
| 6298 | theme: theme, | |
| 6299 | source: CoolingTypeAdapter, | |
| 6300 | valueMember: 'id', | |
| 6301 | displayMember: 'nl', | |
| 6302 | width: 180, | |
| 6303 | height: 23, | |
| 6304 | autoDropDownHeight: true | |
| 6305 | }); | |
|
633
ec4601ab3ed2
Fixed loading of the product edit page. A bit faster loading.
Michiel Broek <mbroek@mbse.eu>
parents:
623
diff
changeset
|
6306 | $('#brew_cooling_time,#brew_whirlpool9,#brew_whirlpool7,#brew_whirlpool6,#brew_whirlpool2,#brew_aeration_time,#brew_aeration_speed').jqxNumberInput(PosInt); |
|
ec4601ab3ed2
Fixed loading of the product edit page. A bit faster loading.
Michiel Broek <mbroek@mbse.eu>
parents:
623
diff
changeset
|
6307 | $('#brew_cooling_time,#brew_aeration_time,#brew_aeration_speed').jqxNumberInput({ max: 1440 }); |
| 610 | 6308 | $('#brew_whirlpool9,#brew_whirlpool7,#brew_whirlpool6,#brew_whirlpool2').jqxNumberInput({ max: 120 }); |
| 478 | 6309 | $('#brew_aeration_type').jqxDropDownList({ |
| 6310 | theme: theme, | |
| 6311 | source: AerationTypeAdapter, | |
| 6312 | valueMember: 'id', | |
| 6313 | displayMember: 'nl', | |
| 6314 | width: 180, | |
| 6315 | height: 23, | |
| 6316 | autoDropDownHeight: true | |
| 6317 | }); | |
| 6318 | $('#brew_fermenter_volume').jqxNumberInput(Show1dec); | |
| 6319 | $('#brew_fermenter_sg').jqxNumberInput(Show3dec); | |
| 610 | 6320 | $('#brew_fermenter_extrawater,#brew_fermenter_tcloss').jqxNumberInput(Spin1dec); |
| 6321 | $('#brew_fermenter_ibu,#brew_fermenter_color').jqxNumberInput(Show0dec); | |
| 478 | 6322 | $('#BLog').jqxButton({ template: 'info', width: '150px', theme: theme }); |
| 6323 | $('#BLog').click(function() { | |
| 6324 | // Open log in a new tab. | |
| 6325 | window.open('log_brew.php?code=' + dataRecord.code + '&name=' + dataRecord.name); | |
| 6326 | }); | |
| 6327 | ||
| 6328 | // Tab 10, Fermentation | |
| 6329 | // Note, fermentation temps changes must do calcCarbonation() | |
| 6330 | $('#brew_fermenter_sg2').jqxTooltip({ content: 'Het behaalde SG in het gistvat, overgenomen van de brouwdag.' }); | |
| 6331 | $('#primary_start_temp').jqxTooltip({ content: 'De begintemperatuur van de hoofdvergisting.' }); | |
| 6332 | $('#primary_max_temp').jqxTooltip({ content: 'De hoogst bereikte piek temperatuur tijdens de hoofgvergisting.' }); | |
| 6333 | $('#primary_end_temp').jqxTooltip({ content: 'De eind temperatuur van de hoofdvergisting.' }); | |
| 6334 | $('#primary_end_sg').jqxTooltip({ content: 'Het gemeten SG aan het eind van de hoofdvergisting.' }); | |
|
633
ec4601ab3ed2
Fixed loading of the product edit page. A bit faster loading.
Michiel Broek <mbroek@mbse.eu>
parents:
623
diff
changeset
|
6335 | $('#primary_end_brix,#secondary_end_brix,#final_brix').jqxTooltip({ content: 'Hulpfinctie: de afgelezen °Brix RI waarde met een refractometer.' }); |
| 478 | 6336 | $('#primary_svg').jqxTooltip({ content: 'De schijnbare vergisting graad behaald na de hoofdgisting.' }); |
| 6337 | $('#primary_end_date').jqxTooltip({ content: 'De eind datum van de hoofdvergisting en eventueel overhevelen.' }); | |
| 6338 | $('#secondary_end_sg').jqxTooltip({ content: 'Het gemeten SG aan het eind van de navergisting.' }); | |
| 6339 | $('#secondary_svg').jqxTooltip({ content: 'De schijnbare vergisting graad behaald na de nagisting.' }); | |
| 6340 | $('#secondary_end_date').jqxTooltip({ content: 'De eind datum van de navergisting en het begin van het lageren.' }); | |
|
633
ec4601ab3ed2
Fixed loading of the product edit page. A bit faster loading.
Michiel Broek <mbroek@mbse.eu>
parents:
623
diff
changeset
|
6341 | $('#est_fg3').jqxTooltip({ content: 'Het verwachte eind SG. Dit wordt automatisch berekend.' }); |
|
ec4601ab3ed2
Fixed loading of the product edit page. A bit faster loading.
Michiel Broek <mbroek@mbse.eu>
parents:
623
diff
changeset
|
6342 | |
|
ec4601ab3ed2
Fixed loading of the product edit page. A bit faster loading.
Michiel Broek <mbroek@mbse.eu>
parents:
623
diff
changeset
|
6343 | $('#primary_end_sg,#secondary_end_sg').jqxNumberInput(SGopts); |
| 610 | 6344 | $('#primary_end_date,#secondary_end_date').jqxDateTimeInput(Dateopts); |
| 6345 | $('#primary_end_date,#secondary_end_date').on('close', function(event) { calcStage(); }); | |
| 6346 | $('#primary_start_temp,#primary_max_temp,#primary_end_temp,#secondary_temp,#tertiary_temp').jqxNumberInput(YeastT); | |
| 478 | 6347 | $('#fg').jqxNumberInput(Spin3dec); |
| 610 | 6348 | $('#brew_fermenter_sg2,#est_fg3').jqxNumberInput(Show3dec); |
| 6349 | $('#primary_end_brix,#secondary_end_brix,#final_brix').jqxNumberInput(Spin1dec); | |
| 478 | 6350 | $('#final_abv').jqxNumberInput(Show2dec); |
| 610 | 6351 | $('#primary_svg,#secondary_svg,#final_svg').jqxNumberInput(Show1dec); |
| 478 | 6352 | $('#FLog').jqxButton({ template: 'info', width: '150px', theme: theme }); |
| 6353 | $('#FLog').click(function() { | |
| 6354 | // Open log in a new tab. | |
| 6355 | window.open('log_fermentation.php?code=' + dataRecord.code + '&name=' + dataRecord.name); | |
| 6356 | }); | |
|
602
10b61aacb1c1
New products field log_ispindel. Add check for ispindel log to crontasks.php Added log_ispindel to prod_edit, pprod_divide, prod_new and prod_duplicate. Renamed some log_fermentation vergisting names into klimaatkast.
Michiel Broek <mbroek@mbse.eu>
parents:
586
diff
changeset
|
6357 | $('#ILog').jqxButton({ template: 'info', width: '150px', theme: theme }); |
|
10b61aacb1c1
New products field log_ispindel. Add check for ispindel log to crontasks.php Added log_ispindel to prod_edit, pprod_divide, prod_new and prod_duplicate. Renamed some log_fermentation vergisting names into klimaatkast.
Michiel Broek <mbroek@mbse.eu>
parents:
586
diff
changeset
|
6358 | $('#ILog').click(function() { |
|
10b61aacb1c1
New products field log_ispindel. Add check for ispindel log to crontasks.php Added log_ispindel to prod_edit, pprod_divide, prod_new and prod_duplicate. Renamed some log_fermentation vergisting names into klimaatkast.
Michiel Broek <mbroek@mbse.eu>
parents:
586
diff
changeset
|
6359 | // Open log in a new tab. |
|
10b61aacb1c1
New products field log_ispindel. Add check for ispindel log to crontasks.php Added log_ispindel to prod_edit, pprod_divide, prod_new and prod_duplicate. Renamed some log_fermentation vergisting names into klimaatkast.
Michiel Broek <mbroek@mbse.eu>
parents:
586
diff
changeset
|
6360 | window.open('log_ispindel.php?code=' + dataRecord.code + '&name=' + dataRecord.name); |
|
10b61aacb1c1
New products field log_ispindel. Add check for ispindel log to crontasks.php Added log_ispindel to prod_edit, pprod_divide, prod_new and prod_duplicate. Renamed some log_fermentation vergisting names into klimaatkast.
Michiel Broek <mbroek@mbse.eu>
parents:
586
diff
changeset
|
6361 | }); |
| 478 | 6362 | |
| 6363 | // Tab 11, Packaging | |
| 6364 | // TODO: high gravity packaging, extra water and recalc abv, color and ibu. | |
| 6365 | $('#package_date').jqxTooltip({ content: 'De verpakkings datum van dit bier.' }); | |
| 6366 | $('#package_volume').jqxTooltip({ content: 'Het beschikbare volume om te bottelen of op fust te zetten.' }); | |
| 6367 | $('#package_infuse_amount').jqxTooltip({ content: 'De hoeveelheid water of drank extra toe te voegen.' }); | |
| 6368 | $('#package_infuse_abv').jqxTooltip({ content: 'De hoeveelheid alcohol in de drank, of 0.0 als het water is.' }); | |
| 6369 | $('#package_infuse_notes').jqxTooltip({ content: 'Omschrijving van de extra toevoeging.' }); | |
| 6370 | $('#package_abv').jqxTooltip({ content: 'De uiteindelijke hoeveelheid alcohol volume %.' }); | |
| 6371 | $('#package_ph').jqxTooltip({ content: 'De gemeten pH vlak voor het verpakken.' }); | |
| 6372 | $('#st_carb_min2').jqxTooltip({ content: 'Het minimum aanbevolen koolzuur volume voor deze bierstijl.'}); | |
| 6373 | $('#st_carb_max2').jqxTooltip({ content: 'Het maximum aamnevolen koolzuur volume voor deze bierstijl.'}); | |
| 6374 | $('#bottle_amount').jqxTooltip({ content: 'De totale hoeveelheid te bottelen bier.' }); | |
| 6375 | $('#keg_amount').jqxTooltip({ content: 'De totale hoeveelheid op fust te zetten bier.' }); | |
| 6376 | $('#bottle_carbonation').jqxTooltip({ content: 'Het gewenste CO2 volume in de flessen.' }); | |
| 6377 | $('#keg_carbonation').jqxTooltip({ content: 'Het gewenste CO2 volume door de suiker in de fusten.' }); | |
|
633
ec4601ab3ed2
Fixed loading of the product edit page. A bit faster loading.
Michiel Broek <mbroek@mbse.eu>
parents:
623
diff
changeset
|
6378 | $('#bottle_priming_water,#keg_priming_water').jqxTooltip({ content: 'De hoeveelheid water om de suiker op te lossen.' }); |
|
ec4601ab3ed2
Fixed loading of the product edit page. A bit faster loading.
Michiel Broek <mbroek@mbse.eu>
parents:
623
diff
changeset
|
6379 | $('#bottle_pressure').jqxTooltip({ content: 'De maximaal te verwachten druk tijdens het hergisten.' }); |
|
ec4601ab3ed2
Fixed loading of the product edit page. A bit faster loading.
Michiel Broek <mbroek@mbse.eu>
parents:
623
diff
changeset
|
6380 | $('#package_date').jqxDateTimeInput(Dateopts); |
|
ec4601ab3ed2
Fixed loading of the product edit page. A bit faster loading.
Michiel Broek <mbroek@mbse.eu>
parents:
623
diff
changeset
|
6381 | $('#package_date').on('close', function(event) { calcStage(); }); |
|
ec4601ab3ed2
Fixed loading of the product edit page. A bit faster loading.
Michiel Broek <mbroek@mbse.eu>
parents:
623
diff
changeset
|
6382 | $('#package_infuse_amount').jqxNumberInput(Spin3dec); |
|
ec4601ab3ed2
Fixed loading of the product edit page. A bit faster loading.
Michiel Broek <mbroek@mbse.eu>
parents:
623
diff
changeset
|
6383 | $('#package_infuse_notes').jqxInput({ theme: theme, width: 640, height: 23 }); |
|
ec4601ab3ed2
Fixed loading of the product edit page. A bit faster loading.
Michiel Broek <mbroek@mbse.eu>
parents:
623
diff
changeset
|
6384 | $('#package_abv').jqxNumberInput(Show2dec); |
|
ec4601ab3ed2
Fixed loading of the product edit page. A bit faster loading.
Michiel Broek <mbroek@mbse.eu>
parents:
623
diff
changeset
|
6385 | $('#package_ph').jqxNumberInput(SpinpH); |
|
ec4601ab3ed2
Fixed loading of the product edit page. A bit faster loading.
Michiel Broek <mbroek@mbse.eu>
parents:
623
diff
changeset
|
6386 | $('#st_carb_min2,#st_carb_max2').jqxNumberInput(Smal1dec); |
|
ec4601ab3ed2
Fixed loading of the product edit page. A bit faster loading.
Michiel Broek <mbroek@mbse.eu>
parents:
623
diff
changeset
|
6387 | $('#package_volume,#package_infuse_abv,#bottle_amount,#keg_amount').jqxNumberInput(Spin1dec); |
| 610 | 6388 | $('#bottle_carbonation,#keg_carbonation').jqxNumberInput(Spin2dec); |
| 6389 | $('#bottle_carbonation,#keg_carbonation').jqxNumberInput({ max: 5 }); | |
| 478 | 6390 | $('#bottle_priming_sugar').jqxDropDownList({ |
| 6391 | placeHolder: 'Kies suiker:', | |
| 6392 | theme: theme, | |
| 6393 | source: fermentablesugars, | |
| 6394 | displayMember: 'name', | |
| 6395 | width: 200, | |
| 6396 | height: 23, | |
| 6397 | dropDownWidth: 300, | |
| 6398 | dropDownHeight: 400 | |
| 6399 | }); | |
| 6400 | $('#bottle_priming_sugar').on('select', function(event) { | |
| 6401 | if (event.args) { | |
| 6402 | var rowID, index, editrow = -1, datarecord, rows, i, row = {}; | |
| 6403 | index = event.args.index; | |
| 6404 | datarecord = fermentablesugars.records[index]; | |
| 6405 | rows = $('#fermentableGrid').jqxGrid('getrows'); | |
| 6406 | for (i = 0; i < rows.length; i++) { | |
| 6407 | if (rows[i].f_added == 4) { | |
| 6408 | editrow = i; | |
| 6409 | } | |
| 6410 | } | |
| 6411 | row['f_name'] = datarecord.name; | |
| 6412 | row['f_origin'] = datarecord.origin; | |
| 6413 | row['f_supplier'] = datarecord.supplier; | |
| 6414 | row['f_amount'] = parseFloat($('#bottle_priming_total').jqxNumberInput('decimal')) / 1000; | |
| 6415 | row['f_cost'] = datarecord.cost; | |
| 6416 | row['f_type'] = datarecord.type; | |
| 6417 | row['f_yield'] = datarecord.yield; | |
| 6418 | row['f_color'] = datarecord.color; | |
| 6419 | row['f_coarse_fine_diff'] = datarecord.coarse_fine_diff; | |
| 6420 | row['f_moisture'] = datarecord.moisture; | |
| 6421 | row['f_diastatic_power'] = datarecord.diastatic_power; | |
| 6422 | row['f_protein'] = datarecord.protein; | |
| 6423 | row['f_max_in_batch'] = datarecord.max_in_batch; | |
| 6424 | row['f_graintype'] = datarecord.graintype; | |
| 6425 | row['f_added'] = 4; | |
| 6426 | row['f_dissolved_protein'] = datarecord.dissolved_protein; | |
| 6427 | row['f_recommend_mash'] = datarecord.recommend_mash; | |
| 6428 | row['f_add_after_boil'] = 1; | |
| 6429 | row['f_adjust_to_total_100'] = 0; | |
| 6430 | row['f_percentage'] = 0; | |
| 6431 | row['f_di_ph'] = datarecord.di_ph; | |
| 6432 | row['f_acid_to_ph_57'] = datarecord.acid_to_ph_57; | |
| 6433 | row['f_inventory'] = datarecord.inventory; | |
| 6434 | if (editrow >= 0) { | |
| 6435 | rowID = $('#fermentableGrid').jqxGrid('getrowid', editrow); | |
| 6436 | $('#fermentableGrid').jqxGrid('updaterow', rowID, row); | |
| 6437 | } else { | |
| 6438 | $('#fermentableGrid').jqxGrid('addrow', null, row); | |
| 6439 | } | |
| 6440 | calcCarbonation(); | |
| 6441 | } | |
| 6442 | }); | |
| 6443 | $('#keg_priming_sugar').jqxDropDownList({ | |
| 6444 | placeHolder: 'Kies suiker:', | |
| 6445 | theme: theme, | |
| 6446 | source: fermentablesugars, | |
| 6447 | displayMember: 'name', | |
| 6448 | width: 200, | |
| 6449 | height: 23, | |
| 6450 | dropDownWidth: 300, | |
| 6451 | dropDownHeight: 400 | |
| 6452 | }); | |
| 6453 | $('#keg_priming_sugar').on('select', function(event) { | |
| 6454 | if (event.args) { | |
| 6455 | var rowID, index, editrow = -1, datarecord, rows, i, row = {}; | |
| 6456 | index = event.args.index; | |
| 6457 | datarecord = fermentablesugars.records[index]; | |
| 6458 | rows = $('#fermentableGrid').jqxGrid('getrows'); | |
| 6459 | for (i = 0; i < rows.length; i++) { | |
| 6460 | if (rows[i].f_added == 5) { | |
| 6461 | editrow = i; | |
| 6462 | } | |
| 6463 | } | |
| 6464 | row['f_name'] = datarecord.name; | |
| 6465 | row['f_origin'] = datarecord.origin; | |
| 6466 | row['f_supplier'] = datarecord.supplier; | |
| 6467 | row['f_amount'] = parseFloat($('#keg_priming_total').jqxNumberInput('decimal')) / 1000; | |
| 6468 | row['f_cost'] = datarecord.cost; | |
| 6469 | row['f_type'] = datarecord.type; | |
| 6470 | row['f_yield'] = datarecord.yield; | |
| 6471 | row['f_color'] = datarecord.color; | |
| 6472 | row['f_coarse_fine_diff'] = datarecord.coarse_fine_diff; | |
| 6473 | row['f_moisture'] = datarecord.moisture; | |
| 6474 | row['f_diastatic_power'] = datarecord.diastatic_power; | |
| 6475 | row['f_protein'] = datarecord.protein; | |
| 6476 | row['f_max_in_batch'] = datarecord.max_in_batch; | |
| 6477 | row['f_graintype'] = datarecord.graintype; | |
| 6478 | row['f_added'] = 5; | |
| 6479 | row['f_dissolved_protein'] = datarecord.dissolved_protein; | |
| 6480 | row['f_recommend_mash'] = datarecord.recommend_mash; | |
| 6481 | row['f_add_after_boil'] = 1; | |
| 6482 | row['f_adjust_to_total_100'] = 0; | |
| 6483 | row['f_percentage'] = 0; | |
| 6484 | row['f_di_ph'] = datarecord.di_ph; | |
| 6485 | row['f_acid_to_ph_57'] = datarecord.acid_to_ph_57; | |
| 6486 | row['f_inventory'] = datarecord.inventory; | |
| 6487 | if (editrow >= 0) { | |
| 6488 | rowID = $('#fermentableGrid').jqxGrid('getrowid', editrow); | |
| 6489 | $('#fermentableGrid').jqxGrid('updaterow', rowID, row); | |
| 6490 | } else { | |
| 6491 | $('#fermentableGrid').jqxGrid('addrow', null, row); | |
| 6492 | } | |
| 6493 | calcCarbonation(); | |
| 6494 | } | |
| 6495 | }); | |
| 610 | 6496 | $('#bottle_priming_water,#keg_priming_water').jqxNumberInput(Spin3dec); |
| 478 | 6497 | $('#keg_forced_carb').jqxCheckBox({ theme: theme, width: 120, height: 23 }); |
| 610 | 6498 | $('#bottle_priming_amount,#keg_priming_amount,#bottle_priming_total,#bottle_pressure,#keg_priming_total,#keg_pressure').jqxNumberInput(Show1dec); |
| 6499 | $('#bottle_abv,#keg_abv').jqxNumberInput(Show2dec); | |
| 6500 | $('#bottle_carbonation_temp,#keg_carbonation_temp').jqxNumberInput(YeastT); | |
|
615
9034e65b0d7a
Added CO2 carbonation log to the products database. Added button in the packaging tab.
Michiel Broek <mbroek@mbse.eu>
parents:
613
diff
changeset
|
6501 | $('#CLog').jqxButton({ template: 'info', width: '150px', theme: theme }); |
|
9034e65b0d7a
Added CO2 carbonation log to the products database. Added button in the packaging tab.
Michiel Broek <mbroek@mbse.eu>
parents:
613
diff
changeset
|
6502 | $('#CLog').click(function() { |
|
9034e65b0d7a
Added CO2 carbonation log to the products database. Added button in the packaging tab.
Michiel Broek <mbroek@mbse.eu>
parents:
613
diff
changeset
|
6503 | // Open log in a new tab. |
|
9034e65b0d7a
Added CO2 carbonation log to the products database. Added button in the packaging tab.
Michiel Broek <mbroek@mbse.eu>
parents:
613
diff
changeset
|
6504 | window.open('log_co2pressure.php?code=' + dataRecord.code + '&name=' + dataRecord.name); |
|
9034e65b0d7a
Added CO2 carbonation log to the products database. Added button in the packaging tab.
Michiel Broek <mbroek@mbse.eu>
parents:
613
diff
changeset
|
6505 | }); |
| 478 | 6506 | |
| 6507 | // Tab 12, Tasting | |
| 6508 | $('#taste_date').jqxTooltip({ content: 'De proef datum van dit bier.' }); | |
| 6509 | $('#taste_date').jqxDateTimeInput(Dateopts); | |
| 6510 | $('#taste_date').on('close', function(event) { calcStage(); }); | |
| 6511 | $('#taste_rate').jqxTooltip({ content: 'Het cijfer voor dit bier van 1 tot 10.' }); | |
| 6512 | $('#taste_rate').jqxNumberInput(Spin1dec); | |
| 6513 | $('#taste_rate').jqxNumberInput({ max: 10 }); | |
| 6514 | $('#taste_color').jqxTooltip({ content: 'De kleur van het bier.' }); | |
| 6515 | $('#taste_transparency').jqxTooltip({ content: 'De helderheid van het bier.' }); | |
| 6516 | $('#taste_head').jqxTooltip({ content: 'Het schuim op het bier.' }); | |
| 610 | 6517 | $('#taste_color,#taste_transparency,#taste_head').jqxInput({ theme: theme, width: 320, height: 23 }); |
| 478 | 6518 | $('#taste_aroma').jqxTooltip({ content: 'Het aroma van het bier.' }); |
| 6519 | $('#taste_taste').jqxTooltip({ content: 'De smaak van het bier.' }); | |
| 6520 | $('#taste_aftertaste').jqxTooltip({ content: 'De nasmaak van het bier.' }); | |
| 6521 | $('#taste_mouthfeel').jqxTooltip({ content: 'Het mondgevoelvan het bier.' }); | |
| 610 | 6522 | $('#taste_aroma,#taste_taste,#taste_aftertaste,#taste_mouthfeel').jqxInput({ theme: theme, width: 960, height: 23 }); |
| 478 | 6523 | $('#taste_notes').jqxTooltip({ content: 'Het oordeel en opmerkingen over dit bier.' }); |
| 6524 | $('#taste_notes').jqxInput({ theme: theme, width: 960, height: 100 }); | |
| 6525 | ||
| 6526 | $('#jqxTabs').jqxTabs({ | |
| 6527 | theme: theme, | |
| 6528 | width: 1280, | |
| 6529 | height: 660, | |
| 6530 | autoHeight: false, | |
| 6531 | position: 'top' | |
| 6532 | }); | |
| 6533 | ||
| 6534 | // Buttons below | |
| 6535 | $('#Export').jqxButton({ template: 'info', width: '80px', theme: theme }); | |
| 6536 | $('#Export').bind('click', function() { | |
|
489
18e5cfe5d126
Load new url in database write callback
Michiel Broek <mbroek@mbse.eu>
parents:
484
diff
changeset
|
6537 | saveRecord(0); |
| 478 | 6538 | }); |
| 6539 | ||
| 6540 | $('#Delete').jqxButton({ template: 'danger', width: '80px', theme: theme }); | |
| 6541 | $('#Delete').bind('click', function() { | |
| 6542 | // Open a popup to confirm this action. | |
| 6543 | $('#eventWindow').jqxWindow('open'); | |
| 6544 | $('#delOk').click(function() { | |
| 6545 | var data = 'delete=true&' + $.param({ uuid: dataRecord.uuid }); | |
| 6546 | $.ajax({ | |
| 6547 | dataType: 'json', | |
| 6548 | url: url, | |
| 6549 | cache: false, | |
| 6550 | data: data, | |
| 6551 | type: 'POST', | |
| 6552 | success: function(data, status, xhr) { | |
| 6553 | // delete command is executed. | |
| 6554 | window.location.href = my_return; | |
| 6555 | }, | |
| 6556 | error: function(jqXHR, textStatus, errorThrown) { | |
| 6557 | } | |
| 6558 | }); | |
| 6559 | }); | |
| 6560 | }); | |
| 6561 | ||
| 6562 | $('#Cancel').jqxButton({ template: 'primary', width: '80px', theme: theme }); | |
| 6563 | $('#Cancel').bind('click', function() { | |
| 6564 | window.location.href = my_return; | |
| 6565 | }); | |
| 6566 | ||
| 6567 | $('#Save').jqxButton({ template: 'success', width: '80px', theme: theme }); | |
| 6568 | $('#Save').bind('click', function() { | |
|
489
18e5cfe5d126
Load new url in database write callback
Michiel Broek <mbroek@mbse.eu>
parents:
484
diff
changeset
|
6569 | saveRecord(1); |
| 478 | 6570 | }); |
|
697
367ae7ff52f0
Version 0.3.34 Changed log messages in the daemon. Added yeast_pitchrate field to the product database. Added yeast pitchrate edit field to the yeast tab. Initial value is guessed. There is also a popup window for predefined values. An finally the value can be edited by the user. All popup windows are initialized together.
Michiel Broek <mbroek@mbse.eu>
parents:
669
diff
changeset
|
6571 | createPopupElements(); |
|
111
8c4ba91adf58
Basic screens for brew products.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
6572 | }); |
|
8c4ba91adf58
Basic screens for brew products.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
6573 |
