Wed, 06 Mar 2019 20:15:24 +0100
Fix for ugly fermentables in stock notation below 1 kg. Don't show days for in production list on the package day.
www/js/inv_fermentables.js | file | annotate | diff | comparison | revisions | |
www/js/prod_inprod.js | file | annotate | diff | comparison | revisions |
--- a/www/js/inv_fermentables.js Wed Mar 06 16:07:54 2019 +0100 +++ b/www/js/inv_fermentables.js Wed Mar 06 20:15:24 2019 +0100 @@ -263,8 +263,8 @@ cellsrenderer: function (index, datafield, value, defaultvalue, column, rowdata) { var amount = ""; if (value > 0) { - if (value < 1) - amount = value * 1000+" gr"; + if (value < 1.000) + amount = dataAdapter.formatNumber(value * 1000,"f0")+" gr"; else amount = dataAdapter.formatNumber(value,"f1")+" kg"; }
--- a/www/js/prod_inprod.js Wed Mar 06 16:07:54 2019 +0100 +++ b/www/js/prod_inprod.js Wed Mar 06 20:15:24 2019 +0100 @@ -68,7 +68,7 @@ if (value == 2) { fase = StageData[value].nl + " op " + rowdata.brew_date; } - if (value >= 6 && value < 9) { + if (value == 7 || value == 8) { var d = new Date(); var date2 = rowdata.package_date; date2 = date2.split('-');