From 113a874de8a1dbac4893573774ae15d0b2f22a50 Mon Sep 17 00:00:00 2001 From: sm1990 Date: Sat, 13 Feb 2021 15:03:57 +0530 Subject: [PATCH] gh-858:PCE_PC_SA_2, PCE_PC_SA_2-letter and PCE-42 template updates --- .../ExtendedTallySheet_PCE_PC_SA_2.py | 4 - .../ProvincialCouncilElection2021/PCE-42.html | 2 +- .../PCE-PC-SA-2-LETTER.html | 55 ++---- .../PCE-PC-SA-2.html | 166 ++++++++++-------- 4 files changed, 103 insertions(+), 124 deletions(-) diff --git a/results-tabulation-api/ext/ExtendedElection/ExtendedElectionProvincialCouncilElection2021/ExtendedTallySheet/ExtendedTallySheet_PCE_PC_SA_2.py b/results-tabulation-api/ext/ExtendedElection/ExtendedElectionProvincialCouncilElection2021/ExtendedTallySheet/ExtendedTallySheet_PCE_PC_SA_2.py index fe25438a..cedc9fa5 100644 --- a/results-tabulation-api/ext/ExtendedElection/ExtendedElectionProvincialCouncilElection2021/ExtendedTallySheet/ExtendedTallySheet_PCE_PC_SA_2.py +++ b/results-tabulation-api/ext/ExtendedElection/ExtendedElectionProvincialCouncilElection2021/ExtendedTallySheet/ExtendedTallySheet_PCE_PC_SA_2.py @@ -147,7 +147,6 @@ def html(self, title="", total_registered_voters=None): for party_wise_result in party_wise_results.itertuples(): data_row = [ party_wise_result.partyName, - party_wise_result.partyAbbreviation, to_comma_seperated_num(party_wise_result.validVoteCount) ] @@ -156,7 +155,6 @@ def html(self, title="", total_registered_voters=None): else: data_row.append('') - data_row.append(to_comma_seperated_num(party_wise_result.seatsAllocated)) data_row.append(to_comma_seperated_num(party_wise_result.bonusSeatsAllocated)) data_row.append(to_comma_seperated_num(party_wise_result.totalSeatsAllocated)) @@ -221,7 +219,6 @@ def html_letter(self, title="", total_registered_voters=None, signatures=[]): for party_wise_result in party_wise_results.itertuples(): data_row = [ party_wise_result.partyName, - party_wise_result.partyAbbreviation, to_comma_seperated_num(party_wise_result.validVoteCount) ] @@ -230,7 +227,6 @@ def html_letter(self, title="", total_registered_voters=None, signatures=[]): else: data_row.append('') - data_row.append(to_comma_seperated_num(party_wise_result.seatsAllocated)) data_row.append(to_comma_seperated_num(party_wise_result.bonusSeatsAllocated)) data_row.append(to_comma_seperated_num(party_wise_result.totalSeatsAllocated)) diff --git a/results-tabulation-api/templates/ProvincialCouncilElection2021/PCE-42.html b/results-tabulation-api/templates/ProvincialCouncilElection2021/PCE-42.html index bea2aa7b..3ce96fe0 100644 --- a/results-tabulation-api/templates/ProvincialCouncilElection2021/PCE-42.html +++ b/results-tabulation-api/templates/ProvincialCouncilElection2021/PCE-42.html @@ -29,7 +29,7 @@ I hereby certify that the following Members, nominated by the recognized Poloitical Party or - Independent group shown against the name of each such Member, were elected for {{content.administrativeDistrictNo}} Provincial Council + Independent group shown against the name of each such Member, were elected for {{content.province}} Provincial Council from the Administrative District of {{content.administrativeDistrict}} the election held on .......................... diff --git a/results-tabulation-api/templates/ProvincialCouncilElection2021/PCE-PC-SA-2-LETTER.html b/results-tabulation-api/templates/ProvincialCouncilElection2021/PCE-PC-SA-2-LETTER.html index 1e641da5..e3ae6b1b 100644 --- a/results-tabulation-api/templates/ProvincialCouncilElection2021/PCE-PC-SA-2-LETTER.html +++ b/results-tabulation-api/templates/ProvincialCouncilElection2021/PCE-PC-SA-2-LETTER.html @@ -56,38 +56,22 @@ - - - - - - - - + + + + {% for row in content.data %} - - - - + style="text-align:right;">{{ row[4] }}{% if row[3]==2 %}*{% endif %} {% endfor %} - - - - - - + - - - + - - - + - + - - - + - - - - - - - + + - - - +
#Name of the PartyParty AbbreviationVotes ReceivedPercentageSeatsBonus SeatsTotal SeatsName of the Party/Independent GroupNo. of Votes ReceivedPercentage %No. of Members Elected
{{ loop.index }} {{ row[0] }} {{ row[1] }} {{ row[2] }}{{ row[3] }} {{ row[4] }}{{ row[5] }}{{ row[6] }}
Total Valid Votes @@ -97,11 +81,9 @@ style="text-align:right;"> {{ content.validVoteCounts[1] }}
Rejected Votes @@ -111,12 +93,10 @@ style="text-align:right;"> {{ content.rejectedVoteCounts[1] }}
Total PolledTotal Votes Polled {{ content.totalVoteCounts[0] }} @@ -125,30 +105,21 @@ style="text-align:right;"> {{ content.totalVoteCounts[1] }}
Registered No. of ElectorsRegistered Electors {{ content.registeredVoters[0] }}
Time{{ content.time }}
* Including two(2) bonus seats. Date{{ content.date }}
diff --git a/results-tabulation-api/templates/ProvincialCouncilElection2021/PCE-PC-SA-2.html b/results-tabulation-api/templates/ProvincialCouncilElection2021/PCE-PC-SA-2.html index 607c56ae..a9919ddc 100644 --- a/results-tabulation-api/templates/ProvincialCouncilElection2021/PCE-PC-SA-2.html +++ b/results-tabulation-api/templates/ProvincialCouncilElection2021/PCE-PC-SA-2.html @@ -9,7 +9,7 @@ } } - * { + /* * { font-family: "Lucida Console", Courier, monospace; } @@ -23,136 +23,148 @@ .table th { font-weight: 800; - } + } */ -
- +
+
- - - - - + + + + + + + + + + + + + + + + + + +
-
- OFFICIAL RESULTS - 		- ELECTION COMMISSION OF SRI LANKA
- - {{ content.election.electionName }} -
- Votes, Seats & Bonus Seats by Party
- - {{ content.election.provinceName }} Province - -
+ +
+ Department of Elections
+ {{ content.election.electionName }} +
+ Final Results +
+ {{ content.election.provinceName }} Province Provincial Council +
+
- +
- - - - - - - - + + + + {% for row in content.data %} - - - - + + - - - - + {% endfor %} - - - - - - - + - - + - - - - + - - + - - - - + - - + + + + + + + + + + - - - - + + - - - + + - - - + + + + + + + + + + + + +
#Name of the PartyParty AbbreviationVotes ReceivedPercentageSeatsBonus SeatsTotal SeatsName of the Party/Independent GroupNo. of Votes ReceivedPercentageNo. of Members Elected
{{ loop.index }}{{ row[0] }}{{ row[1] }}{{ row[0] }}{{ row[1] }}{{ row[2] }}{{ row[3] }}{{ row[4] }}{{ row[5] }}{{ row[6] }}{{ row[4] }} + {% if row[3]==2 %}*{% endif %} +
Total Valid VotesTotal Valid Votes {{ content.validVoteCounts[0] }} {{ content.validVoteCounts[1] }}
Rejected VotesRejected Votes {{ content.rejectedVoteCounts[0] }} {{ content.rejectedVoteCounts[1] }}
Total Polled + Total Votes Polled {{ content.totalVoteCounts[0] }} {{ content.totalVoteCounts[1] }}
Registered Electors{{ content.registeredVoters[0] }}
* Including two(2) bonus seats. Registered No. of Electors{{ content.registeredVoters[0] }}
Time{{ content.time }}
Date{{ content.date }}
+ Mahinda Deshapriya
+ Commissioner of Elections +
- {% include 'ParliamentaryElection2020/calculation-information.html' with context %} - {% endblock %}