diff -r e29b53962cd1 -r 5df88c6dc903 www/js/inv_miscs.js
--- a/www/js/inv_miscs.js Fri Jan 25 20:24:00 2019 +0100
+++ b/www/js/inv_miscs.js Fri Jan 25 20:38:31 2019 +0100
@@ -205,7 +205,7 @@
filterable: true,
filtermode: 'excel',
columns: [
- { text: 'Ingredient naam', datafield: 'name' },
+ { text: 'Ingredient naam', datafield: 'name', menu: false },
{ text: 'Type', datafield: 'type', align: 'center', cellsalign: 'center', width: 120,
cellsrenderer: function (index, datafield, value, defaultvalue, column, rowdata) {
return "
" + MiscTypeData[value].nl + "
";
@@ -216,27 +216,34 @@
return "" + MiscUseData[value].nl + "
";
}
},
- { text: 'Tijd', datafield: 'time', width: 90, align: 'right', cellsalign: 'right', cellsformat: 'f0',
+ { text: 'Tijd', datafield: 'time', width: 90, align: 'left', menu: false,
+ cellsrenderer: function (index, datafield, value, defaultvalue, column, rowdata) {
+ if (value == 0)
+ return "";
+ if (value == 1)
+ return "1 minuut
";
+ if (value < 60)
+ return ""+dataAdapter.formatNumber(value, "f0")+" minuten
";
+ if (value == 60)
+ return "1 uur
";
+ if (value < 1440)
+ return ""+dataAdapter.formatNumber(value / 60, "f0")+" uren
";
+ if (value == 1440)
+ return "1 dag
";
+ return ""+dataAdapter.formatNumber(value / 1440, "f0")+" dagen
";
+ }
+ },
+ { text: 'Voorraad', datafield: 'inventory', width: 110, menu: false, align: 'right', cellsalign: 'right',
cellsrenderer: function (index, datafield, value, defaultvalue, column, rowdata) {
if (value == 0)
return "";
- if (value == 1)
- return "1 minuut
";
- if (value < 60)
- return ""+dataAdapter.formatNumber(value, "f0")+" minuten
";
- if (value == 60)
- return "1 uur
";
- if (value < 1440)
- return ""+dataAdapter.formatNumber(value / 60, "f0")+" uren
";
- if (value == 1440)
- return "1 dag
";
- return ""+dataAdapter.formatNumber(value / 1440, "f0")+" dagen
";
+ if (rowdata.amount_is_weight)
+ return ""+dataAdapter.formatNumber(value,"f1")+" gr
";
+ return ""+dataAdapter.formatNumber(value,"f1")+" ml
";
}
},
- { text: 'Voor. gr/ml.', datafield: 'inventory', width: 110, align: 'right', cellsalign: 'right' },
- { text: 'Prijs kg/l', datafield: 'cost', width: 90, align: 'right', cellsalign: 'right', cellsformat: 'c2' },
- { text: 'THT datum', datafield: 'tht_date', width: 100, align: 'center', cellsalign: 'center' },
- { text: 'Wijzig', datafield: 'Edit', columntype: 'button', width: 100, align: 'center', cellsrenderer: function () {
+ { text: 'THT datum', datafield: 'tht_date', width: 100, menu: false, align: 'center', cellsalign: 'center' },
+ { text: 'Wijzig', datafield: 'Edit', columntype: 'button', width: 100, menu: false, align: 'center', cellsrenderer: function () {
return "Wijzig";
}, buttonclick: function (row) {
// open the popup window when the user clicks a button.