Sat, 23 May 2020 12:03:33 +0200
Manual sort of mash steps. Removed some debug logging. Better add mashsteps, set temperature 2 degrees above the previous step.
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 | /***************************************************************************** |
688
0ce464e42d8b
Manual sort of mash steps. Removed some debug logging. Better add mashsteps, set temperature 2 degrees above the previous step.
Michiel Broek <mbroek@mbse.eu>
parents:
563
diff
changeset
|
2 | * Copyright (C) 2014-2020 |
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 | * |
688
0ce464e42d8b
Manual sort of mash steps. Removed some debug logging. Better add mashsteps, set temperature 2 degrees above the previous step.
Michiel Broek <mbroek@mbse.eu>
parents:
563
diff
changeset
|
6 | * This file is part of Brewery Management System |
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
|
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 | location.reload(true); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
77 | }, |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
78 | error: function(jqXHR, textStatus, errorThrown) { |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
79 | commit(false); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
80 | console.log('mash deleterow ' + textStatus); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
81 | } |
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 | addrow: function(rowid, rowdata, position, commit) { |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
85 | var data = 'insert=true&' + $.param(rowdata); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
86 | $.ajax({ |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
87 | dataType: 'json', |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
88 | url: url, |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
89 | cache: false, |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
90 | data: data, |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
91 | type: 'POST', |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
92 | success: function(data, status, xhr) { |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
93 | commit(true); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
94 | location.reload(true); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
95 | }, |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
96 | error: function(jqXHR, textStatus, errorThrown) { |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
97 | commit(false); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
98 | console.log('mash addrow ' + textStatus); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
99 | } |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
100 | }); |
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 | updaterow: function(rowid, rowdata, commit) { |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
103 | var data = 'update=true&' + $.param(rowdata); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
104 | $.ajax({ |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
105 | dataType: 'json', |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
106 | url: url, |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
107 | cache: false, |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
108 | data: data, |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
109 | type: 'POST', |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
110 | success: function(data, status, xhr) { |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
111 | commit(true); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
112 | location.reload(true); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
113 | }, |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
114 | error: function(jqXHR, textStatus, errorThrown) { |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
115 | commit(false); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
116 | console.log('mash updaterow ' + textStatus); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
117 | } |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
118 | }); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
119 | } |
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 | dataAdapter = new $.jqx.dataAdapter(source), |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
122 | editrow = -1, |
482
ce814c787b79
Fixed not creating new records
Michiel Broek <mbroek@mbse.eu>
parents:
286
diff
changeset
|
123 | |
523
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
124 | // Inline steps editor |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
125 | editsteps = function(data) { |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
126 | var stepSource = { |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
127 | localdata: data.steps, |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
128 | datatype: 'local', |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
129 | datafields: [ |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
130 | { name: 'step_name', type: 'string' }, |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
131 | { name: 'step_type', type: 'int' }, |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
132 | { name: 'step_temp', type: 'float' }, |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
133 | { name: 'step_time', type: 'float' }, |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
134 | { name: 'ramp_time', type: 'float' }, |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
135 | { name: 'end_temp', type: 'float' } |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
136 | ], |
688
0ce464e42d8b
Manual sort of mash steps. Removed some debug logging. Better add mashsteps, set temperature 2 degrees above the previous step.
Michiel Broek <mbroek@mbse.eu>
parents:
563
diff
changeset
|
137 | addrow: function(rowid, rowdata, position, commit) { commit(true); }, |
0ce464e42d8b
Manual sort of mash steps. Removed some debug logging. Better add mashsteps, set temperature 2 degrees above the previous step.
Michiel Broek <mbroek@mbse.eu>
parents:
563
diff
changeset
|
138 | deleterow: function(rowid, commit) { commit(true); } |
523
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
139 | }, |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
140 | 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
|
141 | |
523
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
142 | $('#grid').jqxGrid({ |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
143 | width: 1020, |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
144 | height: 330, |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
145 | source: stepAdapter, |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
146 | theme: theme, |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
147 | selectionmode: 'singlerow', |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
148 | showtoolbar: true, |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
149 | rendertoolbar: function(toolbar) { |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
150 | var container = $('<div style="margin: 5px;"></div>'); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
151 | toolbar.append(container); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
152 | 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
|
153 | 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
|
154 | $('#addrowbutton').jqxButton({ template: 'primary', theme: theme, width: 150 }); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
155 | $('#deleterowbutton').jqxButton({ template: 'danger', theme: theme, width: 150 }); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
156 | // create new row. |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
157 | $('#addrowbutton').on('click', function() { |
688
0ce464e42d8b
Manual sort of mash steps. Removed some debug logging. Better add mashsteps, set temperature 2 degrees above the previous step.
Michiel Broek <mbroek@mbse.eu>
parents:
563
diff
changeset
|
158 | var row = {}, rowscount = $('#grid').jqxGrid('getdatainformation').rowscount; |
0ce464e42d8b
Manual sort of mash steps. Removed some debug logging. Better add mashsteps, set temperature 2 degrees above the previous step.
Michiel Broek <mbroek@mbse.eu>
parents:
563
diff
changeset
|
159 | var temp = $('#grid').jqxGrid('getcell', rowscount -1, 'step_temp'); |
0ce464e42d8b
Manual sort of mash steps. Removed some debug logging. Better add mashsteps, set temperature 2 degrees above the previous step.
Michiel Broek <mbroek@mbse.eu>
parents:
563
diff
changeset
|
160 | row['step_name'] = 'Stap ' + (rowscount + 1); |
0ce464e42d8b
Manual sort of mash steps. Removed some debug logging. Better add mashsteps, set temperature 2 degrees above the previous step.
Michiel Broek <mbroek@mbse.eu>
parents:
563
diff
changeset
|
161 | if (rowscount > 0) { |
0ce464e42d8b
Manual sort of mash steps. Removed some debug logging. Better add mashsteps, set temperature 2 degrees above the previous step.
Michiel Broek <mbroek@mbse.eu>
parents:
563
diff
changeset
|
162 | row['step_type'] = 1; |
0ce464e42d8b
Manual sort of mash steps. Removed some debug logging. Better add mashsteps, set temperature 2 degrees above the previous step.
Michiel Broek <mbroek@mbse.eu>
parents:
563
diff
changeset
|
163 | row['step_temp'] = row['end_temp'] = temp.value + 2; |
0ce464e42d8b
Manual sort of mash steps. Removed some debug logging. Better add mashsteps, set temperature 2 degrees above the previous step.
Michiel Broek <mbroek@mbse.eu>
parents:
563
diff
changeset
|
164 | } else { |
0ce464e42d8b
Manual sort of mash steps. Removed some debug logging. Better add mashsteps, set temperature 2 degrees above the previous step.
Michiel Broek <mbroek@mbse.eu>
parents:
563
diff
changeset
|
165 | row['step_type'] = 0; |
0ce464e42d8b
Manual sort of mash steps. Removed some debug logging. Better add mashsteps, set temperature 2 degrees above the previous step.
Michiel Broek <mbroek@mbse.eu>
parents:
563
diff
changeset
|
166 | row['step_temp'] = row['end_temp'] = 62.0; |
0ce464e42d8b
Manual sort of mash steps. Removed some debug logging. Better add mashsteps, set temperature 2 degrees above the previous step.
Michiel Broek <mbroek@mbse.eu>
parents:
563
diff
changeset
|
167 | } |
0ce464e42d8b
Manual sort of mash steps. Removed some debug logging. Better add mashsteps, set temperature 2 degrees above the previous step.
Michiel Broek <mbroek@mbse.eu>
parents:
563
diff
changeset
|
168 | row['step_time'] = 20.0; |
0ce464e42d8b
Manual sort of mash steps. Removed some debug logging. Better add mashsteps, set temperature 2 degrees above the previous step.
Michiel Broek <mbroek@mbse.eu>
parents:
563
diff
changeset
|
169 | row['ramp_time'] = 1.0; |
0ce464e42d8b
Manual sort of mash steps. Removed some debug logging. Better add mashsteps, set temperature 2 degrees above the previous step.
Michiel Broek <mbroek@mbse.eu>
parents:
563
diff
changeset
|
170 | $('#grid').jqxGrid('addrow', null, row); |
523
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
171 | }); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
172 | // delete row. |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
173 | $('#deleterowbutton').on('click', function() { |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
174 | var rowscount, id, selectedrowindex = $('#grid').jqxGrid('getselectedrowindex'); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
175 | rowscount = $('#grid').jqxGrid('getdatainformation').rowscount; |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
176 | if (selectedrowindex >= 0 && selectedrowindex < rowscount) { |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
177 | id = $('#grid').jqxGrid('getrowid', selectedrowindex); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
178 | $('#grid').jqxGrid('deleterow', id); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
179 | } |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
180 | }); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
181 | }, |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
182 | columns: [ |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
183 | { text: 'Stap naam', datafield: 'step_name' }, |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
184 | { text: 'Stap type', datafield: 'step_type', width: 150, |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
185 | cellsrenderer: function(index, datafield, value, defaultvalue, column, rowdata) { |
688
0ce464e42d8b
Manual sort of mash steps. Removed some debug logging. Better add mashsteps, set temperature 2 degrees above the previous step.
Michiel Broek <mbroek@mbse.eu>
parents:
563
diff
changeset
|
186 | return '<span style="margin: 4px; margin-top: 6px; float: left;">' + MashStepTypeData[value].nl + '</span>'; |
523
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 | }, |
688
0ce464e42d8b
Manual sort of mash steps. Removed some debug logging. Better add mashsteps, set temperature 2 degrees above the previous step.
Michiel Broek <mbroek@mbse.eu>
parents:
563
diff
changeset
|
189 | { text: 'Start °C', datafield: 'step_temp', width: 90, align: 'right', cellsalign: 'right', cellsformat: 'f1' }, |
0ce464e42d8b
Manual sort of mash steps. Removed some debug logging. Better add mashsteps, set temperature 2 degrees above the previous step.
Michiel Broek <mbroek@mbse.eu>
parents:
563
diff
changeset
|
190 | { text: 'Eind °C', datafield: 'end_temp', width: 90, align: 'right', cellsalign: 'right', cellsformat: 'f1' }, |
523
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
191 | { 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
|
192 | { text: 'Stap min.', datafield: 'ramp_time', width: 90, align: 'right', cellsalign: 'right' }, |
688
0ce464e42d8b
Manual sort of mash steps. Removed some debug logging. Better add mashsteps, set temperature 2 degrees above the previous step.
Michiel Broek <mbroek@mbse.eu>
parents:
563
diff
changeset
|
193 | { text: '', columntype: 'button', width: 15, align: 'center', |
0ce464e42d8b
Manual sort of mash steps. Removed some debug logging. Better add mashsteps, set temperature 2 degrees above the previous step.
Michiel Broek <mbroek@mbse.eu>
parents:
563
diff
changeset
|
194 | cellsrenderer: function(row) { |
0ce464e42d8b
Manual sort of mash steps. Removed some debug logging. Better add mashsteps, set temperature 2 degrees above the previous step.
Michiel Broek <mbroek@mbse.eu>
parents:
563
diff
changeset
|
195 | if (row < 2) |
0ce464e42d8b
Manual sort of mash steps. Removed some debug logging. Better add mashsteps, set temperature 2 degrees above the previous step.
Michiel Broek <mbroek@mbse.eu>
parents:
563
diff
changeset
|
196 | return ' '; |
0ce464e42d8b
Manual sort of mash steps. Removed some debug logging. Better add mashsteps, set temperature 2 degrees above the previous step.
Michiel Broek <mbroek@mbse.eu>
parents:
563
diff
changeset
|
197 | return 'â–´'; |
0ce464e42d8b
Manual sort of mash steps. Removed some debug logging. Better add mashsteps, set temperature 2 degrees above the previous step.
Michiel Broek <mbroek@mbse.eu>
parents:
563
diff
changeset
|
198 | }, buttonclick: function(row) { |
0ce464e42d8b
Manual sort of mash steps. Removed some debug logging. Better add mashsteps, set temperature 2 degrees above the previous step.
Michiel Broek <mbroek@mbse.eu>
parents:
563
diff
changeset
|
199 | if (row >= 2) { |
0ce464e42d8b
Manual sort of mash steps. Removed some debug logging. Better add mashsteps, set temperature 2 degrees above the previous step.
Michiel Broek <mbroek@mbse.eu>
parents:
563
diff
changeset
|
200 | swapMash(row, row-1); |
0ce464e42d8b
Manual sort of mash steps. Removed some debug logging. Better add mashsteps, set temperature 2 degrees above the previous step.
Michiel Broek <mbroek@mbse.eu>
parents:
563
diff
changeset
|
201 | } |
0ce464e42d8b
Manual sort of mash steps. Removed some debug logging. Better add mashsteps, set temperature 2 degrees above the previous step.
Michiel Broek <mbroek@mbse.eu>
parents:
563
diff
changeset
|
202 | } |
0ce464e42d8b
Manual sort of mash steps. Removed some debug logging. Better add mashsteps, set temperature 2 degrees above the previous step.
Michiel Broek <mbroek@mbse.eu>
parents:
563
diff
changeset
|
203 | }, |
0ce464e42d8b
Manual sort of mash steps. Removed some debug logging. Better add mashsteps, set temperature 2 degrees above the previous step.
Michiel Broek <mbroek@mbse.eu>
parents:
563
diff
changeset
|
204 | { text: '', columntype: 'button', width: 15, align: 'center', |
0ce464e42d8b
Manual sort of mash steps. Removed some debug logging. Better add mashsteps, set temperature 2 degrees above the previous step.
Michiel Broek <mbroek@mbse.eu>
parents:
563
diff
changeset
|
205 | cellsrenderer: function(row) { |
0ce464e42d8b
Manual sort of mash steps. Removed some debug logging. Better add mashsteps, set temperature 2 degrees above the previous step.
Michiel Broek <mbroek@mbse.eu>
parents:
563
diff
changeset
|
206 | rowscount = $('#grid').jqxGrid('getdatainformation').rowscount; |
0ce464e42d8b
Manual sort of mash steps. Removed some debug logging. Better add mashsteps, set temperature 2 degrees above the previous step.
Michiel Broek <mbroek@mbse.eu>
parents:
563
diff
changeset
|
207 | if (row < 1 || row > (rowscount -2)) |
0ce464e42d8b
Manual sort of mash steps. Removed some debug logging. Better add mashsteps, set temperature 2 degrees above the previous step.
Michiel Broek <mbroek@mbse.eu>
parents:
563
diff
changeset
|
208 | return ' '; |
0ce464e42d8b
Manual sort of mash steps. Removed some debug logging. Better add mashsteps, set temperature 2 degrees above the previous step.
Michiel Broek <mbroek@mbse.eu>
parents:
563
diff
changeset
|
209 | return 'â–¾'; |
0ce464e42d8b
Manual sort of mash steps. Removed some debug logging. Better add mashsteps, set temperature 2 degrees above the previous step.
Michiel Broek <mbroek@mbse.eu>
parents:
563
diff
changeset
|
210 | }, buttonclick: function(row) { |
0ce464e42d8b
Manual sort of mash steps. Removed some debug logging. Better add mashsteps, set temperature 2 degrees above the previous step.
Michiel Broek <mbroek@mbse.eu>
parents:
563
diff
changeset
|
211 | rowscount = $('#grid').jqxGrid('getdatainformation').rowscount; |
0ce464e42d8b
Manual sort of mash steps. Removed some debug logging. Better add mashsteps, set temperature 2 degrees above the previous step.
Michiel Broek <mbroek@mbse.eu>
parents:
563
diff
changeset
|
212 | if (row >= 1 && row <= (rowscount -2)) { |
0ce464e42d8b
Manual sort of mash steps. Removed some debug logging. Better add mashsteps, set temperature 2 degrees above the previous step.
Michiel Broek <mbroek@mbse.eu>
parents:
563
diff
changeset
|
213 | swapMash(row, row+1); |
0ce464e42d8b
Manual sort of mash steps. Removed some debug logging. Better add mashsteps, set temperature 2 degrees above the previous step.
Michiel Broek <mbroek@mbse.eu>
parents:
563
diff
changeset
|
214 | } |
0ce464e42d8b
Manual sort of mash steps. Removed some debug logging. Better add mashsteps, set temperature 2 degrees above the previous step.
Michiel Broek <mbroek@mbse.eu>
parents:
563
diff
changeset
|
215 | } |
0ce464e42d8b
Manual sort of mash steps. Removed some debug logging. Better add mashsteps, set temperature 2 degrees above the previous step.
Michiel Broek <mbroek@mbse.eu>
parents:
563
diff
changeset
|
216 | }, |
0ce464e42d8b
Manual sort of mash steps. Removed some debug logging. Better add mashsteps, set temperature 2 degrees above the previous step.
Michiel Broek <mbroek@mbse.eu>
parents:
563
diff
changeset
|
217 | { text: '', datafield: 'Edit', columntype: 'button', width: 80, align: 'center', |
523
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
218 | cellsrenderer: function() { |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
219 | return 'Wijzig'; |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
220 | }, buttonclick: function(row) { |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
221 | steprow = row; |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
222 | stepData = $('#grid').jqxGrid('getrowdata', steprow); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
223 | $('#m_step_name').val(stepData.step_name); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
224 | $('#m_step_type').val(stepData.step_type); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
225 | $('#m_step_temp').val(stepData.step_temp); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
226 | $('#m_end_temp').val(stepData.end_temp); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
227 | $('#m_step_time').val(stepData.step_time); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
228 | $('#m_ramp_time').val(stepData.ramp_time); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
229 | // show the popup window. |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
230 | $('#popupStep').jqxWindow('open'); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
231 | } |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
232 | } |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
233 | ] |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
234 | }); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
235 | }; |
38
b7d44c98d609
Initial setup for mash steps editing.
Michiel Broek <mbroek@mbse.eu>
parents:
25
diff
changeset
|
236 | |
523
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
237 | // Initialize the input fields. |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
238 | $('#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
|
239 | $('#m_step_type').jqxDropDownList({ |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
240 | theme: theme, |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
241 | source: MashStepTypeAdapter, |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
242 | valueMember: 'id', |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
243 | displayMember: 'nl', |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
244 | width: 180, |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
245 | height: 23, |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
246 | autoDropDownHeight: true |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
247 | }); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
248 | $('#m_step_temp').jqxNumberInput(Spin1dec); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
249 | $('#m_step_temp').jqxNumberInput({ Min: 30, Max: 80 }); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
250 | $('#m_end_temp').jqxNumberInput(Spin1dec); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
251 | $('#m_end_temp').jqxNumberInput({ Min: 30, Max: 80 }); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
252 | $('#m_step_time').jqxNumberInput(PosInt); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
253 | $('#m_step_time').jqxNumberInput({ Min: 1, Max: 120 }); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
254 | $('#m_ramp_time').jqxNumberInput(PosInt); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
255 | $('#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
|
256 | |
523
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
257 | // initialize the input fields. |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
258 | $('#name').jqxInput({ theme: theme, width: 480, height: 23 }); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
259 | $('#notes').jqxInput({ theme: theme, width: 800, height: 100 }); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
260 | // initialize jqxGrid |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
261 | $('#jqxgrid').jqxGrid({ |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
262 | width: 1280, |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
263 | height: 630, |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
264 | source: dataAdapter, |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
265 | theme: theme, |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
266 | showstatusbar: true, |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
267 | renderstatusbar: function(statusbar) { |
688
0ce464e42d8b
Manual sort of mash steps. Removed some debug logging. Better add mashsteps, set temperature 2 degrees above the previous step.
Michiel Broek <mbroek@mbse.eu>
parents:
563
diff
changeset
|
268 | var container = $('<div style="overflow: hidden; position: relative; margin: 5px;"></div>'); |
0ce464e42d8b
Manual sort of mash steps. Removed some debug logging. Better add mashsteps, set temperature 2 degrees above the previous step.
Michiel Broek <mbroek@mbse.eu>
parents:
563
diff
changeset
|
269 | var addButton = $('<div style="float: right; margin-right: 15px;"><img style="position: relative; margin-top: 2px;" ' + |
523
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
270 | 'src="images/add.png"/><span style="margin-left: 4px; position: relative; top: -3px;">Add</span></div>'); |
688
0ce464e42d8b
Manual sort of mash steps. Removed some debug logging. Better add mashsteps, set temperature 2 degrees above the previous step.
Michiel Broek <mbroek@mbse.eu>
parents:
563
diff
changeset
|
271 | var expButton = $('<div style="float: right; margin-right: 50px;"><img style="position: relative; margin-top: 2px;" ' + |
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
|
272 | '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
|
273 | 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
|
274 | container.append(expButton); |
523
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
275 | statusbar.append(container); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
276 | 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
|
277 | expButton.jqxButton({ theme: theme, width: 90, height: 20 }); |
523
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
278 | // add new row. |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
279 | addButton.click(function(event) { |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
280 | editrow = -1; |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
281 | $('#name').val('Nieuw maisch schema'); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
282 | $('#notes').val(''); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
283 | editsteps(''); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
284 | $('#popupWindow').jqxWindow('open'); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
285 | }); |
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
|
286 | 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
|
287 | 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
|
288 | }); |
523
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 | columns: [ |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
291 | { text: 'Maish schema', datafield: 'name', width: 250 }, |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
292 | { text: 'Opmerkingen', datafield: 'notes' }, |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
293 | { text: '', datafield: 'Edit', width: 100, align: 'center', columntype: 'button', |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
294 | cellsrenderer: function() { |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
295 | return 'Wijzig'; |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
296 | }, buttonclick: function(row) { |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
297 | editrow = row; |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
298 | // 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
|
299 | dataRecord = $('#jqxgrid').jqxGrid('getrowdata', editrow); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
300 | $('#name').val(dataRecord.name); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
301 | $('#notes').val(dataRecord.notes); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
302 | editsteps(dataRecord); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
303 | // show the popup window. |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
304 | $('#popupWindow').jqxWindow('open'); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
305 | } |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
306 | } |
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 | }); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
309 | // initialize the popup window and buttons. |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
310 | $('#popupWindow').jqxWindow({ |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
311 | width: 1050, |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
312 | height: 580, |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
313 | position: { x: 110, y: 30 }, |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
314 | resizable: false, |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
315 | theme: theme, |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
316 | isModal: true, |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
317 | autoOpen: false, |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
318 | cancelButton: $('#Cancel'), |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
319 | modalOpacity: 0.40 |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
320 | }); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
321 | $('#popupWindow').on('open', function() { |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
322 | $('#name').jqxInput('selectAll'); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
323 | }); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
324 | $('#popupStep').jqxWindow({ |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
325 | width: 800, |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
326 | height: 300, |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
327 | position: { x: 230, y: 100 }, |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
328 | resizable: false, |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
329 | theme: theme, |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
330 | isModal: true, |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
331 | autoOpen: false, |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
332 | cancelButton: $('#Ready'), |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
333 | modalOpacity: 0.40 |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
334 | }); |
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
|
335 | |
523
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
336 | // step detail popup update values. |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
337 | $('#Ready').jqxButton({ template: 'success', width: '90px', theme: theme }); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
338 | $('#Ready').click(function() { |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
339 | $('#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
|
340 | $('#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
|
341 | $('#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
|
342 | $('#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
|
343 | $('#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
|
344 | $('#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
|
345 | $('#grid').jqxGrid('sortby', 'step_temp', 'asc'); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
346 | }); |
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
|
347 | |
523
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
348 | // mash profile popup. |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
349 | $('#Delete').jqxButton({ template: 'danger', width: '90px', theme: theme }); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
350 | $('#Delete').click(function() { |
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 | // Open a popup to confirm this action. |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
353 | $('#eventWindow').jqxWindow('open'); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
354 | $('#delOk').click(function() { |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
355 | var rowID = $('#jqxgrid').jqxGrid('getrowid', editrow); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
356 | $('#jqxgrid').jqxGrid('deleterow', rowID); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
357 | }); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
358 | } |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
359 | $('#popupWindow').jqxWindow('hide'); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
360 | }); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
361 | $('#Cancel').jqxButton({ template: 'primary', width: '90px', theme: theme }); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
362 | $('#Save').jqxButton({ template: 'success', width: '90px', theme: theme }); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
363 | $('#Save').click(function() { |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
364 | var steprows = $('#grid').jqxGrid('getrows'), |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
365 | rowID = -1, |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
366 | row; |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
367 | if (editrow >= 0) { |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
368 | rowID = $('#jqxgrid').jqxGrid('getrowid', editrow); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
369 | } |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
370 | row = { |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
371 | record: rowID, |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
372 | name: $('#name').val(), |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
373 | notes: $('#notes').val(), |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
374 | steps: steprows |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
375 | }; |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
376 | if (editrow >= 0) { |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
377 | $('#jqxgrid').jqxGrid('updaterow', rowID, row); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
378 | } else { |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
379 | $('#jqxgrid').jqxGrid('addrow', null, row); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
380 | } |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
381 | $('#popupWindow').jqxWindow('hide'); |
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
382 | }); |
688
0ce464e42d8b
Manual sort of mash steps. Removed some debug logging. Better add mashsteps, set temperature 2 degrees above the previous step.
Michiel Broek <mbroek@mbse.eu>
parents:
563
diff
changeset
|
383 | |
0ce464e42d8b
Manual sort of mash steps. Removed some debug logging. Better add mashsteps, set temperature 2 degrees above the previous step.
Michiel Broek <mbroek@mbse.eu>
parents:
563
diff
changeset
|
384 | function swapMash(r1, r2) { |
0ce464e42d8b
Manual sort of mash steps. Removed some debug logging. Better add mashsteps, set temperature 2 degrees above the previous step.
Michiel Broek <mbroek@mbse.eu>
parents:
563
diff
changeset
|
385 | |
0ce464e42d8b
Manual sort of mash steps. Removed some debug logging. Better add mashsteps, set temperature 2 degrees above the previous step.
Michiel Broek <mbroek@mbse.eu>
parents:
563
diff
changeset
|
386 | console.log('swap mash rows ' + r1 + ' ' + r2); |
0ce464e42d8b
Manual sort of mash steps. Removed some debug logging. Better add mashsteps, set temperature 2 degrees above the previous step.
Michiel Broek <mbroek@mbse.eu>
parents:
563
diff
changeset
|
387 | var row1 = $('#grid').jqxGrid('getrowdata', r1); |
0ce464e42d8b
Manual sort of mash steps. Removed some debug logging. Better add mashsteps, set temperature 2 degrees above the previous step.
Michiel Broek <mbroek@mbse.eu>
parents:
563
diff
changeset
|
388 | var row2 = $('#grid').jqxGrid('getrowdata', r2); |
0ce464e42d8b
Manual sort of mash steps. Removed some debug logging. Better add mashsteps, set temperature 2 degrees above the previous step.
Michiel Broek <mbroek@mbse.eu>
parents:
563
diff
changeset
|
389 | var obj1 = { step_name: row1.step_name, step_type: row1.step_type, step_temp: row1.step_temp, step_time: row1.step_time, |
0ce464e42d8b
Manual sort of mash steps. Removed some debug logging. Better add mashsteps, set temperature 2 degrees above the previous step.
Michiel Broek <mbroek@mbse.eu>
parents:
563
diff
changeset
|
390 | ramp_time: row1.ramp_time, end_temp: row1.end_temp }; |
0ce464e42d8b
Manual sort of mash steps. Removed some debug logging. Better add mashsteps, set temperature 2 degrees above the previous step.
Michiel Broek <mbroek@mbse.eu>
parents:
563
diff
changeset
|
391 | var obj2 = { step_name: row2.step_name, step_type: row2.step_type, step_temp: row2.step_temp, step_time: row2.step_time, |
0ce464e42d8b
Manual sort of mash steps. Removed some debug logging. Better add mashsteps, set temperature 2 degrees above the previous step.
Michiel Broek <mbroek@mbse.eu>
parents:
563
diff
changeset
|
392 | ramp_time: row2.ramp_time, end_temp: row2.end_temp }; |
0ce464e42d8b
Manual sort of mash steps. Removed some debug logging. Better add mashsteps, set temperature 2 degrees above the previous step.
Michiel Broek <mbroek@mbse.eu>
parents:
563
diff
changeset
|
393 | $("#grid").jqxGrid('updaterow', r1, obj2); |
0ce464e42d8b
Manual sort of mash steps. Removed some debug logging. Better add mashsteps, set temperature 2 degrees above the previous step.
Michiel Broek <mbroek@mbse.eu>
parents:
563
diff
changeset
|
394 | $("#grid").jqxGrid('updaterow', r2, obj1); |
0ce464e42d8b
Manual sort of mash steps. Removed some debug logging. Better add mashsteps, set temperature 2 degrees above the previous step.
Michiel Broek <mbroek@mbse.eu>
parents:
563
diff
changeset
|
395 | } |
0ce464e42d8b
Manual sort of mash steps. Removed some debug logging. Better add mashsteps, set temperature 2 degrees above the previous step.
Michiel Broek <mbroek@mbse.eu>
parents:
563
diff
changeset
|
396 | |
523
3cccf4392a25
Code cleanup and manual compress.
Michiel Broek <mbroek@mbse.eu>
parents:
494
diff
changeset
|
397 | 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
|
398 | }); |
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
|
399 |