diff -r 0ea9dfb3fce9 -r 124af734af68 www/js/inv_yeasts.js
--- a/www/js/inv_yeasts.js Sat Feb 23 22:56:35 2019 +0100
+++ b/www/js/inv_yeasts.js Sun Feb 24 17:23:52 2019 +0100
@@ -201,7 +201,6 @@
source: dataAdapter,
theme: theme,
showstatusbar: true,
- localization: getLocalization(),
renderstatusbar: function (statusbar) {
var container = $("
");
var addButton = $("Nieuw ");
@@ -249,20 +248,23 @@
}
},
{ text: 'SVG', datafield: 'attenuation', width: 80, align: 'right', cellsalign: 'right', menu: false, cellsformat: 'p1' },
- { text: 'Voorraad', datafield: 'inventory', width: 100, align: 'right', menu: false, cellsalign: 'right',
+ { text: 'Voorraad', datafield: 'inventory', width: 100, align: 'right', menu: false,
cellsrenderer: function (index, datafield, value, defaultvalue, column, rowdata) {
- if (value == 0)
- return "";
- if ((rowdata.form == 0) && (value > 1))
- return ""+dataAdapter.formatNumber(value,"f0")+" pakken
";
- if (rowdata.form == 0)
- return ""+dataAdapter.formatNumber(value,"f0")+" pak
";
- if (rowdata.form == 1)
- return ""+dataAdapter.formatNumber(value * 1000,"f1")+" gram
";
- return ""+dataAdapter.formatNumber(value * 1000,"f1")+" ml
";
+ var amount = "";
+ if (value > 0) {
+ if ((rowdata.form == 0) && (value > 1))
+ amount = dataAdapter.formatNumber(value,"f0")+" pakken";
+ else if (rowdata.form == 0)
+ amount = dataAdapter.formatNumber(value,"f0")+" pak";
+ else if (rowdata.form == 1)
+ amount = dataAdapter.formatNumber(value * 1000,"f1")+" gram";
+ else
+ amount = dataAdapter.formatNumber(value * 1000,"f1")+" ml";
+ }
+ return "" + amount + "";
}
},
- { text: 'Wijzig', datafield: 'Edit', columntype: 'button', width: 100, align: 'center', menu: false, cellsrenderer: function () {
+ { text: '', datafield: 'Edit', columntype: 'button', width: 100, align: 'center', menu: false, cellsrenderer: function () {
return "Wijzig";
}, buttonclick: function (row) {
// open the popup window when the user clicks a button.