Wed, 04 Mar 2020 10:48:21 +0100
Workaround for hang during startup. Changed order of displayed fields on the yeast tab. Tooltip text changes. More decimals on the checklist for misc ingredients. More decimals for the starter on product print.
292
90cd3798edc2
Added archive view on date and code.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
1 | /***************************************************************************** |
90cd3798edc2
Added archive view on date and code.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
2 | * Copyright (C) 2019 |
90cd3798edc2
Added archive view on date and code.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
3 | * |
90cd3798edc2
Added archive view on date and code.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
4 | * Michiel Broek <mbroek at mbse dot eu> |
90cd3798edc2
Added archive view on date and code.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
5 | * |
90cd3798edc2
Added archive view on date and code.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
6 | * This file is part of BMS |
90cd3798edc2
Added archive view on date and code.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
7 | * |
90cd3798edc2
Added archive view on date and code.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
8 | * This is free software; you can redistribute it and/or modify it |
90cd3798edc2
Added archive view on date and code.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
9 | * under the terms of the GNU General Public License as published by the |
90cd3798edc2
Added archive view on date and code.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
10 | * Free Software Foundation; either version 2, or (at your option) any |
90cd3798edc2
Added archive view on date and code.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
11 | * later version. |
90cd3798edc2
Added archive view on date and code.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
12 | * |
90cd3798edc2
Added archive view on date and code.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
13 | * BrewCloud is distributed in the hope that it will be useful, but |
90cd3798edc2
Added archive view on date and code.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
14 | * WITHOUT ANY WARRANTY; without even the implied warranty of |
90cd3798edc2
Added archive view on date and code.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
15 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
90cd3798edc2
Added archive view on date and code.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
16 | * General Public License for more details. |
90cd3798edc2
Added archive view on date and code.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
17 | * |
90cd3798edc2
Added archive view on date and code.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
18 | * You should have received a copy of the GNU General Public License |
90cd3798edc2
Added archive view on date and code.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
19 | * along with ThermFerm; see the file COPYING. If not, write to the Free |
90cd3798edc2
Added archive view on date and code.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
20 | * Software Foundation, 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. |
90cd3798edc2
Added archive view on date and code.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
21 | *****************************************************************************/ |
90cd3798edc2
Added archive view on date and code.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
22 | |
90cd3798edc2
Added archive view on date and code.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
23 | |
525
8bbc5730aaa8
Code cleanup and manual compress
Michiel Broek <mbroek@mbse.eu>
parents:
468
diff
changeset
|
24 | $(document).ready(function() { |
8bbc5730aaa8
Code cleanup and manual compress
Michiel Broek <mbroek@mbse.eu>
parents:
468
diff
changeset
|
25 | var source = { |
8bbc5730aaa8
Code cleanup and manual compress
Michiel Broek <mbroek@mbse.eu>
parents:
468
diff
changeset
|
26 | datatype: 'json', |
8bbc5730aaa8
Code cleanup and manual compress
Michiel Broek <mbroek@mbse.eu>
parents:
468
diff
changeset
|
27 | cache: false, |
8bbc5730aaa8
Code cleanup and manual compress
Michiel Broek <mbroek@mbse.eu>
parents:
468
diff
changeset
|
28 | datafields: [ |
8bbc5730aaa8
Code cleanup and manual compress
Michiel Broek <mbroek@mbse.eu>
parents:
468
diff
changeset
|
29 | { name: 'record', type: 'number' }, |
8bbc5730aaa8
Code cleanup and manual compress
Michiel Broek <mbroek@mbse.eu>
parents:
468
diff
changeset
|
30 | { name: 'name', type: 'string' }, |
8bbc5730aaa8
Code cleanup and manual compress
Michiel Broek <mbroek@mbse.eu>
parents:
468
diff
changeset
|
31 | { name: 'code', type: 'string' }, |
8bbc5730aaa8
Code cleanup and manual compress
Michiel Broek <mbroek@mbse.eu>
parents:
468
diff
changeset
|
32 | { name: 'year', type: 'string' }, |
8bbc5730aaa8
Code cleanup and manual compress
Michiel Broek <mbroek@mbse.eu>
parents:
468
diff
changeset
|
33 | { name: 'date', type: 'string' }, |
8bbc5730aaa8
Code cleanup and manual compress
Michiel Broek <mbroek@mbse.eu>
parents:
468
diff
changeset
|
34 | { name: 'style', type: 'string' }, |
8bbc5730aaa8
Code cleanup and manual compress
Michiel Broek <mbroek@mbse.eu>
parents:
468
diff
changeset
|
35 | { name: 'og', type: 'float' }, |
8bbc5730aaa8
Code cleanup and manual compress
Michiel Broek <mbroek@mbse.eu>
parents:
468
diff
changeset
|
36 | { name: 'fg', type: 'float' }, |
8bbc5730aaa8
Code cleanup and manual compress
Michiel Broek <mbroek@mbse.eu>
parents:
468
diff
changeset
|
37 | { name: 'batch_size', type: 'float' }, |
8bbc5730aaa8
Code cleanup and manual compress
Michiel Broek <mbroek@mbse.eu>
parents:
468
diff
changeset
|
38 | ], |
8bbc5730aaa8
Code cleanup and manual compress
Michiel Broek <mbroek@mbse.eu>
parents:
468
diff
changeset
|
39 | id: 'record', |
8bbc5730aaa8
Code cleanup and manual compress
Michiel Broek <mbroek@mbse.eu>
parents:
468
diff
changeset
|
40 | url: 'includes/db_product.php?select=archdate' |
8bbc5730aaa8
Code cleanup and manual compress
Michiel Broek <mbroek@mbse.eu>
parents:
468
diff
changeset
|
41 | }, |
8bbc5730aaa8
Code cleanup and manual compress
Michiel Broek <mbroek@mbse.eu>
parents:
468
diff
changeset
|
42 | dataAdapter = new $.jqx.dataAdapter(source); |
468
371f2da785d9
Code optimisation for compressed javascript
Michiel Broek <mbroek@mbse.eu>
parents:
292
diff
changeset
|
43 | |
525
8bbc5730aaa8
Code cleanup and manual compress
Michiel Broek <mbroek@mbse.eu>
parents:
468
diff
changeset
|
44 | // initialize jqxGrid |
8bbc5730aaa8
Code cleanup and manual compress
Michiel Broek <mbroek@mbse.eu>
parents:
468
diff
changeset
|
45 | $('#jqxgrid').jqxGrid({ |
8bbc5730aaa8
Code cleanup and manual compress
Michiel Broek <mbroek@mbse.eu>
parents:
468
diff
changeset
|
46 | width: 1280, |
8bbc5730aaa8
Code cleanup and manual compress
Michiel Broek <mbroek@mbse.eu>
parents:
468
diff
changeset
|
47 | height: 630, |
8bbc5730aaa8
Code cleanup and manual compress
Michiel Broek <mbroek@mbse.eu>
parents:
468
diff
changeset
|
48 | source: dataAdapter, |
8bbc5730aaa8
Code cleanup and manual compress
Michiel Broek <mbroek@mbse.eu>
parents:
468
diff
changeset
|
49 | groupable: true, |
8bbc5730aaa8
Code cleanup and manual compress
Michiel Broek <mbroek@mbse.eu>
parents:
468
diff
changeset
|
50 | theme: theme, |
8bbc5730aaa8
Code cleanup and manual compress
Michiel Broek <mbroek@mbse.eu>
parents:
468
diff
changeset
|
51 | columns: [ |
8bbc5730aaa8
Code cleanup and manual compress
Michiel Broek <mbroek@mbse.eu>
parents:
468
diff
changeset
|
52 | { text: 'Jaar', datafield: 'year', width: 80 }, |
8bbc5730aaa8
Code cleanup and manual compress
Michiel Broek <mbroek@mbse.eu>
parents:
468
diff
changeset
|
53 | { text: 'Datum', datafield: 'date', width: 120, menu: false }, |
8bbc5730aaa8
Code cleanup and manual compress
Michiel Broek <mbroek@mbse.eu>
parents:
468
diff
changeset
|
54 | { text: 'Naam', datafield: 'name', menu: false }, |
8bbc5730aaa8
Code cleanup and manual compress
Michiel Broek <mbroek@mbse.eu>
parents:
468
diff
changeset
|
55 | { text: 'Stijl', datafield: 'style', width: 250 }, |
8bbc5730aaa8
Code cleanup and manual compress
Michiel Broek <mbroek@mbse.eu>
parents:
468
diff
changeset
|
56 | { text: 'OG', datafield: 'og', width: 80, cellsformat: 'f3', menu: false }, |
8bbc5730aaa8
Code cleanup and manual compress
Michiel Broek <mbroek@mbse.eu>
parents:
468
diff
changeset
|
57 | { text: 'FG', datafield: 'fg', width: 80, cellsformat: 'f3', menu: false }, |
8bbc5730aaa8
Code cleanup and manual compress
Michiel Broek <mbroek@mbse.eu>
parents:
468
diff
changeset
|
58 | { text: 'Code', datafield: 'code', width: 100, menu: false }, |
8bbc5730aaa8
Code cleanup and manual compress
Michiel Broek <mbroek@mbse.eu>
parents:
468
diff
changeset
|
59 | { text: 'Liters', datafield: 'batch_size', width: 80, align: 'right', cellsalign: 'right', cellsformat: 'f1', menu: false }, |
8bbc5730aaa8
Code cleanup and manual compress
Michiel Broek <mbroek@mbse.eu>
parents:
468
diff
changeset
|
60 | { text: '', datafield: 'Edit', width: 80, align: 'center', columntype: 'button', cellsrenderer: function() { |
8bbc5730aaa8
Code cleanup and manual compress
Michiel Broek <mbroek@mbse.eu>
parents:
468
diff
changeset
|
61 | return 'Bekijk'; |
8bbc5730aaa8
Code cleanup and manual compress
Michiel Broek <mbroek@mbse.eu>
parents:
468
diff
changeset
|
62 | }, buttonclick: function(row) { |
8bbc5730aaa8
Code cleanup and manual compress
Michiel Broek <mbroek@mbse.eu>
parents:
468
diff
changeset
|
63 | var datarecord = dataAdapter.records[row]; |
8bbc5730aaa8
Code cleanup and manual compress
Michiel Broek <mbroek@mbse.eu>
parents:
468
diff
changeset
|
64 | window.location.href = 'prod_edit.php?record=' + datarecord.record + '&select=archdate&return=prod_archive_date.php'; |
8bbc5730aaa8
Code cleanup and manual compress
Michiel Broek <mbroek@mbse.eu>
parents:
468
diff
changeset
|
65 | } |
8bbc5730aaa8
Code cleanup and manual compress
Michiel Broek <mbroek@mbse.eu>
parents:
468
diff
changeset
|
66 | } |
8bbc5730aaa8
Code cleanup and manual compress
Michiel Broek <mbroek@mbse.eu>
parents:
468
diff
changeset
|
67 | ], |
8bbc5730aaa8
Code cleanup and manual compress
Michiel Broek <mbroek@mbse.eu>
parents:
468
diff
changeset
|
68 | groups: ['year'] |
8bbc5730aaa8
Code cleanup and manual compress
Michiel Broek <mbroek@mbse.eu>
parents:
468
diff
changeset
|
69 | }); |
292
90cd3798edc2
Added archive view on date and code.
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
70 | }); |