Merge pull request #553 from uclouvain/qa

[PROD] INTERNSHIP-335 display multiple masters when available in xls

Author: mathieuzen

business/assignment.py

@@ -147,7 +147,7 @@ def _prepare_subcohorts(self):
         if self.parent_cohort:
             for cohort in [cohort for cohort in self.parent_cohort.subcohorts.all() if cohort != self.cohort]:
                 self.existing_affectations += list(
-                    InternshipStudentAffectationStat.objects.filter(internship__cohort=cohort)
+                    InternshipStudentAffectationStat.objects.filter(internship__cohort=cohort, organization__fake=False)
                 )
 
         # keep internship availability occurences in all cohorts

models/master_allocation.py

@@ -28,7 +28,8 @@
 
 from django.contrib import admin
 from django.db import models
-from django.db.models import Q
+from django.db.models import Q, F, Value
+from django.db.models.functions import Concat, Upper
 from django.utils.datetime_safe import datetime
 from django.utils.translation import gettext_lazy as _
 
@@ -139,4 +140,6 @@ def clean_allocations(cohort, master, postpone):
 
 
 def find_by_cohort(cohort_from):
-    return MasterAllocation.objects.filter(Q(organization__cohort=cohort_from) | Q(specialty__cohort=cohort_from))
+    return MasterAllocation.objects.annotate(master_display_name=Concat(
+        Upper(F('master__person__last_name')), Value(' '), F('master__person__first_name')
+    )).filter(Q(organization__cohort=cohort_from) | Q(specialty__cohort=cohort_from))

utils/exporting/organization_affectation_hospital.py

@@ -23,13 +23,16 @@
 #    see http://www.gnu.org/licenses/.
 #
 ##############################################################################
-from django.db.models import OuterRef, Subquery
+from django.contrib.postgres.aggregates import StringAgg
+from django.db.models import OuterRef, Subquery, F, Value
+from django.db.models.functions import Concat, Upper
 from django.utils.translation import gettext_lazy as _
 from openpyxl import Workbook
 from openpyxl.styles import Font
 
 from internship import models
 from internship.models.enums import organization_report_fields
+from internship.models.enums.role import Role
 from internship.models.internship_student_information import InternshipStudentInformation
 from internship.models.master_allocation import MasterAllocation
 from internship.utils.exporting.spreadsheet import columns_resizing, add_row
@@ -69,14 +72,22 @@ def _add_students(worksheet, cohort, organization):
             cohort, organization
         ).select_related('student__person')
 
-    master_allocation_subquery = MasterAllocation.objects.filter(
+    master_names = MasterAllocation.objects.filter(
         organization_id=OuterRef('organization_id'),
-        specialty_id=OuterRef('speciality_id')
-    )
+        specialty_id=OuterRef('speciality_id'),
+        role=Role.MASTER.name,
+    ).annotate(
+        full_name=Concat(
+            Upper(F('master__person__last_name')),
+            Value(' '),
+            F('master__person__first_name')
+        )
+    ).values('organization_id').annotate(
+        all_names=StringAgg('full_name', delimiter=', ')
+    ).values('all_names')
 
     students_stat = students_stat.annotate(
-        master_last_name=Subquery(master_allocation_subquery.values('master__person__last_name')[:1]),
-        master_first_name=Subquery(master_allocation_subquery.values('master__person__first_name')[:1])
+        masters=Subquery(master_names[:1])
     )
 
     rep_seq = list(organization.report_sequence())
@@ -98,8 +109,7 @@ def _add_students(worksheet, cohort, organization):
                     organization_report_fields.LAST_NAME: student_info.person.last_name,
                     organization_report_fields.FIRST_NAME: student_info.person.first_name,
                     organization_report_fields.SPECIALTY: student_stat.speciality.name,
-                    organization_report_fields.MASTER:
-                        f"{student_stat.master_first_name[0].upper()}. {student_stat.master_last_name.upper()}",
+                    organization_report_fields.MASTER: student_stat.masters,
                     organization_report_fields.BIRTHDATE: student_info.person.birth_date.strftime("%d-%m-%Y")
                     if student_info.person.birth_date else None,
                     organization_report_fields.EMAIL: student_info.person.email,

views/place.py

@@ -230,8 +230,7 @@ def _get_affec_by_specialties_for_cohorts(cohorts, organization_id):
             )
             _add_student_information(affectation, internship_student_info)
             if master_allocation:
-                allocation = master_allocation.first()
-                affectation.master = allocation.master
+                affectation.master = ", ".join(master_allocation.values_list('master_display_name', flat=True))
     return affec_by_specialties, organization