Wed, 15 Apr 2020 20:18:00 +0200
Changed priming sugar calculation to Brew by the Numbers by Michael L. Hall. This gives a bit higher and better amount of sugar to use. Removed dead parameter from the ResCO2 function.
23
4b157d7a1cee
Added first part of mash profiles. Steps are in the database but not in the web ui.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
1 | /***************************************************************************** |
286
124af734af68
Version 0.1.0. Removed localization because it was messy, parts were localized and others not. In production and recipes ingredients not in stock are marked in red.
Michiel Broek <mbroek@mbse.eu>
parents:
245
diff
changeset
|
2 | * Copyright (C) 2014-2019 |
23
4b157d7a1cee
Added first part of mash profiles. Steps are in the database but not in the web ui.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
3 | * |
4b157d7a1cee
Added first part of mash profiles. Steps are in the database but not in the web ui.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
4 | * Michiel Broek <mbroek at mbse dot eu> |
4b157d7a1cee
Added first part of mash profiles. Steps are in the database but not in the web ui.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
5 | * |
4b157d7a1cee
Added first part of mash profiles. Steps are in the database but not in the web ui.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
6 | * This file is part of BrewCloud |
4b157d7a1cee
Added first part of mash profiles. Steps are in the database but not in the web ui.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
7 | * |
4b157d7a1cee
Added first part of mash profiles. Steps are in the database but not in the web ui.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
8 | * This is free software; you can redistribute it and/or modify it |
4b157d7a1cee
Added first part of mash profiles. Steps are in the database but not in the web ui.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
9 | * under the terms of the GNU General Public License as published by the |
4b157d7a1cee
Added first part of mash profiles. Steps are in the database but not in the web ui.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
10 | * Free Software Foundation; either version 2, or (at your option) any |
4b157d7a1cee
Added first part of mash profiles. Steps are in the database but not in the web ui.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
11 | * later version. |
4b157d7a1cee
Added first part of mash profiles. Steps are in the database but not in the web ui.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
12 | * |
4b157d7a1cee
Added first part of mash profiles. Steps are in the database but not in the web ui.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
13 | * BrewCloud is distributed in the hope that it will be useful, but |
4b157d7a1cee
Added first part of mash profiles. Steps are in the database but not in the web ui.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
14 | * WITHOUT ANY WARRANTY; without even the implied warranty of |
4b157d7a1cee
Added first part of mash profiles. Steps are in the database but not in the web ui.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
15 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
4b157d7a1cee
Added first part of mash profiles. Steps are in the database but not in the web ui.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
16 | * General Public License for more details. |
4b157d7a1cee
Added first part of mash profiles. Steps are in the database but not in the web ui.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
17 | * |
4b157d7a1cee
Added first part of mash profiles. Steps are in the database but not in the web ui.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
18 | * You should have received a copy of the GNU General Public License |
4b157d7a1cee
Added first part of mash profiles. Steps are in the database but not in the web ui.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
19 | * along with ThermFerm; see the file COPYING. If not, write to the Free |
4b157d7a1cee
Added first part of mash profiles. Steps are in the database but not in the web ui.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
20 | * Software Foundation, 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. |
4b157d7a1cee
Added first part of mash profiles. Steps are in the database but not in the web ui.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
21 | *****************************************************************************/ |
4b157d7a1cee
Added first part of mash profiles. Steps are in the database but not in the web ui.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
22 | |
4b157d7a1cee
Added first part of mash profiles. Steps are in the database but not in the web ui.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
23 | |
4b157d7a1cee
Added first part of mash profiles. Steps are in the database but not in the web ui.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
24 | function createDelElements() { |
523
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
25 | $('#eventWindow').jqxWindow({ |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
26 | theme: theme, |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
27 | position: { x: 490, y: 210 }, |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
28 | width: 300, |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
29 | height: 175, |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
30 | resizable: false, |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
31 | isModal: true, |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
32 | modalOpacity: 0.4, |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
33 | okButton: $('#delOk'), |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
34 | cancelButton: $('#delCancel'), |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
35 | initContent: function() { |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
36 | $('#delOk').jqxButton({ template: 'danger', width: '65px', theme: theme }); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
37 | $('#delCancel').jqxButton({ template: 'success', width: '65px', theme: theme }); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
38 | $('#delCancel').focus(); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
39 | } |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
40 | }); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
41 | $('#eventWindow').jqxWindow('hide'); |
23
4b157d7a1cee
Added first part of mash profiles. Steps are in the database but not in the web ui.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
42 | } |
4b157d7a1cee
Added first part of mash profiles. Steps are in the database but not in the web ui.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
43 | |
4b157d7a1cee
Added first part of mash profiles. Steps are in the database but not in the web ui.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
44 | |
523
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
45 | $(document).ready(function() { |
215
83cee005d2d9
Fixed the utf-8 problems when storing json arrays on the server by using manual encoding. The json-encode function sucks for this project. Added step detail edit screen instead of on grid cell editing. This must go into the product and recipe editors too.
Michiel Broek <mbroek@mbse.eu>
parents:
213
diff
changeset
|
46 | |
523
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
47 | // tooltips |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
48 | $('#name').jqxTooltip({ content: 'De naam voor dit maisch profiel.' }); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
49 | $('#notes').jqxTooltip({ content: 'De uitgebreide opmerkingen over dit maisch profiel.' }); |
494
af28ebe4a779
Fixed as much as possible warnings from the yui-compressor.
Michiel Broek <mbroek@mbse.eu>
parents:
483
diff
changeset
|
50 | |
523
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
51 | var steprow = 0, |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
52 | stepData = {}, |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
53 | dataRecord = {}, |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
54 | url = 'includes/db_profile_mash.php', |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
55 | source = { |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
56 | datatype: 'json', |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
57 | cache: false, |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
58 | datafields: [ |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
59 | { name: 'record', type: 'number' }, |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
60 | { name: 'name', type: 'string' }, |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
61 | { name: 'notes', type: 'string' }, |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
62 | { name: 'steps', type: 'array' } |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
63 | ], |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
64 | id: 'record', |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
65 | url: url, |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
66 | deleterow: function(rowid, commit) { |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
67 | var data = 'delete=true&' + $.param({ record: rowid }); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
68 | $.ajax({ |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
69 | dataType: 'json', |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
70 | url: url, |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
71 | cache: false, |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
72 | data: data, |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
73 | type: 'POST', |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
74 | success: function(data, status, xhr) { |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
75 | commit(true); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
76 | console.log('mash deleterow ' + rowid + ' success'); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
77 | location.reload(true); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
78 | }, |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
79 | error: function(jqXHR, textStatus, errorThrown) { |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
80 | commit(false); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
81 | console.log('mash deleterow ' + textStatus); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
82 | } |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
83 | }); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
84 | }, |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
85 | addrow: function(rowid, rowdata, position, commit) { |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
86 | var data = 'insert=true&' + $.param(rowdata); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
87 | $.ajax({ |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
88 | dataType: 'json', |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
89 | url: url, |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
90 | cache: false, |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
91 | data: data, |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
92 | type: 'POST', |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
93 | success: function(data, status, xhr) { |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
94 | commit(true); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
95 | console.log('mash addrow ' + rowid + ' success'); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
96 | location.reload(true); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
97 | }, |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
98 | error: function(jqXHR, textStatus, errorThrown) { |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
99 | commit(false); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
100 | console.log('mash addrow ' + textStatus); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
101 | } |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
102 | }); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
103 | }, |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
104 | updaterow: function(rowid, rowdata, commit) { |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
105 | var data = 'update=true&' + $.param(rowdata); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
106 | $.ajax({ |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
107 | dataType: 'json', |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
108 | url: url, |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
109 | cache: false, |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
110 | data: data, |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
111 | type: 'POST', |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
112 | success: function(data, status, xhr) { |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
113 | commit(true); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
114 | console.log('mash updaterow ' + rowid + ' success'); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
115 | location.reload(true); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
116 | }, |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
117 | error: function(jqXHR, textStatus, errorThrown) { |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
118 | commit(false); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
119 | console.log('mash updaterow ' + textStatus); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
120 | } |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
121 | }); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
122 | } |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
123 | }, |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
124 | dataAdapter = new $.jqx.dataAdapter(source), |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
125 | editrow = -1, |
482
ce814c787b79
Fixed not creating new records
Michiel Broek <mbroek@mbse.eu>
parents:
286
diff
changeset
|
126 | |
523
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
127 | // Inline steps editor |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
128 | editsteps = function(data) { |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
129 | var generaterow = function() { |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
130 | var row = {}; |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
131 | row['step_name'] = 'Stap 1'; |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
132 | row['step_type'] = 0; |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
133 | row['step_temp'] = 62.0; |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
134 | row['step_time'] = 20.0; |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
135 | row['ramp_time'] = 1.0; |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
136 | row['end_temp'] = 62.0; |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
137 | return row; |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
138 | }; |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
139 | var stepSource = { |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
140 | localdata: data.steps, |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
141 | datatype: 'local', |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
142 | datafields: [ |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
143 | { name: 'step_name', type: 'string' }, |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
144 | { name: 'step_type', type: 'int' }, |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
145 | { name: 'step_temp', type: 'float' }, |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
146 | { name: 'step_time', type: 'float' }, |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
147 | { name: 'ramp_time', type: 'float' }, |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
148 | { name: 'end_temp', type: 'float' } |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
149 | ], |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
150 | addrow: function(rowid, rowdata, position, commit) { |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
151 | commit(true); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
152 | }, |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
153 | deleterow: function(rowid, commit) { |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
154 | commit(true); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
155 | } |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
156 | }, |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
157 | stepAdapter = new $.jqx.dataAdapter(stepSource); |
494
af28ebe4a779
Fixed as much as possible warnings from the yui-compressor.
Michiel Broek <mbroek@mbse.eu>
parents:
483
diff
changeset
|
158 | |
523
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
159 | $('#grid').jqxGrid({ |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
160 | width: 1020, |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
161 | height: 330, |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
162 | source: stepAdapter, |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
163 | theme: theme, |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
164 | selectionmode: 'singlerow', |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
165 | showtoolbar: true, |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
166 | rendertoolbar: function(toolbar) { |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
167 | var container = $('<div style="margin: 5px;"></div>'); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
168 | toolbar.append(container); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
169 | container.append('<input style="margin-left: 100px;" id="addrowbutton" type="button" value="Nieuwe stap" />'); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
170 | container.append('<input style="margin-left: 450px;" id="deleterowbutton" type="button" value="Verwijder stap" />'); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
171 | $('#addrowbutton').jqxButton({ template: 'primary', theme: theme, width: 150 }); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
172 | $('#deleterowbutton').jqxButton({ template: 'danger', theme: theme, width: 150 }); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
173 | // create new row. |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
174 | $('#addrowbutton').on('click', function() { |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
175 | var datarow = generaterow(); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
176 | $('#grid').jqxGrid('addrow', null, datarow); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
177 | }); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
178 | // delete row. |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
179 | $('#deleterowbutton').on('click', function() { |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
180 | var rowscount, id, selectedrowindex = $('#grid').jqxGrid('getselectedrowindex'); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
181 | rowscount = $('#grid').jqxGrid('getdatainformation').rowscount; |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
182 | if (selectedrowindex >= 0 && selectedrowindex < rowscount) { |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
183 | id = $('#grid').jqxGrid('getrowid', selectedrowindex); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
184 | $('#grid').jqxGrid('deleterow', id); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
185 | } |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
186 | }); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
187 | }, |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
188 | columns: [ |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
189 | { text: 'Stap naam', datafield: 'step_name' }, |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
190 | { text: 'Stap type', datafield: 'step_type', width: 150, |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
191 | cellsrenderer: function(index, datafield, value, defaultvalue, column, rowdata) { |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
192 | return '<div style="margin: 4px;">' + MashStepTypeData[value].nl + '</div>'; |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
193 | } |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
194 | }, |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
195 | { text: 'Begin °C', datafield: 'step_temp', width: 100, align: 'right', cellsalign: 'right', cellsformat: 'f1' }, |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
196 | { text: 'Eind °C', datafield: 'end_temp', width: 100, align: 'right', cellsalign: 'right', cellsformat: 'f1' }, |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
197 | { text: 'Rust min.', datafield: 'step_time', width: 90, align: 'right', cellsalign: 'right' }, |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
198 | { text: 'Stap min.', datafield: 'ramp_time', width: 90, align: 'right', cellsalign: 'right' }, |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
199 | { text: '', datafield: 'Edit', columntype: 'button', width: 100, align: 'center', |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
200 | cellsrenderer: function() { |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
201 | return 'Wijzig'; |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
202 | }, buttonclick: function(row) { |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
203 | steprow = row; |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
204 | stepData = $('#grid').jqxGrid('getrowdata', steprow); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
205 | $('#m_step_name').val(stepData.step_name); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
206 | $('#m_step_type').val(stepData.step_type); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
207 | $('#m_step_temp').val(stepData.step_temp); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
208 | $('#m_end_temp').val(stepData.end_temp); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
209 | $('#m_step_time').val(stepData.step_time); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
210 | $('#m_ramp_time').val(stepData.ramp_time); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
211 | // show the popup window. |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
212 | $('#popupStep').jqxWindow('open'); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
213 | } |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
214 | } |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
215 | ] |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
216 | }); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
217 | }; |
38
b7d44c98d609
Initial setup for mash steps editing.
Michiel Broek <mbroek@mbse.eu>
parents:
25
diff
changeset
|
218 | |
523
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
219 | // Initialize the input fields. |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
220 | $('#m_step_name').jqxInput({ theme: theme, width: 320, height: 23 }); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
221 | $('#m_step_type').jqxDropDownList({ |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
222 | theme: theme, |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
223 | source: MashStepTypeAdapter, |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
224 | valueMember: 'id', |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
225 | displayMember: 'nl', |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
226 | width: 180, |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
227 | height: 23, |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
228 | autoDropDownHeight: true |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
229 | }); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
230 | $('#m_step_temp').jqxNumberInput(Spin1dec); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
231 | $('#m_step_temp').jqxNumberInput({ Min: 30, Max: 80 }); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
232 | $('#m_end_temp').jqxNumberInput(Spin1dec); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
233 | $('#m_end_temp').jqxNumberInput({ Min: 30, Max: 80 }); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
234 | $('#m_step_time').jqxNumberInput(PosInt); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
235 | $('#m_step_time').jqxNumberInput({ Min: 1, Max: 120 }); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
236 | $('#m_ramp_time').jqxNumberInput(PosInt); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
237 | $('#m_ramp_time').jqxNumberInput({ Min: 1, Max: 30 }); |
494
af28ebe4a779
Fixed as much as possible warnings from the yui-compressor.
Michiel Broek <mbroek@mbse.eu>
parents:
483
diff
changeset
|
238 | |
523
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
239 | // initialize the input fields. |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
240 | $('#name').jqxInput({ theme: theme, width: 480, height: 23 }); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
241 | $('#notes').jqxInput({ theme: theme, width: 800, height: 100 }); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
242 | // initialize jqxGrid |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
243 | $('#jqxgrid').jqxGrid({ |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
244 | width: 1280, |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
245 | height: 630, |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
246 | source: dataAdapter, |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
247 | theme: theme, |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
248 | showstatusbar: true, |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
249 | renderstatusbar: function(statusbar) { |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
250 | var addButton, container = $('<div style="overflow: hidden; position: relative; margin: 5px;"></div>'); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
251 | addButton = $('<div style="float: right; margin-right: 15px;"><img style="position: relative; margin-top: 2px;" ' + |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
252 | 'src="images/add.png"/><span style="margin-left: 4px; position: relative; top: -3px;">Add</span></div>'); |
563
acdd54144838
Added export inventory and profiles in beerxml format. Small fixes in beerxml recipe and product export.
Michiel Broek <mbroek@mbse.eu>
parents:
523
diff
changeset
|
253 | expButton = $('<div style="float: right; margin-right: 50px;"><img style="position: relative; margin-top: 2px;" ' + |
acdd54144838
Added export inventory and profiles in beerxml format. Small fixes in beerxml recipe and product export.
Michiel Broek <mbroek@mbse.eu>
parents:
523
diff
changeset
|
254 | 'src="images/database.png"/><span style="margin-left: 4px; position: relative; top: -3px;">Export</span></div>'); |
523
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
255 | container.append(addButton); |
563
acdd54144838
Added export inventory and profiles in beerxml format. Small fixes in beerxml recipe and product export.
Michiel Broek <mbroek@mbse.eu>
parents:
523
diff
changeset
|
256 | container.append(expButton); |
523
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
257 | statusbar.append(container); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
258 | addButton.jqxButton({ theme: theme, width: 90, height: 20 }); |
563
acdd54144838
Added export inventory and profiles in beerxml format. Small fixes in beerxml recipe and product export.
Michiel Broek <mbroek@mbse.eu>
parents:
523
diff
changeset
|
259 | expButton.jqxButton({ theme: theme, width: 90, height: 20 }); |
523
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
260 | // add new row. |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
261 | addButton.click(function(event) { |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
262 | editrow = -1; |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
263 | $('#name').val('Nieuw maisch schema'); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
264 | $('#notes').val(''); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
265 | editsteps(''); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
266 | $('#popupWindow').jqxWindow('open'); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
267 | }); |
563
acdd54144838
Added export inventory and profiles in beerxml format. Small fixes in beerxml recipe and product export.
Michiel Broek <mbroek@mbse.eu>
parents:
523
diff
changeset
|
268 | expButton.click(function(event) { |
acdd54144838
Added export inventory and profiles in beerxml format. Small fixes in beerxml recipe and product export.
Michiel Broek <mbroek@mbse.eu>
parents:
523
diff
changeset
|
269 | window.open('export_mashs.php'); |
acdd54144838
Added export inventory and profiles in beerxml format. Small fixes in beerxml recipe and product export.
Michiel Broek <mbroek@mbse.eu>
parents:
523
diff
changeset
|
270 | }); |
523
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
271 | }, |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
272 | filterable: true, |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
273 | filtermode: 'excel', |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
274 | columns: [ |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
275 | { text: 'Maish schema', datafield: 'name', width: 250 }, |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
276 | { text: 'Opmerkingen', datafield: 'notes' }, |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
277 | { text: '', datafield: 'Edit', width: 100, align: 'center', columntype: 'button', |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
278 | cellsrenderer: function() { |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
279 | return 'Wijzig'; |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
280 | }, buttonclick: function(row) { |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
281 | editrow = row; |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
282 | // get the clicked row's data and initialize the input fields. |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
283 | dataRecord = $('#jqxgrid').jqxGrid('getrowdata', editrow); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
284 | $('#name').val(dataRecord.name); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
285 | $('#notes').val(dataRecord.notes); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
286 | editsteps(dataRecord); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
287 | // show the popup window. |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
288 | $('#popupWindow').jqxWindow('open'); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
289 | } |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
290 | } |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
291 | ] |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
292 | }); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
293 | // initialize the popup window and buttons. |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
294 | $('#popupWindow').jqxWindow({ |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
295 | width: 1050, |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
296 | height: 580, |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
297 | position: { x: 110, y: 30 }, |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
298 | resizable: false, |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
299 | theme: theme, |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
300 | isModal: true, |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
301 | autoOpen: false, |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
302 | cancelButton: $('#Cancel'), |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
303 | modalOpacity: 0.40 |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
304 | }); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
305 | $('#popupWindow').on('open', function() { |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
306 | $('#name').jqxInput('selectAll'); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
307 | }); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
308 | $('#popupStep').jqxWindow({ |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
309 | width: 800, |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
310 | height: 300, |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
311 | position: { x: 230, y: 100 }, |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
312 | resizable: false, |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
313 | theme: theme, |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
314 | isModal: true, |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
315 | autoOpen: false, |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
316 | cancelButton: $('#Ready'), |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
317 | modalOpacity: 0.40 |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
318 | }); |
215
83cee005d2d9
Fixed the utf-8 problems when storing json arrays on the server by using manual encoding. The json-encode function sucks for this project. Added step detail edit screen instead of on grid cell editing. This must go into the product and recipe editors too.
Michiel Broek <mbroek@mbse.eu>
parents:
213
diff
changeset
|
319 | |
523
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
320 | // step detail popup update values. |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
321 | $('#Ready').jqxButton({ template: 'success', width: '90px', theme: theme }); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
322 | $('#Ready').click(function() { |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
323 | $('#grid').jqxGrid('setcellvalue', steprow, 'step_name', $('#m_step_name').val()); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
324 | $('#grid').jqxGrid('setcellvalue', steprow, 'step_type', $('#m_step_type').val()); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
325 | $('#grid').jqxGrid('setcellvalue', steprow, 'step_temp', $('#m_step_temp').val()); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
326 | $('#grid').jqxGrid('setcellvalue', steprow, 'end_temp', $('#m_end_temp').val()); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
327 | $('#grid').jqxGrid('setcellvalue', steprow, 'step_time', $('#m_step_time').val()); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
328 | $('#grid').jqxGrid('setcellvalue', steprow, 'ramp_time', $('#m_ramp_time').val()); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
329 | $('#grid').jqxGrid('sortby', 'step_temp', 'asc'); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
330 | }); |
215
83cee005d2d9
Fixed the utf-8 problems when storing json arrays on the server by using manual encoding. The json-encode function sucks for this project. Added step detail edit screen instead of on grid cell editing. This must go into the product and recipe editors too.
Michiel Broek <mbroek@mbse.eu>
parents:
213
diff
changeset
|
331 | |
523
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
332 | // mash profile popup. |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
333 | $('#Delete').jqxButton({ template: 'danger', width: '90px', theme: theme }); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
334 | $('#Delete').click(function() { |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
335 | if (editrow >= 0) { |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
336 | // Open a popup to confirm this action. |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
337 | $('#eventWindow').jqxWindow('open'); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
338 | $('#delOk').click(function() { |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
339 | var rowID = $('#jqxgrid').jqxGrid('getrowid', editrow); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
340 | $('#jqxgrid').jqxGrid('deleterow', rowID); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
341 | }); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
342 | } |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
343 | $('#popupWindow').jqxWindow('hide'); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
344 | }); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
345 | $('#Cancel').jqxButton({ template: 'primary', width: '90px', theme: theme }); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
346 | $('#Save').jqxButton({ template: 'success', width: '90px', theme: theme }); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
347 | $('#Save').click(function() { |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
348 | var steprows = $('#grid').jqxGrid('getrows'), |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
349 | rowID = -1, |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
350 | row; |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
351 | if (editrow >= 0) { |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
352 | rowID = $('#jqxgrid').jqxGrid('getrowid', editrow); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
353 | } |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
354 | row = { |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
355 | record: rowID, |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
356 | name: $('#name').val(), |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
357 | notes: $('#notes').val(), |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
358 | steps: steprows |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
359 | }; |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
360 | if (editrow >= 0) { |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
361 | $('#jqxgrid').jqxGrid('updaterow', rowID, row); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
362 | } else { |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
363 | $('#jqxgrid').jqxGrid('addrow', null, row); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
364 | } |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
365 | $('#popupWindow').jqxWindow('hide'); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
366 | }); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
367 | createDelElements(); |
23
4b157d7a1cee
Added first part of mash profiles. Steps are in the database but not in the web ui.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
368 | }); |
4b157d7a1cee
Added first part of mash profiles. Steps are in the database but not in the web ui.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
369 |