diff -r d24269303f0b -r 72ba4a5e8ebc www/js/prod_edit.js
--- a/www/js/prod_edit.js Fri Jun 14 16:05:57 2019 +0200
+++ b/www/js/prod_edit.js Fri Jun 14 17:08:05 2019 +0200
@@ -3411,6 +3411,8 @@
},
{ text: 'Procent', datafield: 'f_percentage', width: 90, align: 'right',
cellsrenderer: function (row, columnfield, value, defaulthtml, columnproperties, rowdata) {
+ if (rowdata.f_added >= 4)
+ return '';
var color = '#ffffff';
if (value > rowdata.f_max_in_batch)
color = '#ff4040';
@@ -3418,16 +3420,22 @@
color + ';">' +fermentableAdapter.formatNumber(value, "p1") + '';
}
},
- { text: '100%', align: 'center', datafield: 'f_adjust_to_total_100', columntype: 'checkbox', width: 70 },
+ { text: '100%', datafield: 'f_adjust_to_total_100', width: 70, align: 'center', cellsalign: 'center',
+ cellsrenderer: function (index, datafield, value, defaultvalue, column, rowdata) {
+ if (value == 0)
+ return '';
+ return '';
+ }
+ },
{ text: '', datafield: 'Edit', columntype: 'button', width: 100, align: 'center', cellsrenderer: function () {
return "Wijzig";
}, buttonclick: function (row) {
fermentableRow = row;
fermentableData = $("#fermentableGrid").jqxGrid('getrowdata', fermentableRow);
- if (dataRecord.stage > 3) {
+ if (fermentableData.f_added >= 4) {
+ alert("Wijzig dit in de Verpakken tab");
+ } else if (dataRecord.stage > 3) {
alert("Ingredieënt is al verwerkt.");
- } else if (fermentableData.f_added >= 4) {
- alert("Wijzig dit in de Verpakken tab");
} else {
$("#wf_name").val(fermentableData.f_name);
$("#wf_amount").val(fermentableData.f_amount);