Skip to content

Commit 06438d0

Browse files
dinukadesilvadinukadesilva
authored
Merge pull request #788 from dinukadesilva/gh-787-enabling-pe-letter-signatures-adjustable
Gh 787 enabling pe letter signatures adjustable
2 parents ebe77d8 + 7c5619b commit 06438d0

File tree

47 files changed

+270
-224
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+270
-224
lines changed

‎results-tabulation-api/api/TallySheetVersionApi/__init__.py

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -42,15 +42,18 @@ def create_empty_and_get_html(tallySheetId):
4242

4343

4444
@authorize(required_roles=ALL_ROLES)
45-
def letter_html(tallySheetId, tallySheetVersionId):
45+
def letter_html(tallySheetId, tallySheetVersionId, body):
46+
request_body = RequestBody(body)
47+
signatures = request_body.get("signatures")
48+
4649
user_access_area_ids = get_user_access_area_ids()
4750

4851
return _cache_letter_html(user_access_area_ids=user_access_area_ids, tally_sheet_id=tallySheetId,
49-
tally_sheet_version_id=tallySheetVersionId)
52+
tally_sheet_version_id=tallySheetVersionId, signatures=signatures)
5053

5154

5255
@cache.memoize()
53-
def _cache_letter_html(user_access_area_ids, tally_sheet_id, tally_sheet_version_id):
56+
def _cache_letter_html(user_access_area_ids, tally_sheet_id, tally_sheet_version_id, signatures):
5457
tally_sheet = TallySheet.get_by_id(tallySheetId=tally_sheet_id)
5558

5659
if tally_sheet is None:
@@ -68,7 +71,8 @@ def _cache_letter_html(user_access_area_ids, tally_sheet_id, tally_sheet_version
6871
code=MESSAGE_CODE_TALLY_SHEET_VERSION_NOT_FOUND
6972
)
7073

71-
return Response(tally_sheet.html_letter(tallySheetVersionId=tally_sheet_version_id), mimetype='text/html')
74+
return Response(tally_sheet.html_letter(tallySheetVersionId=tally_sheet_version_id, signatures=signatures),
75+
mimetype='text/html')
7276

7377

7478
@authorize(required_roles=ALL_ROLES)
@@ -139,15 +143,18 @@ def _cache_pdf(user_access_area_ids, tally_sheet_id, tally_sheet_version_id):
139143

140144

141145
@authorize(required_roles=ALL_ROLES)
142-
def letter_pdf(tallySheetId, tallySheetVersionId):
146+
def letter_pdf(tallySheetId, tallySheetVersionId, body):
147+
request_body = RequestBody(body)
148+
signatures = request_body.get("signatures")
149+
143150
user_access_area_ids = get_user_access_area_ids()
144151

145152
return _cache_letter_pdf(user_access_area_ids=user_access_area_ids, tally_sheet_id=tallySheetId,
146-
tally_sheet_version_id=tallySheetVersionId)
153+
tally_sheet_version_id=tallySheetVersionId, signatures=signatures)
147154

148155

149156
@cache.memoize()
150-
def _cache_letter_pdf(user_access_area_ids, tally_sheet_id, tally_sheet_version_id):
157+
def _cache_letter_pdf(user_access_area_ids, tally_sheet_id, tally_sheet_version_id, signatures):
151158
tally_sheet = TallySheet.get_by_id(tallySheetId=tally_sheet_id)
152159

153160
if tally_sheet is None:
@@ -167,7 +174,8 @@ def _cache_letter_pdf(user_access_area_ids, tally_sheet_id, tally_sheet_version_
167174

168175
file_response = FileApi.get_download_file(fileId=tally_sheet_version.get_exported_letter_pdf_file_id(
169176
tallySheetId=tally_sheet_id,
170-
tallySheetVersionId=tally_sheet_version_id
177+
tallySheetVersionId=tally_sheet_version_id,
178+
signatures=signatures
171179
))
172180

173181
db.session.commit()

‎results-tabulation-api/ext/ExtendedElection/ExtendedElectionParliamentaryElection2020/ExtendedTallySheet/ExtendedTallySheet_CE_201.py

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,6 @@
1010
class ExtendedTallySheet_CE_201(ExtendedTallySheetDataEntry):
1111
class ExtendedTallySheetVersion(ExtendedTallySheetDataEntry.ExtendedTallySheetVersion):
1212

13-
def html_letter(self, title="", total_registered_voters=None):
14-
return super(ExtendedTallySheet_CE_201.ExtendedTallySheetVersion, self).html_letter(
15-
title="Results of Electoral District %s" % self.tallySheetVersion.submission.area.areaName
16-
)
17-
1813
def html(self, title="", total_registered_voters=None):
1914
tallySheetVersion = self.tallySheetVersion
2015

@@ -88,7 +83,7 @@ def html(self, title="", total_registered_voters=None):
8883

8984
content["data"].append(data_row)
9085

91-
content["totalBallotBoxCount"]= to_comma_seperated_num(totalBallotBoxCount)
86+
content["totalBallotBoxCount"] = to_comma_seperated_num(totalBallotBoxCount)
9287

9388
html = render_template(
9489
'CE-201.html',

‎results-tabulation-api/ext/ExtendedElection/ExtendedElectionParliamentaryElection2020/ExtendedTallySheet/ExtendedTallySheet_CE_201_PV.py

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,24 +10,19 @@
1010
class ExtendedTallySheet_CE_201_PV(ExtendedTallySheetDataEntry):
1111
class ExtendedTallySheetVersion(ExtendedTallySheetDataEntry.ExtendedTallySheetVersion):
1212

13-
def html_letter(self, title="", total_registered_voters=None):
14-
return super(ExtendedTallySheet_CE_201_PV.ExtendedTallySheetVersion, self).html_letter(
15-
title="Results of Electoral District %s" % self.tallySheetVersion.submission.area.areaName
16-
)
17-
1813
def html(self, title="", total_registered_voters=None):
1914
tallySheetVersion = self.tallySheetVersion
2015

21-
2216
time_of_commencement = self.get_time_of_commencement()
2317
number_of_a_packets_found = self.get_number_of_a_packets_found()
2418
ballot_box_serial_number = self.get_ballot_box_serial_number()
2519
no_of_packets_inserted_to_ballot_box = self.get_no_of_packets_inserted_to_ballot_box()
2620
number_of_a_covers_rejected = self.get_number_of_a_covers_rejected()
2721
number_of_b_covers_rejected = self.get_number_of_b_covers_rejected()
2822

29-
accepted_ballots = number_of_a_packets_found['numValue'].sum() - (number_of_a_covers_rejected['numValue'].values[0] +
30-
number_of_b_covers_rejected['numValue'].values[0])
23+
accepted_ballots = number_of_a_packets_found['numValue'].sum() - (
24+
number_of_a_covers_rejected['numValue'].values[0] +
25+
number_of_b_covers_rejected['numValue'].values[0])
3126

3227
stamp = tallySheetVersion.stamp
3328

‎results-tabulation-api/ext/ExtendedElection/ExtendedElectionParliamentaryElection2020/ExtendedTallySheet/ExtendedTallySheet_PE_21.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ def html(self, title="", total_registered_voters=None):
239239

240240
return html
241241

242-
def html_letter(self, title="", total_registered_voters=None):
242+
def html_letter(self, title="", total_registered_voters=None, signatures=[]):
243243
tallySheetVersion = self.tallySheetVersion
244244
stamp = tallySheetVersion.stamp
245245

@@ -252,6 +252,7 @@ def html_letter(self, title="", total_registered_voters=None):
252252
"createdBy": stamp.createdBy,
253253
"barcodeString": stamp.barcodeString
254254
},
255+
"signatures": signatures,
255256
"electoralDistrict": Area.get_associated_areas(
256257
tallySheetVersion.submission.area, AreaTypeEnum.ElectoralDistrict)[0].areaName,
257258
"data": [],

‎results-tabulation-api/ext/ExtendedElection/ExtendedElectionParliamentaryElection2020/ExtendedTallySheet/ExtendedTallySheet_PE_22.py

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,6 @@
1010
class ExtendedTallySheet_PE_22(ExtendedTallySheetDataEntry):
1111
class ExtendedTallySheetVersion(ExtendedTallySheetDataEntry.ExtendedTallySheetVersion):
1212

13-
#
14-
# def html_letter(self, title="", total_registered_voters=None):
15-
# # TODO: implement
16-
# pass
17-
#
1813
def html(self, title="", total_registered_voters=None):
1914
tallySheetVersion = self.tallySheetVersion
2015

‎results-tabulation-api/ext/ExtendedElection/ExtendedElectionParliamentaryElection2020/ExtendedTallySheet/ExtendedTallySheet_PE_27.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,6 @@
99

1010
class ExtendedTallySheet_PE_27(ExtendedTallySheetDataEntry):
1111
class ExtendedTallySheetVersion(ExtendedTallySheetDataEntry.ExtendedTallySheetVersion):
12-
def html_letter(self, title="", total_registered_voters=None):
13-
return super(ExtendedTallySheet_PE_27.ExtendedTallySheetVersion, self).html_letter(
14-
title="Results of Electoral District %s" % self.tallySheetVersion.submission.area.areaName
15-
)
1612

1713
def html(self, title="", total_registered_voters=None):
1814
tallySheetVersion = self.tallySheetVersion

‎results-tabulation-api/ext/ExtendedElection/ExtendedElectionParliamentaryElection2020/ExtendedTallySheet/ExtendedTallySheet_PE_39.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,7 @@
99

1010
class ExtendedTallySheet_PE_39(ExtendedTallySheetDataEntry):
1111
class ExtendedTallySheetVersion(ExtendedTallySheetDataEntry.ExtendedTallySheetVersion):
12-
#
13-
# def html_letter(self, title="", total_registered_voters=None):
14-
# # TODO: implement
15-
# pass
16-
#
12+
1713
def html(self, title="", total_registered_voters=None):
1814
tallySheetVersion = self.tallySheetVersion
1915

‎results-tabulation-api/ext/ExtendedElection/ExtendedElectionParliamentaryElection2020/ExtendedTallySheet/ExtendedTallySheet_PE_4.py

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,6 @@
1010
class ExtendedTallySheet_PE_4(ExtendedTallySheetDataEntry):
1111
class ExtendedTallySheetVersion(ExtendedTallySheetDataEntry.ExtendedTallySheetVersion):
1212

13-
def html_letter(self, title="", total_registered_voters=None):
14-
return super(ExtendedTallySheet_PE_4.ExtendedTallySheetVersion, self).html_letter(
15-
title="Results of Electoral District %s" % self.tallySheetVersion.submission.area.areaName
16-
)
17-
1813
def html(self, title="", total_registered_voters=None):
1914
tallySheetVersion = self.tallySheetVersion
2015

‎results-tabulation-api/ext/ExtendedElection/ExtendedElectionParliamentaryElection2020/ExtendedTallySheet/ExtendedTallySheet_PE_AI_1.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ def html(self, title="", total_registered_voters=None):
170170

171171
return html
172172

173-
def html_letter(self, title="", total_registered_voters=None):
173+
def html_letter(self, title="", total_registered_voters=None, signatures=[]):
174174
tallySheetVersion = self.tallySheetVersion
175175
party_wise_results = self.get_party_wise_results()
176176
stamp = tallySheetVersion.stamp
@@ -185,6 +185,7 @@ def html_letter(self, title="", total_registered_voters=None):
185185
"createdBy": stamp.createdBy,
186186
"barcodeString": stamp.barcodeString
187187
},
188+
"signatures": signatures,
188189
"data": [],
189190
"validVoteCounts": [0, "0%"],
190191
"rejectedVoteCounts": [0, "0%"],

‎results-tabulation-api/ext/ExtendedElection/ExtendedElectionParliamentaryElection2020/ExtendedTallySheet/ExtendedTallySheet_PE_AI_2.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ def html(self, title="", total_registered_voters=None):
9292

9393
return html
9494

95-
def html_letter(self, title="", total_registered_voters=None):
95+
def html_letter(self, title="", total_registered_voters=None, signatures=[]):
9696
tallySheetVersion = self.tallySheetVersion
9797
stamp = tallySheetVersion.stamp
9898

@@ -105,6 +105,7 @@ def html_letter(self, title="", total_registered_voters=None):
105105
"createdBy": stamp.createdBy,
106106
"barcodeString": stamp.barcodeString
107107
},
108+
"signatures": signatures,
108109
"data": [],
109110
"logo": convert_image_to_data_uri("static/Emblem_of_Sri_Lanka.png"),
110111
"date": stamp.createdAt.strftime("%d/%m/%Y"),

‎results-tabulation-api/ext/ExtendedElection/ExtendedElectionParliamentaryElection2020/ExtendedTallySheet/ExtendedTallySheet_PE_AI_ED.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ def json(self):
6161
}
6262
}
6363

64-
def html_letter(self, title="", total_registered_voters=None):
64+
def html_letter(self, title="", total_registered_voters=None, signatures=[]):
6565
tallySheetVersion = self.tallySheetVersion
6666
party_wise_valid_vote_count_result = self.get_party_wise_valid_vote_count_result()
6767
area_wise_valid_vote_count_result = self.get_area_wise_valid_vote_count_result()
@@ -79,6 +79,7 @@ def html_letter(self, title="", total_registered_voters=None):
7979
"createdBy": stamp.createdBy,
8080
"barcodeString": stamp.barcodeString
8181
},
82+
"signatures": signatures,
8283
"data": [],
8384
"validVoteCounts": [0, "0%"],
8485
"rejectedVoteCounts": [0, "0%"],
@@ -132,7 +133,7 @@ def html_letter(self, title="", total_registered_voters=None):
132133
content["data"].append(data_row)
133134

134135
html = render_template(
135-
'ParliamentaryElection2020/AI-LETTER.html',
136+
'ParliamentaryElection2020/PE-AI-ED-LETTER.html',
136137
content=content
137138
)
138139

‎results-tabulation-api/ext/ExtendedElection/ExtendedElectionParliamentaryElection2020/ExtendedTallySheet/ExtendedTallySheet_PE_AI_NL_1.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ def html(self, title="", total_registered_voters=None):
210210

211211
return html
212212

213-
def html_letter(self, title="", total_registered_voters=None):
213+
def html_letter(self, title="", total_registered_voters=None, signatures=[]):
214214
tallySheetVersion = self.tallySheetVersion
215215
party_wise_valid_vote_count_result = self.get_party_wise_seat_calculations()
216216
area_wise_valid_vote_count_result = self.get_area_wise_valid_vote_count_result()
@@ -228,6 +228,7 @@ def html_letter(self, title="", total_registered_voters=None):
228228
"createdBy": stamp.createdBy,
229229
"barcodeString": stamp.barcodeString
230230
},
231+
"signatures": signatures,
231232
"data": [],
232233
"validVoteCounts": [0, "0%"],
233234
"rejectedVoteCounts": [0, "0%"],

‎results-tabulation-api/ext/ExtendedElection/ExtendedElectionParliamentaryElection2020/ExtendedTallySheet/ExtendedTallySheet_PE_AI_NL_2.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ def html(self, title="", total_registered_voters=None):
166166

167167
return html
168168

169-
def html_letter(self, title="", total_registered_voters=None):
169+
def html_letter(self, title="", total_registered_voters=None, signatures=[]):
170170
tallySheetVersion = self.tallySheetVersion
171171

172172
stamp = tallySheetVersion.stamp
@@ -180,6 +180,7 @@ def html_letter(self, title="", total_registered_voters=None):
180180
"createdBy": stamp.createdBy,
181181
"barcodeString": stamp.barcodeString
182182
},
183+
"signatures": signatures,
183184
"data": [],
184185
"logo": convert_image_to_data_uri("static/Emblem_of_Sri_Lanka.png"),
185186
"date": stamp.createdAt.strftime("%d/%m/%Y"),

‎results-tabulation-api/ext/ExtendedElection/ExtendedElectionParliamentaryElection2020/ExtendedTallySheet/ExtendedTallySheet_PE_AI_SA.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ def html(self, title="", total_registered_voters=None):
163163

164164
return html
165165

166-
def html_letter(self, title="", total_registered_voters=None):
166+
def html_letter(self, title="", total_registered_voters=None, signatures=[]):
167167
tallySheetVersion = self.tallySheetVersion
168168
party_wise_results = self.get_party_wise_results()
169169
area_wise_valid_vote_count_result = self.get_area_wise_valid_vote_count_result()
@@ -181,6 +181,7 @@ def html_letter(self, title="", total_registered_voters=None):
181181
"createdBy": stamp.createdBy,
182182
"barcodeString": stamp.barcodeString
183183
},
184+
"signatures": signatures,
184185
"data": [],
185186
"validVoteCounts": [0, "0%"],
186187
"rejectedVoteCounts": [0, "0%"],

‎results-tabulation-api/ext/ExtendedElection/ExtendedElectionParliamentaryElection2020/ExtendedTallySheet/ExtendedTallySheet_PE_CE_RO_PR_1.py

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,6 @@
1010
class ExtendedTallySheet_PE_CE_RO_PR_1(ExtendedTallySheetReport):
1111
class ExtendedTallySheetVersion(ExtendedTallySheetReport.ExtendedTallySheetVersion):
1212

13-
def html_letter(self, title="", total_registered_voters=None):
14-
return super(ExtendedTallySheet_PE_CE_RO_PR_1.ExtendedTallySheetVersion, self).html_letter(
15-
title="Results of Electoral District %s" % self.tallySheetVersion.submission.area.areaName
16-
)
17-
1813
def html(self, title="", total_registered_voters=None):
1914
tallySheetVersion = self.tallySheetVersion
2015

‎results-tabulation-api/ext/ExtendedElection/ExtendedElectionParliamentaryElection2020/ExtendedTallySheet/ExtendedTallySheet_PE_CE_RO_PR_2.py

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,6 @@
1010
class ExtendedTallySheet_PE_CE_RO_PR_2(ExtendedTallySheetReport):
1111
class ExtendedTallySheetVersion(ExtendedTallySheetReport.ExtendedTallySheetVersion):
1212

13-
def html_letter(self, title="", total_registered_voters=None):
14-
return super(ExtendedTallySheet_PE_CE_RO_PR_2.ExtendedTallySheetVersion, self).html_letter(
15-
title="Results of Electoral District %s" % self.tallySheetVersion.submission.area.areaName
16-
)
17-
1813
def html(self, title="", total_registered_voters=None):
1914
tallySheetVersion = self.tallySheetVersion
2015

‎results-tabulation-api/ext/ExtendedElection/ExtendedElectionParliamentaryElection2020/ExtendedTallySheet/ExtendedTallySheet_PE_CE_RO_PR_3.py

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,6 @@
99
class ExtendedTallySheet_PE_CE_RO_PR_3(ExtendedTallySheetReport):
1010
class ExtendedTallySheetVersion(ExtendedTallySheetReport.ExtendedTallySheetVersion):
1111

12-
def html_letter(self, title="", total_registered_voters=None):
13-
return super(ExtendedTallySheet_PE_CE_RO_PR_3.ExtendedTallySheetVersion, self).html_letter(
14-
title="Results of Electoral District %s" % self.tallySheetVersion.submission.area.areaName
15-
)
16-
1712
def html(self, title="", total_registered_voters=None):
1813
tallySheetVersion = self.tallySheetVersion
1914

‎results-tabulation-api/ext/ExtendedElection/ExtendedElectionParliamentaryElection2020/ExtendedTallySheet/ExtendedTallySheet_PE_CE_RO_V1.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ def json(self):
8080
}
8181
}
8282

83-
def html_letter(self, title="", total_registered_voters=None):
83+
def html_letter(self, title="", total_registered_voters=None, signatures=[]):
8484
tallySheetVersion = self.tallySheetVersion
8585
party_wise_valid_vote_count_result = self.get_party_wise_valid_vote_count_result()
8686
area_wise_valid_vote_count_result = self.get_area_wise_valid_vote_count_result()
@@ -103,6 +103,7 @@ def html_letter(self, title="", total_registered_voters=None):
103103
"createdBy": stamp.createdBy,
104104
"barcodeString": stamp.barcodeString
105105
},
106+
"signatures": signatures,
106107
"electoralDistrict": Area.get_associated_areas(
107108
tallySheetVersion.submission.area, AreaTypeEnum.ElectoralDistrict)[0].areaName,
108109
"pollingDivision": polling_division_name,

‎results-tabulation-api/ext/ExtendedElection/ExtendedElectionParliamentaryElection2020/ExtendedTallySheet/ExtendedTallySheet_PE_CE_RO_V2.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ def json(self):
6565
}
6666
}
6767

68-
def html_letter(self, title="", total_registered_voters=None):
68+
def html_letter(self, title="", total_registered_voters=None, signatures=[]):
6969
tallySheetVersion = self.tallySheetVersion
7070
party_wise_valid_vote_count_result = self.get_party_wise_valid_vote_count_result()
7171
area_wise_valid_vote_count_result = self.get_area_wise_valid_vote_count_result()
@@ -85,6 +85,7 @@ def html_letter(self, title="", total_registered_voters=None):
8585
"createdBy": stamp.createdBy,
8686
"barcodeString": stamp.barcodeString
8787
},
88+
"signatures": signatures,
8889
"electoralDistrict": tallySheetVersion.submission.area.areaName,
8990
"data": [],
9091
"validVoteCounts": [0, "0%"],

‎results-tabulation-api/ext/ExtendedElection/ExtendedElectionParliamentaryElection2020/ExtendedTallySheet/ExtendedTallySheet_PE_R2.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -349,7 +349,7 @@ def html(self, title="", total_registered_voters=None):
349349

350350
return html
351351

352-
def html_letter(self, title="", total_registered_voters=None):
352+
def html_letter(self, title="", total_registered_voters=None, signatures=[]):
353353
tallySheetVersion = self.tallySheetVersion
354354
party_wise_valid_vote_count_result = self.get_party_wise_seat_calculations()
355355
area_wise_valid_vote_count_result = self.get_area_wise_valid_vote_count_result()
@@ -368,6 +368,7 @@ def html_letter(self, title="", total_registered_voters=None):
368368
"createdBy": stamp.createdBy,
369369
"barcodeString": stamp.barcodeString
370370
},
371+
"signatures": signatures,
371372
"electoralDistrict": Area.get_associated_areas(
372373
tallySheetVersion.submission.area, AreaTypeEnum.ElectoralDistrict)[0].areaName,
373374
"data": [],

‎results-tabulation-api/ext/ExtendedElection/ExtendedElectionParliamentaryElection2020/ExtendedTallySheet/ExtendedTallySheet_POLLING_DIVISION_RESULTS.py

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,6 @@
1313
class ExtendedTallySheet_POLLING_DIVISION_RESULTS(ExtendedTallySheetReport):
1414
class ExtendedTallySheetVersion(ExtendedTallySheetReport.ExtendedTallySheetVersion):
1515

16-
def html_letter(self, title="", total_registered_voters=None):
17-
return super(ExtendedTallySheet_POLLING_DIVISION_RESULTS.ExtendedTallySheetVersion, self).html_letter(
18-
title="Results of Polling Division %s" % self.tallySheetVersion.submission.area.areaName
19-
)
20-
2116
def html(self, title="", total_registered_voters=None):
2217
tallySheetVersion = self.tallySheetVersion
2318

@@ -92,7 +87,7 @@ def html(self, title="", total_registered_voters=None):
9287
total_rejected_vote_count * 100 / total_vote_count) if total_vote_count > 0 else 0
9388
content["rejectedVotePercentage"] = to_percentage(rejected_vote_percentage)
9489
total_vote_percentage = (
95-
total_vote_count * 100 / registered_voters_count) if registered_voters_count > 0 else 0
90+
total_vote_count * 100 / registered_voters_count) if registered_voters_count > 0 else 0
9691
content["totalVotePercentage"] = to_percentage(total_vote_percentage)
9792

9893
html = render_template(

0 commit comments

Comments
 (0)