Merge branch 'master' into fmb-read-only

Conflicts:
	.gitignore
	bin/make_css
	perllib/FixMyStreet/Cobrand/FixMyStreet.pm

1 files changed, 236 insertions, 0 deletions

diff --git a/data/dashboard.json b/data/dashboard.json
new file mode 100644
index 000000000..1da667356
--- /dev/null
+++ b/data/dashboard.json
@@ -0,0 +1,236 @@
+{
+    "council": { "name": "South Borsetshire District Council" },
+    "wards": {
+        "1": { "id": 1, "name": "West Ward" },
+        "2": { "id": 2, "name": "East Ward" },
+        "3": { "id": 3, "name": "North Ward" },
+        "4": { "id": 4, "name": "South Ward" }
+    },
+    "category_options": [
+        "Abandoned vehicles",
+        "Grafitti",
+        "Potholes",
+        "Street lighting",
+        "Trees",
+        "Other"
+    ],
+    "counts_all": {
+        "wtd": {
+            "total": 10,
+            "planned": 2,
+            "in progress": 1,
+            "investigating": 1,
+            "fixed - council": 3,
+            "fixed_user": 2,
+            "time_to_fix": 2,
+            "time_to_mark": 2,
+            "not_marked": 1
+        },
+        "week": {
+            "total": 21,
+            "planned": 5,
+            "in progress": 3,
+            "investigating": 4,
+            "fixed - council": 6,
+            "fixed_user": 3,
+            "time_to_fix": 3,
+            "time_to_mark": 2,
+            "not_marked": 1
+        },
+        "weeks": {
+            "total": 57,
+            "planned": 5,
+            "in progress": 16,
+            "investigating": 4,
+            "fixed - council": 23,
+            "fixed_user": 9,
+            "time_to_fix": 2,
+            "time_to_mark": 2,
+            "not_marked": 1
+        },
+        "ytd": {
+            "total": 171,
+            "planned": 23,
+            "in progress": 34,
+            "investigating": 9,
+            "fixed - council": 72,
+            "fixed_user": 33,
+            "time_to_fix": 2,
+            "time_to_mark": 2,
+            "not_marked": 1
+        }
+    },
+    "counts_some": {
+        "wtd": {
+            "total": 5,
+            "planned": 0,
+            "in progress": 1,
+            "investigating": 1,
+            "fixed - council": 2,
+            "fixed_user": 1,
+            "time_to_fix": 2,
+            "time_to_mark": 2,
+            "not_marked": 0
+        },
+        "week": {
+            "total": 7,
+            "planned": 1,
+            "in progress": 2,
+            "investigating": 1,
+            "fixed - council": 2,
+            "fixed_user": 1,
+            "time_to_fix": 3,
+            "time_to_mark": 2,
+            "not_marked": 0
+        },
+        "weeks": {
+            "total": 57,
+            "planned": 5,
+            "in progress": 16,
+            "investigating": 4,
+            "fixed - council": 23,
+            "fixed_user": 9,
+            "time_to_fix": 2,
+            "time_to_mark": 2,
+            "not_marked": 1
+        },
+        "ytd": {
+            "total": 57,
+            "planned": 5,
+            "in progress": 16,
+            "investigating": 4,
+            "fixed - council": 23,
+            "fixed_user": 9,
+            "time_to_fix": 2,
+            "time_to_mark": 2,
+            "not_marked": 1
+        }
+    },
+    "lists": {
+        "all": {
+            "1": [
+                { "id": 0, "title": "Pothole" },
+                { "id": 0, "title": "Fallen Tree" },
+                { "id": 0, "title": "Fly tipping" },
+                { "id": 0, "title": "Loose kerb" },
+                { "id": 0, "title": "Blocked drain" },
+                { "id": 0, "title": "Pothole" },
+                { "id": 0, "title": "Abandoned car" },
+                { "id": 0, "title": "Burst pipe" },
+                { "id": 0, "title": "Pothole" },
+                { "id": 0, "title": "Uneven paving" }
+            ],
+            "2": [
+                { "id": 0, "title": "Burst pipe" },
+                { "id": 0, "title": "Blocked drain" },
+                { "id": 0, "title": "Burst pipe" },
+                { "id": 0, "title": "Pothole" },
+                { "id": 0, "title": "Fly tipping" },
+                { "id": 0, "title": "Blocked drain" },
+                { "id": 0, "title": "Burst pipe" },
+                { "id": 0, "title": "Pothole" },
+                { "id": 0, "title": "Uneven paving" },
+                { "id": 0, "title": "Blocked drain" },
+                { "id": 0, "title": "Loose kerb" },
+                { "id": 0, "title": "Blocked drain" },
+                { "id": 0, "title": "Fallen Tree" },
+                { "id": 0, "title": "Burst pipe" },
+                { "id": 0, "title": "Abandoned car" },
+                { "id": 0, "title": "Pothole" },
+                { "id": 0, "title": "Pothole" },
+                { "id": 0, "title": "Loose kerb" },
+                { "id": 0, "title": "Blocked drain" },
+                { "id": 0, "title": "Blocked drain" }
+            ],
+            "3": [
+                { "id": 0, "title": "Burst pipe" },
+                { "id": 0, "title": "Loose kerb" },
+                { "id": 0, "title": "Blocked drain" },
+                { "id": 0, "title": "Blocked drain" },
+                { "id": 0, "title": "Fly tipping" },
+                { "id": 0, "title": "Uneven paving" },
+                { "id": 0, "title": "Fallen Tree" },
+                { "id": 0, "title": "Blocked drain" },
+                { "id": 0, "title": "Pothole" },
+                { "id": 0, "title": "Pothole" },
+                { "id": 0, "title": "Burst pipe" },
+                { "id": 0, "title": "Burst pipe" },
+                { "id": 0, "title": "Loose kerb" },
+                { "id": 0, "title": "Abandoned car" },
+                { "id": 0, "title": "Pothole" },
+                { "id": 0, "title": "Blocked drain" },
+                { "id": 0, "title": "Blocked drain" },
+                { "id": 0, "title": "Fallen Tree" },
+                { "id": 0, "title": "Pothole" },
+                { "id": 0, "title": "Burst pipe" },
+                { "id": 0, "title": "Pothole" },
+                { "id": 0, "title": "Fly tipping" },
+                { "id": 0, "title": "Burst pipe" },
+                { "id": 0, "title": "Abandoned car" },
+                { "id": 0, "title": "Pothole" },
+                { "id": 0, "title": "Loose kerb" },
+                { "id": 0, "title": "Uneven paving" },
+                { "id": 0, "title": "Blocked drain" },
+                { "id": 0, "title": "Blocked drain" },
+                { "id": 0, "title": "Pothole" }
+            ]
+        },
+        "filtered": {
+            "1": [
+                { "id": 0, "title": "Pothole" },
+                { "id": 0, "title": "Fallen Tree" },
+                { "id": 0, "title": "Loose kerb" },
+                { "id": 0, "title": "Abandoned car" },
+                { "id": 0, "title": "Pothole" },
+                { "id": 0, "title": "Uneven paving" }
+            ],
+            "2": [
+                { "id": 0, "title": "Burst pipe" },
+                { "id": 0, "title": "Loose kerb" },
+                { "id": 0, "title": "Blocked drain" },
+                { "id": 0, "title": "Fly tipping" },
+                { "id": 0, "title": "Fallen Tree" },
+                { "id": 0, "title": "Blocked drain" },
+                { "id": 0, "title": "Pothole" },
+                { "id": 0, "title": "Burst pipe" },
+                { "id": 0, "title": "Burst pipe" },
+                { "id": 0, "title": "Loose kerb" },
+                { "id": 0, "title": "Blocked drain" },
+                { "id": 0, "title": "Fallen Tree" },
+                { "id": 0, "title": "Pothole" },
+                { "id": 0, "title": "Pothole" },
+                { "id": 0, "title": "Fly tipping" },
+                { "id": 0, "title": "Abandoned car" },
+                { "id": 0, "title": "Pothole" },
+                { "id": 0, "title": "Uneven paving" },
+                { "id": 0, "title": "Blocked drain" },
+                { "id": 0, "title": "Pothole" }
+            ],
+            "3": [
+                { "id": 0, "title": "Burst pipe" },
+                { "id": 0, "title": "Blocked drain" },
+                { "id": 0, "title": "Blocked drain" },
+                { "id": 0, "title": "Uneven paving" },
+                { "id": 0, "title": "Fallen Tree" },
+                { "id": 0, "title": "Pothole" },
+                { "id": 0, "title": "Pothole" },
+                { "id": 0, "title": "Burst pipe" },
+                { "id": 0, "title": "Loose kerb" },
+                { "id": 0, "title": "Abandoned car" },
+                { "id": 0, "title": "Pothole" },
+                { "id": 0, "title": "Blocked drain" },
+                { "id": 0, "title": "Fallen Tree" },
+                { "id": 0, "title": "Pothole" },
+                { "id": 0, "title": "Burst pipe" },
+                { "id": 0, "title": "Fly tipping" },
+                { "id": 0, "title": "Burst pipe" },
+                { "id": 0, "title": "Abandoned car" },
+                { "id": 0, "title": "Pothole" },
+                { "id": 0, "title": "Uneven paving" },
+                { "id": 0, "title": "Blocked drain" },
+                { "id": 0, "title": "Blocked drain" },
+                { "id": 0, "title": "Pothole" }
+            ]
+        }
+    }
+}