Merge branch 'master' of https://github.com/ECLK/epollbook

ECLK · Aug 4, 2020 · 3ad947c · 3ad947c
2 parents b224a95 + 82ec873
commit 3ad947c
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 deletions.
diff --git a/grafana/electoral_district_dashboard.json b/grafana/electoral_district_dashboard.json
@@ -64,7 +64,7 @@
   "gnetId": null,
   "graphTooltip": 0,
   "id": null,
-  "iteration": 1596462290218,
+  "iteration": 1596462290228,
   "links": [],
   "panels": [
     {
@@ -504,7 +504,7 @@
           "group": [],
           "metricColumn": "none",
           "rawQuery": true,
-          "rawSql": "SELECT (COUNT(*)/${casted_votes}) * 100 as \"Male Voters (%)\"\nFROM ElectorRegistry\nWHERE Sex = 'MALE' and ID in (SELECT ID FROM VoteRecords WHERE DistrictID = ${electoral_district_id} and VotingStatus = \"VOTED\");",
+          "rawSql": "SELECT (COUNT(*)/${casted_votes}) * 100 as \"Male Voters (%)\"\nFROM ElectorRegistry\nWHERE Sex = 'MALE' and ID in (SELECT ID FROM VoteRecords WHERE $__timeFilter(Timestamp) and DistrictID = ${electoral_district_id} and VotingStatus = \"VOTED\");",
           "refId": "B",
           "select": [
             [
@@ -531,7 +531,7 @@
           "hide": false,
           "metricColumn": "none",
           "rawQuery": true,
-          "rawSql": "SELECT (COUNT(*)/${casted_votes}) * 100 as \"Female Voters (%)\"\nFROM ElectorRegistry\nWHERE Sex = \"FEMALE\" and ID in (SELECT ID FROM VoteRecords WHERE DistrictID = ${electoral_district_id} and VotingStatus = \"VOTED\");",
+          "rawSql": "SELECT (COUNT(*)/${casted_votes}) * 100 as \"Female Voters (%)\"\nFROM ElectorRegistry\nWHERE Sex = \"FEMALE\" and ID in (SELECT ID FROM VoteRecords WHERE $__timeFilter(Timestamp) and DistrictID = ${electoral_district_id} and VotingStatus = \"VOTED\");",
           "refId": "C",
           "select": [
             [
@@ -936,5 +936,5 @@
   "timezone": "",
   "title": "Electoral District Dashboard - E Poll Book",
   "uid": "-8CSgjVGz",
-  "version": 4
+  "version": 5
 }
diff --git a/grafana/polling_division_dashboard.json b/grafana/polling_division_dashboard.json
@@ -64,7 +64,7 @@
   "gnetId": null,
   "graphTooltip": 0,
   "id": null,
-  "iteration": 1596462013688,
+  "iteration": 1596462013701,
   "links": [],
   "panels": [
     {
@@ -483,7 +483,7 @@
           "hide": true,
           "metricColumn": "none",
           "rawQuery": true,
-          "rawSql": "SELECT COUNT(*) as \"Failed Attempts\"\nFROM VoteRecords\nWHERE DistrictID = ${electoral_district_id} and PollingDivisionID = ${polling_division_id:singlequote} and PollingStationID = $polling_station and Status = \"failed\";",
+          "rawSql": "SELECT COUNT(*) as \"Failed Attempts\"\nFROM VoteRecords\nWHERE $__timeFilter(Timestamp) and DistrictID = ${electoral_district_id} and PollingDivisionID = ${polling_division_id:singlequote} and PollingStationID = $polling_station and Status = \"failed\";",
           "refId": "A",
           "select": [
             [
@@ -504,7 +504,7 @@
           "group": [],
           "metricColumn": "none",
           "rawQuery": true,
-          "rawSql": "SELECT (COUNT(*)/${casted_votes}) * 100 as \"Male Voters (%)\"\nFROM ElectorRegistry\nWHERE Sex = 'MALE' and ID in (SELECT ID FROM VoteRecords WHERE DistrictID = ${electoral_district_id} and PollingDivisionID = ${polling_division_id:singlequote} and VotingStatus = \"VOTED\");",
+          "rawSql": "SELECT (COUNT(*)/${casted_votes}) * 100 as \"Male Voters (%)\"\nFROM ElectorRegistry\nWHERE Sex = 'MALE' and ID in (SELECT ID FROM VoteRecords WHERE $__timeFilter(Timestamp) and DistrictID = ${electoral_district_id} and PollingDivisionID = ${polling_division_id:singlequote} and VotingStatus = \"VOTED\");",
           "refId": "B",
           "select": [
             [
@@ -531,7 +531,7 @@
           "hide": false,
           "metricColumn": "none",
           "rawQuery": true,
-          "rawSql": "SELECT (COUNT(*)/${casted_votes}) * 100 as \"Female Voters (%)\"\nFROM ElectorRegistry\nWHERE Sex = \"FEMALE\" and ID in (SELECT ID FROM VoteRecords WHERE DistrictID = ${electoral_district_id} and PollingDivisionID = ${polling_division_id:singlequote} and VotingStatus = \"VOTED\");",
+          "rawSql": "SELECT (COUNT(*)/${casted_votes}) * 100 as \"Female Voters (%)\"\nFROM ElectorRegistry\nWHERE Sex = \"FEMALE\" and ID in (SELECT ID FROM VoteRecords WHERE $__timeFilter(Timestamp) and DistrictID = ${electoral_district_id} and PollingDivisionID = ${polling_division_id:singlequote} and VotingStatus = \"VOTED\");",
           "refId": "C",
           "select": [
             [
@@ -980,5 +980,5 @@
   "timezone": "",
   "title": "Polling Division Dashboard - E Poll Book",
   "uid": "DZ6bB9VGk",
-  "version": 6
+  "version": 7
 }
diff --git a/grafana/polling_station_dashboard.json b/grafana/polling_station_dashboard.json
@@ -64,7 +64,7 @@
   "gnetId": null,
   "graphTooltip": 0,
   "id": null,
-  "iteration": 1596457080601,
+  "iteration": 1596457080629,
   "links": [],
   "panels": [
     {
@@ -504,7 +504,7 @@
           "group": [],
           "metricColumn": "none",
           "rawQuery": true,
-          "rawSql": "SELECT (COUNT(*)/${casted_votes}) * 100 as \"Male Voters (%)\"\nFROM ElectorRegistry\nWHERE Sex = 'MALE' and ID in (SELECT ID FROM VoteRecords WHERE DistrictID = ${electoral_district_id} and PollingDivisionID = ${polling_division_id:singlequote} and PollingStationID = $polling_station and VotingStatus = \"VOTED\");",
+          "rawSql": "SELECT (COUNT(*)/${casted_votes}) * 100 as \"Male Voters (%)\"\nFROM ElectorRegistry\nWHERE Sex = 'MALE' and ID in (SELECT ID FROM VoteRecords WHERE $__timeFilter(Timestamp) and DistrictID = ${electoral_district_id} and PollingDivisionID = ${polling_division_id:singlequote} and PollingStationID = $polling_station and VotingStatus = \"VOTED\");",
           "refId": "B",
           "select": [
             [
@@ -531,7 +531,7 @@
           "hide": false,
           "metricColumn": "none",
           "rawQuery": true,
-          "rawSql": "SELECT (COUNT(*)/${casted_votes}) * 100 as \"Female Voters (%)\"\nFROM ElectorRegistry\nWHERE Sex = \"FEMALE\" and ID in (SELECT ID FROM VoteRecords WHERE DistrictID = ${electoral_district_id} and PollingDivisionID = ${polling_division_id:singlequote} and PollingStationID = $polling_station and VotingStatus = \"VOTED\");",
+          "rawSql": "SELECT (COUNT(*)/${casted_votes}) * 100 as \"Female Voters (%)\"\nFROM ElectorRegistry\nWHERE Sex = \"FEMALE\" and ID in (SELECT ID FROM VoteRecords WHERE $__timeFilter(Timestamp) and DistrictID = ${electoral_district_id} and PollingDivisionID = ${polling_division_id:singlequote} and PollingStationID = $polling_station and VotingStatus = \"VOTED\");",
           "refId": "C",
           "select": [
             [
@@ -1002,5 +1002,5 @@
   "timezone": "",
   "title": "Polling Station Dashboard - E Poll Book",
   "uid": "y_Ua1V9Wz",
-  "version": 50
+  "version": 51
 }