diff -r 0ea9dfb3fce9 -r 124af734af68 www/js/inv_miscs.js --- a/www/js/inv_miscs.js Sat Feb 23 22:56:35 2019 +0100 +++ b/www/js/inv_miscs.js Sun Feb 24 17:23:52 2019 +0100 @@ -175,7 +175,6 @@ source: dataAdapter, theme: theme, showstatusbar: true, - localization: getLocalization(), renderstatusbar: function (statusbar) { var container = $("
"); var addButton = $("
Nieuw
"); @@ -205,44 +204,50 @@ filtermode: 'excel', columns: [ { text: 'Ingredient naam', datafield: 'name', menu: false }, - { text: 'Type', datafield: 'type', align: 'center', cellsalign: 'center', width: 120, + { text: 'Type', datafield: 'type', align: 'left', width: 120, cellsrenderer: function (index, datafield, value, defaultvalue, column, rowdata) { - return "
" + MiscTypeData[value].nl + "
"; + return "" + MiscTypeData[value].nl + ""; } }, - { text: 'Gebruik', datafield: 'use_use', align: 'center', cellsalign: 'center', width: 120, + { text: 'Gebruik', datafield: 'use_use', align: 'left', width: 120, cellsrenderer: function (index, datafield, value, defaultvalue, column, rowdata) { - return "
" + MiscUseData[value].nl + "
"; + return "" + MiscUseData[value].nl + ""; } }, { 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
"; + var duration = ""; + if (value > 0) { + if (value == 1) + duration = "1 minuut"; + else if (value < 60) + duration = dataAdapter.formatNumber(value, "f0")+" minuten"; + else if (value == 60) + duration = "1 uur"; + else if (value < 1440) + duration = dataAdapter.formatNumber(value / 60, "f0")+" uren"; + else if (value == 1440) + duration = "1 dag"; + else + duration = dataAdapter.formatNumber(value / 1440, "f0")+" dagen"; + } + return "" + duration + ""; } }, - { text: 'Voorraad', datafield: 'inventory', width: 110, menu: false, align: 'right', cellsalign: 'right', + { text: 'Voorraad', datafield: 'inventory', width: 110, menu: false, align: 'right', cellsrenderer: function (index, datafield, value, defaultvalue, column, rowdata) { - if (value == 0) - return "
"; - if (rowdata.amount_is_weight) - return "
"+dataAdapter.formatNumber(value,"f1")+" gr
"; - return "
"+dataAdapter.formatNumber(value,"f1")+" ml
"; + var amount = ""; + if (value > 0) { + if (rowdata.amount_is_weight) + amount = dataAdapter.formatNumber(value,"f1")+" gr"; + else + amount = dataAdapter.formatNumber(value,"f1")+" ml"; + } + return "" + amount + ""; } }, { 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 () { + { text: '', 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.