diff --git a/results-tabulation-api/ext/ExtendedElection/ExtendedElectionProvincialCouncilElection2021/ExtendedTallySheet/ExtendedTallySheet_PCE_PD_V.py b/results-tabulation-api/ext/ExtendedElection/ExtendedElectionProvincialCouncilElection2021/ExtendedTallySheet/ExtendedTallySheet_PCE_PD_V.py index 3564a247..4c14f980 100644 --- a/results-tabulation-api/ext/ExtendedElection/ExtendedElectionProvincialCouncilElection2021/ExtendedTallySheet/ExtendedTallySheet_PCE_PD_V.py +++ b/results-tabulation-api/ext/ExtendedElection/ExtendedElectionProvincialCouncilElection2021/ExtendedTallySheet/ExtendedTallySheet_PCE_PD_V.py @@ -6,7 +6,7 @@ from ext.ExtendedTallySheet import ExtendedTallySheetReport from orm.entities import Area from orm.entities.Area import AreaModel -from util import to_comma_seperated_num, to_percentage +from util import to_comma_seperated_num, to_percentage, convert_image_to_data_uri from orm.enums import AreaTypeEnum @@ -29,7 +29,9 @@ def html(self, title="", total_registered_voters=None): content = { "election": { - "electionName": tallySheetVersion.tallySheet.election.get_official_name() + "electionName": tallySheetVersion.tallySheet.election.get_official_name(), + "provinceName": Area.get_associated_areas( + tallySheetVersion.tallySheet.area, AreaTypeEnum.Province)[0].areaName }, "stamp": { "createdAt": stamp.createdAt, @@ -47,7 +49,8 @@ def html(self, title="", total_registered_voters=None): "rejectedVotePercentage": '', "totalVoteCount": '', "totalVotePercentage": '', - "numberOfElectors": to_comma_seperated_num(registered_voters_count) + "numberOfElectors": to_comma_seperated_num(registered_voters_count), + "logo": convert_image_to_data_uri("static/Emblem_of_Sri_Lanka.png") } total_valid_vote_count = 0 diff --git a/results-tabulation-api/static/css/styles.css b/results-tabulation-api/static/css/styles.css index 935414d6..d13c5c23 100644 --- a/results-tabulation-api/static/css/styles.css +++ b/results-tabulation-api/static/css/styles.css @@ -153,6 +153,34 @@ margin-top: 50px; } +.top2px { + border-top: 2px solid #000 !important; +} + +.bottom2px { + border-bottom: 2px solid #000 !important; +} + +.left2px { + border-left: 2px solid #000 !important; +} + +.right2px { + border-right: 2px solid #000 !important; +} + +.dotted-bottom { + border-bottom: 1px dotted #000 !important;; +} + +.dotted-left { + border-left: 1px dotted #000 !important;; +} + +.dotted-right { + border-right: 1px dotted #000 !important;; +} + /* styles for pre-41*/ .pre-41 .top-thick { border-top: 4px solid #000 !important; @@ -256,4 +284,4 @@ .pe-r2 .group div { display: table-cell; vertical-align: top; -} \ No newline at end of file +} diff --git a/results-tabulation-api/templates/ProvincialCouncilElection2021/PCE-PD-V.html b/results-tabulation-api/templates/ProvincialCouncilElection2021/PCE-PD-V.html index 5c216158..713d95d9 100644 --- a/results-tabulation-api/templates/ProvincialCouncilElection2021/PCE-PD-V.html +++ b/results-tabulation-api/templates/ProvincialCouncilElection2021/PCE-PD-V.html @@ -1,86 +1,117 @@ {% extends 'base.html' %} {% block container %} -
+ + | +||
+ |
+ Department of Elections + {{ content.election.electionName }} + {{ content.election.provinceName }} Province + {{content.pollingDivision}} Votes Results + |
+ + |
Political Party / Independent Group | -Votes Obtained | -Percentage | +Name of the Party / Independent Group | +No. of Votes Received | +Percentage % | {% for row in content.data %}
---|---|---|---|---|---|
{{row[0]}} | -{{row[1]}} | -{{row[2]}} | +{{row[0]}} | +{{row[1]}} | +{{row[2]}} |
Total Valid Votes | -{{content.totalValidVoteCount}} | -{{content.totalValidVotePercentage}} | +
Rejected Votes | -{{content.rejectedVoteCount}} | -{{content.rejectedVotePercentage}} | + +
Total Valid Votes | +{{content.totalValidVoteCount}} | +{{content.totalValidVotePercentage}} |
Total Polled | -{{content.totalVoteCount}} | -{{content.totalVotePercentage}} | +
Rejected Votes | +{{content.rejectedVoteCount}} | +{{content.rejectedVotePercentage}} |
Registered No. of Electors | -{{content.numberOfElectors}} | -+ |
Total Votes Polled | +{{content.totalVoteCount}} | +{{content.totalVotePercentage}} |
- | .................................................... | +|||
- | Commissioner of Elections | +|||
+ | ||||
+ |
+ .................................................... + Mahinda Deshapriya + Commissioner of Elections + |
+