diff -r a59ecd6d72f4 -r 30abc8024afe www/js/prod_divide.js --- a/www/js/prod_divide.js Sun Jun 13 19:36:42 2021 +0200 +++ b/www/js/prod_divide.js Fri Jun 18 15:26:55 2021 +0200 @@ -39,7 +39,7 @@ leftover = Round(available, 1); for (i = 0; i < rows.length; i++) { row = rows[i]; - leftover -= row.split_size; + leftover = Round(leftover - row.split_size, 1); console.log('i:' + i + ' split_size:' + row.split_size); } $('#leftover').val(leftover); @@ -298,7 +298,6 @@ $('#stage').val(StageData[dataRecord.stage].nl); // Disable stages that are already done. for (i = 0; i < SplitData.length; i++) { - console.log('i:' + i + ' ok:' + SplitData[i].ok + ' stage:' + dataRecord.stage); if (SplitData[i].ok < dataRecord.stage) $('#divide_type').jqxDropDownList('disableAt', i); } @@ -363,7 +362,7 @@ id = $('#splitGrid').jqxGrid('getrowid', rowscount - 1); // First, give back this batch volume. row = $('#splitGrid').jqxGrid('getrowdata', id); - leftover += row.split_size; + leftover = Round(leftover + row.split_size, 1); if (leftover > available) leftover = available; $('#leftover').val(leftover); @@ -440,7 +439,6 @@ break; } leftover = available; -// minvolume = Round(0.1 * available, 1); /* What was the use for this ?? */ console.log('divide_type:' + index + ' available:' + available); $('#available').val(available); $('#leftover').val(leftover); @@ -459,7 +457,10 @@ $('#Save').jqxButton({ template: 'success', width: '80px', theme: theme }); $('#Save').bind('click', function() { var rows, row, i, div, data; - if (leftover != available) { + if (! leftover) { + console.log('Save and no volume left'); + alert('Fout, er is geen volume over in de hoofd batch.'); + } else if (leftover != available) { console.log('Save and there are splits'); // Send all the info to the database. The server handles the splitting. @@ -498,15 +499,19 @@ cache: false, data: data, type: 'POST', - success: function(data, status, xhr) { - console.log('insert divides: success'); + success: function(data) { + if (data.error) { + console.log('insert divides: error ' + data.msg); + alert('Fout: ' + data.msg); + } else { + console.log('insert divides: success'); + } window.location.href = my_return; }, error: function(jqXHR, textStatus, errorThrown) { console.log('insert divides: ' + textStatus); } }); - - } + } // if (leftover != available) }); });