www/js/global.js

Tue, 10 Sep 2019 15:22:12 +0200

author
Michiel Broek <mbroek@mbse.eu>
date
Tue, 10 Sep 2019 15:22:12 +0200
changeset 476
7ee8072baaba
parent 475
c34d71572023
child 495
fdbb6bfae569
permissions
-rw-r--r--

Added hybrid yeast planning

13
b8c3ca152984 Added hops inventory
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
1 /*****************************************************************************
144
ae15cfe5f008 Moved inventory dropdown lists to global.js
Michiel Broek <mbroek@mbse.eu>
parents: 139
diff changeset
2 * Copyright (C) 2014-2019
13
b8c3ca152984 Added hops inventory
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
3 *
b8c3ca152984 Added hops inventory
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
4 * Michiel Broek <mbroek at mbse dot eu>
b8c3ca152984 Added hops inventory
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
5 *
b8c3ca152984 Added hops inventory
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
6 * This file is part of BrewCloud
b8c3ca152984 Added hops inventory
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
7 *
b8c3ca152984 Added hops inventory
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
8 * This is free software; you can redistribute it and/or modify it
b8c3ca152984 Added hops inventory
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
9 * under the terms of the GNU General Public License as published by the
b8c3ca152984 Added hops inventory
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
10 * Free Software Foundation; either version 2, or (at your option) any
b8c3ca152984 Added hops inventory
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
11 * later version.
b8c3ca152984 Added hops inventory
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
12 *
b8c3ca152984 Added hops inventory
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
13 * BrewCloud is distributed in the hope that it will be useful, but
b8c3ca152984 Added hops inventory
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
14 * WITHOUT ANY WARRANTY; without even the implied warranty of
b8c3ca152984 Added hops inventory
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
b8c3ca152984 Added hops inventory
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
16 * General Public License for more details.
b8c3ca152984 Added hops inventory
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
17 *
b8c3ca152984 Added hops inventory
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
18 * You should have received a copy of the GNU General Public License
b8c3ca152984 Added hops inventory
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
19 * along with ThermFerm; see the file COPYING. If not, write to the Free
b8c3ca152984 Added hops inventory
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
20 * Software Foundation, 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
b8c3ca152984 Added hops inventory
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
21 *****************************************************************************/
b8c3ca152984 Added hops inventory
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
22
b8c3ca152984 Added hops inventory
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
23
195
2ac491548d8d Fermentables database bool to int types. Dropdown lists are using tables with indexes. Dropdown lists display in Dutch. Save and delete in the database now use POST instead of GET. Added the added and dissolved_protein fields. Removed the ibu_gal_per_lb field. Redesigned the web page. Code cleanup.
Michiel Broek <mbroek@mbse.eu>
parents: 186
diff changeset
24 // dropdownlists arrays
2ac491548d8d Fermentables database bool to int types. Dropdown lists are using tables with indexes. Dropdown lists display in Dutch. Save and delete in the database now use POST instead of GET. Added the added and dissolved_protein fields. Removed the ibu_gal_per_lb field. Redesigned the web page. Code cleanup.
Michiel Broek <mbroek@mbse.eu>
parents: 186
diff changeset
25
2ac491548d8d Fermentables database bool to int types. Dropdown lists are using tables with indexes. Dropdown lists display in Dutch. Save and delete in the database now use POST instead of GET. Added the added and dissolved_protein fields. Removed the ibu_gal_per_lb field. Redesigned the web page. Code cleanup.
Michiel Broek <mbroek@mbse.eu>
parents: 186
diff changeset
26 var StageData = [
475
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
27 { id: 0, en: 'Plan', nl: 'Plan' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
28 { id: 1, en: 'Wait', nl: 'Wacht' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
29 { id: 2, en: 'Brew', nl: 'Brouwen' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
30 { id: 3, en: 'Primary', nl: 'Hoofdgisting' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
31 { id: 4, en: 'Secondary', nl: 'Nagisting' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
32 { id: 5, en: 'Tertiary', nl: 'Lagering' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
33 { id: 6, en: 'Package', nl: 'Afvullen' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
34 { id: 7, en: 'Carbonation', nl: 'Hergisten' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
35 { id: 8, en: 'Mature', nl: 'Rijpen' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
36 { id: 9, en: 'Taste', nl: 'Proeven' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
37 { id: 10, en: 'Ready', nl: 'Gereed' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
38 { id: 11, en: 'Closed', nl: 'Afgesloten' }
465
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
39 ],
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
40 StageSource = {
475
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
41 localdata: StageData,
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
42 datatype: 'array',
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
43 datafields: [{ name: 'id' }, { name: 'en' }, { name: 'nl' }]
465
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
44 },
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
45 StageAdapter = new $.jqx.dataAdapter(StageSource),
195
2ac491548d8d Fermentables database bool to int types. Dropdown lists are using tables with indexes. Dropdown lists display in Dutch. Save and delete in the database now use POST instead of GET. Added the added and dissolved_protein fields. Removed the ibu_gal_per_lb field. Redesigned the web page. Code cleanup.
Michiel Broek <mbroek@mbse.eu>
parents: 186
diff changeset
46
465
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
47 MaterialData = [
475
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
48 { id: 0, en: 'Stainless Steel', nl: 'RVS', sh: 0.11 },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
49 { id: 1, en: 'Aluminium', nl: 'Aluminium', sh: 0.22 },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
50 { id: 2, en: 'Plastics', nl: 'Kunststof', sh: 0.46 },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
51 { id: 3, en: 'Copper', nl: 'Koper', sh: 0.092 }
465
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
52 ],
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
53 MaterialSource = {
475
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
54 localdata: MaterialData,
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
55 datatype: 'array',
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
56 datafields: [{ name: 'id' }, { name: 'en' }, { name: 'nl' }, { name: 'sh' }]
465
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
57 },
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
58 MaterialAdapter = new $.jqx.dataAdapter(MaterialSource),
195
2ac491548d8d Fermentables database bool to int types. Dropdown lists are using tables with indexes. Dropdown lists display in Dutch. Save and delete in the database now use POST instead of GET. Added the added and dissolved_protein fields. Removed the ibu_gal_per_lb field. Redesigned the web page. Code cleanup.
Michiel Broek <mbroek@mbse.eu>
parents: 186
diff changeset
59
465
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
60 FermentableTypeData = [
475
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
61 { id: 0, en: 'Grain', nl: 'Mout' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
62 { id: 1, en: 'Sugar', nl: 'Suiker' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
63 { id: 2, en: 'Extract', nl: 'Vloeibaar extract' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
64 { id: 3, en: 'Dry extract', nl: 'Droog extract' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
65 { id: 4, en: 'Adjunct', nl: 'Ongemout graan' }
465
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
66 ],
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
67 FermentableTypeSource = {
475
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
68 localdata: FermentableTypeData,
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
69 datatype: 'array',
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
70 datafields: [{ name: 'id' }, { name: 'en' }, { name: 'nl' }]
465
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
71 },
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
72 FermentableTypeAdapter = new $.jqx.dataAdapter(FermentableTypeSource),
195
2ac491548d8d Fermentables database bool to int types. Dropdown lists are using tables with indexes. Dropdown lists display in Dutch. Save and delete in the database now use POST instead of GET. Added the added and dissolved_protein fields. Removed the ibu_gal_per_lb field. Redesigned the web page. Code cleanup.
Michiel Broek <mbroek@mbse.eu>
parents: 186
diff changeset
73
465
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
74 GrainTypeData = [
475
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
75 { id: 0, en: 'Base', nl: 'Basismout' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
76 { id: 1, en: 'Roast', nl: 'Geroosterde mout' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
77 { id: 2, en: 'Crystal', nl: 'Cara- of crystalmout' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
78 { id: 3, en: 'Kilned', nl: 'Geƫeste mout'},
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
79 { id: 4, en: 'Sour malt', nl: 'Zuurmout' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
80 { id: 5, en: 'Special', nl: 'Speciale mout' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
81 { id: 6, en: 'No malt', nl: 'Geen mout' }
465
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
82 ],
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
83 GrainTypeSource = {
475
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
84 localdata: GrainTypeData,
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
85 datatype: 'array',
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
86 datafields: [{ name: 'id' }, { name: 'en' }, { name: 'nl' }]
465
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
87 },
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
88 GrainTypeAdapter = new $.jqx.dataAdapter(GrainTypeSource),
195
2ac491548d8d Fermentables database bool to int types. Dropdown lists are using tables with indexes. Dropdown lists display in Dutch. Save and delete in the database now use POST instead of GET. Added the added and dissolved_protein fields. Removed the ibu_gal_per_lb field. Redesigned the web page. Code cleanup.
Michiel Broek <mbroek@mbse.eu>
parents: 186
diff changeset
89
465
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
90 AddedData = [
475
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
91 { id: 0, en: 'Mash', nl: 'Maischen' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
92 { id: 1, en: 'Boil', nl: 'Koken' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
93 { id: 2, en: 'Fermentation', nl: 'Vergisten' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
94 { id: 3, en: 'Lagering', nl: 'Nagisten/lageren' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
95 { id: 4, en: 'Bottle', nl: 'Bottelen' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
96 { id: 5, en: 'Kegs', nl: 'Fust' }
465
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
97 ],
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
98 AddedSource = {
475
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
99 localdata: AddedData,
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
100 datatype: 'array',
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
101 datafields: [{ name: 'id' }, { name: 'en' }, { name: 'nl' }]
465
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
102 },
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
103 AddedAdapter = new $.jqx.dataAdapter(AddedSource),
195
2ac491548d8d Fermentables database bool to int types. Dropdown lists are using tables with indexes. Dropdown lists display in Dutch. Save and delete in the database now use POST instead of GET. Added the added and dissolved_protein fields. Removed the ibu_gal_per_lb field. Redesigned the web page. Code cleanup.
Michiel Broek <mbroek@mbse.eu>
parents: 186
diff changeset
104
465
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
105 HopTypeData = [
475
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
106 { id: 0, en: 'Bittering', nl: 'Bitterhop' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
107 { id: 1, en: 'Aroma', nl: 'Aromahop' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
108 { id: 2, en: 'Both', nl: 'Beide' }
465
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
109 ],
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
110 HopTypeSource = {
475
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
111 localdata: HopTypeData,
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
112 datatype: 'array',
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
113 datafields: [{ name: 'id' }, { name: 'en' }, { name: 'nl' }]
465
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
114 },
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
115 HopTypeAdapter = new $.jqx.dataAdapter(HopTypeSource),
196
531d5458782f Hops database bool to int types. Dropdown lists are using tables with indexes. Dropdown lists display in Dutch. Save and delete in the database now use POST instead of GET. Removed the useat field. Redesigned the web page. Code cleanup.
Michiel Broek <mbroek@mbse.eu>
parents: 195
diff changeset
116
465
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
117 HopFormData = [
475
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
118 { id: 0, en: 'Pellet', nl: 'Pellets' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
119 { id: 1, en: 'Plug', nl: 'Plugs' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
120 { id: 2, en: 'Leaf', nl: 'Bloemen' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
121 { id: 3, en: 'Leaf wet', nl: 'Hop nat' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
122 { id: 4, en: 'Cryo', nl: 'Cryo' }
465
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
123 ],
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
124 HopFormSource = {
475
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
125 localdata: HopFormData,
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
126 datatype: 'array',
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
127 datafields: [{ name: 'id' }, { name: 'en' }, { name: 'nl' }]
465
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
128 },
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
129 HopFormAdapter = new $.jqx.dataAdapter(HopFormSource),
196
531d5458782f Hops database bool to int types. Dropdown lists are using tables with indexes. Dropdown lists display in Dutch. Save and delete in the database now use POST instead of GET. Removed the useat field. Redesigned the web page. Code cleanup.
Michiel Broek <mbroek@mbse.eu>
parents: 195
diff changeset
130
465
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
131 HopUseData = [
475
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
132 { id: 0, en: 'Mash', nl: 'Maischhop' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
133 { id: 1, en: 'First wort', nl: 'First wort hop' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
134 { id: 2, en: 'Boil', nl: 'Koken' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
135 { id: 3, en: 'Aroma', nl: 'Vlamuit' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
136 { id: 4, en: 'Whirlpool', nl: 'Whirlpool' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
137 { id: 5, en: 'Dry hop', nl: 'Koudhop' }
465
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
138 ],
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
139 HopUseSource = {
475
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
140 localdata: HopUseData,
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
141 datatype: 'array',
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
142 datafields: [{ name: 'id' }, { name: 'en' }, { name: 'nl' }]
465
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
143 },
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
144 HopUseAdapter = new $.jqx.dataAdapter(HopUseSource),
220
14e349ff2a10 Recipes import uses indexes instead of strings. Started rebuilding the recipes editor using indexes and standard formats. Rebuild the fermentable editor from grid editing to popup editing. Most calculations are using indexes for dropdown values.
Michiel Broek <mbroek@mbse.eu>
parents: 217
diff changeset
145
465
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
146 YeastTypeData = [
475
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
147 { id: 0, en: 'Lager', nl: 'Ondergist' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
148 { id: 1, en: 'Ale', nl: 'Bovengist' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
149 { id: 2, en: 'Wheat', nl: 'Tarwegist' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
150 { id: 3, en: 'Wine', nl: 'Wijngist' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
151 { id: 4, en: 'Champagne', nl: 'Champagnegist' }
476
7ee8072baaba Added hybrid yeast planning
Michiel Broek <mbroek@mbse.eu>
parents: 475
diff changeset
152 // { id: 5, en: 'Hybrid', nl: 'Hybride' },
475
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
153 // { id: 5, en: 'Brett', nl: 'Brett' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
154 // { id: 6, en: 'Kveik', nl: 'Kveik' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
155 // { id: 7, en: 'Mixed', nl: 'Mixed' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
156 // { id: 8, en: 'Spontaneous', nl: 'Spontaan' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
157 // { id: 9, en: 'Other', nl: 'Overig' }
465
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
158 ],
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
159 YeastTypeSource = {
475
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
160 localdata: YeastTypeData,
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
161 datatype: 'array',
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
162 datafields: [{ name: 'id' }, { name: 'en' }, { name: 'nl' }]
465
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
163 },
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
164 YeastTypeAdapter = new $.jqx.dataAdapter(YeastTypeSource),
198
f0ec83e1e01f Switches yeasts inventory to indexed names and translations. Database save is using POST instead of GET. Redesigned the web page. Added total cost display which updates on inventory changes.
Michiel Broek <mbroek@mbse.eu>
parents: 196
diff changeset
165
465
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
166 YeastFormData = [
475
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
167 { id: 0, en: 'Liquid', nl: 'Vloeibaar', cells: 100000000000 },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
168 { id: 1, en: 'Dry', nl: 'Korrel', cells: 15000000000 },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
169 { id: 2, en: 'Slant', nl: 'Schuine buis', cells: 1700000000 },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
170 { id: 3, en: 'Culture', nl: 'Slurry', cells: 1700000000 },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
171 { id: 4, en: 'Frozen', nl: 'Ingevroren', cells: 1700000000 },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
172 { id: 5, en: 'Bottle', nl: 'Depot', cells: 1700000000 }
465
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
173 ],
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
174 YeastFormSource = {
475
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
175 localdata: YeastFormData,
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
176 datatype: 'array',
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
177 datafields: [{ name: 'id' }, { name: 'en' }, { name: 'nl' }, { name: 'cells' }]
465
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
178 },
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
179 YeastFormAdapter = new $.jqx.dataAdapter(YeastFormSource),
198
f0ec83e1e01f Switches yeasts inventory to indexed names and translations. Database save is using POST instead of GET. Redesigned the web page. Added total cost display which updates on inventory changes.
Michiel Broek <mbroek@mbse.eu>
parents: 196
diff changeset
180
465
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
181 YeastUseData = [
475
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
182 { id: 0, en: 'Primary', nl: 'Hoofdgisting' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
183 { id: 1, en: 'Secondary', nl: 'Nagisting' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
184 { id: 2, en: 'Tertiary', nl: 'Lagering' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
185 { id: 3, en: 'Bottle', nl: 'Bottelen' }
465
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
186 ],
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
187 YeastUseSource = {
475
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
188 localdata: YeastUseData,
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
189 datatype: 'array',
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
190 datafields: [{ name: 'id' }, { name: 'en' }, { name: 'nl' }, { name: 'cells' }]
465
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
191 },
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
192 YeastUseAdapter = new $.jqx.dataAdapter(YeastUseSource),
220
14e349ff2a10 Recipes import uses indexes instead of strings. Started rebuilding the recipes editor using indexes and standard formats. Rebuild the fermentable editor from grid editing to popup editing. Most calculations are using indexes for dropdown values.
Michiel Broek <mbroek@mbse.eu>
parents: 217
diff changeset
193
465
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
194 FlocculationData = [
475
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
195 { id: 0, en: 'Low', nl: 'Laag' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
196 { id: 1, en: 'Medium', nl: 'Medium' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
197 { id: 2, en: 'High', nl: 'Hoog' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
198 { id: 3, en: 'Very high', nl: 'Zeer hoog' }
465
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
199 ],
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
200 FlocculationSource = {
475
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
201 localdata: FlocculationData,
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
202 datatype: 'array',
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
203 datafields: [{ name: 'id' }, { name: 'en' }, { name: 'nl' }]
465
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
204 },
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
205 FlocculationAdapter = new $.jqx.dataAdapter(FlocculationSource),
198
f0ec83e1e01f Switches yeasts inventory to indexed names and translations. Database save is using POST instead of GET. Redesigned the web page. Added total cost display which updates on inventory changes.
Michiel Broek <mbroek@mbse.eu>
parents: 196
diff changeset
206
465
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
207 StarterTypeData = [
475
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
208 { id: 0, en: 'Stirred', nl: 'Geroerd' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
209 { id: 1, en: 'Shaken', nl: 'Geschud' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
210 { id: 2, en: 'Simple', nl: 'Simpel' }
465
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
211 ],
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
212 StarterTypeSource = {
475
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
213 localdata: StarterTypeData,
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
214 datatype: 'array',
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
215 datafields: [{ name: 'id' }, { name: 'en' }, { name: 'nl' }]
465
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
216 },
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
217 StarterTypeAdapter = new $.jqx.dataAdapter(StarterTypeSource),
198
f0ec83e1e01f Switches yeasts inventory to indexed names and translations. Database save is using POST instead of GET. Redesigned the web page. Added total cost display which updates on inventory changes.
Michiel Broek <mbroek@mbse.eu>
parents: 196
diff changeset
218
465
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
219 MiscTypeData = [
475
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
220 { id: 0, en: 'Spice', nl: 'Specerij' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
221 { id: 1, en: 'Herb', nl: 'Kruid' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
222 { id: 2, en: 'Flavor', nl: 'Smaakstof' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
223 { id: 3, en: 'Fining', nl: 'Klaringsmiddel' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
224 { id: 4, en: 'Water agent', nl: 'Brouwzout' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
225 { id: 5, en: 'Yeast nutrient', nl: 'Gistvoeding' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
226 { id: 6, en: 'Other', nl: 'Overig' }
465
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
227 ],
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
228 MiscTypeSource = {
475
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
229 localdata: MiscTypeData,
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
230 datatype: 'array',
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
231 datafields: [{ name: 'id' }, { name: 'en' }, { name: 'nl' }]
465
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
232 },
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
233 MiscTypeAdapter = new $.jqx.dataAdapter(MiscTypeSource),
200
7b2f11652d67 Miscs from bool to ints. Miscs database uses POST instead of GET. Dropdowns are unsing indexes. Dynamic edit screen adjust for weight and liter. Edit screen redesigned. Friendly show duration of ingredients.
Michiel Broek <mbroek@mbse.eu>
parents: 198
diff changeset
234
465
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
235 MiscUseData = [
475
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
236 { id: 0, en: 'Starter', nl: 'Starter' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
237 { id: 1, en: 'Mash', nl: 'Maischen' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
238 { id: 2, en: 'Boil', nl: 'Koken' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
239 { id: 3, en: 'Primary', nl: 'Hoofdvergisting' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
240 { id: 4, en: 'Secondary', nl: 'Nagisting/lagering' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
241 { id: 5, en: 'Bottling', nl: 'Bottelen' }
465
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
242 ],
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
243 MiscUseSource = {
475
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
244 localdata: MiscUseData,
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
245 datatype: 'array',
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
246 datafields: [{ name: 'id' }, { name: 'en' }, { name: 'nl' }]
465
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
247 },
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
248 MiscUseAdapter = new $.jqx.dataAdapter(MiscUseSource),
200
7b2f11652d67 Miscs from bool to ints. Miscs database uses POST instead of GET. Dropdowns are unsing indexes. Dynamic edit screen adjust for weight and liter. Edit screen redesigned. Friendly show duration of ingredients.
Michiel Broek <mbroek@mbse.eu>
parents: 198
diff changeset
249
465
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
250 StyleTypeData = [
475
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
251 { id: 0, en: 'Lager', nl: 'Ondergistend bier' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
252 { id: 1, en: 'Ale', nl: 'Bovengistend bier' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
253 { id: 2, en: 'Mead', nl: 'Mede' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
254 { id: 3, en: 'Wheat', nl: 'Tarwebier' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
255 { id: 4, en: 'Mixed', nl: 'Gemengd' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
256 { id: 5, en: 'Cider', nl: 'Cider' }
465
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
257 ],
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
258 StyleTypeSource = {
475
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
259 localdata: StyleTypeData,
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
260 datatype: 'array',
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
261 datafields: [{ name: 'id' }, { name: 'en' }, { name: 'nl' }]
465
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
262 },
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
263 StyleTypeAdapter = new $.jqx.dataAdapter(StyleTypeSource),
195
2ac491548d8d Fermentables database bool to int types. Dropdown lists are using tables with indexes. Dropdown lists display in Dutch. Save and delete in the database now use POST instead of GET. Added the added and dissolved_protein fields. Removed the ibu_gal_per_lb field. Redesigned the web page. Code cleanup.
Michiel Broek <mbroek@mbse.eu>
parents: 186
diff changeset
264
465
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
265 MashStepTypeData = [
475
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
266 { id: 0, en: 'Infusion', nl: 'Infusie' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
267 { id: 1, en: 'Temperature', nl: 'Verwarming' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
268 { id: 2, en: 'Decoction', nl: 'Decoctie' }
465
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
269 ],
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
270 MashStepTypeSource = {
475
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
271 localdata: MashStepTypeData,
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
272 datatype: 'array',
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
273 datafields: [{ name: 'id' }, { name: 'en' }, { name: 'nl' }]
465
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
274 },
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
275 MashStepTypeAdapter = new $.jqx.dataAdapter(MashStepTypeSource),
207
f87ff15be531 Finished data arrays for dropdown menus.
Michiel Broek <mbroek@mbse.eu>
parents: 200
diff changeset
276
465
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
277 RecipeTypeData = [
475
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
278 { id: 0, en: 'Extract', nl: 'Extract' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
279 { id: 1, en: 'Partial Mash', nl: 'Deelmaisch' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
280 { id: 2, en: 'All Grain', nl: 'Mout' }
465
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
281 ],
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
282 RecipeTypeSource = {
475
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
283 localdata: RecipeTypeData,
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
284 datatype: 'array',
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
285 datafields: [{ name: 'id' }, { name: 'en' }, { name: 'nl' }]
465
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
286 },
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
287 RecipeTypeAdapter = new $.jqx.dataAdapter(RecipeTypeSource),
207
f87ff15be531 Finished data arrays for dropdown menus.
Michiel Broek <mbroek@mbse.eu>
parents: 200
diff changeset
288
465
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
289 IBUmethodData = [
475
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
290 { id: 0, en: 'Tinseth', nl: 'Tinseth' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
291 { id: 1, en: 'Rager', nl: 'Rager' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
292 { id: 2, en: 'Daniels', nl: 'Daniels' }
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
293 // { id: 3, en: 'Garetz', nl: 'Garetz' }, // Not yet supported.
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
294 // { id: 4, en: 'Mosher', nl: 'Mosher' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
295 // { id: 5, en: 'Noonan', nl: 'Noonan' }
465
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
296 ],
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
297 IBUmethodSource = {
475
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
298 localdata: IBUmethodData,
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
299 datatype: 'array',
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
300 datafields: [{ name: 'id' }, { name: 'en' }, { name: 'nl' }]
465
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
301 },
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
302 IBUmethodAdapter = new $.jqx.dataAdapter(IBUmethodSource),
207
f87ff15be531 Finished data arrays for dropdown menus.
Michiel Broek <mbroek@mbse.eu>
parents: 200
diff changeset
303
465
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
304 ColorMethodData = [
475
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
305 { id: 0, en: 'Morey', nl: 'Morey' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
306 { id: 1, en: 'Mosher', nl: 'Mosher' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
307 { id: 2, en: 'Daniels', nl: 'Daniels' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
308 { id: 3, en: 'Halberstadt', nl: 'Halberstadt' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
309 { id: 4, en: 'Naudts', nl: 'Naudts' }
465
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
310 ],
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
311 ColorMethodSource = {
475
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
312 localdata: ColorMethodData,
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
313 datatype: 'array',
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
314 datafields: [{ name: 'id' }, { name: 'en' }, { name: 'nl' }]
465
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
315 },
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
316 ColorMethodAdapter = new $.jqx.dataAdapter(ColorMethodSource),
207
f87ff15be531 Finished data arrays for dropdown menus.
Michiel Broek <mbroek@mbse.eu>
parents: 200
diff changeset
317
465
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
318 CoolingTypeData = [
475
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
319 { id: 0, en: '-', nl: '-' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
320 { id: 1, en: 'Emersion chiller', nl: 'Dompelkoeler' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
321 { id: 2, en: 'Counterflow chiller', nl: 'Tegenstroomkoeler' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
322 { id: 3, en: 'Au bain marie', nl: 'Au bain marie' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
323 { id: 4, en: 'Natural', nl: 'Laten afkoelen' }
465
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
324 ],
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
325 CoolingTypeSource = {
475
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
326 localdata: CoolingTypeData,
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
327 datatype: 'array',
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
328 datafields: [{ name: 'id' }, { name: 'en' }, { name: 'nl' }]
465
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
329 },
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
330 CoolingTypeAdapter = new $.jqx.dataAdapter(CoolingTypeSource),
207
f87ff15be531 Finished data arrays for dropdown menus.
Michiel Broek <mbroek@mbse.eu>
parents: 200
diff changeset
331
465
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
332 AerationTypeData = [
475
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
333 { id: 0, en: 'None', nl: 'Geen' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
334 { id: 1, en: 'Air', nl: 'Lucht' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
335 { id: 2, en: 'Oxygen', nl: 'Zuurstof' }
465
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
336 ],
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
337 AerationTypeSource = {
475
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
338 localdata: AerationTypeData,
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
339 datatype: 'array',
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
340 datafields: [{ name: 'id' }, { name: 'en' }, { name: 'nl' }]
465
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
341 },
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
342 AerationTypeAdapter = new $.jqx.dataAdapter(AerationTypeSource),
207
f87ff15be531 Finished data arrays for dropdown menus.
Michiel Broek <mbroek@mbse.eu>
parents: 200
diff changeset
343
465
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
344 AcidTypeData = [
475
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
345 { id: 0, en: 'Lactic', nl: 'Melkzuur' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
346 { id: 1, en: 'Hydrochloric', nl: 'Zoutzuur' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
347 { id: 2, en: 'Phosphoric', nl: 'Fosforzuur' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
348 { id: 3, en: 'Sulfuric', nl: 'Zwavelzuur' }
465
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
349 ],
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
350 AcidTypeSource = {
475
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
351 localdata: AcidTypeData,
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
352 datatype: 'array',
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
353 datafields: [{ name: 'id' }, { name: 'en' }, { name: 'nl' }]
465
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
354 },
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
355 AcidTypeAdapter = new $.jqx.dataAdapter(AcidTypeSource),
207
f87ff15be531 Finished data arrays for dropdown menus.
Michiel Broek <mbroek@mbse.eu>
parents: 200
diff changeset
356
465
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
357 BaseTypeData = [
475
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
358 { id: 0, en: 'Sodiumbicarbonate', nl: 'NaHCO3' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
359 { id: 1, en: 'Sodiumcarbonate', nl: 'Na2CO3' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
360 { id: 2, en: 'Calciumcarbonate', nl: 'CaCO3' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
361 { id: 3, en: 'Calciumhydroxide', nl: 'Ca(OH)2' }
465
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
362 ],
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
363 BaseTypeSource = {
475
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
364 localdata: BaseTypeData,
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
365 datatype: 'array',
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
366 datafields: [{ name: 'id' }, { name: 'en' }, { name: 'nl' }]
465
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
367 },
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
368 BaseTypeAdapter = new $.jqx.dataAdapter(BaseTypeSource),
195
2ac491548d8d Fermentables database bool to int types. Dropdown lists are using tables with indexes. Dropdown lists display in Dutch. Save and delete in the database now use POST instead of GET. Added the added and dissolved_protein fields. Removed the ibu_gal_per_lb field. Redesigned the web page. Code cleanup.
Michiel Broek <mbroek@mbse.eu>
parents: 186
diff changeset
369
465
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
370 SpargeSourceData = [
475
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
371 { id: 0, en: 'Source 1', nl: 'Bron 1' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
372 { id: 1, en: 'Source 2', nl: 'Bron 2' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
373 { id: 2, en: 'Mixed', nl: 'Gemengd' }
465
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
374 ],
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
375 SpargeSourceSource = {
475
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
376 localdata: SpargeSourceData,
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
377 datatype: 'array',
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
378 datafields: [{ name: 'id' }, { name: 'en' }, { name: 'nl' }]
465
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
379 },
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
380 SpargeSourceAdapter = new $.jqx.dataAdapter(SpargeSourceSource),
220
14e349ff2a10 Recipes import uses indexes instead of strings. Started rebuilding the recipes editor using indexes and standard formats. Rebuild the fermentable editor from grid editing to popup editing. Most calculations are using indexes for dropdown values.
Michiel Broek <mbroek@mbse.eu>
parents: 217
diff changeset
381
195
2ac491548d8d Fermentables database bool to int types. Dropdown lists are using tables with indexes. Dropdown lists display in Dutch. Save and delete in the database now use POST instead of GET. Added the added and dissolved_protein fields. Removed the ibu_gal_per_lb field. Redesigned the web page. Code cleanup.
Michiel Broek <mbroek@mbse.eu>
parents: 186
diff changeset
382
2ac491548d8d Fermentables database bool to int types. Dropdown lists are using tables with indexes. Dropdown lists display in Dutch. Save and delete in the database now use POST instead of GET. Added the added and dissolved_protein fields. Removed the ibu_gal_per_lb field. Redesigned the web page. Code cleanup.
Michiel Broek <mbroek@mbse.eu>
parents: 186
diff changeset
383 // options for editors
2ac491548d8d Fermentables database bool to int types. Dropdown lists are using tables with indexes. Dropdown lists display in Dutch. Save and delete in the database now use POST instead of GET. Added the added and dissolved_protein fields. Removed the ibu_gal_per_lb field. Redesigned the web page. Code cleanup.
Michiel Broek <mbroek@mbse.eu>
parents: 186
diff changeset
384
475
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
385 Show1wat = { inputMode: 'simple', theme: theme, width: 74, height: 23, decimalDigits: 1, readOnly: true },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
386 Show2wat = { inputMode: 'simple', theme: theme, width: 74, height: 23, decimalDigits: 2, readOnly: true },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
387 Show3wat = { inputMode: 'simple', theme: theme, width: 74, height: 23, decimalDigits: 3, readOnly: true },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
388 Smal0dec = { inputMode: 'simple', theme: theme, width: 50, height: 23, decimalDigits: 0, readOnly: true },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
389 Smal1dec = { inputMode: 'simple', theme: theme, width: 50, height: 23, decimalDigits: 1, readOnly: true },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
390 Show0dec = { inputMode: 'simple', theme: theme, width: 90, height: 23, readOnly: true, decimalDigits: 0 },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
391 Show1dec = { inputMode: 'simple', theme: theme, width: 90, height: 23, readOnly: true, decimalDigits: 1 },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
392 Show2dec = { inputMode: 'simple', theme: theme, width: 90, height: 23, readOnly: true, decimalDigits: 2 },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
393 Show3dec = { inputMode: 'simple', theme: theme, width: 90, height: 23, readOnly: true, decimalDigits: 3 },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
394 SGopts = { inputMode: 'simple', theme: theme, width: 110, height: 23, min: 0.990, max: 1.199, decimalDigits: 3, spinButtons: true },
465
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
395 Spin1dec = { inputMode: 'simple', theme: theme, width: 110, height: 23, min: 0, decimalDigits: 1, spinButtons: true },
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
396 Spin2dec = { inputMode: 'simple', theme: theme, width: 110, height: 23, min: 0, decimalDigits: 2, spinButtons: true },
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
397 Spin3dec = { inputMode: 'simple', theme: theme, width: 110, height: 23, min: 0, decimalDigits: 3, spinButtons: true },
475
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
398 SpinpH = { inputMode: 'simple', theme: theme, width: 110, height: 23, min: 1, max: 14, decimalDigits: 1, spinButtons: true },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
399 Spin2pH = { inputMode: 'simple', theme: theme, width: 110, height: 23, min: 1, max: 14, decimalDigits: 2, spinButtons: true },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
400 YeastT = { inputMode: 'simple', theme: theme, width: 110, height: 23, min: 0, max: 40, decimalDigits: 1, spinButtons: true },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
401 PosInt = { inputMode: 'simple', theme: theme, width: 110, height: 23, min: 0, decimalDigits: 0, spinButtons: true },
465
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
402 Perc1dec = { inputMode: 'simple', theme: theme, width: 110, height: 23, min: 0, max: 100, decimalDigits: 1, spinButtons: true },
475
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
403 Perc0 = { inputMode: 'simple', theme: theme, width: 110, height: 23, min: 0, max: 100, decimalDigits: 0, spinButtons: true },
465
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
404 Dateopts = {
475
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
405 theme: theme, width: 150, height: 23, allowNullDate: true, todayString: 'Vandaag', clearString: 'Wissen', showFooter: true,
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
406 formatString: 'yyyy-MM-dd', enableBrowserBoundsDetection: true
465
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
407 },
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
408 DateTimeopts = {
475
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
409 theme: theme, width: 230, height: 23, allowNullDate: true, todayString: 'Vandaag', clearString: 'Wissen', showFooter: true,
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
410 formatString: 'yyyy-MM-dd HH:mm:ss', enableBrowserBoundsDetection: true, showTimeButton: true
465
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
411 },
195
2ac491548d8d Fermentables database bool to int types. Dropdown lists are using tables with indexes. Dropdown lists display in Dutch. Save and delete in the database now use POST instead of GET. Added the added and dissolved_protein fields. Removed the ibu_gal_per_lb field. Redesigned the web page. Code cleanup.
Michiel Broek <mbroek@mbse.eu>
parents: 186
diff changeset
412
2ac491548d8d Fermentables database bool to int types. Dropdown lists are using tables with indexes. Dropdown lists display in Dutch. Save and delete in the database now use POST instead of GET. Added the added and dissolved_protein fields. Removed the ibu_gal_per_lb field. Redesigned the web page. Code cleanup.
Michiel Broek <mbroek@mbse.eu>
parents: 186
diff changeset
413
465
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
414 sugardensity = 1.611, //kg/l in solution
121
875aeb365e1c Added sparge pH during import. Added several calculations. Added calculated estimates to the brewday screen.
Michiel Broek <mbroek@mbse.eu>
parents: 101
diff changeset
415
144
ae15cfe5f008 Moved inventory dropdown lists to global.js
Michiel Broek <mbroek@mbse.eu>
parents: 139
diff changeset
416 // Styles dropdown list
465
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
417 stylesSource = {
475
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
418 datatype: 'json',
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
419 datafields: [
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
420 { name: 'record', type: 'number' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
421 { name: 'name', type: 'string' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
422 { name: 'category', type: 'string' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
423 { name: 'category_number', type: 'number' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
424 { name: 'style_letter', type: 'string' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
425 { name: 'style_guide', type: 'string' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
426 { name: 'type', type: 'int' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
427 { name: 'og_min', type: 'float' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
428 { name: 'og_max', type: 'float' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
429 { name: 'fg_min', type: 'float' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
430 { name: 'fg_max', type: 'float' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
431 { name: 'ibu_min', type: 'float' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
432 { name: 'ibu_max', type: 'float' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
433 { name: 'color_min', type: 'float' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
434 { name: 'color_max', type: 'float' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
435 { name: 'carb_min', type: 'float' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
436 { name: 'carb_max', type: 'float' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
437 { name: 'abv_min', type: 'float' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
438 { name: 'abv_max', type: 'float' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
439 { name: 'notes', type: 'string' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
440 { name: 'profile', type: 'string' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
441 { name: 'ingredients', type: 'string' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
442 { name: 'examples', type: 'string' }
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
443 ],
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
444 url: 'includes/db_profile_styles.php'
465
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
445 },
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
446 styleslist = new $.jqx.dataAdapter(stylesSource),
144
ae15cfe5f008 Moved inventory dropdown lists to global.js
Michiel Broek <mbroek@mbse.eu>
parents: 139
diff changeset
447
167
dabcd35f8f92 Added new brew project wizzard. Moved equipment dropdown to global script. The project birth date is allways read-only, so it can never be changed.
Michiel Broek <mbroek@mbse.eu>
parents: 164
diff changeset
448 // Equipemnt dropdown list
465
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
449 equipmentSource = {
475
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
450 datatype: 'json',
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
451 datafields: [
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
452 { name: 'name', type: 'string' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
453 { name: 'boil_size', type: 'float' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
454 { name: 'batch_size', type: 'float' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
455 { name: 'tun_volume', type: 'float' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
456 { name: 'tun_weight', type: 'float' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
457 { name: 'tun_specific_heat', type: 'float' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
458 { name: 'tun_material', type: 'int' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
459 { name: 'tun_height', type: 'float' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
460 { name: 'top_up_water', type: 'float' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
461 { name: 'trub_chiller_loss', type: 'float' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
462 { name: 'evap_rate', type: 'float' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
463 { name: 'boil_time', type: 'float' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
464 { name: 'calc_boil_volume', type: 'int' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
465 { name: 'top_up_kettle', type: 'float' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
466 { name: 'hop_utilization', type: 'float' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
467 { name: 'notes', type: 'string' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
468 { name: 'lauter_volume', type: 'float' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
469 { name: 'lauter_height', type: 'float' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
470 { name: 'lauter_deadspace', type: 'float' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
471 { name: 'kettle_volume', type: 'float' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
472 { name: 'kettle_height', type: 'float' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
473 { name: 'mash_volume', type: 'float' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
474 { name: 'mash_max', type: 'float' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
475 { name: 'efficiency', type: 'float' }
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
476 ],
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
477 url: 'includes/db_inventory_equipments.php'
465
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
478 },
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
479 equipmentlist = new $.jqx.dataAdapter(equipmentSource),
167
dabcd35f8f92 Added new brew project wizzard. Moved equipment dropdown to global script. The project birth date is allways read-only, so it can never be changed.
Michiel Broek <mbroek@mbse.eu>
parents: 164
diff changeset
480
144
ae15cfe5f008 Moved inventory dropdown lists to global.js
Michiel Broek <mbroek@mbse.eu>
parents: 139
diff changeset
481 // dropdownlist datasource from inventory_fermentables
465
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
482 fermentableInvSource = {
475
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
483 datatype: 'json',
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
484 datafields: [
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
485 { name: 'record', type: 'number' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
486 { name: 'name', type: 'string' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
487 { name: 'type', type: 'int' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
488 { name: 'yield', type: 'float' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
489 { name: 'color', type: 'float' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
490 { name: 'add_after_boil', type: 'int' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
491 { name: 'origin', type: 'string' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
492 { name: 'supplier', type: 'string' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
493 { name: 'coarse_fine_diff', type: 'float' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
494 { name: 'moisture', type: 'float' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
495 { name: 'diastatic_power', type: 'float' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
496 { name: 'protein', type: 'float' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
497 { name: 'dissolved_protein', type: 'float' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
498 { name: 'max_in_batch', type: 'float' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
499 { name: 'recommend_mash', type: 'int' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
500 { name: 'graintype', type: 'int' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
501 { name: 'di_ph', type: 'float' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
502 { name: 'acid_to_ph_57', type: 'float' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
503 { name: 'inventory', type: 'float' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
504 { name: 'cost', type: 'float' }
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
505 ],
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
506 url: 'getfermentablesources.php'
465
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
507 },
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
508 fermentableinstock = false,
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
509 fermentablelist = new $.jqx.dataAdapter(fermentableInvSource, {
475
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
510 beforeLoadComplete: function(records) {
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
511 var row, i, data = new Array();
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
512 for (i = 0; i < records.length; i++) {
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
513 row = records[i];
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
514 if (row.inventory || ! fermentableinstock)
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
515 data.push(row);
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
516 }
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
517 return data;
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
518 },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
519 loadError: function(jqXHR, status, error) {
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
520 console.log(status + ' ' + error);
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
521 },
465
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
522 }),
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
523 fermentablesugars = new $.jqx.dataAdapter(fermentableInvSource, {
475
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
524 beforeLoadComplete: function(records) {
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
525 var row, i, data = new Array();
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
526 for (i = 0; i < records.length; i++) {
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
527 row = records[i];
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
528 if (row.type == 1 || row.type == 3) // Sugars or dry extract
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
529 data.push(row);
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
530 }
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
531 return data;
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
532 },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
533 loadError: function(jqXHR, status, error) {
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
534 console.log(status + ' ' + error);
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
535 },
465
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
536 }),
144
ae15cfe5f008 Moved inventory dropdown lists to global.js
Michiel Broek <mbroek@mbse.eu>
parents: 139
diff changeset
537
ae15cfe5f008 Moved inventory dropdown lists to global.js
Michiel Broek <mbroek@mbse.eu>
parents: 139
diff changeset
538 // dropdownlist datasource from inventory_hops
465
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
539 hopInvSource = {
475
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
540 datatype: 'json',
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
541 datafields: [
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
542 { name: 'record', type: 'number' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
543 { name: 'name', type: 'string' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
544 { name: 'origin', type: 'string' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
545 { name: 'type', type: 'int' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
546 { name: 'alpha', type: 'float' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
547 { name: 'beta', type: 'float' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
548 { name: 'humulene', type: 'float' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
549 { name: 'caryophyllene', type: 'float' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
550 { name: 'cohumulone', type: 'float' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
551 { name: 'myrcene', type: 'float' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
552 { name: 'hsi', type: 'float' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
553 { name: 'useat', type: 'int' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
554 { name: 'form', type: 'int' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
555 { name: 'total_oil', type: 'float' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
556 { name: 'inventory', type: 'float' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
557 { name: 'cost', type: 'float' }
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
558 ],
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
559 url: 'gethopsources.php'
465
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
560 },
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
561 hopinstock = false,
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
562 hoplist = new $.jqx.dataAdapter(hopInvSource, {
475
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
563 beforeLoadComplete: function(records) {
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
564 var row, i, data = new Array();
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
565 for (i = 0; i < records.length; i++) {
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
566 row = records[i];
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
567 if (row.inventory || ! hopinstock)
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
568 data.push(row);
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
569 }
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
570 return data;
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
571 },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
572 loadError: function(jqXHR, status, error) {
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
573 console.log(status + ' ' + error);
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
574 },
465
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
575 }),
144
ae15cfe5f008 Moved inventory dropdown lists to global.js
Michiel Broek <mbroek@mbse.eu>
parents: 139
diff changeset
576
ae15cfe5f008 Moved inventory dropdown lists to global.js
Michiel Broek <mbroek@mbse.eu>
parents: 139
diff changeset
577 // dropdownlist datasource from inventory_miscs
465
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
578 miscInvSource = {
475
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
579 datatype: 'json',
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
580 datafields: [
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
581 { name: 'record', type: 'number' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
582 { name: 'name', type: 'string' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
583 { name: 'type', type: 'int' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
584 { name: 'use_use', type: 'int' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
585 { name: 'amount_is_weight', type: 'int' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
586 { name: 'time', type: 'float' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
587 { name: 'inventory', type: 'float' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
588 { name: 'cost', type: 'float' }
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
589 ],
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
590 url: 'getmiscsources.php'
465
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
591 },
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
592 miscinstock = false,
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
593 misclist = new $.jqx.dataAdapter(miscInvSource, {
475
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
594 beforeLoadComplete: function(records) {
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
595 var row, i, data = new Array();
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
596 for (i = 0; i < records.length; i++) {
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
597 row = records[i];
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
598 if (row.inventory || ! miscinstock)
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
599 data.push(row);
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
600 }
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
601 return data;
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
602 },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
603 loadError: function(jqXHR, status, error) {
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
604 console.log(status + ' ' + error);
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
605 },
465
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
606 }),
144
ae15cfe5f008 Moved inventory dropdown lists to global.js
Michiel Broek <mbroek@mbse.eu>
parents: 139
diff changeset
607
ae15cfe5f008 Moved inventory dropdown lists to global.js
Michiel Broek <mbroek@mbse.eu>
parents: 139
diff changeset
608 // dropdownlist datasource from inventory_yeasts
465
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
609 yeastInvSource = {
475
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
610 datatype: 'json',
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
611 datafields: [
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
612 { name: 'record', type: 'number' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
613 { name: 'name', type: 'string' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
614 { name: 'type', type: 'int' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
615 { name: 'form', type: 'int' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
616 { name: 'laboratory', type: 'string' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
617 { name: 'product_id', type: 'string' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
618 { name: 'min_temperature', type: 'float' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
619 { name: 'max_temperature', type: 'float' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
620 { name: 'flocculation', type: 'int' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
621 { name: 'attenuation', type: 'float' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
622 { name: 'cells', type: 'float' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
623 { name: 'inventory', type: 'float' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
624 { name: 'cost', type: 'float' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
625 { name: 'tolerance', type: 'float' }
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
626 ],
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
627 url: 'getyeastsources.php'
465
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
628 },
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
629 yeastinstock = false,
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
630 yeastlist = new $.jqx.dataAdapter(yeastInvSource, {
475
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
631 beforeLoadComplete: function(records) {
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
632 var row, i, data = new Array();
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
633 for (i = 0; i < records.length; i++) {
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
634 row = records[i];
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
635 if (row.inventory || ! yeastinstock)
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
636 data.push(row);
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
637 }
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
638 return data;
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
639 },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
640 loadError: function(jqXHR, status, error) {
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
641 console.log(status + ' ' + error);
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
642 },
465
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
643 }),
144
ae15cfe5f008 Moved inventory dropdown lists to global.js
Michiel Broek <mbroek@mbse.eu>
parents: 139
diff changeset
644
ae15cfe5f008 Moved inventory dropdown lists to global.js
Michiel Broek <mbroek@mbse.eu>
parents: 139
diff changeset
645 // dropdownlist datasource from inventory_waters
465
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
646 waterInvSource = {
475
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
647 datatype: 'json',
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
648 datafields: [
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
649 { name: 'record', type: 'number' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
650 { name: 'name', type: 'string' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
651 { name: 'unlimited_stock', type: 'int' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
652 { name: 'calcium', type: 'float' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
653 { name: 'sulfate', type: 'float' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
654 { name: 'chloride', type: 'float' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
655 { name: 'sodium', type: 'float' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
656 { name: 'magnesium', type: 'float' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
657 { name: 'ph', type: 'float' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
658 { name: 'total_alkalinity', type: 'float' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
659 { name: 'inventory', type: 'float' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
660 { name: 'cost', type: 'float' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
661 ],
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
662 url: 'getwatersources.php'
465
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
663 },
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
664 waterinstock = false,
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
665 waterlist = new $.jqx.dataAdapter(waterInvSource, {
475
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
666 beforeLoadComplete: function(records) {
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
667 var data, i, row;
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
668 data = new Array();
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
669 for (i = 0; i < records.length; i++) {
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
670 row = records[i];
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
671 if (row.inventory || row.unlimited_stock || ! waterinstock)
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
672 data.push(row);
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
673 }
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
674 return data;
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
675 },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
676 loadError: function(jqXHR, status, error) {
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
677 console.log(status + ' ' + error);
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
678 },
465
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
679 }),
144
ae15cfe5f008 Moved inventory dropdown lists to global.js
Michiel Broek <mbroek@mbse.eu>
parents: 139
diff changeset
680
149
ff45488d480e Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents: 148
diff changeset
681 // dropdownlist datasource from profile_water
465
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
682 waterProfileSource = {
475
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
683 datatype: 'json',
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
684 datafields: [
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
685 { name: 'record', type: 'number' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
686 { name: 'name', type: 'string' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
687 { name: 'calcium', type: 'float' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
688 { name: 'bicarbonate', type: 'float' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
689 { name: 'sulfate', type: 'float' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
690 { name: 'chloride', type: 'float' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
691 { name: 'sodium', type: 'float' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
692 { name: 'magnesium', type: 'float' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
693 { name: 'ph', type: 'float' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
694 { name: 'total_alkalinity', type: 'float' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
695 ],
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
696 url: 'includes/db_profile_water.php'
465
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
697 },
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
698 waterprofiles = new $.jqx.dataAdapter(waterProfileSource),
149
ff45488d480e Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents: 148
diff changeset
699
144
ae15cfe5f008 Moved inventory dropdown lists to global.js
Michiel Broek <mbroek@mbse.eu>
parents: 139
diff changeset
700 // dropdownlist datasource from profile_mash
465
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
701 mashProfileSource = {
475
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
702 datatype: 'json',
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
703 datafields: [
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
704 { name: 'record', type: 'number' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
705 { name: 'name', type: 'string' },
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
706 { name: 'steps', type: 'array' }
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
707 ],
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
708 url: 'includes/db_profile_mash.php'
465
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
709 },
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
710 mashlist = new $.jqx.dataAdapter(mashProfileSource),
13
b8c3ca152984 Added hops inventory
Michiel Broek <mbroek@mbse.eu>
parents:
diff changeset
711
438
61436d428454 Added Round() function. Start new sugar calculations. Compressed some code. Dropped seanterrill refracto formula and switched back to brouwhulp/halberstadt formula and allow SVG above 100% for saisons.
Michiel Broek <mbroek@mbse.eu>
parents: 430
diff changeset
712
61436d428454 Added Round() function. Start new sugar calculations. Compressed some code. Dropped seanterrill refracto formula and switched back to brouwhulp/halberstadt formula and allow SVG above 100% for saisons.
Michiel Broek <mbroek@mbse.eu>
parents: 430
diff changeset
713
61436d428454 Added Round() function. Start new sugar calculations. Compressed some code. Dropped seanterrill refracto formula and switched back to brouwhulp/halberstadt formula and allow SVG above 100% for saisons.
Michiel Broek <mbroek@mbse.eu>
parents: 430
diff changeset
714 /*
61436d428454 Added Round() function. Start new sugar calculations. Compressed some code. Dropped seanterrill refracto formula and switched back to brouwhulp/halberstadt formula and allow SVG above 100% for saisons.
Michiel Broek <mbroek@mbse.eu>
parents: 430
diff changeset
715 * From "Rekenen aan bier" by Hans Halberstadt.
61436d428454 Added Round() function. Start new sugar calculations. Compressed some code. Dropped seanterrill refracto formula and switched back to brouwhulp/halberstadt formula and allow SVG above 100% for saisons.
Michiel Broek <mbroek@mbse.eu>
parents: 430
diff changeset
716 */
475
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
717 K1s = 0.384, K1a = -0.177, K1e = 0.241, K1g = 0.247, Ks = 0.1415, Ka1 = 0.058, Ka2 = 0.078, Ke = 0.174, Kg = 0.109;
438
61436d428454 Added Round() function. Start new sugar calculations. Compressed some code. Dropped seanterrill refracto formula and switched back to brouwhulp/halberstadt formula and allow SVG above 100% for saisons.
Michiel Broek <mbroek@mbse.eu>
parents: 430
diff changeset
718
61436d428454 Added Round() function. Start new sugar calculations. Compressed some code. Dropped seanterrill refracto formula and switched back to brouwhulp/halberstadt formula and allow SVG above 100% for saisons.
Michiel Broek <mbroek@mbse.eu>
parents: 430
diff changeset
719 // =E2/E6+(E3/E6)*$B$24/$B$23+(E3/E6)*(E3/E6)*$B$25/$B$23+E4/E6*$B$26/$B$23+E5/E6*$B$27/$B$23
61436d428454 Added Round() function. Start new sugar calculations. Compressed some code. Dropped seanterrill refracto formula and switched back to brouwhulp/halberstadt formula and allow SVG above 100% for saisons.
Michiel Broek <mbroek@mbse.eu>
parents: 430
diff changeset
720 // For Brix
61436d428454 Added Round() function. Start new sugar calculations. Compressed some code. Dropped seanterrill refracto formula and switched back to brouwhulp/halberstadt formula and allow SVG above 100% for saisons.
Michiel Broek <mbroek@mbse.eu>
parents: 430
diff changeset
721 function A(sugar, volume, alc, eiwit, glycerol) {
61436d428454 Added Round() function. Start new sugar calculations. Compressed some code. Dropped seanterrill refracto formula and switched back to brouwhulp/halberstadt formula and allow SVG above 100% for saisons.
Michiel Broek <mbroek@mbse.eu>
parents: 430
diff changeset
722
475
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
723 var vol, A;
438
61436d428454 Added Round() function. Start new sugar calculations. Compressed some code. Dropped seanterrill refracto formula and switched back to brouwhulp/halberstadt formula and allow SVG above 100% for saisons.
Michiel Broek <mbroek@mbse.eu>
parents: 430
diff changeset
724
475
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
725 vol = volume * 1000;
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
726 A = sugar / vol + (alc / vol) * Ka1 / Ks + (alc / vol) * (alc / vol) * Ka2 / Ks + eiwit / vol * Ke / Ks + glycerol / vol * Kg / Ks;
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
727 console.log('A(' + sugar + ',' + volume + ',' + alc + ',' + eiwit + ',' + glycerol + '):' + A);
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
728 return A;
438
61436d428454 Added Round() function. Start new sugar calculations. Compressed some code. Dropped seanterrill refracto formula and switched back to brouwhulp/halberstadt formula and allow SVG above 100% for saisons.
Michiel Broek <mbroek@mbse.eu>
parents: 430
diff changeset
729 }
61436d428454 Added Round() function. Start new sugar calculations. Compressed some code. Dropped seanterrill refracto formula and switched back to brouwhulp/halberstadt formula and allow SVG above 100% for saisons.
Michiel Broek <mbroek@mbse.eu>
parents: 430
diff changeset
730
61436d428454 Added Round() function. Start new sugar calculations. Compressed some code. Dropped seanterrill refracto formula and switched back to brouwhulp/halberstadt formula and allow SVG above 100% for saisons.
Michiel Broek <mbroek@mbse.eu>
parents: 430
diff changeset
731 // =E2/E6+(E3/E6)*$B$20/$B$19+E4/E6*$B$21/$B$19+E5/E6*$B$22/$B$19
61436d428454 Added Round() function. Start new sugar calculations. Compressed some code. Dropped seanterrill refracto formula and switched back to brouwhulp/halberstadt formula and allow SVG above 100% for saisons.
Michiel Broek <mbroek@mbse.eu>
parents: 430
diff changeset
732 // for Plato
61436d428454 Added Round() function. Start new sugar calculations. Compressed some code. Dropped seanterrill refracto formula and switched back to brouwhulp/halberstadt formula and allow SVG above 100% for saisons.
Michiel Broek <mbroek@mbse.eu>
parents: 430
diff changeset
733 function B(sugar, volume, alc, eiwit, glycerol) {
61436d428454 Added Round() function. Start new sugar calculations. Compressed some code. Dropped seanterrill refracto formula and switched back to brouwhulp/halberstadt formula and allow SVG above 100% for saisons.
Michiel Broek <mbroek@mbse.eu>
parents: 430
diff changeset
734
475
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
735 var vol, B;
438
61436d428454 Added Round() function. Start new sugar calculations. Compressed some code. Dropped seanterrill refracto formula and switched back to brouwhulp/halberstadt formula and allow SVG above 100% for saisons.
Michiel Broek <mbroek@mbse.eu>
parents: 430
diff changeset
736
475
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
737 vol = volume * 1000;
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
738 B = sugar / vol + (alc / vol) * K1a / K1s + eiwit / vol * K1e / K1s + glycerol / vol * K1g / K1s;
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
739 console.log('B(' + sugar + ',' + volume + ',' + alc + ',' + eiwit + ',' + glycerol + '):' + B);
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
740 return B;
438
61436d428454 Added Round() function. Start new sugar calculations. Compressed some code. Dropped seanterrill refracto formula and switched back to brouwhulp/halberstadt formula and allow SVG above 100% for saisons.
Michiel Broek <mbroek@mbse.eu>
parents: 430
diff changeset
741 }
61436d428454 Added Round() function. Start new sugar calculations. Compressed some code. Dropped seanterrill refracto formula and switched back to brouwhulp/halberstadt formula and allow SVG above 100% for saisons.
Michiel Broek <mbroek@mbse.eu>
parents: 430
diff changeset
742
61436d428454 Added Round() function. Start new sugar calculations. Compressed some code. Dropped seanterrill refracto formula and switched back to brouwhulp/halberstadt formula and allow SVG above 100% for saisons.
Michiel Broek <mbroek@mbse.eu>
parents: 430
diff changeset
743
465
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
744
475
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
745 $(document).ready(function() {
465
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
746
475
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
747 $('#jqxMenu').jqxMenu({
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
748 width: 1280,
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
749 height: '30px',
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
750 autoOpen: false,
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
751 clickToOpen: true,
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
752 theme: theme
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
753 });
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
754 $('#jqxWidget').css('visibility', 'visible');
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
755
465
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
756 });
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
757
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
758
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
759
475
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
760 function Round(n, d) {
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
761 for (var i = 0, m = 1; i < d; i++, m *= 10);
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
762 return Math.round(n * m) / m;
98
92d6bc8a4cdd Added javascript formulas for color calculations. Added IBU total calculation. Better IBI calculation for the hop entries. Blocked selection of IBU calculation for Garetz, Mosher and Noonan. Better sg calculation in the recipe print.
Michiel Broek <mbroek@mbse.eu>
parents: 96
diff changeset
763 }
465
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
764
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
765
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
766
475
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
767 function ebc_to_srm(ebc) {
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
768 var srm = -1.32303E-12 * Math.pow(ebc, 4) - 0.00000000291515 * Math.pow(ebc, 3) + 0.00000818515 * Math.pow(ebc, 2) + 0.372038 * ebc + 0.596351;
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
769 if (srm < 0)
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
770 srm = 0;
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
771 return srm;
465
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
772 }
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
773
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
774
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
775
475
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
776 function srm_to_ebc(srm) {
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
777 var ebc = Math.round(0.000000000176506 * Math.pow(srm, 4) + 0.000000154529 * Math.pow(srm, 3) - 0.000159428 * Math.pow(srm, 2) + 2.68837 * srm - 1.6004);
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
778 if (ebc < 0)
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
779 ebc = 0;
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
780 return ebc;
98
92d6bc8a4cdd Added javascript formulas for color calculations. Added IBU total calculation. Better IBI calculation for the hop entries. Blocked selection of IBU calculation for Garetz, Mosher and Noonan. Better sg calculation in the recipe print.
Michiel Broek <mbroek@mbse.eu>
parents: 96
diff changeset
781 }
92d6bc8a4cdd Added javascript formulas for color calculations. Added IBU total calculation. Better IBI calculation for the hop entries. Blocked selection of IBU calculation for Garetz, Mosher and Noonan. Better sg calculation in the recipe print.
Michiel Broek <mbroek@mbse.eu>
parents: 96
diff changeset
782
92d6bc8a4cdd Added javascript formulas for color calculations. Added IBU total calculation. Better IBI calculation for the hop entries. Blocked selection of IBU calculation for Garetz, Mosher and Noonan. Better sg calculation in the recipe print.
Michiel Broek <mbroek@mbse.eu>
parents: 96
diff changeset
783
92d6bc8a4cdd Added javascript formulas for color calculations. Added IBU total calculation. Better IBI calculation for the hop entries. Blocked selection of IBU calculation for Garetz, Mosher and Noonan. Better sg calculation in the recipe print.
Michiel Broek <mbroek@mbse.eu>
parents: 96
diff changeset
784
462
c91175610f8a Code cleanup and compress.
Michiel Broek <mbroek@mbse.eu>
parents: 446
diff changeset
785 /* Return incremented color by the boil and yeast.
c91175610f8a Code cleanup and compress.
Michiel Broek <mbroek@mbse.eu>
parents: 446
diff changeset
786 * https://www.hobbybrouwen.nl/forum/index.php/topic,19020.msg281132.html#msg281132 */
475
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
787 function get_kt(ebc) {
465
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
788
475
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
789 var kt = 1;
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
790 if (ebc < 3)
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
791 kt = 3.5;
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
792 else if (ebc < 6)
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
793 kt = 3;
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
794 else if (ebc < 8)
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
795 kt = 2.75;
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
796 else if (ebc < 10)
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
797 kt = 2.5;
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
798 else if (ebc < 20)
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
799 kt = 1.8;
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
800 else if (ebc < 30)
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
801 kt = 1.6;
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
802 else if (ebc < 60)
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
803 kt = 1.3;
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
804 else if (ebc < 100)
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
805 kt = 1.2;
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
806 else if (ebc < 300)
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
807 kt = 1.1;
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
808 return kt;
372
1365b5e47130 Added color method written by Hans Halberstadt.
Michiel Broek <mbroek@mbse.eu>
parents: 371
diff changeset
809 }
465
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
810
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
811
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
812
475
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
813 function abvol(og, fg) {
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
814 if (((og - fg) < 0) || (fg < 0.9))
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
815 return 0;
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
816 var factor = og * 3157 * Math.pow(10, -5) + 9.716 * Math.pow(10, -2);
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
817 return (og * 1000 - fg * 1000) * factor;
133
22d28dd9c041 Added ABV calculation. Added calculate fermentables from OG calculation. Scale fermentables when the OG changes.
Michiel Broek <mbroek@mbse.eu>
parents: 121
diff changeset
818 }
22d28dd9c041 Added ABV calculation. Added calculate fermentables from OG calculation. Scale fermentables when the OG changes.
Michiel Broek <mbroek@mbse.eu>
parents: 121
diff changeset
819
22d28dd9c041 Added ABV calculation. Added calculate fermentables from OG calculation. Scale fermentables when the OG changes.
Michiel Broek <mbroek@mbse.eu>
parents: 121
diff changeset
820
22d28dd9c041 Added ABV calculation. Added calculate fermentables from OG calculation. Scale fermentables when the OG changes.
Michiel Broek <mbroek@mbse.eu>
parents: 121
diff changeset
821
462
c91175610f8a Code cleanup and compress.
Michiel Broek <mbroek@mbse.eu>
parents: 446
diff changeset
822 /* Kleurwerking naar SRM. Niet voor Halberstadt, Naudts */
475
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
823 function kw_to_srm(colormethod, c) {
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
824 if (colormethod == 0)
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
825 return 1.4922 * Math.pow(c, 0.6859); //Morey
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
826 if (colormethod == 1)
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
827 return 0.3 * c + 4.7; //Mosher
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
828 if (colormethod == 2)
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
829 return 0.2 * c + 8.4; //Daniels
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
830 return 0; //Halberstadt,Naudts
98
92d6bc8a4cdd Added javascript formulas for color calculations. Added IBU total calculation. Better IBI calculation for the hop entries. Blocked selection of IBU calculation for Garetz, Mosher and Noonan. Better sg calculation in the recipe print.
Michiel Broek <mbroek@mbse.eu>
parents: 96
diff changeset
831 }
465
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
832
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
833
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
834
475
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
835 function kw_to_ebc(colormethod, c) {
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
836 return srm_to_ebc(kw_to_srm(colormethod, c));
465
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
837 }
98
92d6bc8a4cdd Added javascript formulas for color calculations. Added IBU total calculation. Better IBI calculation for the hop entries. Blocked selection of IBU calculation for Garetz, Mosher and Noonan. Better sg calculation in the recipe print.
Michiel Broek <mbroek@mbse.eu>
parents: 96
diff changeset
838
92d6bc8a4cdd Added javascript formulas for color calculations. Added IBU total calculation. Better IBI calculation for the hop entries. Blocked selection of IBU calculation for Garetz, Mosher and Noonan. Better sg calculation in the recipe print.
Michiel Broek <mbroek@mbse.eu>
parents: 96
diff changeset
839
92d6bc8a4cdd Added javascript formulas for color calculations. Added IBU total calculation. Better IBI calculation for the hop entries. Blocked selection of IBU calculation for Garetz, Mosher and Noonan. Better sg calculation in the recipe print.
Michiel Broek <mbroek@mbse.eu>
parents: 96
diff changeset
840
59
ad28e09e3abd Added Tinseth IBU calculation.
Michiel Broek <mbroek@mbse.eu>
parents: 34
diff changeset
841 /*
ad28e09e3abd Added Tinseth IBU calculation.
Michiel Broek <mbroek@mbse.eu>
parents: 34
diff changeset
842 * Berekeningen uit https://www.hobbybrouwen.nl/forum/index.php/topic,6079.msg69464.html#msg69464
ad28e09e3abd Added Tinseth IBU calculation.
Michiel Broek <mbroek@mbse.eu>
parents: 34
diff changeset
843 */
465
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
844 function toIBU(Use, Form, SG, Volume, Amount, Boiltime, Alpha, Method) {
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
845
475
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
846 var gravity, liters, alpha, mass, time, fmoment = 1.0, pfactor = 1.0, ibu = 0, boilfactor, sgfactor,
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
847 AddedAlphaAcids, Bigness_factor, BoilTime_factor, utiisation;
465
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
848
475
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
849 gravity = parseFloat(SG);
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
850 liters = parseFloat(Volume);
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
851 alpha = parseFloat(Alpha) / 100;
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
852 mass = parseFloat(Amount) * 1000;
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
853 time = parseFloat(Boiltime);
465
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
854
475
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
855 if ((Use == 3) || (Use == 4) || (Use == 5)) { // Aroma, Whirlpool or Dry hop.
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
856 fmoment = 0.0;
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
857 } else if (Use == 0) { // Mash
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
858 fmoment += my_factor_mashhop / 100; // Brouwhulp
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
859 } else if (Use == 1) { // First wort
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
860 fmoment += my_factor_fwh / 100; // Brouwhulp, Louis, Ozzie
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
861 }
465
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
862
475
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
863 if (Form == 0) { // Pellet
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
864 pfactor += my_factor_pellet / 100;
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
865 } else if (Form == 1) { // Plug
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
866 pfactor += my_factor_plug / 100;
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
867 } else if (Form == 3) { // Wet leaf
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
868 pfactor += my_factor_wethop / 100; // From https://github.com/chrisgilmerproj/brewday/blob/master/brew/constants.py
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
869 } else if (Form == 4) { // Cryo hop
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
870 pfactor += my_factor_cryohop / 100;
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
871 }
59
ad28e09e3abd Added Tinseth IBU calculation.
Michiel Broek <mbroek@mbse.eu>
parents: 34
diff changeset
872
475
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
873 if (Method == 0) { // Tinseth
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
874 /* http://realbeer.com/hops/research.html */
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
875 AddedAlphaAcids = (alpha * mass * 1000) / liters;
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
876 Bigness_factor = 1.65 * Math.pow(0.000125, gravity - 1);
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
877 BoilTime_factor = ((1 - Math.exp(-0.04 * time)) / 4.15);
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
878 utiisation = Bigness_factor * BoilTime_factor;
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
879 ibu = Round(utiisation * AddedAlphaAcids * fmoment * pfactor, 1);
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
880 }
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
881 if (Method == 2) { // Daniels
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
882 if (Form == 2) // Leaf
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
883 boilfactor = -(0.0041 * time * time) + (0.6162 * time) + 1.5779;
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
884 else
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
885 boilfactor = -(0.0051 * time * time) + (0.7835 * time) + 1.9348;
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
886 if (gravity < 1050)
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
887 sgfactor = 0;
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
888 else
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
889 sgfactor = (gravity - 1050) / 200;
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
890 ibu = Round(fmoment * ((mass * (alpha * 100) * boilfactor * 0.1) / (liters * (1 + sgfactor))), 1);
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
891 }
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
892 if (Method == 1) { // Rager
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
893 boilfactor = fmoment * 18.11 + 13.86 * Math.tanh((time * 31.32) / 18.27);
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
894 if (gravity < 1050)
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
895 sgfactor = 0;
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
896 else
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
897 sgfactor = (gravity - 1050) / 200;
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
898 ibu = Round((mass * (alpha * 100) * boilfactor * 0.1) / (liters * (1 + sgfactor)), 1);
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
899 }
59
ad28e09e3abd Added Tinseth IBU calculation.
Michiel Broek <mbroek@mbse.eu>
parents: 34
diff changeset
900
475
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
901 //console.log("toIBU("+Use+","+Form+","+SG+","+Volume+","+Amount+","+Boiltime+","+Alpha+","+Method+"):"+ibu+" fm:"+fmoment+" pf:"+pfactor);
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
902 return ibu;
446
ee7bcfb8e270 Added Cryo Hops type.
Michiel Broek <mbroek@mbse.eu>
parents: 439
diff changeset
903 }
59
ad28e09e3abd Added Tinseth IBU calculation.
Michiel Broek <mbroek@mbse.eu>
parents: 34
diff changeset
904
465
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
905
59
ad28e09e3abd Added Tinseth IBU calculation.
Michiel Broek <mbroek@mbse.eu>
parents: 34
diff changeset
906
475
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
907 function ebc_to_color(ebc) {
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
908 return srm_to_color(ebc_to_srm(ebc));
59
ad28e09e3abd Added Tinseth IBU calculation.
Michiel Broek <mbroek@mbse.eu>
parents: 34
diff changeset
909 }
ad28e09e3abd Added Tinseth IBU calculation.
Michiel Broek <mbroek@mbse.eu>
parents: 34
diff changeset
910
ad28e09e3abd Added Tinseth IBU calculation.
Michiel Broek <mbroek@mbse.eu>
parents: 34
diff changeset
911
ad28e09e3abd Added Tinseth IBU calculation.
Michiel Broek <mbroek@mbse.eu>
parents: 34
diff changeset
912
475
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
913 function srm_to_color(srm) {
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
914 var i, R, G, B, color, result;
465
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
915
475
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
916 i = Math.round(srm * 10);
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
917 if (i < 0)
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
918 i = 0;
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
919 if (i > 299)
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
920 i = 299;
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
921
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
922 /* Table copied from Brouwhulp/BrewBuddy */
465
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
923
475
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
924 R = [
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
925 250, 250, 250, 250, 250, 250, 250, 250, 250, 250, 250, 250, 250, 250, 250, 250, 250, 250, 250, 250, //0
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
926 250, 250, 250, 250, 250, 249, 248, 247, 246, 245, 244, 243, 242, 241, 240, 239, 238, 237, 236, 235, //2
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
927 234, 233, 232, 231, 230, 229, 228, 227, 226, 225, 224, 223, 222, 221, 220, 219, 218, 217, 216, 215, //4
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
928 214, 213, 212, 211, 210, 209, 208, 207, 206, 205, 204, 203, 202, 201, 200, 200, 199, 199, 198, 198, //6
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
929 197, 197, 196, 196, 195, 195, 194, 194, 193, 193, 192, 192, 192, 192, 192, 192, 192, 192, 192, 192, //8
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
930 192, 192, 192, 192, 192, 192, 192, 192, 192, 192, 192, 192, 192, 192, 192, 192, 192, 192, 192, 192, //10
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
931 192, 192, 192, 192, 192, 192, 192, 192, 191, 190, 189, 188, 187, 186, 185, 184, 183, 182, 181, 180, //12
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
932 179, 178, 177, 175, 174, 172, 171, 169, 168, 167, 195, 164, 162, 161, 159, 158, 157, 155, 154, 152, //14
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
933 151, 149, 148, 147, 145, 144, 142, 141, 139, 138, 137, 135, 134, 132, 131, 129, 128, 127, 125, 124, //16
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
934 122, 121, 119, 118, 117, 115, 114, 112, 111, 109, 108, 107, 105, 104, 102, 101, 99, 98, 97, 95, //18
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
935 94, 92, 91, 89, 88, 87, 85, 84, 82, 81, 79, 78, 77, 75, 74, 72, 71, 69, 68, 67, //20
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
936 65, 64, 62, 61, 59, 58, 57, 55, 54, 52, 51, 49, 48, 47, 45, 44, 43, 41, 39, 38, //22
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
937 37, 37, 36, 36, 35, 35, 34, 34, 33, 33, 32, 32, 31, 31, 30, 30, 29, 29, 28, 28, //24
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
938 27, 27, 26, 26, 25, 25, 24, 24, 23, 23, 22, 22, 21, 21, 20, 20, 19, 19, 18, 18, //26
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
939 17, 17, 16, 16, 15, 15, 14, 14, 13, 13, 12, 12, 11, 11, 10, 10, 9, 9, 8, 8];
465
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
940
475
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
941 G = [
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
942 250, 250, 250, 250, 250, 250, 250, 250, 250, 250, 250, 250, 250, 250, 250, 250, 250, 250, 250, 250,
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
943 250, 250, 250, 250, 250, 250, 249, 248, 247, 246, 245, 244, 242, 240, 238, 236, 234, 232, 230, 228,
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
944 226, 224, 222, 220, 218, 216, 214, 212, 210, 208, 206, 204, 202, 200, 198, 196, 194, 192, 190, 188,
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
945 186, 184, 182, 180, 178, 176, 174, 172, 170, 168, 166, 164, 162, 160, 158, 156, 154, 152, 150, 148,
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
946 146, 144, 142, 141, 140, 139, 139, 138, 137, 136, 136, 135, 134, 133, 133, 132, 131, 130, 130, 129,
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
947 128, 127, 127, 126, 125, 124, 124, 123, 122, 121, 121, 120, 119, 118, 118, 117, 116, 115, 115, 114,
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
948 113, 112, 112, 111, 110, 109, 109, 108, 107, 106, 106, 105, 104, 103, 103, 102, 101, 100, 100, 99,
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
949 98, 97, 97, 96, 95, 94, 94, 93, 92, 91, 91, 90, 89, 88, 88, 87, 86, 85, 85, 84,
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
950 83, 82, 82, 81, 80, 79, 78, 77, 76, 75, 75, 74, 73, 72, 72, 71, 70, 69, 69, 68,
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
951 67, 66, 66, 65, 64, 63, 63, 62, 61, 60, 60, 59, 58, 57, 57, 56, 55, 54, 54, 53,
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
952 52, 51, 51, 50, 49, 48, 48, 47, 46, 45, 45, 44, 43, 42, 42, 41, 40, 39, 39, 38,
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
953 37, 36, 36, 35, 34, 33, 33, 32, 31, 30, 30, 29, 28, 27, 27, 26, 25, 24, 24, 23,
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
954 22, 22, 22, 21, 21, 21, 20, 20, 20, 19, 19, 19, 18, 18, 18, 17, 17, 17, 16, 16,
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
955 16, 15, 15, 15, 14, 14, 14, 13, 13, 13, 12, 12, 12, 11, 11, 11, 10, 10, 10, 9,
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
956 9, 9, 8, 8, 8, 7, 7, 7, 6, 6, 6, 5, 5, 5, 4, 4, 4, 3, 3, 3];
465
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
957
475
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
958 B = [
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
959 210, 204, 199, 193, 188, 182, 177, 171, 166, 160, 155, 149, 144, 138, 133, 127, 122, 116, 111, 105,
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
960 100, 94, 89, 83, 78, 72, 67, 61, 56, 50, 45, 45, 45, 46, 46, 46, 46, 47, 47, 47,
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
961 47, 48, 48, 48, 48, 49, 49, 49, 49, 50, 50, 50, 50, 51, 51, 51, 51, 52, 52, 52,
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
962 52, 53, 53, 53, 53, 54, 54, 54, 54, 55, 55, 55, 55, 56, 56, 56, 56, 56, 56, 56,
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
963 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56,
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
964 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56,
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
965 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56, 56,
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
966 56, 56, 56, 55, 55, 55, 55, 54, 54, 54, 54, 53, 53, 53, 53, 52, 52, 52, 52, 51,
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
967 51, 51, 51, 50, 50, 50, 50, 49, 49, 48, 47, 47, 46, 45, 45, 44, 43, 43, 42, 41,
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
968 41, 40, 39, 39, 38, 37, 37, 36, 35, 34, 33, 32, 31, 29, 28, 27, 26, 25, 24, 23,
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
969 21, 20, 19, 18, 17, 16, 15, 13, 12, 11, 10, 9, 8, 9, 9, 10, 10, 11, 11, 12,
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
970 12, 13, 13, 14, 14, 15, 15, 16, 16, 17, 17, 18, 18, 19, 19, 20, 20, 21, 21, 22,
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
971 21, 21, 21, 20, 20, 20, 19, 19, 19, 18, 18, 18, 17, 17, 17, 17, 16, 16, 15, 15,
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
972 15, 14, 14, 14, 13, 13, 13, 12, 12, 12, 11, 11, 11, 10, 10, 10, 9, 9, 9, 8,
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
973 8, 8, 7, 7, 7, 6, 6, 6, 5, 5, 5, 4, 4, 4, 3, 3, 3, 2, 2, 2];
465
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
974
475
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
975 color = R[i] * 65536 + G[i] * 256 + B[i];
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
976 result = color.toString(16).toUpperCase();
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
977 if (result.length < 6)
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
978 result = '0' + result;
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
979 return '#' + result;
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
980 }
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
981
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
982
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
983
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
984 function sg_to_plato(sg) {
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
985 return ((135.997 * sg - 630.272) * sg + 1111.14) * sg - 616.868;
139
eb1ac7487710 Added EBC color examples. Added simple progessbars for hop flavour and aroma contribution. We need something better. In the fermentables tab, above the grid display the malt color and OG estimates. Display supplier as well in the fermentables grid.
Michiel Broek <mbroek@mbse.eu>
parents: 136
diff changeset
986 }
eb1ac7487710 Added EBC color examples. Added simple progessbars for hop flavour and aroma contribution. We need something better. In the fermentables tab, above the grid display the malt color and OG estimates. Display supplier as well in the fermentables grid.
Michiel Broek <mbroek@mbse.eu>
parents: 136
diff changeset
987
eb1ac7487710 Added EBC color examples. Added simple progessbars for hop flavour and aroma contribution. We need something better. In the fermentables tab, above the grid display the malt color and OG estimates. Display supplier as well in the fermentables grid.
Michiel Broek <mbroek@mbse.eu>
parents: 136
diff changeset
988
eb1ac7487710 Added EBC color examples. Added simple progessbars for hop flavour and aroma contribution. We need something better. In the fermentables tab, above the grid display the malt color and OG estimates. Display supplier as well in the fermentables grid.
Michiel Broek <mbroek@mbse.eu>
parents: 136
diff changeset
989
475
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
990 function plato_to_sg(plato) {
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
991 return 1 + (plato / (258.6 - ((plato / 258.2) * 227.1)));
465
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
992 }
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
993
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
994
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
995
475
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
996 function brix_to_sg(brix) {
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
997 if (my_brix_correction > 0)
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
998 return plato_to_sg(brix / my_brix_correction);
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
999 else
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
1000 return plato_to_sg(brix);
465
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
1001 }
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
1002
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
1003
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
1004
475
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
1005 function sg_to_brix(sg) {
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
1006 return sg_to_plato(sg) * my_brix_correction;
465
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
1007 }
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
1008
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
1009
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
1010
475
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
1011 function estimate_sg(sugars, batch_size) {
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
1012
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
1013 var plato, sg, i;
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
1014
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
1015 plato = 100 * sugars / batch_size;
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
1016 sg = plato_to_sg(plato);
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
1017 for (i = 0; i < 20; i++) {
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
1018 if (sg > 0)
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
1019 plato = 100 * sugars / (batch_size * sg);
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
1020 sg = plato_to_sg(plato);
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
1021 }
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
1022 return Round(sg, 4);
465
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
1023 }
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
1024
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
1025
282
f765249d57d7 ABV calculation uses Daniels method. sg_to_plato and plato_to_sg functions use brewersfriend calculation. Added sg_to_brix and brix_to_sg functions. Make brewdate tab read only when the primary fermentation is ready. Brix aid input functions for primary end sg and final sg fields. Added tooltips on the fermentation tab. Changes in the layout of the fermentation tab.
Michiel Broek <mbroek@mbse.eu>
parents: 278
diff changeset
1026
475
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
1027 function estimate_fg(percSugar, percCara, WGratio, TotTme, Temp, attenuation, og) {
465
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
1028
475
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
1029 var BD, AttBeer, fg;
136
bcc4583fd013 Fixed estimate FG calculation during recipes import. Added estimate FG calculation in the recipe editor but do not yet update the recipe. Added SVG calculation to the recipes editor. Added calculations for hop aroma and flavour contribution.
Michiel Broek <mbroek@mbse.eu>
parents: 133
diff changeset
1030
475
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
1031 if (percSugar > 40)
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
1032 percSugar = 0;
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
1033 if (percCara > 50)
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
1034 percCara = 0;
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
1035 if ((WGratio > 0) && (TotTme > 0)) {
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
1036 BD = WGratio;
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
1037 if (BD < 2)
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
1038 BD = 2;
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
1039 if (BD > 5.5)
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
1040 BD = 5.5;
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
1041 if (Temp < 60)
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
1042 Temp = 60;
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
1043 if (Temp > 72)
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
1044 Temp = 72;
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
1045 } else {
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
1046 BD = 3.5;
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
1047 Temp = 67;
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
1048 TotTme = 75;
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
1049 }
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
1050 if (attenuation < 30)
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
1051 attenuation = 77;
136
bcc4583fd013 Fixed estimate FG calculation during recipes import. Added estimate FG calculation in the recipe editor but do not yet update the recipe. Added SVG calculation to the recipes editor. Added calculations for hop aroma and flavour contribution.
Michiel Broek <mbroek@mbse.eu>
parents: 133
diff changeset
1052
475
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
1053 // 0.00825 Attenuation factor yeast
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
1054 // 0.00817 Attenuation factor water/grain ration
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
1055 // -0.00684 Attenuation factor mash temperature
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
1056 // 0.00026 Attenuation factor total mash time (at some places this is 0.0026 this is wrong!)
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
1057 // -0.00356 Attenuation factor percentage crystal malt
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
1058 // 0.00553 Attenuation factor percentage simple sugars
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
1059 // 0.547 Attenuation factor constant
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
1060 AttBeer = 0.00825 * attenuation + 0.00817 * BD - 0.00684 * Temp + 0.00026 * TotTme - 0.00356 * percCara + 0.00553 * percSugar + 0.547;
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
1061 fg = Round(1 + (1 - AttBeer) * (og - 1), 4);
241
e95d2886f49f Added soe extra debug logging in db_product.php. Automatic stage increment in the product editor. On the brewday tab added tooltips.
Michiel Broek <mbroek@mbse.eu>
parents: 232
diff changeset
1062
475
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
1063 console.log('estimate_fg(' + percSugar + ',' + percCara + ',' + BD + ',' + TotTme + ',' +
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
1064 Temp + ',' + attenuation + ',' + og + ') AttBeer:' + AttBeer + ' fg:' + fg);
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
1065 return fg;
136
bcc4583fd013 Fixed estimate FG calculation during recipes import. Added estimate FG calculation in the recipe editor but do not yet update the recipe. Added SVG calculation to the recipes editor. Added calculations for hop aroma and flavour contribution.
Michiel Broek <mbroek@mbse.eu>
parents: 133
diff changeset
1066 }
bcc4583fd013 Fixed estimate FG calculation during recipes import. Added estimate FG calculation in the recipe editor but do not yet update the recipe. Added SVG calculation to the recipes editor. Added calculations for hop aroma and flavour contribution.
Michiel Broek <mbroek@mbse.eu>
parents: 133
diff changeset
1067
bcc4583fd013 Fixed estimate FG calculation during recipes import. Added estimate FG calculation in the recipe editor but do not yet update the recipe. Added SVG calculation to the recipes editor. Added calculations for hop aroma and flavour contribution.
Michiel Broek <mbroek@mbse.eu>
parents: 133
diff changeset
1068
371
023ca640b5af Fixed spelling error and Capitals
Michiel Broek <mbroek@mbse.eu>
parents: 337
diff changeset
1069
149
ff45488d480e Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents: 148
diff changeset
1070 function CalcFrac(TpH, pK1, pK2, pK3) {
ff45488d480e Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents: 148
diff changeset
1071
475
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
1072 var r1d, r2d, r3d, dd, f2d, f3d, f4d;
465
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
1073
475
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
1074 r1d = Math.pow(10, TpH - pK1);
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
1075 r2d = Math.pow(10, TpH - pK2);
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
1076 r3d = Math.pow(10, TpH - pK3);
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
1077 dd = 1 / (1 + r1d + r1d * r2d + r1d * r2d * r3d);
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
1078 f2d = r1d * dd;
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
1079 f3d = r1d * r2d * dd;
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
1080 f4d = r1d * r2d * r3d * dd;
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
1081 return f2d + 2 * f3d + 3 * f4d;
149
ff45488d480e Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents: 148
diff changeset
1082 }
ff45488d480e Added some icons from Brewersfriend. They should be replaced someday. Added maximum mash weight setting to the equipment database. Usefull for brew automate and RIMS systems. During recipes import acid and base additions are translated. Brews and recipes now have 2 water sources. Added water mixer. Added basic water treatment, but not for pH yet. Redesigned the fermentables and water tabs.
Michiel Broek <mbroek@mbse.eu>
parents: 148
diff changeset
1083
376
1de1623e1760 Inventory fermentables convert diastatic power between kolbach and lintner. In recipe and product editors calculate the recipe lintner value. For now a raw presentation of the outcome.
Michiel Broek <mbroek@mbse.eu>
parents: 373
diff changeset
1084
465
dc3e14b976be Global javascript code cleanup and optimisation
Michiel Broek <mbroek@mbse.eu>
parents: 463
diff changeset
1085
376
1de1623e1760 Inventory fermentables convert diastatic power between kolbach and lintner. In recipe and product editors calculate the recipe lintner value. For now a raw presentation of the outcome.
Michiel Broek <mbroek@mbse.eu>
parents: 373
diff changeset
1086 function lintner_to_kolbach(lintner) {
475
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
1087 return (3.5 * lintner) - 16;
376
1de1623e1760 Inventory fermentables convert diastatic power between kolbach and lintner. In recipe and product editors calculate the recipe lintner value. For now a raw presentation of the outcome.
Michiel Broek <mbroek@mbse.eu>
parents: 373
diff changeset
1088 }
1de1623e1760 Inventory fermentables convert diastatic power between kolbach and lintner. In recipe and product editors calculate the recipe lintner value. For now a raw presentation of the outcome.
Michiel Broek <mbroek@mbse.eu>
parents: 373
diff changeset
1089
1de1623e1760 Inventory fermentables convert diastatic power between kolbach and lintner. In recipe and product editors calculate the recipe lintner value. For now a raw presentation of the outcome.
Michiel Broek <mbroek@mbse.eu>
parents: 373
diff changeset
1090
1de1623e1760 Inventory fermentables convert diastatic power between kolbach and lintner. In recipe and product editors calculate the recipe lintner value. For now a raw presentation of the outcome.
Michiel Broek <mbroek@mbse.eu>
parents: 373
diff changeset
1091 function kolbach_to_lintner(kolbach) {
475
c34d71572023 code cleanup checked bu gjslint
Michiel Broek <mbroek@mbse.eu>
parents: 465
diff changeset
1092 return (kolbach + 16) / 3.5;
376
1de1623e1760 Inventory fermentables convert diastatic power between kolbach and lintner. In recipe and product editors calculate the recipe lintner value. For now a raw presentation of the outcome.
Michiel Broek <mbroek@mbse.eu>
parents: 373
diff changeset
1093 }
1de1623e1760 Inventory fermentables convert diastatic power between kolbach and lintner. In recipe and product editors calculate the recipe lintner value. For now a raw presentation of the outcome.
Michiel Broek <mbroek@mbse.eu>
parents: 373
diff changeset
1094
1de1623e1760 Inventory fermentables convert diastatic power between kolbach and lintner. In recipe and product editors calculate the recipe lintner value. For now a raw presentation of the outcome.
Michiel Broek <mbroek@mbse.eu>
parents: 373
diff changeset
1095

mercurial