Renamed files to stop test suite from crashing (but still no tests...)

Author: smangham

.gitignore

@@ -154,6 +154,5 @@ target
 
 # Project
 staticfiles/
-*/migrations/*
 *.csv
 *.xlsx

.idea/codeStyles/codeStyleConfig.xml

@@ -43,7 +43,7 @@ make superuser
 
 Then, log into the website to link your user account to the site.
 The command `make superuser` will then make the `swm1r18` account site staff;
-edit the script `make_swm1r18_superuser.py` to change the account.e
+edit the script `make_swm1r18_superuser.py` to change the account.
 
 ## Updating
 

.idea/ryecharm-overrides.xml

@@ -10,6 +10,7 @@
 from app.models import AcademicGroup
 from app.pages.components.suffixes import SuffixHistory
 from app.style import get_balance_classes
+from app.utility import year_to_academic_year
 
 
 class AcademicGroupHistoryList(Page):
@@ -70,12 +71,12 @@ def extra_evaluated__plot(params: Dict[str, Any], academic_group: AcademicGroup,
             :param staff: The Staff instance, provided via URL decoding.
             :return: The HTML code of the graph.
             """
-            dates: List[str] = [f"{str(timezone.now().year - 1)[-2:]}/{str(timezone.now().year)[-2:]}"]
+            dates: List[str] = [year_to_academic_year(timezone.now())]
             balance_cumulative: List[float] = [academic_group.load_balance_historic + academic_group.get_load_balance()]
             balance_yearly: List[float] = [academic_group.get_load_balance()]
 
             for academic_group_historic in academic_group.history.all():
-                dates.append(f"{str(academic_group_historic.history_date.year - 1)[-2:]}/{str(academic_group_historic.history_date.year)[-2:]}")
+                dates.append(year_to_academic_year(academic_group_historic.history_date.year))
                 balance_cumulative.append(academic_group_historic.load_balance_historic + academic_group_historic.load_balance_final)
                 balance_yearly.append(academic_group_historic.load_balance_final)
 

.idea/ryecharm.xml

@@ -1,11 +1,27 @@
+from datetime import datetime
+
 from django.http import HttpRequest
 
 from app.models import AcademicGroup, Assignment, Staff, StandardLoad, Task
 
 
+def year_to_academic_year(date: datetime) -> str:
+    """
+    Output function for producing tidy dates.
+
+    :param date: A datetime for the last year of an academic year (e.g. 2024/06/15)
+    :return: The academic year that datetime belongs to (e.g. 23/24)
+    """
+    return f"{str(date.year - 1)[-2:]}/{str(date.year)[-2:]}"
+
+
 def update_all_loads(request: HttpRequest | None = None) -> int:
     """
+    Updates the load of all assignments, staff, e.t.c.
+
+    A very expensive function but required given the weirdly self-referential definition.
 
+    :param request: The web request, required to provide an output message.
     :return: The number of cycles taken to update the full-time equivalent loads.
     """
     standard_load: StandardLoad = StandardLoad.objects.latest()

README.md

@@ -22,7 +22,7 @@ services:
         source: "/etc/tls/private/"
         target: "/etc/tls/private/"
       - type: bind
-        source: "${PROJECT_PATH}/logs/"
+        source: "./logs/"
         target: "/var/www/physics-workload/logs/"
 
     restart: unless-stopped
@@ -41,13 +41,13 @@ services:
       - "./.env"
     volumes:
       - type: bind
-        source: "${PROJECT_PATH}/data/"
+        source: "./data/"
         target: "/var/www/physics-workload/data/"
       - type: bind
         source: "./staticfiles/"
         target: "/var/www/physics-workload/staticfiles/"
       - type: bind
-        source: "${PROJECT_PATH}/logs/"
+        source: "./logs/"
         target: "/var/www/physics-workload/logs/"
     command:
       - "bash"