Skip to content
Snippets Groups Projects
Unverified Commit b4889866 authored by Sandeep Chauhan's avatar Sandeep Chauhan Committed by GitHub
Browse files

Exclude draft for round submissions on determination % calculation (#3426)

Fixes #3273
parent 3a0b2c29
No related branches found
No related tags found
2 merge requests!18Fix application form submit button remaining disabled (#3483),!13Merge in v4.1.1
...@@ -583,14 +583,14 @@ class RoundsAndLabsManager(PageManager): ...@@ -583,14 +583,14 @@ class RoundsAndLabsManager(PageManager):
return self.get_queryset(RoundsAndLabsProgressQueryset).annotate( return self.get_queryset(RoundsAndLabsProgressQueryset).annotate(
total_submissions=Coalesce( total_submissions=Coalesce(
Subquery( Subquery(
submissions.values('round').annotate(count=Count('pk')).values('count'), submissions.exclude_draft().values('round').annotate(count=Count('pk')).values('count'),
output_field=IntegerField(), output_field=IntegerField(),
), ),
0, 0,
), ),
closed_submissions=Coalesce( closed_submissions=Coalesce(
Subquery( Subquery(
closed_submissions.values('round').annotate(count=Count('pk')).values('count'), closed_submissions.exclude_draft().values('round').annotate(count=Count('pk')).values('count'),
output_field=IntegerField(), output_field=IntegerField(),
), ),
0, 0,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment