--- 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 = $("<div style='overflow: hidden; position: relative; margin: 5px;'></div>"); var addButton = $("<div style='float: right; margin-right: 15px;'><img style='position: relative; margin-top: 2px;' src='images/add.png'/><span style='margin-left: 4px; position: relative; top: -3px;'>Nieuw</span></div>"); @@ -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 "<div style='margin: 4px;' class='jqx-center-align'>" + FermentableTypeData[rowdata.type].nl + "</div>"; - }, + return "<span style='margin: 3px; margin-top: 6px; float: left;'>" + FermentableTypeData[value].nl + "</span>"; + } }, { text: 'Graan type', datafield: 'graintype', align: 'center', cellsalign: 'center', width: 125, cellsrenderer: function (index, datafield, value, defaultvalue, column, rowdata) { - return "<div style='margin: 4px;' class='jqx-center-align'>" + GrainTypeData[value].nl + "</div>"; + return "<span style='margin: 3px; margin-top: 6px; float: left;'>" + GrainTypeData[value].nl + "</span>"; } }, { 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 "<div style='margin: 4px;' class='jqx-right-align'></div>"; - if (value < 1) - return "<div style='margin: 4px;' class='jqx-right-align'>"+value * 1000+" gr</div>"; - return "<div style='margin: 4px;' class='jqx-right-align'>"+dataAdapter.formatNumber(value,"f1")+" kg</div>"; + var amount = ""; + if (value > 0) { + if (value < 1) + amount = value * 1000+" gr"; + else + amount = dataAdapter.formatNumber(value,"f1")+" kg"; + } + return "<span style='margin: 3px; margin-top: 6px; float: right;'>" + amount + "</span>"; } }, - { 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.