--- 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 = $("<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>"); @@ -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 "<div style='margin: 4px;' class='jqx-center-align'>" + HopTypeData[value].nl + "</div>"; + return '<span style="margin: 4px; margin-top: 6px; float: left;">' + HopTypeData[value].nl + '</span>'; } }, - { 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 "<div style='margin: 4px;' class='jqx-center-align'>" + HopFormData[value].nl + "</div>"; + return '<span style="margin: 4px; margin-top: 6px; float: left;">' + HopFormData[value].nl + '</span>'; } }, { 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 "<div style='margin: 4px;' class='jqx-right-align'></div>"; - if (value < 1000) - return "<div style='margin: 4px;' class='jqx-right-align'>"+dataAdapter.formatNumber(value,"f1")+" gr</div>"; - return "<div style='margin: 4px;' class='jqx-right-align'>"+dataAdapter.formatNumber(value / 1000.0,"f1")+" kg</div>"; + var amount = ""; + if (value > 0) { + if (value < 1000) + amount = dataAdapter.formatNumber(value,"f1")+" gr"; + else + amount = dataAdapter.formatNumber(value / 1000.0,"f1")+" kg"; + } + return '<span style="margin: 4px; margin-top: 6px; float: right;">' + amount + '</span>'; } }, - { 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.