Suppression de la librairie VirtualSelect

.github/workflows/codeql-analysis.yml

@@ -38,7 +38,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v5
+      uses: actions/checkout@v4
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL

.github/workflows/publish-docs.yml

@@ -3,7 +3,7 @@ name: Deploy Sphinx Documentation to GitHub Pages
 on:
   push:
     branches:
-      - main  # Adjust this to your default branch name, if necessary
+      - main
       - sphynx
 
 jobs:
@@ -12,7 +12,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v4
 
       - uses: actions/setup-python@v6
         with:

.github/workflows/push-branch-main.yml

@@ -23,7 +23,7 @@ jobs:
     needs: test
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v4
       - uses: kolok/deploy-to-scalingo@v1
         with:
           ssh-private-key: ${{ secrets.SCALINGO_SSH_PRIVATE_KEY }}

.github/workflows/push-branch-recette.yml

@@ -17,13 +17,13 @@ jobs:
   test:
     uses: ./.github/workflows/run_tests.yml
 
-    deploy_to_siap_recette:
+  deploy_to_siap_recette:
     name: "Deploy to Siap Recette"
     runs-on: ubuntu-latest
     needs: test
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v4
       - uses: kolok/deploy-to-scalingo@v1
         with:
           ssh-private-key: ${{ secrets.SCALINGO_SSH_PRIVATE_KEY }}

.github/workflows/push-pull-request.yml

@@ -44,7 +44,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v4
 
       - uses: actions/setup-python@v6
         with:

.github/workflows/push-version-tag.yml

@@ -23,7 +23,7 @@ jobs:
     needs: test
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v4
       - uses: ncipollo/release-action@v1
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
@@ -34,7 +34,7 @@ jobs:
     needs: test
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v4
       - uses: kolok/deploy-to-scalingo@v1
         with:
           ssh-private-key: ${{ secrets.SCALINGO_SSH_PRIVATE_KEY }}
@@ -47,7 +47,7 @@ jobs:
     needs: test
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v4
       - uses: kolok/deploy-to-scalingo@v1
         with:
           ssh-private-key: ${{ secrets.SCALINGO_SSH_PRIVATE_KEY }}

.github/workflows/run_check.yml

@@ -8,7 +8,7 @@ jobs:
         runs-on: ubuntu-latest
         steps:
           - name: Check out the repository
-            uses: actions/checkout@v5
+            uses: actions/checkout@v4
 
           - name: Setup Python
             uses: actions/setup-python@v6

.github/workflows/run_tests.yml

@@ -37,7 +37,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v4
 
       - uses: actions/setup-python@v6
         with:

conventions/admin.py

@@ -120,7 +120,7 @@ class ConventionAdmin(ApilosModelAdmin):
         "administration",
         "bailleur",
         "programme",
-        "lot",
+        "lots_list",
         "numero",
         "numero_pour_recherche",
         "date_fin_conventionnement",
@@ -157,7 +157,7 @@ class ConventionAdmin(ApilosModelAdmin):
         "numero_pour_recherche",
         "cree_par",
         "cree_le",
-        "lot",
+        "lots_list",
     )
     autocomplete_fields = (
         "programme",

conventions/forms/convention_form_annexes.py

@@ -12,6 +12,7 @@
     TypologieAnnexe,
     TypologieLogementClassique,
 )
+from programmes.models.choices import Financement
 
 
 class LotAnnexeForm(forms.Form):
@@ -20,6 +21,9 @@ class LotAnnexeForm(forms.Form):
     """
 
     uuid = forms.UUIDField(required=False)
+    financement = forms.TypedChoiceField(
+        required=False, label="", choices=Financement.choices
+    )
     annexe_caves = forms.BooleanField(
         required=False,
         label="Caves",
@@ -92,6 +96,9 @@ class AnnexeForm(forms.Form):
             "max_length": "La designation du logement ne doit pas excéder 255 caractères",
         },
     )
+    financement = forms.TypedChoiceField(
+        required=False, label="", choices=Financement.choices
+    )
     logement_typologie = forms.TypedChoiceField(
         required=True, label="", choices=TypologieLogementClassique.choices
     )
@@ -123,6 +130,26 @@ class AnnexeForm(forms.Form):
         },
     )
 
+    def clean_financement(self):
+        """
+        Validation du financement
+        """
+        financement = self.cleaned_data.get("financement", None)
+        financement_exist = False
+
+        if financement:
+            for choices in list(Financement.choices):
+                if financement in choices:
+                    financement_exist = True
+                    break
+
+        if not financement_exist:
+            raise ValidationError(
+                "Vérifiez si le financement est pris en charge par Apilos ou s'il s'agit d'une erreur de saisie."
+            )
+
+        return financement
+
     def clean_loyer(self):
         """
         Validation du loyer :
@@ -165,7 +192,7 @@ def manage_logement_exists_validation(self):
             - le logement doit exister dans le lot
         """
         if self.convention:
-            lgts = self.convention.lot.logements.all()
+            lgts = Logement.objects.filter(lot__convention=self.convention)
             for form in self.forms:
                 try:
                     lgts.get(designation=form.cleaned_data.get("logement_designation"))
@@ -176,3 +203,5 @@ def manage_logement_exists_validation(self):
 
 
 AnnexeFormSet = formset_factory(AnnexeForm, formset=BaseAnnexeFormSet, extra=0)
+
+LotAnnexeFormSet = formset_factory(LotAnnexeForm, extra=0)

conventions/forms/convention_form_financement.py

@@ -11,6 +11,7 @@
 
 from conventions.models import Preteur
 from programmes.models import TypeOperation
+from programmes.models.choices import Financement
 
 
 class ConventionFinancementForm(forms.Form):
@@ -61,14 +62,20 @@ def clean(self):
             and self.convention is not None
             and annee_fin_conventionnement is not None
         ):
-            if self.convention.programme.is_outre_mer:
-                self._outre_mer_end_date_validation(annee_fin_conventionnement)
-            elif self.convention.is_pls_financement_type:
-                self._pls_end_date_validation(annee_fin_conventionnement)
-            elif self.convention.programme.type_operation == TypeOperation.SANSTRAVAUX:
-                self._sans_travaux_end_date_validation(annee_fin_conventionnement)
-            else:
+            if self.convention.is_mixte:
                 self._other_end_date_validation(annee_fin_conventionnement)
+            else:
+                if self.convention.programme.is_outre_mer:
+                    self._outre_mer_end_date_validation(annee_fin_conventionnement)
+                elif self.convention.is_pls_financement_type:
+                    self._pls_end_date_validation(annee_fin_conventionnement)
+                elif (
+                    self.convention.programme.type_operation
+                    == TypeOperation.SANSTRAVAUX
+                ):
+                    self._sans_travaux_end_date_validation(annee_fin_conventionnement)
+                else:
+                    self._other_end_date_validation(annee_fin_conventionnement)
 
     def _outre_mer_end_date_validation(self, annee_fin_conventionnement):
         today = datetime.date.today()
@@ -225,6 +232,9 @@ class PretForm(forms.Form):
             "max_length": "Le numero ne doit pas excéder 255 caractères",
         },
     )
+    financement = forms.TypedChoiceField(
+        required=False, label="", choices=Financement.choices
+    )
     preteur = forms.TypedChoiceField(required=False, label="", choices=Preteur.choices)
     autre = forms.CharField(
         required=False,
@@ -259,6 +269,11 @@ def clean(self):
           - si le prêteur est autre, le champ autre est obligatoire
         """
         cleaned_data = super().clean()
+        if not cleaned_data.get("financement"):
+            self.add_error(
+                "financement",
+                "Le financement doit obligatoirement être fourni",
+            )
         preteur = cleaned_data.get("preteur")
 
         if preteur in ["CDCF", "CDCL"]:
@@ -298,15 +313,22 @@ def clean(self):
         self.manage_cdc_validation()
 
     def validate_initial_numero_unicity(self) -> bool:
-        is_valid = True
-        numeros = [form.initial.get("numero") for form in self.forms]
-        for form in self.forms:
-            num = form.initial.get("numero")
-            if numeros.count(num) > 1:
-                form.errors["numero"] = [
-                    f"Le numéro de financement {num} n'est pas unique."
-                ]
-                is_valid = False
+        financements = {form.initial.get("financement") for form in self.forms}
+        for financement in financements:
+            is_valid = True
+            forms_financement = [
+                form
+                for form in self.forms
+                if form.initial.get("financement") == financement
+            ]
+            numeros = [form.initial.get("numero") for form in forms_financement]
+            for form in forms_financement:
+                num = form.initial.get("numero")
+                if numeros.count(num) > 1:
+                    form.errors["numero"] = [
+                        f"Le numéro de financement {num} n'est pas unique pour le financement {financement}."
+                    ]
+                    is_valid = False
         return is_valid
 
     def manage_cdc_validation(self):
@@ -316,17 +338,25 @@ def manage_cdc_validation(self):
         """
         if (
             self.convention is not None
-            and not self.convention.is_pls_financement_type
             and self.convention.programme.type_operation != TypeOperation.SANSTRAVAUX
         ):
-            for form in self.forms:
-                if form.cleaned_data.get("preteur") in ["CDCF", "CDCL"]:
-                    return
-            error = ValidationError(
-                "Au moins un prêt à la Caisee des dépôts et consignations doit-être déclaré "
-                + "(CDC foncière, CDC locative)"
-            )
-            self._non_form_errors.append(error)
+            for lot in self.convention.lots.all():
+                if not lot.is_pls_financement_type:
+                    exist_cdcf_cdcl = False
+                    lot_exist = False
+                    for form in self.forms:
+                        if form.cleaned_data.get("financement") == lot.financement:
+                            lot_exist = True
+                            if form.cleaned_data.get("preteur") in ["CDCF", "CDCL"]:
+                                exist_cdcf_cdcl = True
+                    if exist_cdcf_cdcl or not lot_exist:
+                        continue
+
+                    error = ValidationError(
+                        "Au moins un prêt à la Caisee des dépôts et consignations doit-être déclaré "
+                        + f"(CDC foncière, CDC locative) pour le financement {lot.financement}"
+                    )
+                    self._non_form_errors.append(error)
 
 
 PretFormSet = formset_factory(PretForm, formset=BasePretFormSet, extra=0)