--- a/www/js/rec_edit.js Sun May 26 20:45:01 2019 +0200
+++ b/www/js/rec_edit.js Thu May 30 23:18:48 2019 +0200
@@ -362,8 +362,8 @@
row.h_useat, parseFloat(row.h_amount));
}
total_ibus = Math.round(total_ibus * 10) / 10;
- hop_flavour = Math.round(hop_flavour * 100) / 10;
- hop_aroma = Math.round(hop_aroma * 100) / 10;
+ hop_flavour = Math.round(hop_flavour * 1000 / 5) / 10;
+ hop_aroma = Math.round(hop_aroma * 1000 / 6) / 10;
if (hop_flavour > 100)
hop_flavour = 100;
if (hop_aroma > 100)
@@ -1776,6 +1776,7 @@
height: 470,
source: fermentableAdapter,
theme: theme,
+ sortmode: "many",
selectionmode: 'singlerow',
showtoolbar: true,
rendertoolbar: function (toolbar) {
@@ -1894,6 +1895,11 @@
});
},
ready: function() {
+ var datainformation = $('#fermentableGrid').jqxGrid('getdatainformation');
+ if (datainformation.rowscount) {
+ $("#fermentableGrid").jqxGrid('sortby', 'f_added', 'asc');
+ $("#fermentableGrid").jqxGrid('sortby', 'f_amount', 'desc');
+ }
calcFermentables();
$('#jqxTabs').jqxTabs('next');
},
@@ -1995,6 +2001,7 @@
height: 560,
source: hopAdapter,
theme: theme,
+ sortmode: "many",
selectionmode: 'singlerow',
showtoolbar: true,
rendertoolbar: function (toolbar) {
@@ -2067,6 +2074,12 @@
});
},
ready: function() {
+ var datainformation = $('#hopGrid').jqxGrid('getdatainformation');
+ if (datainformation.rowscount) {
+ $("#hopGrid").jqxGrid('sortby', 'h_useat', 'asc');
+ $("#hopGrid").jqxGrid('sortby', 'h_time', 'desc');
+ $("#hopGrid").jqxGrid('sortby', 'h_amount', 'desc');
+ }
calcIBUs();
$('#jqxTabs').jqxTabs('next');
},
@@ -2245,6 +2258,7 @@
height: 575,
source: miscAdapter,
theme: theme,
+ sortmode: "many",
selectionmode: 'singlerow',
showtoolbar: true,
rendertoolbar: function (toolbar) {
@@ -2301,6 +2315,11 @@
});
},
ready: function() {
+ var datainformation = $('#miscGrid').jqxGrid('getdatainformation');
+ if (datainformation.rowscount) {
+ $("#miscGrid").jqxGrid('sortby', 'm_use_use', 'asc');
+ $("#miscGrid").jqxGrid('sortby', 'm_type', 'asc');
+ }
$('#jqxTabs').jqxTabs('next');
},
columns: [
@@ -2405,6 +2424,7 @@
height: 350,
source: yeastAdapter,
theme: theme,
+ sortmode: "many",
selectionmode: 'singlerow',
showtoolbar: true,
rendertoolbar: function (toolbar) {
@@ -2472,6 +2492,10 @@
});
},
ready: function() {
+ var datainformation = $('#yeastGrid').jqxGrid('getdatainformation');
+ if (datainformation.rowscount) {
+ $("#yeastGrid").jqxGrid('sortby', 'y_use', 'asc');
+ }
calcFermentables();
$('#jqxTabs').jqxTabs('next');
},
@@ -2789,42 +2813,68 @@
$("#est_color2").jqxNumberInput( Show0dec );
$("#est_og2").jqxTooltip({ content: 'Het begin SG wat je wilt bereiken. De moutstort wordt automatisch herberekend.' });
$("#est_og2").jqxNumberInput( Show3dec );
- $("#ferm_lintner").jqxTooltip({ content: 'De enzymkracht van alle mouten in de maisch. Moet hoger dan 35 zijn.' });
- $("#ferm_lintner").jqxNumberInput( Show0dec );
$("#perc_malts").jqxProgressBar({
width: 300,
height: 23,
theme: theme,
showText: true,
+ max: 120,
animationDuration: 0,
colorRanges: [
{ stop: 90, color: '#008C00' },
- { stop: 95, color: '#EB7331' },
- { stop: 100, color: '#FF0000' }
- ]
+ { stop: 100, color: '#EB7331' },
+ { stop: 120, color: '#FF0000' }
+ ],
+ renderText: function (text) {
+ return (Math.round(parseInt(text) * 1.2)) + '%';
+ }
});
$("#perc_sugars").jqxProgressBar({
width: 300,
height: 23,
theme: theme,
showText: true,
+ max: 50,
animationDuration: 0,
colorRanges: [
- { stop: 20, color: '#008C00' },
- { stop: 100, color: '#FF0000' }
- ]
+ { stop: 20, color: '#008C00' },
+ { stop: 50, color: '#FF0000' }
+ ],
+ renderText: function (text) {
+ return (Math.round(parseInt(text) * 5) / 10) + '%';
+ }
});
$("#perc_cara").jqxProgressBar({
width: 300,
height: 23,
theme: theme,
showText: true,
+ max: 50,
animationDuration: 0,
colorRanges: [
- { stop: 25, color: '#008C00' },
- { stop: 100, color: '#FF0000' }
- ]
+ { stop: 25, color: '#008C00' },
+ { stop: 50, color: '#FF0000' }
+ ],
+ renderText: function (text) {
+ return (Math.round(parseInt(text) * 5) / 10) + '%';
+ }
});
+ $("#ferm_lintner").jqxProgressBar({
+ width: 300,
+ height: 23,
+ theme: theme,
+ showText: true,
+ max: 200,
+ animationDuration: 0,
+ colorRanges: [
+ { stop: 30, color: '#FF0000' },
+ { stop: 40, color: '#EB7331' },
+ { stop: 200, color: '#008C00' }
+ ],
+ renderText: function (text) {
+ return (parseInt(text) * 2) + ' lintner';
+ }
+ });
$("#popupFermentable").jqxWindow({
width: 800,
height: 300,
@@ -2838,7 +2888,6 @@
});
$("#FermentableReady").jqxButton({ template: "success", width: '90px', theme: theme });
$("#FermentableReady").click(function () {
- $("#fermentableGrid").jqxGrid('sortby', 'f_amount', 'desc');
// Recalc percentages
calcFermentables();
calcIBUs();
@@ -3037,7 +3086,20 @@
{ stop: 60, color: '#00BF00' },
{ stop: 80, color: '#00FF00' },
{ stop: 100, color: '#80FF80' }
- ]
+ ],
+ renderText: function (text) {
+ var val = parseInt(text);
+ if (val < 20)
+ return 'Weinig';
+ else if (val < 40)
+ return 'Matig';
+ else if (val < 60)
+ return 'Redelijk';
+ else if (val < 80)
+ return 'Veel';
+ else
+ return 'Zeer veel';
+ }
});
$("#hop_aroma").jqxProgressBar({
width: 300,
@@ -3051,7 +3113,20 @@
{ stop: 60, color: '#00BF00' },
{ stop: 80, color: '#00FF00' },
{ stop: 100, color: '#80FF80' }
- ]
+ ],
+ renderText: function (text) {
+ var val = parseInt(text);
+ if (val < 20)
+ return 'Weinig';
+ else if (val < 40)
+ return 'Matig';
+ else if (val < 60)
+ return 'Redelijk';
+ else if (val < 80)
+ return 'Veel';
+ else
+ return 'Zeer veel';
+ }
});
$("#popupHop").jqxWindow({
width: 800,
@@ -3066,7 +3141,6 @@
});
$("#HopReady").jqxButton({ template: "success", width: '90px', theme: theme });
$("#HopReady").click(function () {
- $("#hopGrid").jqxGrid('sortby', 'h_amount', 'asc');
calcIBUs();
});
$("#wh_name").jqxInput({ theme: theme, width: 320, height: 23 });
@@ -3205,9 +3279,6 @@
modalOpacity: 0.40
});
$("#MiscReady").jqxButton({ template: "success", width: '90px', theme: theme });
- $("#MiscReady").click(function () {
- $("#miscGrid").jqxGrid('sortby', 'm_use_use', 'asc');
- });
$("#wm_name").jqxInput({ theme: theme, width: 320, height: 23 });
$("#wm_instock").jqxCheckBox({ theme: theme, height: 23 });
$("#wm_instock").on('change', function (event) {
@@ -3309,7 +3380,6 @@
$("#YeastReady").jqxButton({ template: "success", width: '90px', theme: theme });
$("#YeastReady").click(function () {
calcFermentables();
- $("#yeastGrid").jqxGrid('sortby', 'y_use', 'asc');
});
$("#wy_name").jqxInput({ theme: theme, width: 320, height: 23 });
$("#wy_laboratory").jqxInput({ theme: theme, width: 320, height: 23 });