Merge pull request #665 from dinukadesilva/gh-664-enabling-displaced-…

…and-quarantine-votes Gh 664 enabling displaced and quarantine votes
ECLK · Jul 16, 2020 · 5aff1fe · 5aff1fe
2 parents 450961e + c20c0fb
commit 5aff1fe
Show file tree

Hide file tree

Showing 40 changed files with 1,029 additions and 799 deletions.
diff --git a/results-tabulation-api/api/ElectionApi.py b/results-tabulation-api/api/ElectionApi.py
@@ -11,8 +11,13 @@
 
 
 @authorize(required_roles=ALL_ROLES)
-def get_all(parentElectionId=None, rootElectionId=None):
-    result = Election.get_all(parentElectionId=parentElectionId, rootElectionId=rootElectionId)
+def get_all(parentElectionId=None, rootElectionId=None, isListed=None):
+    if isListed == "false":
+        isListed = False
+    elif isListed == "true":
+        isListed = True
+
+    result = Election.get_all(parentElectionId=parentElectionId, rootElectionId=rootElectionId, isListed=isListed)
 
     result = get_paginated_query(result).all()
 

diff --git a/results-tabulation-api/auth/__init__.py b/results-tabulation-api/auth/__init__.py
@@ -247,7 +247,7 @@ def authorize(func, required_roles=None, *args, **kwargs):
                 area.areaId for area in _get_role_area_ids(
                     parentAreaIds=claim_area_ids,
                     areaType=AreaTypeEnum.CountingCentre,
-                    voteTypes=[VOTE_TYPES.Postal, VOTE_TYPES.NonPostal]
+                    voteTypes=[VOTE_TYPES.Postal, VOTE_TYPES.NonPostal, VOTE_TYPES.Quarantine, VOTE_TYPES.Displaced]
                 )
             ])
 
@@ -299,7 +299,7 @@ def authorize(func, required_roles=None, *args, **kwargs):
                 area.areaId for area in _get_role_area_ids(
                     parentAreaIds=claim_area_ids,
                     areaType=AreaTypeEnum.CountingCentre,
-                    voteTypes=[VOTE_TYPES.Postal]
+                    voteTypes=[VOTE_TYPES.Postal, VOTE_TYPES.Quarantine, VOTE_TYPES.Displaced]
                 )
             ])
 

diff --git a/results-tabulation-api/constants/VOTE_TYPES.py b/results-tabulation-api/constants/VOTE_TYPES.py
@@ -1,3 +1,5 @@
 Postal = "Postal"
 NonPostal = "NonPostal"
+Quarantine = "Quarantine"
+Displaced = "Displaced"
 PostalAndNonPostal = "PostalAndNonPostal"
diff --git a/...ctionParliamentaryElection2020/ExtendedTallySheet/ExtendedTallySheet_ALL_ISLAND_RESULT.py b/...ctionParliamentaryElection2020/ExtendedTallySheet/ExtendedTallySheet_ALL_ISLAND_RESULT.py
@@ -18,7 +18,7 @@ def html_letter(self, title="", total_registered_voters=None):
             area_wise_vote_count_result = self.get_area_wise_vote_count_result()
             stamp = tallySheetVersion.stamp
 
-            registered_voters_count = float(tallySheetVersion.submission.area.registeredVotersCount)
+            registered_voters_count = tallySheetVersion.submission.area.get_registered_voters_count()
             content = {
                 "election": {
                     "electionName": tallySheetVersion.submission.election.get_official_name()
@@ -97,7 +97,8 @@ def html(self, title="", total_registered_voters=None):
             stamp = tallySheetVersion.stamp
 
             area: AreaModel = tallySheetVersion.submission.area
-            number_of_electors = float(area.registeredVotersCount) + float(area.registeredPostalVotersCount)
+
+            registered_voters_count = tallySheetVersion.submission.area.get_registered_voters_count()
 
             content = {
                 "election": {
@@ -116,7 +117,7 @@ def html(self, title="", total_registered_voters=None):
                 "rejectedVotePercentage": '',
                 "totalVoteCount": '',
                 "totalVotePercentage": '',
-                "numberOfElectors": to_comma_seperated_num(number_of_electors)
+                "numberOfElectors": to_comma_seperated_num(registered_voters_count)
             }
 
             total_valid_vote_count = 0
@@ -155,7 +156,8 @@ def html(self, title="", total_registered_voters=None):
             rejected_vote_percentage = (
                     total_rejected_vote_count * 100 / total_vote_count) if total_vote_count > 0 else 0
             content["rejectedVotePercentage"] = to_percentage(rejected_vote_percentage)
-            total_vote_percentage = (total_vote_count * 100 / number_of_electors) if number_of_electors > 0 else 0
+            total_vote_percentage = (
+                        total_vote_count * 100 / registered_voters_count) if registered_voters_count > 0 else 0
             content["totalVotePercentage"] = to_percentage(total_vote_percentage)
 
             html = render_template(

diff --git a/...ExtendedElectionParliamentaryElection2020/ExtendedTallySheet/ExtendedTallySheet_CE_201.py b/...ExtendedElectionParliamentaryElection2020/ExtendedTallySheet/ExtendedTallySheet_CE_201.py
@@ -1,7 +1,8 @@
 from flask import render_template
+
+from constants.VOTE_TYPES import NonPostal
 from ext.ExtendedTallySheet import ExtendedTallySheetDataEntry
 from orm.entities import Area
-from constants.VOTE_TYPES import Postal
 from util import to_comma_seperated_num
 from orm.enums import AreaTypeEnum
 
@@ -32,8 +33,8 @@ def html(self, title="", total_registered_voters=None):
             if len(polling_divisions) > 0:
                 polling_division_name = polling_divisions[0].areaName
 
-            if tallySheetVersion.submission.election.voteType == Postal:
-                polling_division_name = 'Postal'
+            if tallySheetVersion.submission.election.voteType != NonPostal:
+                polling_division_name = tallySheetVersion.submission.election.voteType
 
             content = {
                 "election": {

diff --git a/...endedElectionParliamentaryElection2020/ExtendedTallySheet/ExtendedTallySheet_CE_201_PV.py b/...endedElectionParliamentaryElection2020/ExtendedTallySheet/ExtendedTallySheet_CE_201_PV.py
@@ -1,7 +1,8 @@
 from flask import render_template
+
+from constants.VOTE_TYPES import NonPostal
 from ext.ExtendedTallySheet import ExtendedTallySheetDataEntry
 from orm.entities import Area
-from constants.VOTE_TYPES import Postal
 from util import to_comma_seperated_num
 from orm.enums import AreaTypeEnum
 
@@ -36,8 +37,8 @@ def html(self, title="", total_registered_voters=None):
             if len(polling_divisions) > 0:
                 polling_division_name = polling_divisions[0].areaName
 
-            if tallySheetVersion.submission.election.voteType == Postal:
-                polling_division_name = 'Postal'
+            if tallySheetVersion.submission.election.voteType != NonPostal:
+                polling_division_name = tallySheetVersion.submission.election.voteType
 
             content = {
                 "election": {

diff --git a/.../ExtendedElectionParliamentaryElection2020/ExtendedTallySheet/ExtendedTallySheet_PE_21.py b/.../ExtendedElectionParliamentaryElection2020/ExtendedTallySheet/ExtendedTallySheet_PE_21.py
@@ -149,9 +149,6 @@ def get_post_save_request_content(self):
 
             return content
 
-        def html_letter(self, title="", total_registered_voters=None):
-            return self.html(title=title, total_registered_voters=total_registered_voters)
-
         def html(self, title="", total_registered_voters=None):
             tallySheetVersion = self.tallySheetVersion
 

diff --git a/.../ExtendedElectionParliamentaryElection2020/ExtendedTallySheet/ExtendedTallySheet_PE_22.py b/.../ExtendedElectionParliamentaryElection2020/ExtendedTallySheet/ExtendedTallySheet_PE_22.py
@@ -1,7 +1,8 @@
 from flask import render_template
+
+from constants.VOTE_TYPES import NonPostal
 from ext.ExtendedTallySheet import ExtendedTallySheetDataEntry
 from orm.entities import Area
-from constants.VOTE_TYPES import Postal
 from util import to_comma_seperated_num
 from orm.enums import AreaTypeEnum
 
@@ -27,8 +28,8 @@ def html(self, title="", total_registered_voters=None):
             if len(polling_divisions) > 0:
                 polling_division_name = polling_divisions[0].areaName
 
-            if tallySheetVersion.submission.election.voteType == Postal:
-                polling_division_name = 'Postal'
+            if tallySheetVersion.submission.election.voteType != NonPostal:
+                polling_division_name = tallySheetVersion.submission.election.voteType
 
             content = {
                 "election": {

diff --git a/.../ExtendedElectionParliamentaryElection2020/ExtendedTallySheet/ExtendedTallySheet_PE_27.py b/.../ExtendedElectionParliamentaryElection2020/ExtendedTallySheet/ExtendedTallySheet_PE_27.py
@@ -1,7 +1,8 @@
 from flask import render_template
+
+from constants.VOTE_TYPES import NonPostal
 from ext.ExtendedTallySheet import ExtendedTallySheetDataEntry
 from orm.entities import Area
-from constants.VOTE_TYPES import Postal
 from util import to_comma_seperated_num
 from orm.enums import AreaTypeEnum
 
@@ -25,8 +26,8 @@ def html(self, title="", total_registered_voters=None):
             if len(polling_divisions) > 0:
                 polling_division_name = polling_divisions[0].areaName
 
-            if tallySheetVersion.submission.election.voteType == Postal:
-                polling_division_name = 'Postal'
+            if tallySheetVersion.submission.election.voteType != NonPostal:
+                polling_division_name = tallySheetVersion.submission.election.voteType
 
             content = {
                 "election": {

diff --git a/.../ExtendedElectionParliamentaryElection2020/ExtendedTallySheet/ExtendedTallySheet_PE_39.py b/.../ExtendedElectionParliamentaryElection2020/ExtendedTallySheet/ExtendedTallySheet_PE_39.py
@@ -1,7 +1,8 @@
 from flask import render_template
+
+from constants.VOTE_TYPES import NonPostal
 from ext.ExtendedTallySheet import ExtendedTallySheetDataEntry
 from orm.entities import Area
-from constants.VOTE_TYPES import Postal
 from util import to_comma_seperated_num
 from orm.enums import AreaTypeEnum
 
@@ -26,8 +27,8 @@ def html(self, title="", total_registered_voters=None):
             if len(polling_divisions) > 0:
                 polling_division_name = polling_divisions[0].areaName
 
-            if tallySheetVersion.submission.election.voteType == Postal:
-                polling_division_name = 'Postal'
+            if tallySheetVersion.submission.election.voteType != NonPostal:
+                polling_division_name = tallySheetVersion.submission.election.voteType
 
             content = {
                 "election": {

diff --git a/...n/ExtendedElectionParliamentaryElection2020/ExtendedTallySheet/ExtendedTallySheet_PE_4.py b/...n/ExtendedElectionParliamentaryElection2020/ExtendedTallySheet/ExtendedTallySheet_PE_4.py
@@ -1,7 +1,8 @@
 from flask import render_template
+
+from constants.VOTE_TYPES import NonPostal
 from ext.ExtendedTallySheet import ExtendedTallySheetDataEntry
 from orm.entities import Area
-from constants.VOTE_TYPES import Postal
 from orm.enums import AreaTypeEnum
 
 
@@ -29,8 +30,8 @@ def html(self, title="", total_registered_voters=None):
             if len(polling_divisions) > 0:
                 polling_division_name = polling_divisions[0].areaName
 
-            if tallySheetVersion.submission.election.voteType == Postal:
-                polling_division_name = 'Postal'
+            if tallySheetVersion.submission.election.voteType != NonPostal:
+                polling_division_name = tallySheetVersion.submission.election.voteType
 
             content = {
                 "election": {

diff --git a/...dElectionParliamentaryElection2020/ExtendedTallySheet/ExtendedTallySheet_PE_CE_RO_PR_1.py b/...dElectionParliamentaryElection2020/ExtendedTallySheet/ExtendedTallySheet_PE_CE_RO_PR_1.py
@@ -1,7 +1,8 @@
 from flask import render_template
+
+from constants.VOTE_TYPES import NonPostal
 from ext.ExtendedTallySheet import ExtendedTallySheetReport
 from orm.entities import Area
-from constants.VOTE_TYPES import Postal
 from util import to_comma_seperated_num
 from orm.enums import AreaTypeEnum
 
@@ -23,9 +24,10 @@ def html(self, title="", total_registered_voters=None):
 
             stamp = tallySheetVersion.stamp
 
-            pollingDivision = tallySheetVersion.submission.area.areaName
-            if tallySheetVersion.submission.election.voteType == Postal:
-                pollingDivision = 'Postal'
+            polling_division_name = tallySheetVersion.submission.area.areaName
+
+            if tallySheetVersion.submission.election.voteType != NonPostal:
+                polling_division_name = tallySheetVersion.submission.election.voteType
 
             content = {
                 "election": {
@@ -39,7 +41,7 @@ def html(self, title="", total_registered_voters=None):
                 "tallySheetCode": "CE/RO/PR/1",
                 "electoralDistrict": Area.get_associated_areas(
                     tallySheetVersion.submission.area, AreaTypeEnum.ElectoralDistrict)[0].areaName,
-                "pollingDivision": pollingDivision,
+                "pollingDivision": polling_division_name,
                 "partyName": candidate_and_area_wise_valid_vote_count_result["partyName"].values[0],
                 "data": [],
                 "countingCentres": [],

diff --git a/...dElectionParliamentaryElection2020/ExtendedTallySheet/ExtendedTallySheet_PE_CE_RO_PR_2.py b/...dElectionParliamentaryElection2020/ExtendedTallySheet/ExtendedTallySheet_PE_CE_RO_PR_2.py
@@ -1,7 +1,8 @@
 from flask import render_template
+
+from constants.VOTE_TYPES import NonPostal
 from ext.ExtendedTallySheet import ExtendedTallySheetReport
 from orm.entities import Area
-from constants.VOTE_TYPES import Postal
 from util import to_comma_seperated_num
 from orm.enums import AreaTypeEnum
 
@@ -60,7 +61,7 @@ def html(self, title="", total_registered_voters=None):
                 candidate_wise_valid_postal_vote_count_result["numValue"].sum()
             ))
 
-            if tallySheetVersion.submission.election.voteType == Postal:
+            if tallySheetVersion.submission.election.voteType != NonPostal:
                 content["tallySheetCode"] = "CE/RO/PR/2"
 
             for index_1 in candidate_wise_valid_vote_count_result.index:

diff --git a/...dElectionParliamentaryElection2020/ExtendedTallySheet/ExtendedTallySheet_PE_CE_RO_PR_3.py b/...dElectionParliamentaryElection2020/ExtendedTallySheet/ExtendedTallySheet_PE_CE_RO_PR_3.py
@@ -3,7 +3,6 @@
 from flask import render_template
 from ext.ExtendedTallySheet import ExtendedTallySheetReport
 from orm.entities import Area
-from constants.VOTE_TYPES import Postal
 from orm.enums import AreaTypeEnum
 
 
@@ -22,10 +21,6 @@ def html(self, title="", total_registered_voters=None):
 
             stamp = tallySheetVersion.stamp
 
-            pollingDivision = tallySheetVersion.submission.area.areaName
-            if tallySheetVersion.submission.election.voteType == Postal:
-                pollingDivision = 'Postal'
-
             content = {
                 "election": {
                     "electionName": tallySheetVersion.submission.election.get_official_name()
@@ -38,7 +33,6 @@ def html(self, title="", total_registered_voters=None):
                 "tallySheetCode": "CE/RO/PR/1",
                 "electoralDistrict": Area.get_associated_areas(
                     tallySheetVersion.submission.area, AreaTypeEnum.ElectoralDistrict)[0].areaName,
-                "pollingDivision": pollingDivision,
                 "partyName": candidate_wise_valid_vote_count_result["partyName"].values[0],
                 "data": []
             }

diff --git a/...dedElectionParliamentaryElection2020/ExtendedTallySheet/ExtendedTallySheet_PE_CE_RO_V1.py b/...dedElectionParliamentaryElection2020/ExtendedTallySheet/ExtendedTallySheet_PE_CE_RO_V1.py
@@ -1,8 +1,8 @@
 from flask import render_template
 
+from constants.VOTE_TYPES import NonPostal
 from ext.ExtendedTallySheet import ExtendedTallySheetReport
 from orm.entities import Area
-from constants.VOTE_TYPES import Postal
 from util import to_comma_seperated_num, convert_image_to_data_uri, to_percentage
 from orm.enums import AreaTypeEnum
 
@@ -17,11 +17,13 @@ def html_letter(self, title="", total_registered_voters=None):
             area_wise_rejected_vote_count_result = self.get_area_wise_rejected_vote_count_result()
             area_wise_vote_count_result = self.get_area_wise_vote_count_result()
             stamp = tallySheetVersion.stamp
-            pollingDivision = tallySheetVersion.submission.area.areaName
-            if tallySheetVersion.submission.election.voteType == Postal:
-                pollingDivision = 'Postal'
+            polling_division_name = tallySheetVersion.submission.area.areaName
+            if tallySheetVersion.submission.election.voteType == NonPostal:
+                polling_division_name = 'Postal'
 
-            registered_voters_count = float(tallySheetVersion.submission.area.registeredVotersCount)
+            registered_voters_count = tallySheetVersion.submission.area.get_registered_voters_count(
+                vote_type=tallySheetVersion.submission.election.voteType)
+
             content = {
                 "election": {
                     "electionName": tallySheetVersion.submission.election.get_official_name()
@@ -33,7 +35,7 @@ def html_letter(self, title="", total_registered_voters=None):
                 },
                 "electoralDistrict": Area.get_associated_areas(
                     tallySheetVersion.submission.area, AreaTypeEnum.ElectoralDistrict)[0].areaName,
-                "pollingDivision": pollingDivision,
+                "pollingDivision": polling_division_name,
                 "data": [],
                 "validVoteCounts": [0, "0%"],
                 "rejectedVoteCounts": [0, "0%"],
@@ -101,9 +103,11 @@ def html(self, title="", total_registered_voters=None):
             area_wise_rejected_vote_count_result = self.get_area_wise_rejected_vote_count_result()
             area_wise_vote_count_result = self.get_area_wise_vote_count_result()
             stamp = tallySheetVersion.stamp
-            pollingDivision = tallySheetVersion.submission.area.areaName
-            if tallySheetVersion.submission.election.voteType == Postal:
-                pollingDivision = 'Postal'
+
+            polling_division_name = tallySheetVersion.submission.area.areaName
+            if tallySheetVersion.submission.election.voteType != NonPostal:
+                polling_division_name = tallySheetVersion.submission.election.voteType
+
             content = {
                 "election": {
                     "electionName": tallySheetVersion.submission.election.get_official_name()
@@ -116,7 +120,7 @@ def html(self, title="", total_registered_voters=None):
                 "tallySheetCode": "CE/RO/V1",
                 "electoralDistrict": Area.get_associated_areas(
                     tallySheetVersion.submission.area, AreaTypeEnum.ElectoralDistrict)[0].areaName,
-                "pollingDivision": pollingDivision,
+                "pollingDivision": polling_division_name,
                 "data": [],
                 "countingCentres": [],
                 "validVoteCounts": [],
@@ -144,8 +148,7 @@ def html(self, title="", total_registered_voters=None):
             content["validVoteCounts"].append(to_comma_seperated_num(total_valid_vote_count))
             content["rejectedVoteCounts"].append(to_comma_seperated_num(total_rejected_vote_count))
             content["totalVoteCounts"].append(to_comma_seperated_num(total_vote_count))
-            if tallySheetVersion.submission.election.voteType == Postal:
-                content["tallySheetCode"] = "CE/RO/V1"
+
             number_of_counting_centres = len(area_wise_vote_count_result)
             for party_wise_valid_vote_count_result_item_index, party_wise_valid_vote_count_result_item in party_wise_valid_vote_count_result.iterrows():
                 data_row = []