diff -r 0ea9dfb3fce9 -r 124af734af68 www/js/inv_hops.js
--- a/www/js/inv_hops.js Sat Feb 23 22:56:35 2019 +0100
+++ b/www/js/inv_hops.js Sun Feb 24 17:23:52 2019 +0100
@@ -180,7 +180,6 @@
source: dataAdapter,
theme: theme,
showstatusbar: true,
- localization: getLocalization(),
renderstatusbar: function (statusbar) {
var container = $("
");
var addButton = $("Nieuw ");
@@ -218,14 +217,14 @@
columns: [
{ text: 'Herkomst', datafield: 'origin', width: 150 },
{ text: 'Hop Naam', datafield: 'name', menu: false },
- { text: 'Soort', datafield: 'type', align: 'center', menu: false, width: 90,
+ { text: 'Soort', datafield: 'type', align: 'left', menu: false, width: 90,
cellsrenderer: function (index, datafield, value, defaultvalue, column, rowdata) {
- return "" + HopTypeData[value].nl + "
";
+ return '' + HopTypeData[value].nl + '';
}
},
- { text: 'Vorm', datafield: 'form', align: 'center', menu: false, width: 90,
+ { text: 'Vorm', datafield: 'form', align: 'left', menu: false, width: 90,
cellsrenderer: function (index, datafield, value, defaultvalue, column, rowdata) {
- return "" + HopFormData[value].nl + "
";
+ return '' + HopFormData[value].nl + '';
}
},
{ text: 'Alpha %', datafield: 'alpha', width: 80, align: 'right', cellsalign: 'right', menu: false, cellsformat: 'p1' },
@@ -235,14 +234,17 @@
{ text: 'Oogst datum', datafield: 'production_date', align: 'center', cellsalign: 'center', menu: false, width: 110 },
{ text: 'Voorraad', datafield: 'inventory', width: 100, align: 'right', cellsalign: 'right', menu: false, cellsformat: 'f1',
cellsrenderer: function (index, datafield, value, defaultvalue, column, rowdata) {
- if (value == 0)
- return "";
- if (value < 1000)
- return ""+dataAdapter.formatNumber(value,"f1")+" gr
";
- return ""+dataAdapter.formatNumber(value / 1000.0,"f1")+" kg
";
+ var amount = "";
+ if (value > 0) {
+ if (value < 1000)
+ amount = dataAdapter.formatNumber(value,"f1")+" gr";
+ else
+ amount = dataAdapter.formatNumber(value / 1000.0,"f1")+" kg";
+ }
+ return '' + amount + '';
}
},
- { text: 'Wijzig', datafield: 'Wijzig', columntype: 'button', width: 100, align: 'center', menu: false, cellsrenderer: function () {
+ { text: '', datafield: 'Wijzig', 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.