From 7626174652454d31dd817a73e21c7cbc665e2da3 Mon Sep 17 00:00:00 2001 From: Dinuka De Silva Date: Wed, 16 Dec 2020 01:02:50 +0530 Subject: [PATCH] gh-842: Adding the missing required `numValue` column to the candidates summary sheets --- .../ExtendedElectionParliamentaryElection2020/__init__.py | 3 ++- .../TallysheetTemplates/pce_pc_cd.py | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/results-tabulation-api/ext/ExtendedElection/ExtendedElectionParliamentaryElection2020/__init__.py b/results-tabulation-api/ext/ExtendedElection/ExtendedElectionParliamentaryElection2020/__init__.py index 5114b332..1c8247cf 100644 --- a/results-tabulation-api/ext/ExtendedElection/ExtendedElectionParliamentaryElection2020/__init__.py +++ b/results-tabulation-api/ext/ExtendedElection/ExtendedElectionParliamentaryElection2020/__init__.py @@ -1368,7 +1368,8 @@ def build_election(self, party_candidate_dataset_file=None, {"columnName": "electionId", "grouped": True, "func": None, "source": SOURCE_META}, {"columnName": "areaId", "grouped": True, "func": None, "source": SOURCE_META}, {"columnName": "partyId", "grouped": True, "func": None, "source": SOURCE_QUERY}, - {"columnName": "candidateId", "grouped": True, "func": None, "source": SOURCE_QUERY} + {"columnName": "candidateId", "grouped": True, "func": None, "source": SOURCE_QUERY}, + {"columnName": "numValue", "grouped": False, "func": "sum", "source": SOURCE_QUERY} ], "derivativeRows": [ {"templateName": PE_21, "templateRowType": TEMPLATE_ROW_TYPE_ELECTED_CANDIDATE}, diff --git a/results-tabulation-api/ext/ExtendedElection/ExtendedElectionProvincialCouncilElection2021/TallysheetTemplates/pce_pc_cd.py b/results-tabulation-api/ext/ExtendedElection/ExtendedElectionProvincialCouncilElection2021/TallysheetTemplates/pce_pc_cd.py index a605cf81..84546979 100644 --- a/results-tabulation-api/ext/ExtendedElection/ExtendedElectionProvincialCouncilElection2021/TallysheetTemplates/pce_pc_cd.py +++ b/results-tabulation-api/ext/ExtendedElection/ExtendedElectionProvincialCouncilElection2021/TallysheetTemplates/pce_pc_cd.py @@ -70,7 +70,8 @@ def create_template(): {"columnName": "electionId", "grouped": True, "func": None, "source": SOURCE_META}, {"columnName": "areaId", "grouped": True, "func": None, "source": SOURCE_META}, {"columnName": "partyId", "grouped": True, "func": None, "source": SOURCE_QUERY}, - {"columnName": "candidateId", "grouped": True, "func": None, "source": SOURCE_QUERY} + {"columnName": "candidateId", "grouped": True, "func": None, "source": SOURCE_QUERY}, + {"columnName": "numValue", "grouped": False, "func": "sum", "source": SOURCE_QUERY} ], "derivativeRows": [ {"templateName": PCE_42, "templateRowType": TEMPLATE_ROW_TYPE_ELECTED_CANDIDATE}, @@ -83,7 +84,8 @@ def create_template(): {"columnName": "electionId", "grouped": True, "func": None, "source": SOURCE_META}, {"columnName": "areaId", "grouped": True, "func": None, "source": SOURCE_META}, {"columnName": "partyId", "grouped": True, "func": None, "source": SOURCE_QUERY}, - {"columnName": "candidateId", "grouped": True, "func": None, "source": SOURCE_QUERY} + {"columnName": "candidateId", "grouped": True, "func": None, "source": SOURCE_QUERY}, + {"columnName": "numValue", "grouped": False, "func": "sum", "source": SOURCE_QUERY} ], "derivativeRows": [ {"templateName": PCE_PC_BS_2, "templateRowType": TEMPLATE_ROW_TYPE_ELECTED_CANDIDATE}