From 6e9a1f930676b9b4678c43a8bd536dc065353984 Mon Sep 17 00:00:00 2001 From: Alejandro Martinez Date: Sun, 3 Aug 2025 19:14:23 -0300 Subject: [PATCH] Update Expected PMC (TriScore) example chart [skip ci] Lets make it a User Chart. --- test/charts/Expected PMC (TriScore).gchart | 25 ++++------------------ 1 file changed, 4 insertions(+), 21 deletions(-) diff --git a/test/charts/Expected PMC (TriScore).gchart b/test/charts/Expected PMC (TriScore).gchart index f115b4807..2b2bc39a3 100644 --- a/test/charts/Expected PMC (TriScore).gchart +++ b/test/charts/Expected PMC (TriScore).gchart @@ -2,32 +2,15 @@ "CHART":{ "VERSION":"1", "VIEW":"home", - "TYPE":"7", + "TYPE":"45", "PROPERTIES":{ - "title":"PMC ", - "subtitle":"PMC ", + "title":"Expected PMC (TriScore) ", + "subtitle":" ", "widthFactor":"2", "heightFactor":"2", "style":"0", "resizable":"0", - "preset":"0", - "bin":"0", - "shade":"0", - "data":"0", - "stack":"0", - "stackWidth":"3", - "legend":"1", - "events":"1", - "banister":"1", - "filter":"filter: ", - "fromDate":"Sat Jan 1 2000", - "toDate":"Sat Jan 1 2000", - "startDate":"Sun Dec 20 2020", - "lastN":"7", - "lastNX":"0", - "prevN":"0", - "settings":"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", - "useSelected":"0", + "settings":"{ \"title\": \"Triathlon PMC \",\n\"description\": \"PMC based on completed activities until today and planned ones going forward. \",\n\"type\": 1,\n\"animate\": false,\n\"intervalrefresh\": false,\n\"legendpos\": 2,\n\"stack\": false,\n\"orientation\": 2,\n\"bgcolor\": \"#010102\", \n\"scale\": 1,\n\"SERIES\": [\n{ \"name\": \"TSB \", \"group\": \" \", \"xname\": \"Date \", \"yname\": \"TriScore \", \"program\": \"{:sl:n x { pmc(TriScore, date, expected); }:sl:n y { pmc(TriScore, sb, expected); }:sl:n} \", \"line\": 1, \"symbol\": 0, \"size\": 3, \"color\": \"#01012a\", \"opacity\": 100, \"legend\": true, \"opengl\": true, \"datalabels\": false, \"aggregate\": -1, \"fill\": false},\n{ \"name\": \"ATL \", \"group\": \" \", \"xname\": \"Date \", \"yname\": \"TriScore \", \"program\": \"{:sl:n x { pmc(TriScore, date, expected); }:sl:n y { pmc(TriScore, sts, expected); }:sl:n} \", \"line\": 1, \"symbol\": 0, \"size\": 3, \"color\": \"#010128\", \"opacity\": 100, \"legend\": true, \"opengl\": true, \"datalabels\": false, \"aggregate\": -1, \"fill\": false},\n{ \"name\": \"CTL \", \"group\": \" \", \"xname\": \"Date \", \"yname\": \"TriScore \", \"program\": \"{:sl:n finalise {:sl:n # Add a marker for each event:sl:n sapply(events(date), { annotate(vline, events(name)[i], solid, x); });:sl:n annotate(vline, :qu:Today:qu:, dash, Today);:sl:n annotate(hline, :qu:0:qu:, solid, 0);:sl:n }:sl:n:sl:n x { pmc(TriScore, date, expected); }:sl:n y { pmc(TriScore, lts, expected); }:sl:n}:sl:n \", \"line\": 1, \"symbol\": 0, \"size\": 3, \"color\": \"#010129\", \"opacity\": 100, \"legend\": true, \"opengl\": true, \"datalabels\": false, \"aggregate\": -1, \"fill\": false},\n{ \"name\": \"Gym \", \"group\": \" \", \"xname\": \"Date \", \"yname\": \"TriScore \", \"program\": \"{:sl:n x { pmc(isXtrain ? TriScore : 0, date, expected); }:sl:n y { pmc(isXtrain ? TriScore : 0, lts, expected); }:sl:n}:sl:n \", \"line\": 1, \"symbol\": 0, \"size\": 3, \"color\": \"#ffff7f\", \"opacity\": 100, \"legend\": true, \"opengl\": true, \"datalabels\": false, \"aggregate\": -1, \"fill\": false},\n{ \"name\": \"Run \", \"group\": \" \", \"xname\": \"Date \", \"yname\": \"TriScore \", \"program\": \"{:sl:n x { pmc(GOVSS, date, expected); }:sl:n y { pmc(GOVSS, lts, expected); }:sl:n} \", \"line\": 1, \"symbol\": 0, \"size\": 3, \"color\": \"#010120\", \"opacity\": 100, \"legend\": true, \"opengl\": true, \"datalabels\": false, \"aggregate\": -1, \"fill\": false},\n{ \"name\": \"Bike \", \"group\": \" \", \"xname\": \"Date \", \"yname\": \"TriScore \", \"program\": \"{:sl:n x { pmc(BikeStress, date, expected); }:sl:n y { pmc(BikeStress, lts, expected); }:sl:n} \", \"line\": 1, \"symbol\": 0, \"size\": 3, \"color\": \"#01016f\", \"opacity\": 100, \"legend\": true, \"opengl\": true, \"datalabels\": false, \"aggregate\": -1, \"fill\": false},\n{ \"name\": \"Swim \", \"group\": \" \", \"xname\": \"Date \", \"yname\": \"TriScore \", \"program\": \"{:sl:n x { pmc(SwimScore, date, expected); }:sl:n y { pmc(SwimScore, lts, expected); }:sl:n} \", \"line\": 1, \"symbol\": 0, \"size\": 3, \"color\": \"#01016e\", \"opacity\": 100, \"legend\": true, \"opengl\": true, \"datalabels\": false, \"aggregate\": -1, \"fill\": false} ]\n,\n\"AXES\": [\n{ \"name\": \"Date \", \"type\": 1, \"orientation\": 1, \"align\": 1, \"minx\": 0, \"maxx\": 0, \"miny\": 0, \"maxy\": 0, \"smooth\": 0, \"groupby\": 0, \"visible\": true, \"fixed\": false, \"log\": false, \"minorgrid\": false, \"majorgrid\": true, \"labelcolor\": \"#2684f6\", \"axiscolor\": \"#2684f6\"},\n{ \"name\": \"TriScore \", \"type\": 0, \"orientation\": 2, \"align\": 1, \"minx\": 0, \"maxx\": 0, \"miny\": -30, \"maxy\": 150, \"smooth\": 0, \"groupby\": 0, \"visible\": true, \"fixed\": false, \"log\": false, \"minorgrid\": false, \"majorgrid\": true, \"labelcolor\": \"#01012a\", \"axiscolor\": \"#01012a\"} ]\n} ", "__LAST__":"1" } }