Add roast schedule lookup to new batch window

config/Windows/newbatch.xml

@@ -5,111 +5,129 @@
     <menu name="Batch">
         <item id="new" shortcut="Ctrl+N">New Batch...</item>
     </menu>
-    <layout type="horizontal">
-        <splitter type="horizontal" id="splitter">
-            <widget id="required">
+    <layout type="vertical">
+        <layout type="horizontal">
+            <label>Scheduled Batch ID:</label>
+            <line id="search" />
+            <stretch />
+        </layout>
+        <tabbar id="tabs" />
+        <layout type="stack" id="pages">
+            <page>
                 <layout type="vertical">
-                    <layout type="horizontal">
-                        <label>Machine:</label>
-                        <line id="machine" writable="false" />
-                        <label>Unit:</label>
-                        <sqldrop id="unit" />
-                        <stretch />
-                    </layout>
-                    <layout type="horizontal">
-                        <label>Roasted Coffee:</label>
-                        <sqldrop data="0" display="1" showdata="true" id="roasted">
-                            <null />
-                            <query>SELECT id, name FROM items WHERE category = 'Coffee: Roasted' AND id IN (SELECT item FROM current_items) ORDER BY name</query>
-                        </sqldrop>
-                        <stretch />
-                    </layout>
-                    <label>Green Coffee:</label>
-                    <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>
-                        <line id="green" writable="false">0.0</line>
-                    </layout>
-                    <layout type="horizontal">
-                        <button name="Load Profile" type="push" id="load" />
-                        <button name="No Profile" type="push" id="noprofile" />
-                    </layout>
-                    <layout type="horizontal">
-                        <label>Time:</label>
-                        <line id="time" writable="false" />
-                        <label>Duration:</label>
-                        <line id="duration" writable="false" />
-                    </layout>
-                    <layout type="horizontal">
-                        <label>Roasted Weight:</label>
-                        <line id="roast" validator="numeric">0.0</line>
-                        <label>Weight Loss:</label>
-                        <line id="wloss" writable="false" />
-                        <button type="check" id="approval" name="Approved" />
-                        <stretch />
-                    </layout>
-                    <layout type="horizontal">
-                        <label>Annotation:</label>
-                        <textarea id="annotation" />
-                    </layout>
-                    <layout type="horizontal">
-                        <button name="Submit" id="submit" type="push" />
-                        <button name="Save log as target profile" type="check" id="target" />
-                    </layout>
+                    <sqlview id="batches" />
                 </layout>
-            </widget>
-            <widget>
+            </page>
+            <page>
                 <layout type="vertical">
-                    <label>Connected Scales</label>
-                    <layout type="vertical" id="scales" />
-                    <label>Expected Weight Loss</label>
-                    <line id="lossspec" writable="false" />
-                    <label>Expected Roasted Weight</label>
-                    <layout type="horizontal">
-                        <label>Min:</label>
-                        <line id="minroastweight" writable="false" />
-                    </layout>
-                    <layout type="horizontal">
-                        <label>Expected:</label>
-                        <line id="expectedroastweight" writable="false" />
-                    </layout>
-                    <layout type="horizontal">
-                        <label>Max:</label>
-                        <line id="maxroastweight" writable="false" />
-                    </layout>
-                    <label>Degree of Roast</label>
-                    <label>Whole Bean:</label>
-                    <roastcoloredit id="wholecolor" />
-                    <label id="wholespec">-</label>
-                    <label>Ground:</label>
-                    <roastcoloredit id="groundcolor" />
-                    <label id="groundspec">-</label>
-                    <label>Specification Details</label>
-                    <textarea id="specnotes" />
-                    <layout type="horizontal">
-                        <label>File ID:</label>
-                        <line id="filenofield" writable="false" />
-                    </layout>
-                    <stretch />
+                    <splitter type="horizontal" id="splitter">
+                        <widget id="required">
+                            <layout type="vertical">
+                                <layout type="horizontal">
+                                    <label>Machine:</label>
+                                    <line id="machine" writable="false" />
+                                    <label>Unit:</label>
+                                    <sqldrop id="unit" />
+                                    <stretch />
+                                </layout>
+                                <layout type="horizontal">
+                                    <label>Roasted Coffee:</label>
+                                    <sqldrop data="0" display="1" showdata="true" id="roasted">
+                                        <null />
+                                        <query>SELECT id, name FROM items WHERE category = 'Coffee: Roasted' AND id IN (SELECT item FROM current_items) ORDER BY name</query>
+                                    </sqldrop>
+                                    <stretch />
+                                </layout>
+                                <label>Green Coffee:</label>
+                                <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>
+                                    <line id="green" writable="false">0.0</line>
+                                </layout>
+                                <layout type="horizontal">
+                                    <button name="Load Profile" type="push" id="load" />
+                                    <button name="No Profile" type="push" id="noprofile" />
+                                </layout>
+                                <layout type="horizontal">
+                                    <label>Time:</label>
+                                    <line id="time" writable="false" />
+                                    <label>Duration:</label>
+                                    <line id="duration" writable="false" />
+                                </layout>
+                                <layout type="horizontal">
+                                    <label>Roasted Weight:</label>
+                                    <line id="roast" validator="numeric">0.0</line>
+                                    <label>Weight Loss:</label>
+                                    <line id="wloss" writable="false" />
+                                    <button type="check" id="approval" name="Approved" />
+                                    <stretch />
+                                </layout>
+                                <layout type="horizontal">
+                                    <label>Annotation:</label>
+                                    <textarea id="annotation" />
+                                </layout>
+                                <layout type="horizontal">
+                                    <button name="Submit" id="submit" type="push" />
+                                    <button name="Save log as target profile" type="check" id="target" />
+                                </layout>
+                            </layout>
+                        </widget>
+                        <widget>
+                            <layout type="vertical">
+                                <label>Connected Scales</label>
+                                <layout type="vertical" id="scales" />
+                                <label>Expected Weight Loss</label>
+                                <line id="lossspec" writable="false" />
+                                <label>Expected Roasted Weight</label>
+                                <layout type="horizontal">
+                                    <label>Min:</label>
+                                    <line id="minroastweight" writable="false" />
+                                </layout>
+                                <layout type="horizontal">
+                                    <label>Expected:</label>
+                                    <line id="expectedroastweight" writable="false" />
+                                </layout>
+                                <layout type="horizontal">
+                                    <label>Max:</label>
+                                    <line id="maxroastweight" writable="false" />
+                                </layout>
+                                <label>Degree of Roast</label>
+                                <label>Whole Bean:</label>
+                                <roastcoloredit id="wholecolor" />
+                                <label id="wholespec">-</label>
+                                <label>Ground:</label>
+                                <roastcoloredit id="groundcolor" />
+                                <label id="groundspec">-</label>
+                                <label>Specification Details</label>
+                                <textarea id="specnotes" />
+                                <layout type="horizontal">
+                                    <label>File ID:</label>
+                                    <line id="filenofield" writable="false" />
+                                </layout>
+                                <stretch />
+                            </layout>
+                        </widget>
+                        <widget id="tagcontainer" ignoreSizePolicy="true">
+                            <layout type="vertical">
+                                <webview id="batchTag" />
+                                <layout type="horizontal">
+                                    <printerselector id="printerlist" />
+                                    <button name="Print" id="printbutton" type="push" />
+                                </layout>
+                            </layout>
+                        </widget>
+                    </splitter>
                 </layout>
-            </widget>
-            <widget id="tagcontainer" ignoreSizePolicy="true">
-                <layout type="vertical">
-                    <webview id="batchTag" />
-                    <layout type="horizontal">
-                        <printerselector id="printerlist" />
-                        <button name="Print" id="printbutton" type="push" />
-                    </layout>
-                </layout>
-            </widget>
-        </splitter>
+            </page>
+        </layout>
     </layout>
     <program>
         <![CDATA[
+            var scheduledID = 0;
             var window = this;
             var splitter = findChildObject(this, 'splitter');
             window.aboutToClose.connect(function() {
@@ -117,6 +135,27 @@
             });
             splitter.setCollapsible(0, false);
             splitter.restoreState("script/newbatch/splitter");
+            var tabs = findChildObject(this, 'tabs');
+            tabs.addTab(TTR("batchWindow", "Schedule"));
+            tabs.addTab(TTR("batchWindow", "Batch"));
+            var pages = findChildObject(this, 'pages');
+            tabs.currentChanged.connect(function(index) {
+                pages.setCurrentIndex(index);
+            });
+            tabs.setCurrentIndex(1);
+            var batches = findChildObject(this, 'batches');
+            batches.setQuery("SELECT id, (SELECT name FROM items WHERE id = (data#>>'{roasted}')::numeric), (data#>>'{green_weight}')::numeric FROM scheduled_roasts WHERE machine IS NULL");
+            batches.setHeaderData(0, TTR("batchWindow", "ID"));
+            batches.setHeaderData(1, TTR("batchWindow", "Roasted Coffee"));
+            batches.setHeaderData(2, TTR("batchWindow", "Green Weight"));
+            batches.alternatingRowColors = true;
+            batches.selectionMode = 1;
+            batches.selectionBehavior = 1;
+            batches.editTreiggers = 0;
+            var snotifier = Application.subscribe("scheduledroastschange");
+            snotifier.notify.connect(function() {
+                batches.setQuery("SELECT id, (SELECT name FROM items WHERE id = (data#>>'{roasted}')::numeric), (data#>>'{green_weight}')::numeric FROM scheduled_roasts WHERE machine IS NULL");
+            });
             var unitBox = findChildObject(this, 'unit');
             unitBox.addItem("g");
             unitBox.addItem("Kg");
@@ -459,6 +498,14 @@
             }
             var duration = findChildObject(this, 'duration');
             var timefield = findChildObject(this, 'time');
+            var markTaken = function(id) {
+                var query = new QSqlQuery();
+                query.prepare("UPDATE scheduled_roasts SET machine = :mid WHERE id = :id");
+                query.bind(":mid", selectedRoasterID);
+                query.bind(":id", scheduledID);
+                query.exec();
+                query = query.invalidate();
+            }
             profilebutton.clicked.connect(function() {
                 var proceed = false;
                 if(validateCapacity()) {
@@ -476,6 +523,9 @@
                 }
             });
             var doLoadProfile = function() {
+                if(scheduledID > 0) {
+                    markTaken();
+                }
                 batch.windowModified = true;
                 currentBatchInfo = batch;
                 query = new QSqlQuery();
@@ -567,6 +617,9 @@
                 currentBatchInfo = batch;
                 navigationwindow.loggingWindow.raise();
                 navigationwindow.loggingWindow.activateWindow();
+                if(scheduledID > 0) {
+                    markTaken();
+                }
             }
             var submitbutton = findChildObject(this, 'submit');
             var notes = findChildObject(this, 'annotation');
@@ -695,6 +748,14 @@
                     query.bind(":item", roasted.currentData());
                     query.exec();
                 }
+                if(scheduledID > 0) {
+                    query.prepare("UPDATE scheduled_roasts SET machine = :mid, time = :time WHERE id = :id");
+                    query.bind(":mid", selectedRoasterID);
+                    query.bind(":time", timefield.text);
+                    query.bind(":id", scheduledID);
+                    query.exec();
+                }
+                
                 query = query.invalidate();
                 batch.windowModified = false;
                 batch.close();
@@ -794,6 +855,63 @@
             printbutton.clicked.connect(function() {
                 batchTag.print(printers.currentText);
             });
+            var loadBatch = function(id) {
+                var query = new QSqlQuery();
+                query.prepare("SELECT data FROM scheduled_roasts WHERE id = :id");
+                query.bind(":id", id);
+                query.exec();
+                if(query.next()) {
+                    scheduledID = id;
+                    tabs.setCurrentIndex(1);
+                    var d = JSON.parse(query.value(0));
+                    if(d.roasted) {
+                        roasted.currentIndex = roasted.findData(d.roasted);
+                    }
+                    if(d.greens) {
+                        query.prepare("SELECT name FROM items WHERE id = :id");
+                        for(var i = 0; i < d.greens.length; i++) {
+                            query.bind(":id", d.greens[i].id);
+                            query.exec();
+                            if(query.next()) {
+                                table.setData(i, 0, query.value(0), 0);
+                                table.setData(i, 0, d.greens[i].id, 32);
+                                switch(unitBox.currentIndex) {
+                                    case 0:
+                                        table.setData(i, 1, convertFromPounds(d.greens[i].weight, "g"), 0);
+                                        break;
+                                    case 1:
+                                        table.setData(i, 1, convertFromPounds(d.greens[i].weight, "Kg"), 0);
+                                        break;
+                                    case 2:
+                                        table.setData(i, 1, convertFromPounds(d.greens[i].weight, "oz"), 0);
+                                        break;
+                                    default:
+                                        table.setData(i, 1, d.greens[i].weight, 0);
+                                        break;
+                                }
+                            }
+                        }
+                    }
+                } else {
+                    displayInfo(TTR("batchWindow", "Search Failed"),
+                                TTR("batchWindow", "Scheduled batch ID not found."));
+                }
+                query = query.invalidate();
+                drawTag();
+            };
+            batches.selectEntry.connect(function(id) {
+                loadBatch(id);
+            });
+            var search = findChildObject(this, 'search');
+            search.returnPressed.connect(function() {
+                if(search.text.length == 0) {
+                    return;
+                }
+                if(Number(search.text)) {
+                    loadBatch(Number(search.text));
+                }
+                search.text = "";
+            });
         ]]>
     </program>
 </window>