Adds project-to-color mapping for metrics with no color defined.

diff --git a/data/datasources/rc/rc_active_editors_target.yaml b/data/datasources/rc/rc_active_editors_target.yaml
index 5fe5a85..833b288 100644 (file)
--- a/data/datasources/rc/rc_active_editors_target.yaml
+++ b/data/datasources/rc/rc_active_editors_target.yaml
@@ -1,6 +1,6 @@
 id: rc_active_editors_target
-name: Target for Active Editors (5+) 
-shortName : Target Active editors (5+) 
+name: Target for Active Editors (5+)
+shortName : Target Active editors (5+)
 format: csv
 notes: Are notes being displayed?
 url: /data/datasources/rc/rc_active_editors_target.csv
@@ -15,7 +15,7 @@ columns:
     - Month
     - Total
     - Projected
-    - Target    
+    - Target
     types:
     - date
     - int

diff --git a/data/datasources/rc/rc_page_requests_mobile.yaml b/data/datasources/rc/rc_page_requests_mobile.yaml
index d3d1481..26ea846 100644 (file)
--- a/data/datasources/rc/rc_page_requests_mobile.yaml
+++ b/data/datasources/rc/rc_page_requests_mobile.yaml
@@ -2,7 +2,7 @@ id: rc_page_requests_mobile
 name: Mobile Page Request
 shortName : Mobile
 format: csv
-notes: 
+notes:
 url: /data/datasources/rc/rc_page_requests_mobile.csv
 
 timespan:

diff --git a/data/datasources/rc/rc_page_requests_mobile_target.yaml b/data/datasources/rc/rc_page_requests_mobile_target.yaml
index d94c3b1..1b43011 100644 (file)
--- a/data/datasources/rc/rc_page_requests_mobile_target.yaml
+++ b/data/datasources/rc/rc_page_requests_mobile_target.yaml
@@ -14,7 +14,7 @@ columns:
     labels:
     - Month
     - Total
-    - Target    
+    - Target
     types:
     - date
     - int

diff --git a/data/graphs/active_editors.json b/data/graphs/active_editors.json
index 83165bf..0be4627 100644 (file)
--- a/data/graphs/active_editors.json
+++ b/data/graphs/active_editors.json
@@ -1,308 +1,298 @@
 {
-    "chartType": "dygraphs", 
+    "chartType": "dygraphs",
     "data": {
-        "id": "active_editors", 
-        "lines": [], 
+        "id": "active_editors",
+        "lines": [],
         "metrics": [
             {
-                "color": "rgb(116,173,209)", 
-                "disabled": false, 
-                "format_axis": null, 
-                "format_value": null, 
-                "index": 0, 
-                "label": "Total", 
-                "scale": 1, 
-                "source_col": 1, 
-                "source_id": "rc_active_editors_count", 
+                "disabled": false,
+                "format_axis": null,
+                "format_value": null,
+                "index": 0,
+                "label": "Total",
+                "scale": 1,
+                "source_col": 1,
+                "source_id": "rc_active_editors_count",
                 "timespan": {
-                    "end": null, 
-                    "start": null, 
+                    "end": null,
+                    "start": null,
                     "step": null
-                }, 
-                "transforms": [], 
-                "type": "int", 
+                },
+                "transforms": [],
+                "type": "int",
                 "visible": true
-            }, 
+            },
             {
-                "color": "rgb(49,54,149)", 
-                "disabled": false, 
-                "format_axis": null, 
-                "format_value": null, 
-                "index": 0, 
-                "label": "English", 
-                "scale": 1, 
-                "source_col": 2, 
-                "source_id": "rc_active_editors_count", 
+                "disabled": false,
+                "format_axis": null,
+                "format_value": null,
+                "index": 0,
+                "label": "English",
+                "scale": 1,
+                "source_col": 2,
+                "source_id": "rc_active_editors_count",
                 "timespan": {
-                    "end": null, 
-                    "start": null, 
+                    "end": null,
+                    "start": null,
                     "step": null
-                }, 
-                "transforms": [], 
-                "type": "int", 
+                },
+                "transforms": [],
+                "type": "int",
                 "visible": true
-            }, 
+            },
             {
-                "color": "rgb(69,117,180)", 
-                "disabled": false, 
-                "format_axis": null, 
-                "format_value": null, 
-                "index": 0, 
-                "label": "Commons", 
-                "scale": 1, 
-                "source_col": 3, 
-                "source_id": "rc_active_editors_count", 
+                "disabled": false,
+                "format_axis": null,
+                "format_value": null,
+                "index": 0,
+                "label": "Commons",
+                "scale": 1,
+                "source_col": 3,
+                "source_id": "rc_active_editors_count",
                 "timespan": {
-                    "end": null, 
-                    "start": null, 
+                    "end": null,
+                    "start": null,
                     "step": null
-                }, 
-                "transforms": [], 
-                "type": "int", 
+                },
+                "transforms": [],
+                "type": "int",
                 "visible": true
-            }, 
+            },
             {
-                "color": "rgb(254,224,144)", 
-                "disabled": false, 
-                "format_axis": null, 
-                "format_value": null, 
-                "index": 0, 
-                "label": "French", 
-                "scale": 1, 
-                "source_col": 4, 
-                "source_id": "rc_active_editors_count", 
+                "disabled": false,
+                "format_axis": null,
+                "format_value": null,
+                "index": 0,
+                "label": "French",
+                "scale": 1,
+                "source_col": 4,
+                "source_id": "rc_active_editors_count",
                 "timespan": {
-                    "end": null, 
-                    "start": null, 
+                    "end": null,
+                    "start": null,
                     "step": null
-                }, 
-                "transforms": [], 
-                "type": "int", 
+                },
+                "transforms": [],
+                "type": "int",
                 "visible": true
-            }, 
+            },
             {
-                "color": "rgb(244,109,67)", 
-                "disabled": false, 
-                "format_axis": null, 
-                "format_value": null, 
-                "index": 0, 
-                "label": "German", 
-                "scale": 1, 
-                "source_col": 5, 
-                "source_id": "rc_active_editors_count", 
+                "disabled": false,
+                "format_axis": null,
+                "format_value": null,
+                "index": 0,
+                "label": "German",
+                "scale": 1,
+                "source_col": 5,
+                "source_id": "rc_active_editors_count",
                 "timespan": {
-                    "end": null, 
-                    "start": null, 
+                    "end": null,
+                    "start": null,
                     "step": null
-                }, 
-                "transforms": [], 
-                "type": "int", 
+                },
+                "transforms": [],
+                "type": "int",
                 "visible": true
-            }, 
+            },
             {
-                "color": "rgb(224,243,248)", 
-                "disabled": false, 
-                "format_axis": null, 
-                "format_value": null, 
-                "index": 0, 
-                "label": "Russian", 
-                "scale": 1, 
-                "source_col": 6, 
-                "source_id": "rc_active_editors_count", 
+                "disabled": false,
+                "format_axis": null,
+                "format_value": null,
+                "index": 0,
+                "label": "Russian",
+                "scale": 1,
+                "source_col": 6,
+                "source_id": "rc_active_editors_count",
                 "timespan": {
-                    "end": null, 
-                    "start": null, 
+                    "end": null,
+                    "start": null,
                     "step": null
-                }, 
-                "transforms": [], 
-                "type": "int", 
+                },
+                "transforms": [],
+                "type": "int",
                 "visible": true
-            }, 
+            },
             {
-                "color": "rgb(255,255,191)", 
-                "disabled": false, 
-                "format_axis": null, 
-                "format_value": null, 
-                "index": 0, 
-                "label": "Japanese", 
-                "scale": 1, 
-                "source_col": 7, 
-                "source_id": "rc_active_editors_count", 
+                "disabled": false,
+                "format_axis": null,
+                "format_value": null,
+                "index": 0,
+                "label": "Japanese",
+                "scale": 1,
+                "source_col": 7,
+                "source_id": "rc_active_editors_count",
                 "timespan": {
-                    "end": null, 
-                    "start": null, 
+                    "end": null,
+                    "start": null,
                     "step": null
-                }, 
-                "transforms": [], 
-                "type": "int", 
+                },
+                "transforms": [],
+                "type": "int",
                 "visible": true
-            }, 
+            },
             {
-                "color": "rgb(171,217,233)", 
-                "disabled": false, 
-                "format_axis": null, 
-                "format_value": null, 
-                "index": 0, 
-                "label": "Spanish", 
-                "scale": 1, 
-                "source_col": 8, 
-                "source_id": "rc_active_editors_count", 
+                "disabled": false,
+                "format_axis": null,
+                "format_value": null,
+                "index": 0,
+                "label": "Spanish",
+                "scale": 1,
+                "source_col": 8,
+                "source_id": "rc_active_editors_count",
                 "timespan": {
-                    "end": null, 
-                    "start": null, 
+                    "end": null,
+                    "start": null,
                     "step": null
-                }, 
-                "transforms": [], 
-                "type": "int", 
+                },
+                "transforms": [],
+                "type": "int",
                 "visible": true
-            }, 
+            },
             {
-                "color": "rgb(165,0,38)", 
-                "disabled": false, 
-                "format_axis": null, 
-                "format_value": null, 
-                "index": 0, 
-                "label": "Italian", 
-                "scale": 1, 
-                "source_col": 9, 
-                "source_id": "rc_active_editors_count", 
+                "disabled": false,
+                "format_axis": null,
+                "format_value": null,
+                "index": 0,
+                "label": "Italian",
+                "scale": 1,
+                "source_col": 9,
+                "source_id": "rc_active_editors_count",
                 "timespan": {
-                    "end": null, 
-                    "start": null, 
+                    "end": null,
+                    "start": null,
                     "step": null
-                }, 
-                "transforms": [], 
-                "type": "int", 
+                },
+                "transforms": [],
+                "type": "int",
                 "visible": true
-            }, 
+            },
             {
-                "color": "rgb(215,48,39)", 
-                "disabled": false, 
-                "format_axis": null, 
-                "format_value": null, 
-                "index": 0, 
-                "label": "Chinese", 
-                "scale": 1, 
-                "source_col": 10, 
-                "source_id": "rc_active_editors_count", 
+                "disabled": false,
+                "format_axis": null,
+                "format_value": null,
+                "index": 0,
+                "label": "Chinese",
+                "scale": 1,
+                "source_col": 10,
+                "source_id": "rc_active_editors_count",
                 "timespan": {
-                    "end": null, 
-                    "start": null, 
+                    "end": null,
+                    "start": null,
                     "step": null
-                }, 
-                "transforms": [], 
-                "type": "int", 
+                },
+                "transforms": [],
+                "type": "int",
                 "visible": true
             }
-        ], 
+        ],
         "palette": null
-    }, 
-    "desc": "Aug 2010: Editors on Commons are no longer included in overall total, on the assumption that most also edit on one or more other projects. More precise detection of double counts between any projects and languages is in development (using Single User Login registration).", 
-    "height": 250, 
-    "id": "active_editors", 
-    "name": "Active Wikimedia Editors for All Wikimedia Projects (5+ edits per month)", 
-    "notes": "", 
+    },
+    "desc": "Aug 2010: Editors on Commons are no longer included in overall total, on the assumption that most also edit on one or more other projects. More precise detection of double counts between any projects and languages is in development (using Single User Login registration).",
+    "height": 250,
+    "id": "active_editors",
+    "name": "Active Wikimedia Editors for All Wikimedia Projects (5+ edits per month)",
+    "notes": "",
     "options": {
-        "animatedZooms": true, 
-        "avoidMinZero": false, 
-        "axis": null, 
-        "axisLabelColor": "#666666", 
-        "axisLabelFontSize": 11, 
-        "axisLabelFormatter": null, 
-        "axisLabelWidth": 50, 
-        "axisLineColor": "#AAAAAA", 
-        "axisLineWidth": 0.3, 
-        "axisTickSize": 3, 
-        "colorSaturation": 1, 
-        "colorValue": 0.5, 
+        "animatedZooms": true,
+        "avoidMinZero": false,
+        "axis": null,
+        "axisLabelColor": "#666666",
+        "axisLabelFontSize": 11,
+        "axisLabelFormatter": null,
+        "axisLabelWidth": 50,
+        "axisLineColor": "#AAAAAA",
+        "axisLineWidth": 0.3,
+        "axisTickSize": 3,
+        "colorSaturation": 1,
+        "colorValue": 0.5,
         "colors": [
-            "#FF0097", 
-            "#EF8158", 
-            "#83BB32", 
-            "#182B53", 
-            "#4596FF", 
-            "#553DC9", 
-            "#AD3238", 
-            "#00FFBC", 
+            "#FF0097",
+            "#EF8158",
+            "#83BB32",
+            "#182B53",
+            "#4596FF",
+            "#553DC9",
+            "#AD3238",
+            "#00FFBC",
             "#F1D950"
-        ], 
-        "connectSeparatedPoints": false, 
-        "customBars": false, 
-        "dateWindow": null, 
-        "delimiter": ",", 
-        "digitsAfterDecimal": 2, 
-        "displayAnnotations": false, 
-        "drawPoints": true, 
-        "drawXAxis": true, 
-        "drawXGrid": true, 
-        "drawYAxis": true, 
-        "drawYGrid": true, 
-        "errorBars": false, 
-        "file": null, 
-        "fillAlpha": 0.15, 
-        "fillGraph": false, 
-        "fractions": false, 
-        "gridLineColor": "#D8D8D8", 
-        "gridLineWidth": 0.3, 
-        "hideOverlayOnMouseOut": false, 
-        "highlightCircleSize": 4, 
-        "includeZero": false, 
-        "interactionModel": null, 
-        "isZoomedIgnoreProgrammaticZoom": false, 
-        "labels": null, 
-        "labelsDiv": null, 
-        "labelsDivStyles": null, 
-        "labelsDivWidth": 250, 
-        "labelsKMB": true, 
-        "labelsKMG2": false, 
-        "labelsSeparateLines": true, 
-        "labelsShowZeroValues": true, 
-        "legend": "always", 
-        "logscale": true, 
-        "maxNumberWidth": 30, 
-        "panEdgeFraction": null, 
-        "pixelsPerLabel": null, 
-        "pixelsPerXLabel": null, 
-        "pixelsPerYLabel": null, 
-        "pointSize": 1, 
-        "rangeSelectorHeight": 40, 
-        "rangeSelectorPlotFillColor": "#A7B1C4", 
-        "rangeSelectorPlotStrokeColor": "#808FAB", 
-        "rightGap": 20, 
-        "rollPeriod": 1, 
-        "showLabelsOnHighlight": true, 
-        "showRangeSelector": false, 
-        "showRoller": false, 
-        "sigFigs": null, 
-        "sigma": 2, 
-        "stackedGraph": false, 
-        "stepPlot": false, 
-        "strokePattern": null, 
-        "strokeWidth": 3, 
-        "ticker": null, 
-        "title": null, 
-        "titleHeight": 18, 
-        "valueFormatter": null, 
-        "valueRange": null, 
-        "visibility": null, 
-        "wilsonInterval": true, 
-        "xAxisHeight": null, 
-        "xAxisLabelFormatter": null, 
-        "xAxisLabelWidth": 55, 
-        "xLabelHeight": 18, 
-        "xValueFormatter": null, 
-        "xValueParser": null, 
-        "xlabel": null, 
-        "y2label": null, 
-        "yAxisLabelFormatter": null, 
-        "yAxisLabelWidth": 50, 
-        "yLabelWidth": 18, 
-        "yValueFormatter": null, 
+        ],
+        "connectSeparatedPoints": false,
+        "customBars": false,
+        "dateWindow": null,
+        "delimiter": ",",
+        "digitsAfterDecimal": 2,
+        "displayAnnotations": false,
+        "drawPoints": true,
+        "drawXAxis": true,
+        "drawXGrid": true,
+        "drawYAxis": true,
+        "drawYGrid": true,
+        "errorBars": false,
+        "file": null,
+        "fillAlpha": 0.15,
+        "fillGraph": false,
+        "fractions": false,
+        "gridLineColor": "#D8D8D8",
+        "gridLineWidth": 0.3,
+        "hideOverlayOnMouseOut": false,
+        "highlightCircleSize": 4,
+        "includeZero": false,
+        "interactionModel": null,
+        "isZoomedIgnoreProgrammaticZoom": false,
+        "labels": null,
+        "labelsDiv": null,
+        "labelsDivStyles": null,
+        "labelsDivWidth": 250,
+        "labelsKMB": true,
+        "labelsKMG2": false,
+        "labelsSeparateLines": true,
+        "labelsShowZeroValues": true,
+        "legend": "always",
+        "logscale": true,
+        "maxNumberWidth": 30,
+        "panEdgeFraction": null,
+        "pixelsPerLabel": null,
+        "pixelsPerXLabel": null,
+        "pixelsPerYLabel": null,
+        "pointSize": 1,
+        "rangeSelectorHeight": 40,
+        "rangeSelectorPlotFillColor": "#A7B1C4",
+        "rangeSelectorPlotStrokeColor": "#808FAB",
+        "rightGap": 20,
+        "rollPeriod": 1,
+        "showLabelsOnHighlight": true,
+        "showRangeSelector": false,
+        "showRoller": false,
+        "sigFigs": null,
+        "sigma": 2,
+        "stackedGraph": false,
+        "stepPlot": false,
+        "strokePattern": null,
+        "strokeWidth": 3,
+        "ticker": null,
+        "title": null,
+        "titleHeight": 18,
+        "valueFormatter": null,
+        "valueRange": null,
+        "visibility": null,
+        "wilsonInterval": true,
+        "xAxisHeight": null,
+        "xAxisLabelFormatter": null,
+        "xAxisLabelWidth": 55,
+&