Add weight loss and roasting specification notes feature

config/Windows/navigation.xml

@@ -23,6 +23,11 @@
 				<button name="Manage Roasted Coffee Items" id="newroasted" type="push" />
 			</column>
 		</row>
+                <row>
+                    <column>
+                        <button name="Edit Roasting Specification" id="roastspec" type="push" />
+                    </column>
+                </row>
 		<row>
 			<column>
 				<button name="Update Inventory" id="inventory" type="push" />
@@ -132,6 +137,10 @@ type="push" />
             var histwindow = createWindow("history");
             histwindow.windowTitle = "Typica - Batch Log";
         });
+        var roastspecbutton = findChildObject(this, 'roastspec');
+        roastspecbutton.clicked.connect(function() {
+            var specwindow = createWindow("roastspec");
+        });
         var gbutton = findChildObject(this, 'green');
         gbutton.clicked.connect(function() {
             var purchasewindow = createWindow("purchase");
@@ -290,7 +299,13 @@ type="push" />
                     query.exec("UPDATE TypicaFeatures SET version = 5 WHERE feature = 'base-features'");
                     query = query.invalidate();
                 };
-		
+		var DBUpdateSpecification = function() {
+                    var query = new QSqlQuery;
+                    query.exec("CREATE TABLE IF NOT EXISTS roasting_specification (\"time\" timestamp without time zone NOT NULL, item bigint NOT NULL, loss numeric, tolerance numeric, notes text)");
+                    query.exec("UPDATE TypicaFeatures SET version = 6 WHERE feature = 'base-features'");
+                    query = query.invalidate();
+                };
+                
 		query = new QSqlQuery();
 		/* A table keeps track of database versioning information. This table is created
 		   if required. */
@@ -301,27 +316,31 @@ type="push" />
 		query.exec("SELECT feature, enabled, version FROM TypicaFeatures WHERE feature = 'base-features'");
 		if(query.next())
 		{
-			if(query.value(2) < 1)
-			{
-				DBCreateBase();
-			}
-			if(query.value(2) < 2)
-			{
-				DBUpdateMultiUser();
-				DBUpdateHistory();
-			}
-			if(query.value(2) < 3)
-			{
-				DBUpdateNotifications();
-			}
-			if(query.value(2) < 4)
-			{
-				DBUpdateTriggers();
-			}
-                        if(query.value(2) < 5)
-                        {
-                            DBUpdateReminders();
-                        }
+                    if(query.value(2) < 1)
+                    {
+                            DBCreateBase();
+                    }
+                    if(query.value(2) < 2)
+                    {
+                            DBUpdateMultiUser();
+                            DBUpdateHistory();
+                    }
+                    if(query.value(2) < 3)
+                    {
+                            DBUpdateNotifications();
+                    }
+                    if(query.value(2) < 4)
+                    {
+                            DBUpdateTriggers();
+                    }
+                    if(query.value(2) < 5)
+                    {
+                        DBUpdateReminders();
+                    }
+                    if(query.value(2) < 6)
+                    {
+                        DBUpdateSpecification();
+                    }
 		}
 		else
 		{

config/Windows/newbatch.xml

@@ -2,65 +2,82 @@
     <menu name="Batch">
         <item id="new" shortcut="Ctrl+N">New Batch…</item>
     </menu>
-	<layout type="horizontal">
-    <layout type="vertical">
-        <layout type="horizontal">
-			<label>Machine:</label>
-			<line id="machine" writable="false" />
-			<label>Unit:</label>
-			<sqldrop id="unit" />
-            <stretch />
+    <layout type="horizontal">
+        <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" />
+                <label>Weight Loss:</label>
+                <line id="wloss" writable="false" />
+                <button type="check" id="approval" name="Approved" />
+            </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>
-        <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>
+        <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>Specification Details</label>
+            <textarea id="specnotes" />
             <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" />
-            <label>Weight Loss:</label>
-            <line id="wloss" writable="false" />
-            <button type="check" id="approval" name="Approved" />
-        </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>
-	<layout type="vertical">
-		<label>Connected Scales</label>
-		<layout type="vertical" id="scales" />
-		<stretch />
-	</layout>
-	</layout>
     <program>
         <![CDATA[
             var unitBox = findChildObject(this, 'unit');
@@ -76,8 +93,8 @@
             machine.setText(selectedRoasterName + " (" + selectedRoasterID + ")");
             var newMenu = findChildObject(this, 'new');
             newMenu.triggered.connect(function() {
-                    var bwindow = createWindow("batchWindow");
-                    bwindow.windowTitle = "Typica - [*]New Batch";
+                var bwindow = createWindow("batchWindow");
+                bwindow.windowTitle = "Typica - [*]New Batch";
             });
             var batch = this;
             var table = findChildObject(this, 'greens');
@@ -91,36 +108,36 @@
             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);
-                    }
+                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();
@@ -153,6 +170,15 @@
                 }
                 return w;
             };
+            var specnotes = findChildObject(this, 'specnotes');
+            specnotes.readOnly = true;
+            var lossspec = findChildObject(this, 'lossspec');
+            var minfield = findChildObject(this, 'minroastweight');
+            var midfield = findChildObject(this, 'expectedroastweight');
+            var maxfield = findChildObject(this, 'maxroastweight');
+            var minloss = 0;
+            var maxloss = 0;
+            var expectloss = 0;
             var updateGreenTable = function() {
                 var deleteRow = -1;
                 /* The combo box delegate updates user data before display data
@@ -162,11 +188,11 @@
                 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;
-                        }
+                    if(table.data(deleteRow, 0, 0) == "Delete") {
+                        table.removeRow(table.findData("delete", 0));
+                    } else {
+                        break;
+                    }
                 }
                 green.text = table.columnSum(1, 0);
                 table.resizeColumnToContents(0);
@@ -230,6 +256,14 @@
                 }
                 if(parseFloat(green.text) > 0)
                 {
+                    var expectedLossDesc = "";
+                    if(lossspec.text.length > 0) {
+                        if(minloss != expectloss) {
+                            minfield.text = (-(parseFloat(green.text)) * (maxloss - 1)).toFixed(2);
+                            maxfield.text = (-(parseFloat(green.text)) * (minloss - 1)).toFixed(2);
+                        }
+                        midfield.text = (-(parseFloat(green.text)) * (expectloss - 1)).toFixed(2);
+                    }
                     if(parseFloat(roastwt.text) > 0)
                     {
                         lossField.text = (((parseFloat(green.text) - parseFloat(roastwt.text)) / parseFloat(green.text)) * 100).toFixed(2) + "%";
@@ -318,6 +352,34 @@
                         }
                     }
                 }
+                query.prepare("SELECT loss, tolerance, notes FROM roasting_specification WHERE item = :id1 AND time = (SELECT max(time) FROM roasting_specification WHERE item = :id2)");
+                query.bind(":id1", roasted.currentData());
+                query.bind(":id2", roasted.currentData());
+                query.exec();
+                var lossSpecDescription = "";
+                if(query.next()) {
+                    if(query.value(0).length > 0) {
+                        lossSpecDescription += (Number(query.value(0)) * 100).toFixed(2);
+                        minloss = Number(query.value(0));
+                        maxloss = Number(query.value(0));
+                        expectloss = Number(query.value(0));
+                    }
+                    if(query.value(1).length > 0) {
+                        lossSpecDescription += " +/- " + (Number(query.value(1)) * 100).toFixed(2);
+                        minloss -= Number(query.value(1));
+                        maxloss += Number(query.value(1));
+                    }
+                    if(lossSpecDescription.length > 0) {
+                        lossSpecDescription += "%";
+                    }
+                    lossspec.text = lossSpecDescription;
+                    specnotes.plainText = query.value(2);
+                } else {
+                    lossspec.text = "";
+                    specnotes.plainText = "";
+                }
+                roastestimate.text = "";
+                query = query.invalidate();
             });
             profilebutton.clicked.connect(function() {
                 batch.windowModified = true;
@@ -332,51 +394,51 @@
                 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);
-                                        }
-                                });
-                        }
+                    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;
@@ -391,10 +453,10 @@
             });
             var noprofilebutton = findChildObject(this, 'noprofile');
             noprofilebutton.clicked.connect(function() {
-                    batch.windowModified = true;
-                    currentBatchInfo = batch;
-                    navigationwindow.loggingWindow.raise();
-                    navigationwindow.loggingWindow.activateWindow();
+                batch.windowModified = true;
+                currentBatchInfo = batch;
+                navigationwindow.loggingWindow.raise();
+                navigationwindow.loggingWindow.activateWindow();
             });
             var submitbutton = findChildObject(this, 'submit');
             var timefield = findChildObject(this, 'time');
@@ -408,10 +470,10 @@
                 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.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";
@@ -429,7 +491,7 @@
                 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)
+                    table.setData(i, 1, convertToPounds(parseFloat(table.data(i, 1, 0)), unitBox.currentText) ,32)
                 }
                 q2 = q2 + table.columnArray(1, 32);
                 q2 = q2 + ", ";

config/Windows/roastspec.xml

@@ -0,0 +1,78 @@
+<window id="roastspec">
+    <layout type="vertical">
+        <layout type="horizontal">
+            <label>Coffee:</label>
+            <sqldrop data="0" display="1" showdata="false" id="currentitems">
+                <query>SELECT id, name FROM items WHERE id IN (SELECT item FROM current_items) ORDER BY name</query>
+            </sqldrop>
+        </layout>
+        <layout type="horizontal">
+            <label>Expected % weight loss:</label>
+            <line validator="numeric" id="expectedloss" />
+        </layout>
+        <layout type="horizontal">
+            <label>Tolerance</label>
+            <line validator="numeric" id="tolerance" />
+        </layout>
+        <label>Specification Notes:</label>
+        <textarea id="notes" />
+        <layout type="horizontal">
+            <stretch />
+            <button id="save" type="push" name="Save" />
+        </layout>
+    </layout>
+    <program>
+        <![CDATA[
+            var window = this;
+            this.windowTitle = "Typica - Edit Roasting Specification";
+            var selector = findChildObject(this, 'currentitems');
+            var expected = findChildObject(this, 'expectedloss');
+            var tolerance = findChildObject(this, 'tolerance');
+            var notes = findChildObject(this, 'notes');
+            var savebutton = findChildObject(this, 'save');
+            selector['currentIndexChanged(int)'].connect(function() {
+                var query = new QSqlQuery();
+                query.prepare("SELECT loss, tolerance, notes FROM roasting_specification WHERE item = :id1 AND time = (SELECT max(time) FROM roasting_specification WHERE item = :id2)");
+                query.bind(":id1", selector.currentData());
+                query.bind(":id2", selector.currentData());
+                query.exec();
+                if(query.next()) {
+                    if(query.value(0).length > 0) {
+                        expected.text = Number(query.value(0)) * 100;
+                    }
+                    if(query.value(1).length > 0) {
+                        tolerance.text = Number(query.value(1)) * 100;
+                    }
+                    notes.plainText = query.value(2);
+                }
+                query = query.invalidate();
+            });
+            savebutton.clicked.connect(function() {
+                var query = new QSqlQuery();
+                var columnspec = "time, item, ";
+                var valuespec = "'now', :id, ";
+                if(expected.text.length > 0) {
+                    columnspec += "loss, ";
+                    valuespec += ":loss, ";
+                }
+                if(tolerance.text.length > 0) {
+                    columnspec += "tolerance, ";
+                    valuespec += ":tolerance, ";
+                }
+                columnspec += "notes";
+                valuespec += ":notes";
+                query.prepare("INSERT INTO roasting_specification (" + columnspec + ") VALUES (" + valuespec + ")");
+                query.bind(":id", selector.currentData());
+                if(expected.text.length > 0) {
+                    query.bind(":loss", Number(expected.text) / 100);
+                }
+                if(tolerance.text.length > 0) {
+                    query.bind(":tolerance", Number(tolerance.text) / 100);
+                }
+                query.bind(":notes", notes.plainText);
+                query.exec();
+                window.close();
+            });
+        ]]>
+    </program>
+</window>

config/config.xml

@@ -34,6 +34,7 @@
     <include src="Windows/editbatchdetails.xml" />
     <include src="Windows/newsamplebatch.xml" />
     <include src="Windows/editreminder.xml" />
+    <include src="Windows/roastspec.xml" />
     <program>
         <![CDATA[
             Windows = new Object();