diff -r 0ea9dfb3fce9 -r 124af734af68 www/js/inv_fermentables.js
--- a/www/js/inv_fermentables.js Sat Feb 23 22:56:35 2019 +0100
+++ b/www/js/inv_fermentables.js Sun Feb 24 17:23:52 2019 +0100
@@ -197,7 +197,6 @@
source: dataAdapter,
theme: theme,
showstatusbar: true,
- localization: getLocalization(),
renderstatusbar: function (statusbar) {
var container = $("
");
var addButton = $("Nieuw ");
@@ -243,26 +242,29 @@
{ text: 'Vergistbaar product', datafield: 'name', menu: false },
{ text: 'Soort', width: 135, filtertype: 'list', datafield: 'type',
cellsrenderer: function (index, datafield, value, defaultvalue, column, rowdata) {
- return "" + FermentableTypeData[rowdata.type].nl + "
";
- },
+ return "" + FermentableTypeData[value].nl + "";
+ }
},
{ text: 'Graan type', datafield: 'graintype', align: 'center', cellsalign: 'center', width: 125,
cellsrenderer: function (index, datafield, value, defaultvalue, column, rowdata) {
- return "" + GrainTypeData[value].nl + "
";
+ return "" + GrainTypeData[value].nl + "";
}
},
{ text: 'EBC', datafield: 'color', width: 60, align: 'right', menu: false, cellsalign: 'right' },
{ text: 'Opbrengst', datafield: 'yield', width: 70, align: 'right', menu: false, cellsalign: 'right', cellsformat: 'p1' },
{ text: 'Voorraad', datafield: 'inventory', width: 100, align: 'right', menu: false,
cellsrenderer: function (index, datafield, value, defaultvalue, column, rowdata) {
- if (value == 0)
- return "";
- if (value < 1)
- return ""+value * 1000+" gr
";
- return ""+dataAdapter.formatNumber(value,"f1")+" kg
";
+ var amount = "";
+ if (value > 0) {
+ if (value < 1)
+ amount = value * 1000+" gr";
+ else
+ amount = dataAdapter.formatNumber(value,"f1")+" kg";
+ }
+ return "" + amount + "";
}
},
- { text: 'Wijzig', datafield: 'Edit', width: 100, align: 'center', menu: false, columntype: 'button', cellsrenderer: function () {
+ { text: '', datafield: 'Edit', width: 100, align: 'center', menu: false, columntype: 'button', cellsrenderer: function () {
return "Wijzig";
}, buttonclick: function (row) {
// open the popup window when the user clicks a button.