Skip to content

Commit

Permalink
Merge pull request #845 from dinukadesilva/gh-842-fix-pec-42-validations
Browse files Browse the repository at this point in the history
gh-842: Fix the derivative tally sheet validations in PEC-42
  • Loading branch information
umayangag authored Dec 9, 2020
2 parents 7a91b39 + ae7cbe9 commit 8643b38
Showing 1 changed file with 2 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ def get_template_column_to_query_filter_map(self, only_group_by_columns=False):
TallySheet.Model.latestVersionId != None,
TallySheetTallySheetModel.parentTallySheetId == self.tallySheet.tallySheetId,
TallySheet.Model.templateId == Template.Model.templateId,
Template.Model.templateName == TALLY_SHEET_CODES.PCE_42,
Template.Model.templateName == TALLY_SHEET_CODES.PCE_R2,
WorkflowInstance.Model.workflowInstanceId == TallySheet.Model.workflowInstanceId,
WorkflowInstance.Model.status.in_(
extended_election.tally_sheet_verified_statuses_list()
Expand Down Expand Up @@ -67,7 +67,7 @@ def get_template_column_to_query_filter_map(self, only_group_by_columns=False):
TallySheet.Model.tallySheetId == TallySheetTallySheetModel.childTallySheetId,
TallySheetTallySheetModel.parentTallySheetId == self.tallySheet.tallySheetId,
TallySheet.Model.templateId == Template.Model.templateId,
Template.Model.templateName == TALLY_SHEET_CODES.PE_CE_RO_PR_3,
Template.Model.templateName == TALLY_SHEET_CODES.PCE_CE_RO_PR_3,
MetaData.Model.metaId == TallySheet.Model.metaId,
MetaData.Model.metaDataKey == "partyId",
MetaData.Model.metaDataValue.in_(party_ids_to_be_filtered)
Expand Down

0 comments on commit 8643b38

Please sign in to comment.