Allow roasted weight to be edited from batch log

config/Reports/historyreport.xml

@@ -91,7 +91,7 @@
                     conversion = 2.2;
                 }
                 var query = new QSqlQuery();
-                var q = "SELECT to_char(time, 'Dy Mon DD YYYY HH24:MI:SS'), machine, (SELECT name FROM items WHERE id = roasted_id) AS name, unroasted_total_quantity / " + conversion + " AS green, roasted_quantity  / " + conversion + " AS roasted, CASE WHEN unroasted_total_quantity = 0 THEN NULL ELSE ((unroasted_total_quantity - roasted_quantity) / unroasted_total_quantity * 100::numeric)::numeric(12,2) END AS weight_loss, duration, annotation FROM roasting_log WHERE machine = :machine AND time = :time";
+                var q = "SELECT time, machine, (SELECT name FROM items WHERE id = roasted_id) AS name, unroasted_total_quantity / " + conversion + " AS green, roasted_quantity  / " + conversion + " AS roasted, CASE WHEN unroasted_total_quantity = 0 THEN NULL ELSE ((unroasted_total_quantity - roasted_quantity) / unroasted_total_quantity * 100::numeric)::numeric(12,2) END AS weight_loss, duration, annotation FROM roasting_log WHERE machine = :machine AND time = :time";
                 query.prepare(q);
                 query.bind(":machine", key[0]);
                 query.bind(":time", key[1]);
@@ -101,6 +101,7 @@
                     print("Constructing row with " + query.value(i));
                     fakeTable.holding[i] = query.value(i);
                 }
+                fakeTable.holding[0] = key[1];
                 query = query.invalidate();
                 details.loadData(fakeTable, 0);
             });

config/Windows/batchdetailsnew.xml

@@ -42,9 +42,10 @@
             var machine;
             var approval;
             var annotation;
+            var roastWeight;
             edit.clicked.connect(function() {
                 var editWindow = createWindow("editBatchDetails");
-                editWindow.loadData(window, tableReference, rowReference, batchTime, machine, approval, annotation);
+                editWindow.loadData(window, tableReference, rowReference, batchTime, machine, approval, annotation, roastWeight, unit);
             });
             compare.clicked.connect(function() {
                 var query = new QSqlQuery;
@@ -255,6 +256,7 @@
                 output.writeStartElement("td");
                 output.writeAttribute("align", "center");
                 output.writeCharacters(query.value(6));
+                roastWeight = query.value(6);
                 output.writeEndElement();
                 output.writeEndElement();
                 output.writeStartElement("tr");

config/Windows/editbatchdetails.xml

@@ -1,47 +1,63 @@
 <window id="editBatchDetails">
     <layout type="vertical">
-		<button type="check" name="Approved" id="approval" />
-		<layout type="horizontal">
-			<label>Annotation</label>
-			<textarea id="annotation" />
-		</layout>
-		<button type="push" id="submit" name="Submit" />
-	</layout>
+        <layout type="horizontal">
+            <label>Roasted Weight: </label>
+            <line id="roasted" validator="numeric" />
+            <line id="roastunit" writable="false" />
+        </layout>
+        <button type="check" name="Approved" id="approval" />
+        <layout type="horizontal">
+            <label>Annotation</label>
+            <textarea id="annotation" />
+        </layout>
+        <button type="push" id="submit" name="Submit" />
+    </layout>
     <program>
         <![CDATA[
-			var window = this;
-			var approvalButton = findChildObject(this, 'approval');
-			var annotationField = findChildObject(this, 'annotation');
-			var parentWindow;
-			var tableReference;
-			var rowReference;
-			var timeKey;
-			var machineKey;
-			var submit = findChildObject(this, 'submit');
-			submit.enabled = false;
-			this.loadData = function(parent, table, row, time, machine, approval, annotation) {
-				parentWindow = parent;
-				tableReference = table;
-				rowReference = row;
-				if(approval == "true") {
-					approvalButton.checked = true;
-				}
-				annotationField.plainText = annotation;
-				timeKey = time;
-				machineKey = machine;
-				submit.enabled = true;
-			};
-			submit.clicked.connect(function() {
-				var query = new QSqlQuery;
-				query.prepare("UPDATE roasting_log SET approval = :approval, annotation = :annotation WHERE time = :time AND machine = :machine");
-				query.bind("approval", approvalButton.checked);
-				query.bind("annotation", annotationField.plainText);
-				query.bind("time", timeKey);
-				query.bind("machine", machineKey);
-				query.exec();
-				parentWindow.loadData(tableReference, rowReference);
-				window.close();
-			});
+            var window = this;
+            var approvalButton = findChildObject(this, 'approval');
+            var annotationField = findChildObject(this, 'annotation');
+            var parentWindow;
+            var tableReference;
+            var rowReference;
+            var timeKey;
+            var machineKey;
+            var submit = findChildObject(this, 'submit');
+            submit.enabled = false;
+            var roastedEdit = findChildObject(this, 'roasted');
+            var unitEdit = findChildObject(this, 'roastunit');
+            var conversion = 1;
+            this.loadData = function(parent, table, row, time, machine, approval, annotation, roastWeight, unit) {
+                parentWindow = parent;
+                tableReference = table;
+                rowReference = row;
+                if(approval == "true") {
+                    approvalButton.checked = true;
+                }
+                annotationField.plainText = annotation;
+                timeKey = time;
+                machineKey = machine;
+                submit.enabled = true;
+                roastedEdit.text = roastWeight;
+                if(unit == 0) {
+                    unitEdit.text = "Kg";
+                    conversion = 2.2;
+                } else {
+                    unitEdit.text = "Lb";
+                }
+            };
+            submit.clicked.connect(function() {
+                var query = new QSqlQuery;
+                query.prepare("UPDATE roasting_log SET roasted_quantity = :roasted, approval = :approval, annotation = :annotation WHERE time = :time AND machine = :machine");
+                query.bind(":approval", approvalButton.checked);
+                query.bind(":annotation", annotationField.plainText);
+                query.bind(":roasted", Number(roastedEdit.text)/conversion);
+                query.bind(":time", timeKey);
+                query.bind(":machine", Number(machineKey));
+                query.exec();
+                parentWindow.loadData(tableReference, rowReference);
+                window.close();
+            });
         ]]>
     </program>
 </window>