fix(analysis): the review findings - rising gravity, undated readings, the band
A second, deeper review of PR #12 found five things the first review did not. All are fixed here. The band was not the band ------------------------- The fermentation curve's shaded range was drawn as ONE dataset with `fill: "+1"`, which fills to the NEXT dataset - and the next dataset was the median line, not the maximum. So the band shaded min-to-median, the upper half of the range was drawn as a hairline but never shaded, and the tooltip said "range min to max" while the picture showed something else. The band is now two datasets - the min curve filled down to a max curve - with the max hidden from the legend. Rising gravity -------------- `attenuation_percent` rejected a final gravity below 1.000 and one implying more than 100% attenuation, but a run whose gravity went UP produced a NEGATIVE attenuation - which was then averaged into the headline figure and plotted as a negative bar. Verified against the live code: OG 1010 -> FG 1020 gave -100.0%. Now rejected, and reported by `implausible_runs` with the reason "the gravity went up, which is usually a mis-ordered pair of readings". Undated readings ---------------- An undated reading sorted to the front of the run, so it became the original gravity - which put the OG after the FG and produced a negative attenuation. The OG now comes from the earliest *dated* reading, and `days_to_target` skips the readings it cannot place on the timeline rather than giving up on the whole run. Verified: readings 1050 (dated), 1005 (undated), 1010 (dated) gave None instead of 24 days, and an OG of 1005 instead of 1050. Active runs on the curve ------------------------ The curve chart filtered on `curve.length > 1` only, so it plotted the active runs as well - a partial fermentation on a chart meant to describe how a completed one behaves. It now excludes them, along with the suspect runs. Four fetches, one payload ------------------------- `/api/runs` carries every reading of every run, and four charts each fetched it independently - so the analysis page made two identical round-trips of the whole collection. There is now one shared fetch. Also ---- - The "Readings that need a second look" table links to the run, so a suspect reading can be corrected in one click. - `days_to_1015` and the `curves` variable were computed and never used. Removed. - A reading below 1.000 now says what it is - "beer cannot be less dense than water, so this is almost certainly a typo (a 1.012 reading entered as 012?)". The reading is still SAVED: rejecting it would lose the brewer's actual observation, and seeing it recorded is how they spot the mistake. 142 tests (up from 134).
This commit is contained in:
@@ -179,8 +179,7 @@
|
||||
var canvas = document.getElementById("abv-chart");
|
||||
if (!canvas) { return; }
|
||||
|
||||
fetch("/api/runs", { headers: { "Accept": "application/json" } })
|
||||
.then(function (r) { return r.json(); })
|
||||
fetchRuns()
|
||||
.then(function (runs) {
|
||||
// Only finished brews have a measured ABV. An unfinished run
|
||||
// has a projection, not a measurement, so it is not plotted
|
||||
@@ -240,8 +239,7 @@
|
||||
var canvas = document.getElementById("months-chart");
|
||||
if (!canvas) { return; }
|
||||
|
||||
fetch("/api/runs", { headers: { "Accept": "application/json" } })
|
||||
.then(function (r) { return r.json(); })
|
||||
fetchRuns()
|
||||
.then(function (runs) {
|
||||
var counts = {};
|
||||
runs.forEach(function (r) {
|
||||
@@ -302,8 +300,7 @@
|
||||
var canvas = document.getElementById("attenuation-chart");
|
||||
if (!canvas) { return; }
|
||||
|
||||
fetch("/api/runs", { headers: { "Accept": "application/json" } })
|
||||
.then(function (r) { return r.json(); })
|
||||
fetchRuns()
|
||||
.then(function (runs) {
|
||||
// A run with an impossible reading has no attenuation, and
|
||||
// is flagged as suspect. Both are excluded, so one bad
|
||||
@@ -384,14 +381,18 @@
|
||||
var canvas = document.getElementById("curve-chart");
|
||||
if (!canvas) { return; }
|
||||
|
||||
fetch("/api/runs", { headers: { "Accept": "application/json" } })
|
||||
.then(function (r) { return r.json(); })
|
||||
fetchRuns()
|
||||
.then(function (runs) {
|
||||
// A run with an impossible reading has a broken curve - it
|
||||
// plunges to a gravity below water - which would drag the
|
||||
// median line down and stretch the envelope to cover it.
|
||||
// Only FINISHED brews belong on the curve. An active run's
|
||||
// curve is a partial fermentation, and the curve is meant to
|
||||
// describe how a completed fermentation behaves - including
|
||||
// a partial one pulls the median line off the real shape.
|
||||
var withCurve = runs.filter(function (r) {
|
||||
return !r.suspect && r.curve && r.curve.length > 1;
|
||||
return !r.suspect && !r.active &&
|
||||
r.curve && r.curve.length > 1;
|
||||
});
|
||||
if (!withCurve.length) { return; }
|
||||
|
||||
@@ -462,6 +463,7 @@
|
||||
// progress point.
|
||||
var envelope = [];
|
||||
var median = [];
|
||||
var envelopeMax = [];
|
||||
for (var i = 0; i < samples; i++) {
|
||||
var pct = (i / (samples - 1)) * 100;
|
||||
var values = [];
|
||||
@@ -478,6 +480,7 @@
|
||||
y: values[0],
|
||||
yMax: values[values.length - 1]
|
||||
});
|
||||
envelopeMax.push({ x: pct, y: values[values.length - 1] });
|
||||
var mid = Math.floor(values.length / 2);
|
||||
median.push({
|
||||
x: pct,
|
||||
@@ -492,6 +495,12 @@
|
||||
data: {
|
||||
datasets: [
|
||||
{
|
||||
// The band is drawn as TWO datasets: the min
|
||||
// curve filled down to the max curve. With
|
||||
// a single dataset and `fill: "+1"` the band
|
||||
// was filled to the NEXT dataset - which was
|
||||
// the median line, not the max - so the
|
||||
// tooltip and the shading disagreed.
|
||||
label: "Range (min–max)",
|
||||
data: envelope,
|
||||
borderColor: withAlpha(ACCENT, 0.35),
|
||||
@@ -501,6 +510,18 @@
|
||||
fill: "+1",
|
||||
tension: 0.3
|
||||
},
|
||||
{
|
||||
// The upper edge of the band. It is the
|
||||
// dataset the one above fills to.
|
||||
label: "Range max",
|
||||
data: envelopeMax,
|
||||
borderColor: withAlpha(ACCENT, 0.35),
|
||||
backgroundColor: "transparent",
|
||||
borderWidth: 1,
|
||||
pointRadius: 0,
|
||||
fill: false,
|
||||
tension: 0.3
|
||||
},
|
||||
{
|
||||
label: "Median brew",
|
||||
data: median,
|
||||
@@ -522,7 +543,12 @@
|
||||
boxWidth: 10,
|
||||
boxHeight: 10,
|
||||
usePointStyle: true,
|
||||
font: { size: 11 }
|
||||
font: { size: 11 },
|
||||
// The max curve is the helper the band
|
||||
// fills to, not a series of its own.
|
||||
filter: function (item, data) {
|
||||
return item.text !== "Range max";
|
||||
}
|
||||
}
|
||||
},
|
||||
tooltip: {
|
||||
@@ -533,6 +559,9 @@
|
||||
return "range " + point.y +
|
||||
" to " + (point.yMax || point.y);
|
||||
}
|
||||
if (ctx.datasetIndex === 1) {
|
||||
return null;
|
||||
}
|
||||
return "median " + point.y;
|
||||
}
|
||||
}
|
||||
@@ -569,6 +598,26 @@
|
||||
.catch(function (err) { console.warn(err); });
|
||||
}
|
||||
|
||||
/* ------------------------------------------------- shared run payload */
|
||||
|
||||
// The analysis page has two charts that both need /api/runs, and the
|
||||
// payload contains every reading of every run. Fetch it once and
|
||||
// share it rather than making two identical round-trips.
|
||||
var runsPromise = null;
|
||||
|
||||
function fetchRuns() {
|
||||
if (!runsPromise) {
|
||||
runsPromise = fetch("/api/runs", { headers: { "Accept": "application/json" } })
|
||||
.then(function (r) { return r.json(); })
|
||||
.catch(function (err) {
|
||||
console.warn(err);
|
||||
runsPromise = null;
|
||||
return [];
|
||||
});
|
||||
}
|
||||
return runsPromise;
|
||||
}
|
||||
|
||||
function init() {
|
||||
drawSparklines();
|
||||
drawRunChart();
|
||||
|
||||
Reference in New Issue
Block a user