Fix #64

config/Windows/newbatch.xml

@@ -20,9 +20,10 @@
             <stretch />
         </layout>
         <label>Green Coffee:</label>
-        <sqltablearray columns="2" id="greens">
+        <sqltablearray columns="3" id="greens">
             <column name="Coffee" delegate="sql" showdata="true" null="true" nulltext="Delete" nulldata="delete" data="0" display="1">SELECT id, name FROM coffees WHERE quantity &lt;&gt; 0 ORDER BY name</column>
             <column name="Weight" delegate="numeric" />
+            <column name="Remaining" />
         </sqltablearray>
         <layout type="horizontal">
             <label>Green Weight:</label>
@@ -62,79 +63,168 @@
 	</layout>
     <program>
         <![CDATA[
-			var unitBox = findChildObject(this, 'unit');
-			unitBox.addItem("g");
-			unitBox.addItem("Kg");
-			unitBox.addItem("oz");
-			unitBox.addItem("lb");
-			unitBox.currentIndex = (QSettings.value("script/batch_unit", unitBox.findText("lb")));
-			var machine = findChildObject(this, "machine");
-			machine.setText(selectedRoasterName + " (" + selectedRoasterID + ")");
-			var newMenu = findChildObject(this, 'new');
-			newMenu.triggered.connect(function() {
-				var bwindow = createWindow("batchWindow");
-				bwindow.windowTitle = "Typica - [*]New Batch";
-			});
-			var batch = this;
-			var table = findChildObject(this, 'greens');
-			var green = findChildObject(this, 'green');
-			var model = table.model();
+            var unitBox = findChildObject(this, 'unit');
+            unitBox.addItem("g");
+            unitBox.addItem("Kg");
+            unitBox.addItem("oz");
+            unitBox.addItem("lb");
+            unitBox.currentIndex = (QSettings.value("script/batch_unit", unitBox.findText("lb")));
+            var machine = findChildObject(this, "machine");
+            machine.setText(selectedRoasterName + " (" + selectedRoasterID + ")");
+            var newMenu = findChildObject(this, 'new');
+            newMenu.triggered.connect(function() {
+                    var bwindow = createWindow("batchWindow");
+                    bwindow.windowTitle = "Typica - [*]New Batch";
+            });
+            var batch = this;
+            var table = findChildObject(this, 'greens');
+            var green = findChildObject(this, 'green');
+            var model = table.model();
             var lossField = findChildObject(this, 'wloss');
             lossField.maximumWidth = 80;
             var roasted = findChildObject(this, 'roasted');
             var roastwt = findChildObject(this, 'roast');
             roastwt.maximumWidth = 80;
-			var scalesLayout = findChildObject(this, 'scales');
-			scalesLayout.spacing = 10;
-			if(navigationwindow.loggingWindow.scales.length > 0) {
-				for(var i = 0; i < navigationwindow.loggingWindow.scales.length; i++) {
-					var scale = navigationwindow.loggingWindow.scales[i];
-					var label = new DragLabel();
-					var weighButton = new QPushButton();
-					weighButton.text = "Weigh";
-					weighButton.clicked.connect(scale.weigh);
-					label.updateMeasurement = function(m, u) {
-						switch(unitBox.currentIndex) {
-							case 0:
-								this.text = Units.convertWeight(m, u, Units.Gram).toFixed(1);
-								break;
-							case 1:
-								this.text = Units.convertWeight(m, u, Units.Kilogram).toFixed(4);
-								break;
-							case 2:
-								this.text = Units.convertWeight(m, u, Units.Ounce).toFixed(3);
-								break;
-							case 3:
-								this.text = Units.convertWeight(m, u, Units.Pound).toFixed(4);
-								break;
-						}
-					};
-					scalesLayout.addWidget(label);
-					scalesLayout.addWidget(weighButton);
-					scale.newMeasurement.connect(function(m, u) {
-						label.updateMeasurement(m, u);
-					});
-					scale.weigh();
-					unitBox['currentIndexChanged(int)'].connect(scale.weigh);
-				}
-			}
-			model.dataChanged.connect(function() {
-				var deleteRow = -1;
-				/* The combo box delegate updates user data before display data
-				   and this code is executed before the model update is fully
-				   complete. Rather than rely on this behavior continuing, we
-				   check that the display value has also been updated and defer
-				   row removal until both updates are complete.
-				*/
-				while((deleteRow = table.findData("delete", 0)) > -1) {
-					if(table.data(deleteRow, 0, 0) == "Delete") {
-						table.removeRow(table.findData("delete", 0));
-					} else {
-						break;
-					}
-				}
-				green.text = table.columnSum(1, 0);
-				table.resizeColumnToContents(0);
+            var scalesLayout = findChildObject(this, 'scales');
+            scalesLayout.spacing = 10;
+            if(navigationwindow.loggingWindow.scales.length > 0) {
+                    for(var i = 0; i < navigationwindow.loggingWindow.scales.length; i++) {
+                            var scale = navigationwindow.loggingWindow.scales[i];
+                            var label = new DragLabel();
+                            var weighButton = new QPushButton();
+                            weighButton.text = "Weigh";
+                            weighButton.clicked.connect(scale.weigh);
+                            label.updateMeasurement = function(m, u) {
+                                    switch(unitBox.currentIndex) {
+                                            case 0:
+                                                    this.text = Units.convertWeight(m, u, Units.Gram).toFixed(1);
+                                                    break;
+                                            case 1:
+                                                    this.text = Units.convertWeight(m, u, Units.Kilogram).toFixed(4);
+                                                    break;
+                                            case 2:
+                                                    this.text = Units.convertWeight(m, u, Units.Ounce).toFixed(3);
+                                                    break;
+                                            case 3:
+                                                    this.text = Units.convertWeight(m, u, Units.Pound).toFixed(4);
+                                                    break;
+                                    }
+                            };
+                            scalesLayout.addWidget(label);
+                            scalesLayout.addWidget(weighButton);
+                            scale.newMeasurement.connect(function(m, u) {
+                                    label.updateMeasurement(m, u);
+                            });
+                            scale.weigh();
+                            unitBox['currentIndexChanged(int)'].connect(scale.weigh);
+                    }
+            }
+            var remainingStock = new Array();
+            var query = new QSqlQuery();
+            query.exec("SELECT id, quantity, (SELECT conversion FROM lb_bag_conversion WHERE item = id) FROM coffees WHERE quantity <> 0");
+            while(query.next()) {
+                remainingStock.push({id: query.value(0),
+                                     quantity: query.value(1),
+                                     conversion: query.value(2)});
+            }
+            query = query.invalidate();
+            var convertToPounds = function(w, u) {
+                switch(u) {
+                    case "g":
+                        return w * 0.0022;
+                    case "oz":
+                        return w * 0.0625;
+                    case "Kg":
+                        return w * 2.2;
+                }
+                return w;
+            };
+            var convertFromPounds = function(w, u) {
+                switch(u) {
+                    case "g":
+                        return w / 0.0022;
+                    case "oz":
+                        return w / 0.0625;
+                    case "Kg":
+                        return w / 2.2;
+                }
+                return w;
+            };
+            var updateGreenTable = function() {
+                var deleteRow = -1;
+                /* The combo box delegate updates user data before display data
+                and this code is executed before the model update is fully
+                complete. Rather than rely on this behavior continuing, we
+                check that the display value has also been updated and defer
+                row removal until both updates are complete.
+                */
+                while((deleteRow = table.findData("delete", 0)) > -1) {
+                        if(table.data(deleteRow, 0, 0) == "Delete") {
+                                table.removeRow(table.findData("delete", 0));
+                        } else {
+                                break;
+                        }
+                }
+                green.text = table.columnSum(1, 0);
+                table.resizeColumnToContents(0);
+                var gid = 0;
+                var r = 0;
+                while(gid >= 0)
+                {
+                    gid = Number(table.data(r, 0, 32));
+                    if(isNaN(gid))
+                    {
+                        gid = -1;
+                        break;
+                    }
+                    var bagConversion = 1;
+                    for(var i = 0; i < remainingStock.length; i++)
+                    {
+                        if(gid == Number(remainingStock[i].id))
+                        {
+                            var displayValue = Number(remainingStock[i].quantity);
+                            bagConversion = Number(remainingStock[i].conversion);
+                            if(!isNaN(Number(table.data(r, 1, 0))))
+                            {
+                                var change = Number(table.data(r, 1, 0));
+                                switch(unitBox.currentIndex)
+                                {
+                                    case 0:
+                                        change = convertToPounds(change, "g");
+                                        break;
+                                    case 1:
+                                        change = convertToPounds(change, "Kg");
+                                        break;
+                                    case 2:
+                                        change = convertToPounds(change, "oz");
+                                        break;
+                                }
+                                displayValue -= change;
+                            }
+                            switch(unitBox.currentIndex)
+                            {
+                                case 0:
+                                    displayValue = convertFromPounds(displayValue, "g");
+                                    break;
+                                case 1:
+                                    displayValue = convertFromPounds(displayValue, "Kg");
+                                    break;
+                                case 2:
+                                    displayValue = convertFromPounds(displayValue, "oz");
+                                    break;
+                            }
+                            var bagCount = (displayValue / bagConversion).toFixed(2);
+                            displayValue = "" + displayValue + " (" + bagCount + " bags)";
+                            if(table.data(r, 2, 0) != displayValue)
+                            {
+                                table.setData(r, 2, displayValue, 0);
+                                table.setData(r, 2, displayValue, 2);
+                                table.resizeColumnToContents(2);
+                            }
+                        }
+                    }
+                    r++;
+                }
                 if(parseFloat(green.text) > 0)
                 {
                     if(parseFloat(roastwt.text) > 0)
@@ -146,7 +236,9 @@
                         lossField.text = "100%";
                     }
                 }
-			});
+            };
+            model.dataChanged.connect(updateGreenTable);
+            unitBox['currentIndexChanged(int)'].connect(updateGreenTable);
             roastwt.textChanged.connect(function() {
                 if(parseFloat(green.text) > 0)
                 {
@@ -160,21 +252,10 @@
                     }
                 }
             });
-			var convertToPounds = function(w, u) {
-				switch(u) {
-					case "g":
-						return w * 0.0022;
-					case "oz":
-						return w * 0.0625;
-					case "Kg":
-						return w * 2.2;
-				}
-				return w;
-			};
             var profilebutton = findChildObject(this, 'load');
             profilebutton.setEnabled(false);
             roasted['currentIndexChanged(int)'].connect(function() {
-				table.clear();
+                table.clear();
                 var query = new QSqlQuery();
                 var q = "SELECT EXISTS(SELECT 1 FROM item_files WHERE item = ";
                 q = q + roasted.currentData();
@@ -235,151 +316,151 @@
                     }
                 }
             });
-			profilebutton.clicked.connect(function() {
-				batch.windowModified = true;
-				currentBatchInfo = batch;
-				query = new QSqlQuery();
+            profilebutton.clicked.connect(function() {
+                batch.windowModified = true;
+                currentBatchInfo = batch;
+                query = new QSqlQuery();
                 var q = "SELECT files FROM item_files WHERE item = :item AND time = (SELECT max(time) FROM item_files WHERE item = :again)";
-				query.prepare(q);
+                query.prepare(q);
                 query.bind(":item", Number(roasted.currentData()));
                 query.bind(":again", Number(roasted.currentData()));
-				query.exec();
-				var graph;
-				var log;
-				if(query.next())
-				{
-					var files = query.value(0);
-					files = files.replace("{", "(");
-					files = files.replace("}", ")");
-					q = "SELECT file, name FROM files WHERE id IN ";
-					q = q + files;
-					q = q + " AND type = 'profile'";
-					query.exec(q);
-					if(query.next())
-					{
-						var targetseries = -1;
-						var buffer = new QBuffer(query.value(0));
-						var pname = query.value(1);
-						var input = new XMLInput(buffer, 1);
-						graph = findChildObject(navigationwindow.loggingWindow, 'graph');
-						log = findChildObject(navigationwindow.loggingWindow, 'log');
-						log.clear();
-						graph.clear();
-						input.newTemperatureColumn.connect(log.setHeaderData);
-						input.newTemperatureColumn.connect(function(col, text) {
-							if(text == navigationwindow.loggingWindow.targetcolumnname)
-							{
-								targetseries = col;
-							}
-						});
-						input.newAnnotationColumn.connect(log.setHeaderData);
-						input.measure.connect(graph.newMeasurement);
-						input.measure.connect(log.newMeasurement);
-						input.measure.connect(function(data, series) {
-							if(series == targetseries)
-							{
-								targetDetector.newMeasurement(data);
-							}
-						});
-						var lc;
-						input.lastColumn.connect(function(c) {
-							lc = c;
-							QSettings.setValue("liveColumn", c + 1);
-							navigationwindow.loggingWindow.postLoadColumnSetup(c)
-						});
-						input.annotation.connect(function(note, tcol, ncol) {
-							for(var i = tcol; i < ncol; i++) {
-								log.newAnnotation(note, i, ncol);
-							}
-						});
-					}
-				}
+                query.exec();
+                var graph;
+                var log;
+                if(query.next())
+                {
+                        var files = query.value(0);
+                        files = files.replace("{", "(");
+                        files = files.replace("}", ")");
+                        q = "SELECT file, name FROM files WHERE id IN ";
+                        q = q + files;
+                        q = q + " AND type = 'profile'";
+                        query.exec(q);
+                        if(query.next())
+                        {
+                                var targetseries = -1;
+                                var buffer = new QBuffer(query.value(0));
+                                var pname = query.value(1);
+                                var input = new XMLInput(buffer, 1);
+                                graph = findChildObject(navigationwindow.loggingWindow, 'graph');
+                                log = findChildObject(navigationwindow.loggingWindow, 'log');
+                                log.clear();
+                                graph.clear();
+                                input.newTemperatureColumn.connect(log.setHeaderData);
+                                input.newTemperatureColumn.connect(function(col, text) {
+                                        if(text == navigationwindow.loggingWindow.targetcolumnname)
+                                        {
+                                                targetseries = col;
+                                        }
+                                });
+                                input.newAnnotationColumn.connect(log.setHeaderData);
+                                input.measure.connect(graph.newMeasurement);
+                                input.measure.connect(log.newMeasurement);
+                                input.measure.connect(function(data, series) {
+                                        if(series == targetseries)
+                                        {
+                                                targetDetector.newMeasurement(data);
+                                        }
+                                });
+                                var lc;
+                                input.lastColumn.connect(function(c) {
+                                        lc = c;
+                                        QSettings.setValue("liveColumn", c + 1);
+                                        navigationwindow.loggingWindow.postLoadColumnSetup(c)
+                                });
+                                input.annotation.connect(function(note, tcol, ncol) {
+                                        for(var i = tcol; i < ncol; i++) {
+                                                log.newAnnotation(note, i, ncol);
+                                        }
+                                });
+                        }
+                }
                 query = query.invalidate();
-				navigationwindow.loggingWindow.windowTitle = "Typica - [*]" + pname;
-				navigationwindow.loggingWindow.raise();
-				navigationwindow.loggingWindow.activateWindow();
-				graph.updatesEnabled = false;
-				log.updatesEnabled = false;
-				input.input();
-				log.updatesEnabled = true;
-				graph.updatesEnabled = true;
-				log.newAnnotation("End", 1, lc);
-			});
-			var noprofilebutton = findChildObject(this, 'noprofile');
-			noprofilebutton.clicked.connect(function() {
-				batch.windowModified = true;
-				currentBatchInfo = batch;
-				navigationwindow.loggingWindow.raise();
-				navigationwindow.loggingWindow.activateWindow();
-			});
-			var submitbutton = findChildObject(this, 'submit');
-			var timefield = findChildObject(this, 'time');
-			var notes = findChildObject(this, 'annotation');
-			var duration = findChildObject(this, 'duration');
-			var approval = findChildObject(this, 'approval');
-			approval.checked = true;
-			var target = findChildObject(this, 'target');
-			submitbutton.clicked.connect(function() {
-				checkQuery = new QSqlQuery();
-				checkQuery.exec("SELECT 1 FROM machine WHERE id = " + selectedRoasterID);
-				if(!checkQuery.next())
-				{
-					checkQuery.prepare("INSERT INTO machine (id, name) VALUES(:id, :name)");
-					checkQuery.bind(":id", selectedRoasterID);
-					checkQuery.bind(":name", selectedRoasterName);
-					checkQuery.exec();
-				}
-				checkQuery = checkQuery.invalidate();
-				var q = "INSERT INTO files (id, name, type, note, file) VALUES(default, :name, 'profile', NULL, :data) RETURNING id";
-				query = new QSqlQuery();
-				query.prepare(q);
-				query.bind(":name", timefield.text + " " + roasted.currentText);
-				query.bindFileData(":data", batch.tempData);
-				query.exec();
-				query.next();
-				var fileno = query.value(0);
-				var file = new QFile(batch.tempData);
-				file.remove();
-				var q2 = "INSERT INTO roasting_log (time, unroasted_id, unroasted_quantity, unroasted_total_quantity, roasted_id, roasted_quantity, transaction_type, annotation, machine, duration, approval, humidity, barometric, indoor_air, outdoor_air, files) VALUES(:time, ";
-				q2 = q2 + table.columnArray(0, 32);
-				q2 = q2 + ", ";
-				for(var i = 0; table.data(i, 1, 0).value != ""; i++)
-				{
-					table.setData(i, 1, convertToPounds(parseFloat(table.data(i, 1, 0)), unitBox.currentText) ,32)
-				}
-				q2 = q2 + table.columnArray(1, 32);
-				q2 = q2 + ", ";
-				q2 = q2 + convertToPounds(parseFloat(green.text), unitBox.currentText);
-				q2 = q2 + ", ";
-				q2 = q2 + roasted.currentData();
-				q2 = q2 + ", ";
-				q2 = q2 + convertToPounds(parseFloat(roastwt.text), unitBox.currentText);
-				q2 = q2 + ", 'ROAST', :annotation, ";
-				q2 = q2 + selectedRoasterID;
-				q2 = q2 + ", :duration, :approval, NULL, NULL, NULL, NULL, '{";
-				q2 = q2 + fileno;
-				q2 = q2 + "}')";
-				query2 = new QSqlQuery();
-				query2.prepare(q2);
-				query2.bind(":time", timefield.text);
-				query2.bind(":annotation", notes.plainText);
-				query2.bind(":duration", duration.text);
-				query2.bind(":approval", approval.checked);
-				query2.exec();
+                navigationwindow.loggingWindow.windowTitle = "Typica - [*]" + pname;
+                navigationwindow.loggingWindow.raise();
+                navigationwindow.loggingWindow.activateWindow();
+                graph.updatesEnabled = false;
+                log.updatesEnabled = false;
+                input.input();
+                log.updatesEnabled = true;
+                graph.updatesEnabled = true;
+                log.newAnnotation("End", 1, lc);
+            });
+            var noprofilebutton = findChildObject(this, 'noprofile');
+            noprofilebutton.clicked.connect(function() {
+                    batch.windowModified = true;
+                    currentBatchInfo = batch;
+                    navigationwindow.loggingWindow.raise();
+                    navigationwindow.loggingWindow.activateWindow();
+            });
+            var submitbutton = findChildObject(this, 'submit');
+            var timefield = findChildObject(this, 'time');
+            var notes = findChildObject(this, 'annotation');
+            var duration = findChildObject(this, 'duration');
+            var approval = findChildObject(this, 'approval');
+            approval.checked = true;
+            var target = findChildObject(this, 'target');
+            submitbutton.clicked.connect(function() {
+                checkQuery = new QSqlQuery();
+                checkQuery.exec("SELECT 1 FROM machine WHERE id = " + selectedRoasterID);
+                if(!checkQuery.next())
+                {
+                        checkQuery.prepare("INSERT INTO machine (id, name) VALUES(:id, :name)");
+                        checkQuery.bind(":id", selectedRoasterID);
+                        checkQuery.bind(":name", selectedRoasterName);
+                        checkQuery.exec();
+                }
+                checkQuery = checkQuery.invalidate();
+                var q = "INSERT INTO files (id, name, type, note, file) VALUES(default, :name, 'profile', NULL, :data) RETURNING id";
+                query = new QSqlQuery();
+                query.prepare(q);
+                query.bind(":name", timefield.text + " " + roasted.currentText);
+                query.bindFileData(":data", batch.tempData);
+                query.exec();
+                query.next();
+                var fileno = query.value(0);
+                var file = new QFile(batch.tempData);
+                file.remove();
+                var q2 = "INSERT INTO roasting_log (time, unroasted_id, unroasted_quantity, unroasted_total_quantity, roasted_id, roasted_quantity, transaction_type, annotation, machine, duration, approval, humidity, barometric, indoor_air, outdoor_air, files) VALUES(:time, ";
+                q2 = q2 + table.columnArray(0, 32);
+                q2 = q2 + ", ";
+                for(var i = 0; table.data(i, 1, 0).value != ""; i++)
+                {
+                        table.setData(i, 1, convertToPounds(parseFloat(table.data(i, 1, 0)), unitBox.currentText) ,32)
+                }
+                q2 = q2 + table.columnArray(1, 32);
+                q2 = q2 + ", ";
+                q2 = q2 + convertToPounds(parseFloat(green.text), unitBox.currentText);
+                q2 = q2 + ", ";
+                q2 = q2 + roasted.currentData();
+                q2 = q2 + ", ";
+                q2 = q2 + convertToPounds(parseFloat(roastwt.text), unitBox.currentText);
+                q2 = q2 + ", 'ROAST', :annotation, ";
+                q2 = q2 + selectedRoasterID;
+                q2 = q2 + ", :duration, :approval, NULL, NULL, NULL, NULL, '{";
+                q2 = q2 + fileno;
+                q2 = q2 + "}')";
+                query2 = new QSqlQuery();
+                query2.prepare(q2);
+                query2.bind(":time", timefield.text);
+                query2.bind(":annotation", notes.plainText);
+                query2.bind(":duration", duration.text);
+                query2.bind(":approval", approval.checked);
+                query2.exec();
                 query2 = query2.invalidate();
-				if(target.checked) {
-					var q3 = "INSERT INTO item_files (time, item, files) VALUES(:time, :item, '{";
-					q3 = q3 + fileno;
-					q3 = q3 + "}')";
-					query.prepare(q3);
-					query.bind(":time", timefield.text);
-					query.bind(":item", roasted.currentData());
-					query.exec();
-				}
+                if(target.checked) {
+                    var q3 = "INSERT INTO item_files (time, item, files) VALUES(:time, :item, '{";
+                    q3 = q3 + fileno;
+                    q3 = q3 + "}')";
+                    query.prepare(q3);
+                    query.bind(":time", timefield.text);
+                    query.bind(":item", roasted.currentData());
+                    query.exec();
+                }
                 query = query.invalidate();
-				batch.windowModified = false;
-				batch.close();
-			});
+                batch.windowModified = false;
+                batch.close();
+            });
         ]]>
     </program>
 </window>