Show file ID in new batch window

config/Windows/newbatch.xml

@@ -75,6 +75,10 @@
             </layout>
             <label>Specification Details</label>
             <textarea id="specnotes" />
+            <layout type="horizontal">
+                <label>File ID:</label>
+                <line id="filenofield" writable="false" />
+            </layout>
             <stretch />
         </layout>
     </layout>
@@ -528,6 +532,19 @@
                     }
                 }
             });
+            var filenofield = findChildObject(this, 'filenofield');
+            this.endBatch = function() {
+                var q = "INSERT INTO files (id, name, type, note, file) VALUES(default, :name, 'profile', NULL, :data) RETURNING id";
+                var query = new QSqlQuery();
+                query.prepare(q);
+                query.bind(":name", timefield.text + " " + roasted.currentText);
+                query.bindFileData(":data", batch.tempData);
+                query.exec();
+                query.next();
+                filenofield.text = query.value(0);
+                var file = new QFile(batch.tempData);
+                file.remove();
+            }
             var doSubmit = function() {
                 checkQuery = new QSqlQuery();
                 checkQuery.exec("SELECT 1 FROM machine WHERE id = " + selectedRoasterID);
@@ -539,16 +556,8 @@
                     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 fileno = Number(filenofield.text);
                 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 + ", ";

config/Windows/productionroaster.xml

@@ -937,38 +937,39 @@
 		QSettings.setValue("liveColumn", 1);
         var lc = 1;
         stop.clicked.connect(function() {
-			stop.enabled = false;
-			for(var i = 0; i < adapters.length; i++)
-			{
-				adapters[i].measurement.disconnect(log.newMeasurement);
-				adapters[i].measurement.disconnect(graph.newMeasurement);
-			}
-			for(var i = 0; i < rateadapters.length; i++)
-			{
-				rateadapters[i].measurement.disconnect(graph.newMeasurement);
-			}
+            stop.enabled = false;
+            for(var i = 0; i < adapters.length; i++)
+            {
+                adapters[i].measurement.disconnect(log.newMeasurement);
+                adapters[i].measurement.disconnect(graph.newMeasurement);
+            }
+            for(var i = 0; i < rateadapters.length; i++)
+            {
+                rateadapters[i].measurement.disconnect(graph.newMeasurement);
+            }
             if(typeof(currentBatchInfo) == 'undefined') { } else {
                 lc = Number(QSettings.value("liveColumn"));
                 var duration = log.lastTime(lc);
                 var durfield = findChildObject(currentBatchInfo, 'duration');
                 durfield.text = duration;
                 log.clearOutputColumns();
-				channelSkip = 0;
-				for(var i = 0; i < channels.length; i++) {
-					if(channelVisibility[i]) {
-						if(channelType[i] == "T") {
-							log.addOutputTemperatureColumn(lc + i - channelSkip);
-						}
-						else {
-							log.addOutputControlColumn(lc + i - channelSkip);
-						}
-					} else {
-						channelSkip++;
-					}
-				}
-				log.addOutputAnnotationColumn(lc + channels.length - channelSkip);
+                channelSkip = 0;
+                for(var i = 0; i < channels.length; i++) {
+                    if(channelVisibility[i]) {
+                        if(channelType[i] == "T") {
+                            log.addOutputTemperatureColumn(lc + i - channelSkip);
+                        }
+                        else {
+                            log.addOutputControlColumn(lc + i - channelSkip);
+                        }
+                    } else {
+                        channelSkip++;
+                    }
+                }
+                log.addOutputAnnotationColumn(lc + channels.length - channelSkip);
                 var filename = log.saveTemporary();
                 currentBatchInfo.tempData = filename;
+                currentBatchInfo.endBatch();
                 var notes = findChildObject(currentBatchInfo, 'annotation');
                 for(var i = 0; i < rangetimers.length; i++)
                 {
@@ -977,20 +978,20 @@
                 currentBatchInfo.raise();
                 currentBatchInfo.activateWindow();
             }
-			if(translationChannel >= 0)
-			{
-				offsets[offsetForChannel(translationChannel)].measurement.disconnect(currentDetector.newMeasurement);
-			}
-			start.enabled = true;
-			window.windowModified = false;
-			graph.setTimeIndicatorEnabled(false);
+            if(translationChannel >= 0)
+            {
+                offsets[offsetForChannel(translationChannel)].measurement.disconnect(currentDetector.newMeasurement);
+            }
+            start.enabled = true;
+            window.windowModified = false;
+            graph.setTimeIndicatorEnabled(false);
         });
-		stop.annotation.connect(function(note, tcol, ncol) {
-			for(var i = tcol; i < ncol; i++) {
-				log.newAnnotation(note, i, ncol);
-			}
-		});
-		var quitMenu = findChildObject(this, 'quit');
+        stop.annotation.connect(function(note, tcol, ncol) {
+            for(var i = tcol; i < ncol; i++) {
+                log.newAnnotation(note, i, ncol);
+            }
+        });
+        var quitMenu = findChildObject(this, 'quit');
         quitMenu.triggered.connect(function() {
             window.close();
             Application.quit();