Merge pull request #848 from dinukadesilva/gh-842-fix-pce-pc-cd-candi…

…dates-list gh-842: Adding the missing required `numValue` column to the candidates summary sheets
ECLK · Dec 16, 2020 · 8fefacc · 8fefacc
2 parents 73f4a1f + 7626174
commit 8fefacc
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/...tabulation-api/ext/ExtendedElection/ExtendedElectionParliamentaryElection2020/__init__.py b/...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/...edElection/ExtendedElectionProvincialCouncilElection2021/TallysheetTemplates/pce_pc_cd.py b/...edElection/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}