Batch log displays degree of roast data

config/Reports/historyreport.xml

@@ -112,7 +112,7 @@
                 if(search.text.length > 0) {
                     searchClause = " WHERE (person ~* :p1 OR rname ~* :p2 OR mname ~* :p3 OR greens ~* :p4 OR annotation ~* :p5 OR array_to_string(files, ',') ~* :p6)";
                 }
-                var q = "WITH qq AS (SELECT roasting_log.time, array_to_string(files, ','), person, (SELECT name || ' (' || id || ')' FROM items WHERE id = roasted_id) AS rname, duration, (SELECT name FROM machine WHERE id = machine) AS mname, array_to_string(ARRAY(SELECT name || ' (' || id || ')' FROM items WHERE id IN (SELECT unnest(unroasted_id))), ',') AS greens, (unroasted_total_quantity/:c1)::numeric(12,2), (roasted_quantity/:c2)::numeric(12,2), loss, annotation, approval, spec_loss::numeric(12,2) || '±' || spec_tolerance::numeric(12,2) AS lspec, notes, loss_match, machine || '@' || roasting_log.time AS link, files FROM roasting_log, LATERAL (SELECT CASE WHEN (unroasted_total_quantity = 0) THEN NULL ELSE (((unroasted_total_quantity - roasted_quantity)/unroasted_total_quantity)*100)::numeric(12,2) END AS loss) lc, LATERAL (WITH q AS (SELECT (SELECT min(time) - interval '10 years' FROM roasting_log) AS time, NULL::numeric AS loss, NULL::numeric AS tolerance, NULL::text AS notes) SELECT time, (loss*100)::numeric(12,2) AS spec_loss, (tolerance*100)::numeric(12,2) AS spec_tolerance, 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) UNION (SELECT * FROM q) ORDER BY time DESC LIMIT 1) spec, LATERAL (SELECT loss >= spec_loss - spec_tolerance AND loss <= spec_loss + spec_tolerance AS loss_match) m WHERE roasting_log.time >= :sd AND roasting_log.time < :ed::date + interval '1 day'" + approvalClause + batchClause + ") SELECT * FROM qq" + searchClause + " ORDER BY time DESC";
+                var q = "WITH qq AS (SELECT roasting_log.time, array_to_string(files, ','), person, (SELECT name || ' (' || id || ')' FROM items WHERE id = roasted_id) AS rname, duration, (SELECT name FROM machine WHERE id = machine) AS mname, array_to_string(ARRAY(SELECT name || ' (' || id || ')' FROM items WHERE id IN (SELECT unnest(unroasted_id))), ',') AS greens, (unroasted_total_quantity/:c1)::numeric(12,2), (roasted_quantity/:c2)::numeric(12,2), loss, annotation, approval, spec_loss::numeric(12,2) || '±' || spec_tolerance::numeric(12,2) AS lspec, notes, loss_match, machine || '@' || roasting_log.time AS link, files, additional_data, spec FROM roasting_log, LATERAL (SELECT CASE WHEN (unroasted_total_quantity = 0) THEN NULL ELSE (((unroasted_total_quantity - roasted_quantity)/unroasted_total_quantity)*100)::numeric(12,2) END AS loss) lc, LATERAL (WITH q AS (SELECT (SELECT min(time) - interval '10 years' FROM roasting_log) AS time, NULL::numeric AS loss, NULL::numeric AS tolerance, NULL::text AS notes, NULL::jsonb AS spec) SELECT time, (loss*100)::numeric(12,2) AS spec_loss, (tolerance*100)::numeric(12,2) AS spec_tolerance, notes, 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) UNION (SELECT * FROM q) ORDER BY time DESC LIMIT 1) rspec, LATERAL (SELECT loss >= spec_loss - spec_tolerance AND loss <= spec_loss + spec_tolerance AS loss_match) m WHERE roasting_log.time >= :sd AND roasting_log.time < :ed::date + interval '1 day'" + approvalClause + batchClause + ") SELECT * FROM qq" + searchClause + " ORDER BY time DESC";
                 var query = new QSqlQuery();
                 query.prepare(q);
                 query.bind(":c1", conversion);
@@ -171,6 +171,11 @@
                 output.writeStartElement("tr");
                 output.writeAttribute("valign", "bottom");
                 output.writeEmptyElement("td");
+                output.writeTextElement("th", TTR("batchreport", "Degree of Roast"));
+                output.writeEndElement();
+                output.writeStartElement("tr");
+                output.writeAttribute("valign", "bottom");
+                output.writeEmptyElement("td");
                 output.writeStartElement("th");
                 output.writeAttribute("colspan", "2");
                 output.writeCharacters(TTR("batchreport", "Batch Notes"));
@@ -231,6 +236,73 @@
                     output.writeStartElement("tr");
                     output.writeAttribute("valign", "top");
                     output.writeEmptyElement("td");
+                    if(query.value(17).length > 0) {
+                        extradata = JSON.parse(query.value(17));
+                        wcolor = "#000000";
+                        gcolor = "#000000";
+                        wtitle = "";
+                        gtitle = "";
+                        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";
+                                }
+                            }
+                        }
+                        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();
+                    output.writeStartElement("tr");
+                    output.writeAttribute("valign", "top");
+                    output.writeEmptyElement("td");
                     output.writeStartElement("td");
                     output.writeAttribute("colspan", "2");
                     output.writeAttribute("style", "max-width: 400px");