Update master from acceptation (#640)

* Hotfix/to conclude review api view qs bug (#629) * fix: add is_committee_review check to ToConcludeReviewApiView qs * fix: add is_committee_review check to other API views * formatting --------- Co-authored-by: Ty Mees <[email protected]> * fix: apply is_committee_review to filter in get_committee_decisions() * formatting * fix: Save reviews after closure in update_go * fix: hacky changes to working of end_date in qs * formatting * fix: remove explicit protocol prefix from file links (#637) * fix: remove explicit protocol prefix from file links Also adding quotations around the URL * feat: Add protocol prefix to BASE_URL for consistency --------- Co-authored-by: Edo Storm <[email protected]> Co-authored-by: Ty Mees <[email protected]> Co-authored-by: Edo Storm <[email protected]>
DH-IT-Portal-Development · Mar 27, 2024 · 00602f5 · 00602f5
1 parent 2989b7a
commit 00602f5
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/fetc/settings.py b/fetc/settings.py
@@ -158,7 +158,7 @@
 MENU_HIDE_EMPTY = False
 
 # Base URL
-BASE_URL = "127.0.0.1:8000"
+BASE_URL = "https://127.0.0.1:8000"
 
 # CSRF Setting
 CSRF_FAILURE_VIEW = "main.error_views.csrf_failure"

diff --git a/proposals/utils/pdf_diff_logic.py b/proposals/utils/pdf_diff_logic.py
@@ -286,7 +286,7 @@ def create_unordered_html_list(self, lst):
     def handle_field_file(self, field_file):
         if field_file:
             output = format_html(
-                "<a href=https://{}>{}</a>",
+                '<a href="{}">{}</a>',
                 f"{settings.BASE_URL}{field_file.url}",
                 _("Download"),
             )

diff --git a/reviews/models.py b/reviews/models.py
@@ -80,6 +80,7 @@ def update_go(self, last_decision=None):
 
                     start_assignment_phase(self.proposal)
                     self.stage = self.Stages.CLOSED
+                    self.save()
                 # On NO-GO, reset the Proposal status
                 else:
                     # See comment above

diff --git a/reviews/views.py b/reviews/views.py
@@ -132,7 +132,8 @@ def get_context_data(self, **kwargs):
 
     def get_committee_decisions(self):
         decisions = Decision.objects.filter(
-            review__proposal__reviewing_committee=self.committee
+            review__proposal__reviewing_committee=self.committee,
+            review__is_committee_review=True,
         ).select_related(
             "reviewer",
             "review",
@@ -159,11 +160,15 @@ def get_review_counts_last_year(self):
 
         decisions = self.get_committee_decisions()
 
+        # This is done to include in the base_filter, decisions which are taken
+        # today. The comparison was having some troubles due to different
+        # time formats.
+        end_date = self.end_date + timedelta(days=1)
+
         reviewers = get_user_model().objects.filter(decision__in=decisions)
         base_filter = Q(
             decision__review__date_start__gt=self.start_date,
-            decision__review__date_start__lt=self.end_date,
-            decision__review__stage__gt=Review.Stages.SUPERVISOR,
+            decision__review__date_start__lte=end_date,
         )
         return reviewers.annotate(
             total=Count("decision", filter=base_filter),