Change piece_jointe into pieces_jointes

conventions/forms/evenement.py

@@ -13,8 +13,8 @@ class EvenementForm(forms.Form):
  label="Type d'évènement",
  choices=TypeEvenement.choices,
  )
- piece_jointe = forms.CharField(required=False, label="Fichier joint")
- piece_jointe_files = forms.CharField(
+ pieces_jointes = forms.CharField(required=False, label="Fichier joint")
+ pieces_jointes_files = forms.CharField(
  required=False,
  help_text="Les fichiers de type docx sont acceptés dans la limite de 100 Mo",
  )

conventions/migrations/0093_evenement_piece_jointe.py → conventions/migrations/0093_evenement_pieces_jointes.py

@@ -1,4 +1,4 @@
-# Generated by Django 4.2.13 on 2024-09-05 07:52
+# Generated by Django 4.2.15 on 2024-09-11 06:44
 
 from django.db import migrations, models
 
@@ -12,7 +12,7 @@ class Migration(migrations.Migration):
  operations = [
  migrations.AddField(
  model_name="evenement",
- name="piece_jointe",
+ name="pieces_jointes",
  field=models.TextField(blank=True),
  ),
  ]

conventions/models/evenement.py

@@ -22,7 +22,7 @@ class Evenement(models.Model):
  )
  survenu_le = models.DateField(editable=False)
  description = models.TextField(null=True, blank=True)
- piece_jointe = models.TextField(blank=True)
+ pieces_jointes = models.TextField(blank=True)
 
  def save(
  self, force_insert=False, force_update=False, using=None, update_fields=None

conventions/tests/views/test_journal_view.py

@@ -49,8 +49,8 @@ def test_create_journal_evenement(self):
  "action": "submit",
  "description": "Signé par le préfet",
  "type_evenement": TypeEvenement.RETOUR_PREFET,
- "piece_jointe": "filename.jpg",
- "piece_jointe_files": "",
+ "pieces_jointes": "filename.jpg",
+ "pieces_jointes_files": "",
  },
  )
  self.assertEqual(response.status_code, 200, msg="[ConventionJournalTests] ")
@@ -61,7 +61,7 @@ def test_create_journal_evenement(self):
  self.assertIsNotNone(evenement)
  self.assertEqual(evenement.description, "Signé par le préfet")
  self.assertEqual(evenement.type_evenement, TypeEvenement.RETOUR_PREFET)
- assert evenement.piece_jointe == '{"files": [], "text": "filename.jpg"}'
+ assert evenement.pieces_jointes == '{"files": [], "text": "filename.jpg"}'
 
  def test_edit_journal_evenement(self):
  """
@@ -78,8 +78,8 @@ def test_edit_journal_evenement(self):
  "uuid": self.convention_75.evenements.first().uuid,
  "description": "Contact prélimiaire au préfet pour signature",
  "type_evenement": TypeEvenement.ECHANGE,
- "piece_jointe": "filename_update.jpg",
- "piece_jointe_files": "",
+ "pieces_jointes": "filename_update.jpg",
+ "pieces_jointes_files": "",
  },
  )
  self.assertEqual(response.status_code, 200, msg="[ConventionJournalTests] ")
@@ -94,4 +94,6 @@ def test_edit_journal_evenement(self):
  "Contact prélimiaire au préfet pour signature",
  )
  self.assertEqual(evenement.type_evenement, TypeEvenement.ECHANGE)
- assert evenement.piece_jointe == '{"files": [], "text": "filename_update.jpg"}'
+ assert (
+ evenement.pieces_jointes == '{"files": [], "text": "filename_update.jpg"}'
+ )

conventions/views/conventions.py

@@ -668,8 +668,8 @@ def journal(request, convention_uuid):
  description=selected.description,
  type_evenement=selected.type_evenement,
  **utils.get_text_and_files_from_field(
- "piece_jointe",
- selected.piece_jointe,
+ "pieces_jointes",
+ selected.pieces_jointes,
  ),
  )
  )
@@ -682,7 +682,7 @@ def journal(request, convention_uuid):
  "description": request.POST.get("description"),
  "type_evenement": request.POST.get("type_evenement"),
  **utils.init_text_and_files_from_field(
- request, None, "piece_jointe"
+ request, None, "pieces_jointes"
  ),
  }
  )
@@ -691,9 +691,9 @@ def journal(request, convention_uuid):
  evenement = Evenement.objects.get(uuid=form.cleaned_data["uuid"])
  evenement.description = form.cleaned_data["description"]
  evenement.type_evenement = form.cleaned_data["type_evenement"]
- evenement.piece_jointe = utils.set_files_and_text_field(
- form.cleaned_data["piece_jointe_files"],
- form.cleaned_data["piece_jointe"],
+ evenement.pieces_jointes = utils.set_files_and_text_field(
+ form.cleaned_data["pieces_jointes_files"],
+ form.cleaned_data["pieces_jointes"],
  )
  evenement.save()
  else:
@@ -702,9 +702,9 @@ def journal(request, convention_uuid):
  description=form.cleaned_data["description"],
  type_evenement=form.cleaned_data["type_evenement"],
  )
- evenement.piece_jointe = utils.set_files_and_text_field(
- form.cleaned_data["piece_jointe_files"],
- form.cleaned_data["piece_jointe"],
+ evenement.pieces_jointes = utils.set_files_and_text_field(
+ form.cleaned_data["pieces_jointes_files"],
+ form.cleaned_data["pieces_jointes"],
  )
  evenement.save()
 

templates/conventions/journal.html

@@ -33,7 +33,7 @@ <h2 class="fr-text--lg">Ajouter un évènement au journal</h2>
  </div>
  <div class="fr-col-12 fr-mb-4w">
  <label class="fr-label">Ajouter un fichier (optionnel)</label>
- {% include "common/form/input_upload.html" with no_title=True form_input=form.piece_jointe form_input_files=form.piece_jointe_files object_name='convention' object_uuid=convention.uuid file_list=evenement.piece_jointe|get_files_from_textfiles object_field="evenement__piece_jointe__"|add:form.uuid.value %}
+ {% include "common/form/input_upload.html" with no_title=True form_input=form.pieces_jointes form_input_files=form.pieces_jointes_files object_name='convention' object_uuid=convention.uuid file_list=evenement.pieces_jointes|get_files_from_textfiles object_field="evenement__pieces_jointes__"|add:form.uuid.value %}
  </div>
  <div class="fr-grid-row fr-grid-row--right">
  <div class="fr-mr-4w fr-mt-1w">
@@ -80,7 +80,7 @@ <h2 class="fr-mr-2w fr-text--lg">Modifier l'évènement du {{ evenement.survenu_
  </div>
  <div class="fr-col-12 fr-mb-4w">
  <label class="fr-label">Ajouter des fichiers (optionnel)</label>
- {% include "common/form/input_upload.html" with no_title=True form_input=form.piece_jointe form_input_files=form.piece_jointe_files object_name='convention' object_uuid=convention.uuid file_list=evenement.piece_jointe|get_files_from_textfiles object_field="evenement__piece_jointe__"|add:form.uuid.value %}
+ {% include "common/form/input_upload.html" with no_title=True form_input=form.pieces_jointes form_input_files=form.pieces_jointes_files object_name='convention' object_uuid=convention.uuid file_list=evenement.pieces_jointes|get_files_from_textfiles object_field="evenement__pieces_jointes__"|add:form.uuid.value %}
  </div>
  </div>
  <div class="fr-grid-row fr-grid-row--right">
@@ -115,7 +115,7 @@ <h2 class="fr-mr-2w fr-text--lg">Modifier l'évènement du {{ evenement.survenu_
  </div>
  <div class="fr-col-12 fr-ml-4w">{{ evenement.description|linebreaksbr }}</div>
  <div class="fr-col-12 fr-ml-4w">
- {% include "common/display_text_and_files_if_exists.html" with label="Fichiers joints" text=evenement.piece_jointe|get_text_from_textfiles file_list=evenement.piece_jointe|get_files_from_textfiles object_field="evenement__piece_jointe__"|add:evenement.uuid %}
+ {% include "common/display_text_and_files_if_exists.html" with label="Fichiers joints" text=evenement.pieces_jointes|get_text_from_textfiles file_list=evenement.pieces_jointes|get_files_from_textfiles object_field="evenement__pieces_jointes__"|add:evenement.uuid %}
  </div>
  </div>
  </div>