[feature/OP-515=> QA] Intégration des FIE : partnership côdiplomation

admin.py

@@ -1,3 +1,5 @@
+from typing import Dict
+
 from django import forms
 from django.contrib import admin
 from django.contrib.postgres.fields import ArrayField
@@ -25,6 +27,11 @@ class PartnershipEntityManagerAdmin(EntityRoleModelAdmin):
         ArrayField: {'widget': TypeField(choices=PartnershipType.choices())}
     }
 
+    def _build_model_from_csv_row(self, csv_row: Dict):
+        partnership_manager = super()._build_model_from_csv_row(csv_row)
+        partnership_manager.scopes = csv_row.get('SCOPES', 'ALL').split("|")
+        return partnership_manager
+
 
 class PartnershipViewerAdmin(RoleModelAdmin):
     raw_id_fields = ('person',)

auth/predicates.py

@@ -113,6 +113,12 @@ def has_mobility_scope(self, user):
                for role_row in self.context['role_qs'])
 
 
+@rules.predicate(bind=True)
+def has_course_scope(self, user):
+    return any(PartnershipType.COURSE.name in role_row.scopes
+               for role_row in self.context['role_qs'])
+
+
 @rules.predicate
 def partnership_has_agreement(user, partnership):
     return partnership.agreements.exists()

auth/roles/partnership_manager.py

@@ -58,11 +58,11 @@ def rule_set(cls):
 
             # UCLManagementEntity
             'partnership.view_uclmanagemententity':
-                (is_linked_to_adri_entity | is_faculty_manager) & has_mobility_scope,
+                (is_linked_to_adri_entity | is_faculty_manager) & (has_mobility_scope | has_course_scope),
             'partnership.add_uclmanagemententity':
-                is_linked_to_adri_entity & has_mobility_scope,
+                (is_linked_to_adri_entity) & (has_mobility_scope | has_course_scope),
             'partnership.change_uclmanagemententity':
-                (is_linked_to_adri_entity | is_faculty_manager_for_ume) & has_mobility_scope,
+                (is_linked_to_adri_entity | is_faculty_manager_for_ume) & (has_mobility_scope | has_course_scope),
             'partnership.delete_uclmanagemententity':
                 (is_linked_to_adri_entity & ~ume_has_partnerships) & has_mobility_scope,
 

forms/partner/partner.py

@@ -2,7 +2,6 @@
 from django import forms
 from django.core.exceptions import ValidationError
 from django.utils.translation import gettext_lazy as _, pgettext_lazy
-
 from base.forms.utils.datefield import DATE_FORMAT, DatePickerInput
 from base.models.enums.organization_type import MAIN
 from base.models.organization import Organization
@@ -12,7 +11,6 @@
 
 __all__ = ['PartnerForm', 'OrganizationForm']
 
-
 class PartnerForm(forms.ModelForm):
     is_nonprofit = forms.NullBooleanField(
         label=_('is_nonprofit'),

forms/partnership/partnership.py

@@ -1,7 +1,10 @@
 from dal import autocomplete
+from dal_select2.widgets import Select2Multiple, Select2, ModelSelect2
 from django import forms
 from django.core.exceptions import ValidationError
 from django.db.models import Func, OuterRef, Q
+from django.forms import modelformset_factory
+from django.forms.utils import ErrorList
 from django.utils.translation import gettext_lazy as _
 
 from base.forms.utils.datefield import DATE_FORMAT, DatePickerInput
@@ -10,7 +13,8 @@
 from base.utils.cte import CTESubquery
 from partnership.auth.predicates import is_linked_to_adri_entity
 from partnership.auth.roles.partnership_manager import PartnershipEntityManager
-from partnership.models import Partnership, EntityProxy
+from partnership.models import Partnership, EntityProxy, PartnershipDiplomaWithUCL, PartnershipProductionSupplement, \
+    PartnershipPartnerRelation
 from partnership.utils import format_partner_entity
 from ..fields import EntityChoiceField, PersonChoiceField
 
@@ -258,11 +262,56 @@ def clean_partner_entities(self):
 
 
 class PartnershipCourseForm(PartnershipBaseForm):
+    ucl_reference = forms.ChoiceField(
+        label=_('ucl_reference'),
+        required=True,
+        choices=[(True, _('Oui')), (False, _('Non'))],
+    )
+
+    partner_referent = forms.ModelChoiceField(
+        label=_('partner_referent'),
+        required=False,
+        queryset=EntityProxy.objects.partner_entities(),
+        widget=autocomplete.ModelSelect2(
+            url='partnerships:autocomplete:reference_partner_entity',
+            forward=['partner_entities', 'ucl_reference'],
+            attrs={"disabled": "disabled"}
+        ),
+    )
+
+    all_student = forms.BooleanField(
+        label=_('all_student'),
+        required=False,
+        initial=True
+    )
+
+    diploma_prod_by_ucl = forms.BooleanField(
+        label=_('diploma_prod_by_ucl'),
+        required=False,
+        initial=True
+    )
+
+    diploma_by_ucl = forms.ChoiceField(
+        label=_('type_diploma_by_ucl'),
+        choices=PartnershipDiplomaWithUCL.choices,
+    )
+
+    supplement_prod_by_ucl = forms.ChoiceField(
+        label=_('supplement_prod_by_ucl'),
+        choices=PartnershipProductionSupplement.choices(),
+    )
+
     class Meta(PartnershipBaseForm.Meta):
         fields = PartnershipBaseForm.Meta.fields + (
             'subtype',
             'description',
             'project_acronym',
+            'ucl_reference',
+            'partner_referent',
+            'all_student',
+            'diploma_prod_by_ucl',
+            'diploma_by_ucl',
+            'supplement_prod_by_ucl'
         )
         widgets = {
             **PartnershipBaseForm.Meta.widgets,
@@ -273,6 +322,8 @@ def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.fields['subtype'].label = _('partnership_subtype_course')
         self.fields['subtype'].label_from_instance = lambda o: o.label
+        self.fields['supervisor'].required = False
+        self.fields['diploma_prod_by_ucl'].initial = True
 
 
 class PartnershipDoctorateForm(PartnershipBaseForm):
@@ -302,3 +353,39 @@ class Meta(PartnershipWithDatesMixin.Meta):
             'project_title',
             'ucl_status',
         )
+
+
+class PartnershipPartnerRelationForm(forms.ModelForm):
+    def __init__(self, data=None, files=None, auto_id='id_%s', prefix=None, initial=None, error_class=ErrorList,
+                 label_suffix=None, empty_permitted=False, instance=None, use_required_attribute=None, renderer=None):
+        super().__init__(data, files, auto_id, prefix, initial, error_class, label_suffix, empty_permitted, instance,
+                         use_required_attribute, renderer)
+
+    class Meta:
+        model = PartnershipPartnerRelation
+        fields = [
+            'diploma_prod_by_partner',
+            'diploma_with_ucl_by_partner',
+            'supplement_prod_by_partner',
+            'partnership'
+        ]
+
+        widgets = {
+            'supplement_prod_by_partner': ModelSelect2(),
+            'diploma_with_ucl_by_partner': ModelSelect2(),
+            'partnership': forms.HiddenInput,
+        }
+
+        labels = {
+            'diploma_prod_by_partner': _('diploma_prod_by_partner'),
+            'diploma_with_ucl_by_partner': _('diploma_with_ucl_by_partner'),
+            'supplement_prod_by_partner': _('supplement_prod_by_partner'),
+            'partnership': _('partnership'),
+        }
+
+
+PartnershipPartnerRelationFormSet = modelformset_factory(
+    PartnershipPartnerRelation,
+    form=PartnershipPartnerRelationForm,
+    extra=0
+)