Add color to daily production detail report

config/Reports/dailyproductiondetail.xml

@@ -58,7 +58,7 @@
 				output.writeTextElement("h1", TTR("dailyproduction", "Daily Production Report: ") + dateString);
 				output.writeTextElement("h2", TTR("dailyproduction", "Batches Roasted"));
 				var query = new QSqlQuery();
-				var q = "SELECT time, machine, (SELECT name FROM machine WHERE id = machine), (SELECT name FROM items WHERE id = roasted_id), unroasted_id, unroasted_quantity, unroasted_total_quantity, roasted_id, roasted_quantity, annotation, duration, files, (SELECT loss FROM roasting_specification WHERE item = roasted_id AND time = (SELECT max(time) FROM roasting_specification WHERE time <= roasting_log.time AND item = roasted_id)), (SELECT tolerance FROM roasting_specification WHERE item = roasted_id AND time = (SELECT max(time) FROM roasting_specification WHERE time <= roasting_log.time AND item = roasted_id)), (SELECT notes FROM roasting_specification WHERE item = roasted_id AND time = (SELECT max(time) FROM roasting_specification WHERE time <= roasting_log.time AND item = roasted_id)), approval, machine || '@' || time AS link FROM roasting_log WHERE time > '" + dateString + "' AND time < ('" + dateString + "'::date + integer '1') ORDER BY time";
+				var q = "SELECT time, machine, (SELECT name FROM machine WHERE id = machine), (SELECT name FROM items WHERE id = roasted_id), unroasted_id, unroasted_quantity, unroasted_total_quantity, roasted_id, roasted_quantity, annotation, duration, files, (SELECT loss FROM roasting_specification WHERE item = roasted_id AND time = (SELECT max(time) FROM roasting_specification WHERE time <= roasting_log.time AND item = roasted_id)), (SELECT tolerance FROM roasting_specification WHERE item = roasted_id AND time = (SELECT max(time) FROM roasting_specification WHERE time <= roasting_log.time AND item = roasted_id)), (SELECT notes FROM roasting_specification WHERE item = roasted_id AND time = (SELECT max(time) FROM roasting_specification WHERE time <= roasting_log.time AND item = roasted_id)), approval, machine || '@' || time AS link, additional_data, (SELECT spec FROM roasting_specification WHERE item = roasted_id AND time = (SELECT max(time) FROM roasting_specification WHERE time <= roasting_log.time AND item = roasted_id)) FROM roasting_log WHERE time > '" + dateString + "' AND time < ('" + dateString + "'::date + integer '1') ORDER BY time";
 				query.exec(q);
 				var times = new Array();
 				var machines = new Array();
@@ -94,9 +94,20 @@
 				output.writeTextElement("th", TTR("dailyproduction", "% Weight Loss"));
 				output.writeTextElement("th", TTR("dailyproduction", "Duration"));
 				output.writeEndElement();
+                output.writeStartElement("tr");
+                output.writeAttribute("valign", "bottom");
+                output.writeEmptyElement("td");
+                output.writeEmptyElement("td");
+                output.writeEmptyElement("td");
+                output.writeEmptyElement("td");
+                output.writeEmptyElement("td");
+                output.writeEmptyElement("td");
+                output.writeEmptyElement("td");
+                output.writeTextElement("th", TTR("dailyproduction", "Degree of Roast"));
+                output.writeEndElement();
 				output.writeEndElement();
 				output.writeStartElement("tbody");
-                                output.writeAttribute("valign", "top");
+                output.writeAttribute("valign", "top");
 				while(query.next())
 				{
 					times.push(query.value(0));
@@ -168,63 +179,138 @@
 							output.writeCDATA(query.value(8));
 							break;
 					}
-                                        output.writeStartElement("td");
-                                        output.writeStartElement("span");
-                                        if(query.value(15) == "false") {
-                                            output.writeAttribute("style", "color:#FF0000");
-                                        }
-                                        output.writeCharacters(query.value(3) + " (" + query.value(7) + ")");
-                                        output.writeEndElement();
-                                        output.writeEndElement();
+                    output.writeStartElement("td");
+                    output.writeStartElement("span");
+                    if(query.value(15) == "false") {
+                        output.writeAttribute("style", "color:#FF0000");
+                    }
+                    output.writeCharacters(query.value(3) + " (" + query.value(7) + ")");
+                    output.writeEndElement();
+                    output.writeEndElement();
 					if(Number(query.value(6)) > 0) {
 						var loss = (Number(query.value(6)) - Number(query.value(8)))/Number(query.value(6));
-                                                var lossMin;
-                                                var lossMax;
-                                                var lossColor;
-                                                var useLoss;
-                                                if(query.value(12) > 0) {
-                                                    useLoss = true;
-                                                    lossMin = Number(query.value(12)) - Number(query.value(13));
-                                                    lossMax = Number(query.value(12)) + Number(query.value(13));
-                                                    if(loss >= lossMin && loss <= lossMax) {
-                                                        lossColor = '#00FF00';
-                                                    } else {
-                                                        lossColor = '#FF0000';
-                                                    }
-                                                } else {
-                                                    lossColor = '#000000';
-                                                    useLoss = false;
-                                                }
+                        var lossMin;
+                        var lossMax;
+                        var lossColor;
+                        var useLoss;
+                        if(query.value(12) > 0) {
+                            useLoss = true;
+                            lossMin = Number(query.value(12)) - Number(query.value(13));
+                            lossMax = Number(query.value(12)) + Number(query.value(13));
+                            if(loss >= lossMin && loss <= lossMax) {
+                                lossColor = '#00FF00';
+                            } else {
+                                lossColor = '#FF0000';
+                            }
+                        } else {
+                            lossColor = '#000000';
+                            useLoss = false;
+                        }
 						loss *= 100;
-                                                var lossSpec = Number(query.value(12)) * 100;
-                                                var lossTol = Number(query.value(13)) * 100;
-                                                output.writeStartElement("td");
-                                                output.writeStartElement("span");
-                                                output.writeAttribute("style", "color:"+lossColor);
-                                                if(useLoss) {
-                                                    output.writeAttribute("title", lossSpec.toFixed(2) + "+/-" + lossTol.toFixed(2) + "%");
-                                                }
-                                                output.writeCharacters(loss.toFixed(2) + "%");
-                                                output.writeEndElement();
-                                                output.writeEndElement();
+                        var lossSpec = Number(query.value(12)) * 100;
+                        var lossTol = Number(query.value(13)) * 100;
+                        output.writeStartElement("td");
+                        output.writeStartElement("span");
+                        output.writeAttribute("style", "color:"+lossColor);
+                        if(useLoss) {
+                            output.writeAttribute("title", lossSpec.toFixed(2) + "+/-" + lossTol.toFixed(2) + "%");
+                        }
+                        output.writeCharacters(loss.toFixed(2) + "%");
+                        output.writeEndElement();
+                        output.writeEndElement();
 					} else {
 						output.writeTextElement("td", "Undefined");
 					}
 					output.writeTextElement("td", query.value(10));
 					output.writeEndElement();
+                    if(query.value(17).length > 0) {
+                        extradata = JSON.parse(query.value(17));
+                        if(extradata.color) {
+                            wcolor = "#000000";
+                            gcolor = "#000000";
+                            wtitle = "";
+                            gtitle = "";
+                            output.writeStartElement("tr");
+                            output.writeEmptyElement("td");
+                            output.writeEmptyElement("td");
+                            output.writeEmptyElement("td");
+                            output.writeEmptyElement("td");
+                            output.writeEmptyElement("td");
+                            output.writeEmptyElement("td");
+                            output.writeEmptyElement("td");
+                            if(query.value(18).length > 0) {
+                                specdata = JSON.parse(query.value(18));
+                                if(extradata.color.whole && specdata.color.whole.expected) {
+                                    wmin = Number(specdata.color.whole.expected);
+                                    wmax = wmin;
+                                    wtitle += specdata.color.whole.expected;
+                                    if(specdata.color.whole.tolerance) {
+                                        wmin -= Number(specdata.color.whole.tolerance);
+                                        wmax += Number(specdata.color.whole.tolerance);
+                                        wtitle += "±";
+                                        wtitle += specdata.color.whole.tolerance;
+                                    }
+                                    if(Number(extradata.color.whole) < wmin || Number(extradata.color.whole) > wmax) {
+                                        wcolor = "#FF0000";
+                                    } else {
+                                        wcolor = "#00FF00";
+                                    }
+                                }
+                                if(extradata.color.ground && specdata.color.ground.expected) {
+                                    gmin = Number(specdata.color.ground.expected);
+                                    gmax = gmin;
+                                    gtitle += specdata.color.ground.expected;
+                                    if(specdata.color.ground.tolerance) {
+                                        gmin -= Number(specdata.color.ground.tolerance);
+                                        gmax += Number(specdata.color.ground.tolerance);
+                                        gtitle += "±";
+                                        gtitle += specdata.color.ground.tolerance;
+                                    }
+                                    if(Number(extradata.color.ground) < gmin || Number(extradata.color.ground) > gmax) {
+                                        gcolor = "#FF0000";
+                                    } else {
+                                        gcolor = "#00FF00";
+                                    }
+                                }
+                            }
+                            output.writeStartElement("td");
+                            if(extradata.color.whole) {
+                                output.writeStartElement("span");
+                                output.writeAttribute("style", "color:"+wcolor);
+                                output.writeAttribute("title", wtitle);
+                                output.writeCharacters(extradata.color.whole);
+                                output.writeEndElement();
+                            }
+                            output.writeStartElement("span");
+                            if(wcolor === gcolor) {
+                                output.writeAttribute("style", "color:"+wcolor);
+                            }
+                            output.writeCharacters("/");
+                            output.writeEndElement();
+                            if(extradata.color.ground) {
+                                output.writeStartElement("span");
+                                output.writeAttribute("style", "color:"+gcolor);
+                                output.writeAttribute("title", gtitle);
+                                output.writeCharacters(extradata.color.ground);
+                                output.writeEndElement();
+                            }
+                            output.writeEndElement();
+                            output.writeEndElement();
+                        }
+                    }
 					if(query.value(9) != "")
 					{
 						output.writeStartElement("tr");
 						output.writeEmptyElement("td");
 						output.writeStartElement("td");
 						output.writeAttribute("colspan", "8");
-                                                var noteArray = query.value(9).split("\n");
-                                                for(var i = 0; i < noteArray.length; i++) {
-                                                    output.writeStartElement("p");
-                                                    output.writeAttribute("style", "margin-top: 0; margin-bottom: 0");
-                                                    output.writeCharacters(noteArray[i]);
-                                                    output.writeEndElement();
-                                                }
+                        var noteArray = query.value(9).split("\n");
+                        for(var i = 0; i < noteArray.length; i++) {
+                            output.writeStartElement("p");
+                            output.writeAttribute("style", "margin-top: 0; margin-bottom: 0");
+                            output.writeCharacters(noteArray[i]);
+                            output.writeEndElement();
+                        }
 						output.writeEndElement();
 						output.writeEndElement();
 					}