From cdc72ef2979a04d5719c286ec1a032bdc57fa2bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9becca=20Tinchon?= <rebecca.tinchon@hotmail.fr>
Date: Mon, 14 Oct 2024 10:02:22 +0200
Subject: [PATCH 1/4] presence management

---
 .../Controller/EventPresenceController.php    | 36 ++++++++------
 src/plugin/cursus/Entity/EventPresence.php    | 36 ++++++++++++++
 .../Migrations/Version20241014084016.php      | 47 +++++++++++++++++++
 .../cursus/Manager/EventPresenceManager.php   |  2 +-
 .../actions/presence/confirm-presence.js      | 25 ----------
 .../modules/event/components/list.jsx         | 13 +++++
 .../modules/event/components/page.jsx         | 15 +++++-
 src/plugin/cursus/Resources/modules/plugin.js |  1 -
 .../modules/presence/components/list.jsx      | 13 +++++
 .../Resources/translations/presence.en.json   |  6 ++-
 .../Resources/translations/presence.fr.json   |  6 ++-
 .../Serializer/EventPresenceSerializer.php    | 11 +++++
 12 files changed, 165 insertions(+), 46 deletions(-)
 create mode 100644 src/plugin/cursus/Installation/Migrations/Version20241014084016.php
 delete mode 100644 src/plugin/cursus/Resources/modules/actions/presence/confirm-presence.js

diff --git a/src/plugin/cursus/Controller/EventPresenceController.php b/src/plugin/cursus/Controller/EventPresenceController.php
index be9408172bd..8aac1dfc2e1 100644
--- a/src/plugin/cursus/Controller/EventPresenceController.php
+++ b/src/plugin/cursus/Controller/EventPresenceController.php
@@ -91,34 +91,39 @@ public function signStatusAction(Request $request): JsonResponse
             return new JsonResponse(['success' => false]);
         }
 
-        $presenceData = $this->serializer->serialize($presence);
-        $presenceData['status'] = EventPresence::PRESENT;
-        $presenceData['signature'] = $signature;
+        $presence->setStatus(EventPresence::PRESENT);
+        $presence->setSignature($signature);
+        $presence->setPresenceUpdatedBy($this->tokenStorage->getToken()->getUser());
+        $presence->setPresenceUpdatedAt(new \DateTime());
 
-        $this->crud->update($presence, $presenceData);
+        $this->om->persist($presence);
+        $this->om->flush();
 
         return new JsonResponse(['success' => true]);
     }
 
     /**
-     * Confirm the status of a EventPresence for current user.
+     * Confirm the status of a EventPresence for current event.
+     *
+     * @Route("/confirm/{id}", name="apiv2_cursus_event_presence_confirm", methods={"PUT"})
      *
-     * @Route("/confirm", name="apiv2_cursus_event_presence_confirm", methods={"PUT"})
+     * @EXT\ParamConverter("event", class="Claroline\CursusBundle\Entity\Event", options={"mapping": {"id": "uuid"}})
      */
-    public function confirmStatusAction(Request $request): JsonResponse
+    public function confirmStatusAction(Event $event): JsonResponse
     {
-        $data = $this->decodeRequest($request);
-        if (empty($data)) {
-            throw new InvalidDataException('Invalid data');
-        }
+        $this->checkPermission('ADMINISTRATE', $event, [], true);
+
+        $presences = $this->om->getRepository(EventPresence::class)->findBy(['event' => $event]);
+        $presencesToValidate = array_filter($presences, function (EventPresence $presence) {
+            return EventPresence::UNKNOWN !== $presence->getStatus();
+        });
 
-        $presences = $this->om->getRepository(EventPresence::class)->findBy(['uuid' => $data]);
         $this->om->startFlushSuite();
-        foreach ($presences as $presence) {
-            $this->checkPermission('ADMINISTRATE', $presence, [], true);
 
+        foreach ($presencesToValidate as $presence) {
             $this->manager->setValidationDate([$presence], new \DateTime());
         }
+
         $this->om->endFlushSuite();
 
         return new JsonResponse();
@@ -211,6 +216,9 @@ public function updateStatusAction(string $status, Request $request): JsonRespon
             $this->checkPermission('EDIT', $presence, [], true);
 
             $this->manager->setStatus([$presence], $status);
+
+            $presence->setPresenceUpdatedBy($this->tokenStorage->getToken()->getUser());
+            $presence->setPresenceUpdatedAt(new \DateTime());
         }
 
         $this->om->endFlushSuite();
diff --git a/src/plugin/cursus/Entity/EventPresence.php b/src/plugin/cursus/Entity/EventPresence.php
index dd25bb865d0..e44ab0078a5 100644
--- a/src/plugin/cursus/Entity/EventPresence.php
+++ b/src/plugin/cursus/Entity/EventPresence.php
@@ -62,6 +62,18 @@ class EventPresence
      */
     private ?array $evidences = null;
 
+    /**
+     * @ORM\ManyToOne(targetEntity="Claroline\CoreBundle\Entity\User")
+     *
+     * @ORM\JoinColumn(name="presence_updated_by", referencedColumnName="id", nullable=true)
+     */
+    private ?User $presenceUpdatedBy = null;
+
+    /**
+     * @ORM\Column(name="presence_updated_at", type="datetime", nullable=true)
+     */
+    private ?\DateTimeInterface $presenceUpdatedAt = null;
+
     public function __construct()
     {
         $this->refreshUuid();
@@ -126,4 +138,28 @@ public function setEvidences(?array $evidences): void
     {
         $this->evidences = $evidences;
     }
+
+    public function getPresenceUpdatedBy(): ?User
+    {
+        return $this->presenceUpdatedBy;
+    }
+
+    public function setPresenceUpdatedBy(?User $user): self
+    {
+        $this->presenceUpdatedBy = $user;
+
+        return $this;
+    }
+
+    public function getPresenceUpdatedAt(): ?\DateTimeInterface
+    {
+        return $this->presenceUpdatedAt;
+    }
+
+    public function setPresenceUpdatedAt(?\DateTimeInterface $date): self
+    {
+        $this->presenceUpdatedAt = $date;
+
+        return $this;
+    }
 }
diff --git a/src/plugin/cursus/Installation/Migrations/Version20241014084016.php b/src/plugin/cursus/Installation/Migrations/Version20241014084016.php
new file mode 100644
index 00000000000..0a33576739f
--- /dev/null
+++ b/src/plugin/cursus/Installation/Migrations/Version20241014084016.php
@@ -0,0 +1,47 @@
+<?php
+
+namespace Claroline\CursusBundle\Installation\Migrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Auto-generated migration based on mapping information: modify it with caution.
+ *
+ * Generation date: 2024/10/14 08:40:17
+ */
+final class Version20241014084016 extends AbstractMigration
+{
+    public function up(Schema $schema): void
+    {
+        $this->addSql('
+            ALTER TABLE claro_cursusbundle_presence_status 
+            ADD presence_updated_by INT DEFAULT NULL, 
+            ADD presence_updated_at DATETIME DEFAULT NULL
+        ');
+        $this->addSql('
+            ALTER TABLE claro_cursusbundle_presence_status 
+            ADD CONSTRAINT FK_DFE5E1FE349A94C7 FOREIGN KEY (presence_updated_by) 
+            REFERENCES claro_user (id)
+        ');
+        $this->addSql('
+            CREATE INDEX IDX_DFE5E1FE349A94C7 ON claro_cursusbundle_presence_status (presence_updated_by)
+        ');
+    }
+
+    public function down(Schema $schema): void
+    {
+        $this->addSql('
+            ALTER TABLE claro_cursusbundle_presence_status 
+            DROP FOREIGN KEY FK_DFE5E1FE349A94C7
+        ');
+        $this->addSql('
+            DROP INDEX IDX_DFE5E1FE349A94C7 ON claro_cursusbundle_presence_status
+        ');
+        $this->addSql('
+            ALTER TABLE claro_cursusbundle_presence_status 
+            DROP presence_updated_by, 
+            DROP presence_updated_at
+        ');
+    }
+}
diff --git a/src/plugin/cursus/Manager/EventPresenceManager.php b/src/plugin/cursus/Manager/EventPresenceManager.php
index 5727a810e42..cec148e0e58 100644
--- a/src/plugin/cursus/Manager/EventPresenceManager.php
+++ b/src/plugin/cursus/Manager/EventPresenceManager.php
@@ -92,7 +92,7 @@ public function setStatus(array $presences, string $status): array
         return $presences;
     }
 
-    public function setValidationDate(array $presences, \DateTimeInterface $date): array
+    public function setValidationDate(array $presences, ?\DateTimeInterface $date): array
     {
         foreach ($presences as $presence) {
             $presence->setValidationDate($date);
diff --git a/src/plugin/cursus/Resources/modules/actions/presence/confirm-presence.js b/src/plugin/cursus/Resources/modules/actions/presence/confirm-presence.js
deleted file mode 100644
index 9375029e76e..00000000000
--- a/src/plugin/cursus/Resources/modules/actions/presence/confirm-presence.js
+++ /dev/null
@@ -1,25 +0,0 @@
-import {ASYNC_BUTTON} from '#/main/app/buttons'
-import {trans} from '#/main/app/intl'
-import {hasPermission} from '#/main/app/security'
-
-export default (presences, refresher) => {
-  const processable = presences.filter(presence => hasPermission('administrate', presence))
-
-  return {
-    name: 'confirm-presence',
-    type: ASYNC_BUTTON,
-    icon: 'fa fa-fw fa-clipboard-check',
-    label: trans('presence_validation', {}, 'presence'),
-    request: {
-      url: ['apiv2_cursus_event_presence_confirm'],
-      request: {
-        method: 'PUT',
-        body: JSON.stringify(processable.map(presence => presence.id))
-      },
-      success: refresher.update
-    },
-    displayed: 0 !== processable.length,
-    group: trans('validation', {}, 'presence'),
-    scope: ['collection', 'object']
-  }
-}
diff --git a/src/plugin/cursus/Resources/modules/event/components/list.jsx b/src/plugin/cursus/Resources/modules/event/components/list.jsx
index 1317a120df9..f387722ae0c 100644
--- a/src/plugin/cursus/Resources/modules/event/components/list.jsx
+++ b/src/plugin/cursus/Resources/modules/event/components/list.jsx
@@ -103,6 +103,19 @@ const Events = (props) =>
         displayed: hasPermission('edit', rows[0]),
         group: trans('presences', {}, 'cursus'),
         target: ['apiv2_cursus_event_presence_download', {id: rows[0].id, filled: 1}]
+      }, {
+        name: 'confirm-status',
+        type: ASYNC_BUTTON,
+        icon: 'fa fa-fw fa-clipboard-check',
+        label: trans('presence_validation', {}, 'presence'),
+        displayed: hasPermission('edit', rows[0]),
+        group: trans('validation', {}, 'presence'),
+        request: {
+          url: ['apiv2_cursus_event_presence_confirm', {id: rows[0].id}],
+          request: {
+            method: 'PUT'
+          }
+        }
       }
     ].concat(props.customActions(rows))}
     delete={{
diff --git a/src/plugin/cursus/Resources/modules/event/components/page.jsx b/src/plugin/cursus/Resources/modules/event/components/page.jsx
index c5905174013..33f28a07eaa 100644
--- a/src/plugin/cursus/Resources/modules/event/components/page.jsx
+++ b/src/plugin/cursus/Resources/modules/event/components/page.jsx
@@ -5,7 +5,7 @@ import isEmpty from 'lodash/isEmpty'
 
 import {trans} from '#/main/app/intl/translation'
 import {hasPermission} from '#/main/app/security'
-import {MODAL_BUTTON, URL_BUTTON} from '#/main/app/buttons'
+import {MODAL_BUTTON, URL_BUTTON, ASYNC_BUTTON} from '#/main/app/buttons'
 import {ContentLoader} from '#/main/app/content/components/loader'
 import {ToolPage} from '#/main/core/tool'
 
@@ -82,6 +82,19 @@ const EventPage = (props) => {
           displayed: hasPermission('edit', props.event),
           group: trans('presences', {}, 'cursus'),
           target: ['apiv2_cursus_event_presence_download', {id: props.event.id, filled: 1}]
+        }, {
+          name: 'confirm-status',
+          type: ASYNC_BUTTON,
+          icon: 'fa fa-fw fa-clipboard-check',
+          label: trans('presence_validation', {}, 'presence'),
+          displayed: hasPermission('edit', props.event),
+          group: trans('validation', {}, 'presence'),
+          request: {
+            url: ['apiv2_cursus_event_presence_confirm', {id: props.event.id}],
+            request: {
+              method: 'PUT'
+            }
+          }
         }
       ]}
 
diff --git a/src/plugin/cursus/Resources/modules/plugin.js b/src/plugin/cursus/Resources/modules/plugin.js
index 48b74fe4c98..a8012452ea1 100644
--- a/src/plugin/cursus/Resources/modules/plugin.js
+++ b/src/plugin/cursus/Resources/modules/plugin.js
@@ -53,7 +53,6 @@ registry.add('ClarolineCursusBundle', {
       'mark-absent-unjustified': () => { return import(/* webpackChunkName: "training-action-presence-absent-unjustified" */ '#/plugin/cursus/actions/presence/mark-absent-unjustified') },
       'mark-absent-present'    : () => { return import(/* webpackChunkName: "training-action-presence-present" */ '#/plugin/cursus/actions/presence/mark-present') },
       'mark-unknown'           : () => { return import(/* webpackChunkName: "training-action-presence-unknown" */ '#/plugin/cursus/actions/presence/mark-unknown') },
-      'confirm-presence'       : () => { return import(/* webpackChunkName: "training-action-presence-confirm" */ '#/plugin/cursus/actions/presence/confirm-presence') },
       'add-evidence'           : () => { return import(/* webpackChunkName: "training-action-presence-add-evidence" */ '#/plugin/cursus/actions/presence/add-evidence') }
     }
   },
diff --git a/src/plugin/cursus/Resources/modules/presence/components/list.jsx b/src/plugin/cursus/Resources/modules/presence/components/list.jsx
index 9e4817ca54b..a7c172c92a4 100644
--- a/src/plugin/cursus/Resources/modules/presence/components/list.jsx
+++ b/src/plugin/cursus/Resources/modules/presence/components/list.jsx
@@ -46,6 +46,19 @@ const Presences = props => {
           ),
           displayed: true
         }, {
+          name: 'presence_updated_by',
+          type: 'user',
+          label: trans('presence_updated_by', {}, 'presence'),
+          displayed: true
+        }, {
+          name: 'presence_updated_at',
+          type: 'date',
+          label: trans('presence_updated_at', {}, 'presence'),
+          displayed: true,
+          options: {
+            time: true
+          }
+        },{
           name: 'validation_date',
           type: 'date',
           label: trans('presence_confirmation_date', {}, 'presence'),
diff --git a/src/plugin/cursus/Resources/translations/presence.en.json b/src/plugin/cursus/Resources/translations/presence.en.json
index a5a65b4fd00..7d20e641fd9 100644
--- a/src/plugin/cursus/Resources/translations/presence.en.json
+++ b/src/plugin/cursus/Resources/translations/presence.en.json
@@ -16,10 +16,12 @@
   "presence_confirm_title": "Presence confirmation",
   "presence_confirm_desc": "Your %event_title% event signature has been successfully recorded.",
   "presence_confirm_other": "Confirm another presence",
-  "presence_confirmation_date": "Confirmation date",
+  "presence_confirmation_date": "Validation date",
   "presence_validation_date": "Validation date by tutor",
   "presence_info": "Me, %user%, was present at the event %event_title% from %event_date_start% to %event_date_end%.",
-  "presence_validation": "Validate presence",
+  "presence_validation": "Validate status",
+  "presence_updated_by": "Status updated by",
+  "presence_updated_at": "Update date",
 
   "validate": "Validate",
   "validation": "Validation"
diff --git a/src/plugin/cursus/Resources/translations/presence.fr.json b/src/plugin/cursus/Resources/translations/presence.fr.json
index c9589c0afd3..3aafec7970e 100644
--- a/src/plugin/cursus/Resources/translations/presence.fr.json
+++ b/src/plugin/cursus/Resources/translations/presence.fr.json
@@ -16,10 +16,12 @@
   "presence_confirm_title": "Confirmation de présence",
   "presence_confirm_desc": "Votre présence à la séance %event_title% a bien été enregistrée.",
   "presence_confirm_other": "Confirmer une autre présence",
-  "presence_confirmation_date": "Date de confirmation",
+  "presence_confirmation_date": "Date de validation",
   "presence_validation_date": "Date de validation par le formateur",
   "presence_info": "Moi, %user%, étais présent à la séance %event_title% du %event_datetime_start% au %event_datetime_end%.",
-  "presence_validation": "Confirmer la présence",
+  "presence_validation": "Valider les statuts",
+  "presence_updated_by": "Statut mis à jour par",
+  "presence_updated_at": "Date de mise à jour",
 
   "validate": "Valider",
   "validation": "Validation"
diff --git a/src/plugin/cursus/Serializer/EventPresenceSerializer.php b/src/plugin/cursus/Serializer/EventPresenceSerializer.php
index 7f30fa8f2d7..f4c966444ee 100644
--- a/src/plugin/cursus/Serializer/EventPresenceSerializer.php
+++ b/src/plugin/cursus/Serializer/EventPresenceSerializer.php
@@ -54,6 +54,8 @@ public function serialize(EventPresence $eventPresence, array $options = []): ar
             'signature' => $eventPresence->getSignature(),
             'validation_date' => DateNormalizer::normalize($eventPresence->getValidationDate()),
             'evidences' => $eventPresence->getEvidences(),
+            'presence_updated_by' => $eventPresence->getPresenceUpdatedBy() ? $this->userSerializer->serialize($eventPresence->getPresenceUpdatedBy(), [SerializerInterface::SERIALIZE_MINIMAL]) : null,
+            'presence_updated_at' => DateNormalizer::normalize($eventPresence->getPresenceUpdatedAt()),
         ];
 
         if (!in_array(SerializerInterface::SERIALIZE_TRANSFER, $options)) {
@@ -88,6 +90,15 @@ public function deserialize(array $data, EventPresence $eventPresence): EventPre
             $eventPresence->setEvidences($data['evidences'] ?? null);
         }
 
+        if (isset($data['presence_updated_by'])) {
+            $updatedBy = $this->om->getRepository(User::class)->findOneBy(['uuid' => $data['presence_updated_by']['id']]);
+            $eventPresence->setPresenceUpdatedBy($updatedBy);
+        }
+
+        if (isset($data['presence_updated_at'])) {
+            $eventPresence->setPresenceUpdatedAt(DateNormalizer::denormalize($data['presence_updated_at']));
+        }
+
         return $eventPresence;
     }
 }

From deedd2fb21a3a67b113de6615861bcade64bb7bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9becca=20Tinchon?= <rebecca.tinchon@hotmail.fr>
Date: Fri, 18 Oct 2024 11:01:11 +0200
Subject: [PATCH 2/4] Delete evidence

---
 .../Controller/EventPresenceController.php    | 19 ++++++++-
 .../modules/actions/presence/add-evidence.js  |  6 ++-
 .../actions/presence/delete-evidence.js       | 33 +++++++++++++++
 .../presence/evidences/components/modal.jsx   | 26 ++++++------
 .../modals/presence/evidences/store.js        |  6 +--
 src/plugin/cursus/Resources/modules/plugin.js |  3 +-
 .../modules/presence/components/list.jsx      | 41 ++++++-------------
 .../Resources/translations/presence.en.json   | 13 ++++--
 .../Resources/translations/presence.fr.json   | 13 ++++--
 9 files changed, 106 insertions(+), 54 deletions(-)
 create mode 100644 src/plugin/cursus/Resources/modules/actions/presence/delete-evidence.js

diff --git a/src/plugin/cursus/Controller/EventPresenceController.php b/src/plugin/cursus/Controller/EventPresenceController.php
index 8aac1dfc2e1..46adff587d1 100644
--- a/src/plugin/cursus/Controller/EventPresenceController.php
+++ b/src/plugin/cursus/Controller/EventPresenceController.php
@@ -267,7 +267,7 @@ public function downloadUserPdfAction(EventPresence $eventPresence, Request $req
     }
 
     /**
-     * @Route("/{id}/evidences", name="apiv2_cursus_presence_evidences_upload", methods={"POST"})
+     * @Route("/{id}/evidences", name="apiv2_cursus_presence_evidence_upload", methods={"POST"})
      *
      * @EXT\ParamConverter("eventPresence", class="Claroline\CursusBundle\Entity\EventPresence", options={"mapping": {"id": "uuid"}})
      */
@@ -298,6 +298,23 @@ public function uploadEvidences(EventPresence $eventPresence, Request $request):
         return new JsonResponse($this->serializer->serialize($eventPresence));
     }
 
+    /**
+     * @Route("/{id}/evidences", name="apiv2_cursus_presence_evidence_delete", methods={"DELETE"})
+     *
+     * @EXT\ParamConverter("eventPresence", class="Claroline\CursusBundle\Entity\EventPresence", options={"mapping": {"id": "uuid"}})
+     */
+    public function deleteEvidenceAction(EventPresence $eventPresence): JsonResponse
+    {
+        $this->checkPermission('EDIT', $eventPresence, [], true);
+
+        $eventPresence->setEvidences(null);
+
+        $this->om->persist($eventPresence);
+        $this->om->flush();
+
+        return new JsonResponse(['success' => true]);
+    }
+
     /**
      * @Route("/{id}/evidences", name="apiv2_cursus_presence_evidence_download", methods={"GET"})
      *
diff --git a/src/plugin/cursus/Resources/modules/actions/presence/add-evidence.js b/src/plugin/cursus/Resources/modules/actions/presence/add-evidence.js
index 7acf1aca7d5..9a97e3ca03b 100644
--- a/src/plugin/cursus/Resources/modules/actions/presence/add-evidence.js
+++ b/src/plugin/cursus/Resources/modules/actions/presence/add-evidence.js
@@ -11,13 +11,15 @@ export default (presences, refresher) => {
     name: 'add-evidence',
     type: MODAL_BUTTON,
     icon: 'fa fa-fw fa-file-upload',
-    label: trans('add_evidences', {}, 'presence'),
+    label: trans('add_evidence', {}, 'presence'),
     modal: [MODAL_EVIDENCE, {
       parent: processable[0],
       onSuccess: refresher.update,
       editable: true
     }],
-    displayed: 0 !== processable.length && [constants.PRESENCE_STATUS_ABSENT_UNJUSTIFIED, constants.PRESENCE_STATUS_ABSENT_JUSTIFIED].includes(processable[0].status),
+    displayed: 0 !== processable.length
+      && [constants.PRESENCE_STATUS_ABSENT_UNJUSTIFIED, constants.PRESENCE_STATUS_ABSENT_JUSTIFIED].includes(processable[0].status)
+      && (!processable[0].evidences || processable[0].evidences.length === 0),
     group: trans('validation', {}, 'presence'),
     scope: ['object']
   }
diff --git a/src/plugin/cursus/Resources/modules/actions/presence/delete-evidence.js b/src/plugin/cursus/Resources/modules/actions/presence/delete-evidence.js
new file mode 100644
index 00000000000..8be070f1b23
--- /dev/null
+++ b/src/plugin/cursus/Resources/modules/actions/presence/delete-evidence.js
@@ -0,0 +1,33 @@
+import {hasPermission} from '#/main/app/security'
+import {url} from '#/main/app/api'
+import {ASYNC_BUTTON} from '#/main/app/buttons'
+import {trans} from '#/main/app/intl/translation'
+
+/**
+ * Delete evidence action.
+ */
+export default (presences, refresher) => {
+  const processable = presences.filter(presence => hasPermission('edit', presence))
+
+  return {
+    name: 'delete-evidence',
+    type: ASYNC_BUTTON,
+    icon: 'fa fa-fw fa-trash',
+    label: trans('delete_evidence', {}, 'presence'),
+    displayed: 0 !== processable.length && (processable[0].evidences && processable[0].evidences.length > 0),
+    dangerous: true,
+    confirm: {
+      title: trans('delete_evidence', {}, 'presence'),
+      message: trans('delete_evidence_message', {}, 'presence')
+    },
+    request: {
+      url: url(['apiv2_cursus_presence_evidence_delete', {id: processable[0].id}]),
+      request: {
+        method: 'DELETE'
+      },
+      success: () => refresher.delete(processable)
+    },
+    group: trans('management'),
+    scope: ['object']
+  }
+}
diff --git a/src/plugin/cursus/Resources/modules/modals/presence/evidences/components/modal.jsx b/src/plugin/cursus/Resources/modules/modals/presence/evidences/components/modal.jsx
index 7f402cdf38b..45eac224756 100644
--- a/src/plugin/cursus/Resources/modules/modals/presence/evidences/components/modal.jsx
+++ b/src/plugin/cursus/Resources/modules/modals/presence/evidences/components/modal.jsx
@@ -4,7 +4,7 @@ import {PropTypes as T} from 'prop-types'
 
 import omit from 'lodash/omit'
 import classes from 'classnames'
-import isEmpty from 'lodash/isEmpty'
+import isNull from 'lodash/isNull'
 import {trans} from '#/main/app/intl/translation'
 
 import {CALLBACK_BUTTON} from '#/main/app/buttons'
@@ -15,28 +15,28 @@ import {actions} from '#/plugin/cursus/modals/presence/evidences/store'
 import {FileThumbnail} from '#/main/app/data/types/file/components/thumbnail'
 
 const EvidenceModalComponent = (props) => {
-  const [files, setFiles] = useState([])
+  const [file, setFile] = useState(null)
 
   return (
     <Modal
-      {...omit(props, 'parent', 'add', 'editable', 'createFiles')}
+      {...omit(props, 'parent', 'add', 'editable', 'createFile', 'onSuccess')}
       icon={classes('fa fa-fw', {
         'fa-file-upload': props.editable,
         'fa-file-lines': !props.editable
       })}
-      title={trans(props.editable ? 'add_evidences' : 'evidences', {}, 'presence')}
+      title={trans(props.editable ? 'add_evidence' : 'evidence', {}, 'presence')}
     >
       <div className="modal-body">
         {props.editable &&
           <DataInput
-            id="add-evidences-files"
+            id="add-evidence-file"
             type="file"
             label={trans('files')}
-            value={files}
-            onChange={setFiles}
+            value={file}
+            onChange={setFile}
             required={true}
             options={{
-              multiple: true,
+              multiple: false,
               autoUpload: false
             }}
           />
@@ -59,8 +59,8 @@ const EvidenceModalComponent = (props) => {
           type={CALLBACK_BUTTON}
           primary={true}
           label={trans('add', {}, 'actions')}
-          disabled={isEmpty(files)}
-          callback={() => props.createFiles(props.parent, files, () => {
+          disabled={isNull(file)}
+          callback={() => props.createFile(props.parent, file, () => {
             props.onSuccess()
             props.fadeModal()
           })}
@@ -74,15 +74,15 @@ EvidenceModalComponent.propTypes = {
   parent: T.object.isRequired,
   editable: T.bool.isRequired,
   onSuccess: T.func.isRequired,
-  createFiles: T.func.isRequired,
+  createFile: T.func.isRequired,
   fadeModal: T.func.isRequired
 }
 
 const EvidenceModal = connect(
   null,
   (dispatch) => ({
-    createFiles(parent, files, callback) {
-      dispatch(actions.createFiles(parent, files, callback))
+    createFile(parent, file, callback) {
+      dispatch(actions.createFile(parent, file, callback))
     }
   })
 )(EvidenceModalComponent)
diff --git a/src/plugin/cursus/Resources/modules/modals/presence/evidences/store.js b/src/plugin/cursus/Resources/modules/modals/presence/evidences/store.js
index 7f0cdaf5497..9cf798a6187 100644
--- a/src/plugin/cursus/Resources/modules/modals/presence/evidences/store.js
+++ b/src/plugin/cursus/Resources/modules/modals/presence/evidences/store.js
@@ -1,13 +1,13 @@
 import {API_REQUEST} from '#/main/app/api'
 export const actions = {}
 
-actions.createFiles = (presence, files, onSuccess) => {
+actions.createFile = (presence, file, onSuccess) => {
   const formData = new FormData()
-  files.forEach((file, index) => formData.append(index, file))
+  formData.append(0, file)
 
   return ({
     [API_REQUEST]: {
-      url: ['apiv2_cursus_presence_evidences_upload', {id: presence.id}],
+      url: ['apiv2_cursus_presence_evidence_upload', {id: presence.id}],
       type: 'upload',
       request: {
         method: 'POST',
diff --git a/src/plugin/cursus/Resources/modules/plugin.js b/src/plugin/cursus/Resources/modules/plugin.js
index a8012452ea1..9ee6c1f2ebe 100644
--- a/src/plugin/cursus/Resources/modules/plugin.js
+++ b/src/plugin/cursus/Resources/modules/plugin.js
@@ -53,7 +53,8 @@ registry.add('ClarolineCursusBundle', {
       'mark-absent-unjustified': () => { return import(/* webpackChunkName: "training-action-presence-absent-unjustified" */ '#/plugin/cursus/actions/presence/mark-absent-unjustified') },
       'mark-absent-present'    : () => { return import(/* webpackChunkName: "training-action-presence-present" */ '#/plugin/cursus/actions/presence/mark-present') },
       'mark-unknown'           : () => { return import(/* webpackChunkName: "training-action-presence-unknown" */ '#/plugin/cursus/actions/presence/mark-unknown') },
-      'add-evidence'           : () => { return import(/* webpackChunkName: "training-action-presence-add-evidence" */ '#/plugin/cursus/actions/presence/add-evidence') }
+      'add-evidence'           : () => { return import(/* webpackChunkName: "training-action-presence-add-evidence" */ '#/plugin/cursus/actions/presence/add-evidence') },
+      'delete-evidence'        : () => { return import(/* webpackChunkName: "training-action-presence-delete-evidence" */ '#/plugin/cursus/actions/presence/delete-evidence') }
     }
   },
 
diff --git a/src/plugin/cursus/Resources/modules/presence/components/list.jsx b/src/plugin/cursus/Resources/modules/presence/components/list.jsx
index a7c172c92a4..a6970017f22 100644
--- a/src/plugin/cursus/Resources/modules/presence/components/list.jsx
+++ b/src/plugin/cursus/Resources/modules/presence/components/list.jsx
@@ -5,13 +5,12 @@ import omit from 'lodash/omit'
 import merge from 'lodash/merge'
 import classes from 'classnames'
 
-import {trans, transChoice} from '#/main/app/intl/translation'
+import {trans} from '#/main/app/intl/translation'
 import {Button} from '#/main/app/action'
 import {constants} from '#/plugin/cursus/constants'
-import {MODAL_BUTTON, DOWNLOAD_BUTTON} from '#/main/app/buttons'
+import {DOWNLOAD_BUTTON} from '#/main/app/buttons'
 import {ListData} from '#/main/app/content/list/containers/data'
 import {actions as listActions} from '#/main/app/content/list/store'
-import {MODAL_EVIDENCE} from '#/plugin/cursus/modals/presence/evidences'
 import {selectors as securitySelectors} from '#/main/app/security/store'
 import {getActions, getDefaultAction} from '#/plugin/cursus/presence/utils'
 
@@ -69,34 +68,20 @@ const Presences = props => {
         }, {
           name: 'evidences',
           type: 'number',
-          label: trans('evidences', {}, 'presence'),
+          label: trans('evidence', {}, 'presence'),
           displayed: true,
           render: (row) => {
-            if (row.evidences && row.evidences.length > 0) {
-              if( row.evidences.length === 1) {
-                return (
-                  <Button
-                    className="btn btn-link"
-                    type={DOWNLOAD_BUTTON}
-                    label={(transChoice('evidence_count', 1, {count: 1}, 'presence') )}
-                    file={{url: ['apiv2_cursus_presence_evidence_download', {id: row.id, file: row.evidences[0]}]}}
-                  />
-                )
-              } else {
-                return (
-                  <Button
-                    className="btn btn-link"
-                    type={MODAL_BUTTON}
-                    label={(transChoice('evidence_count', row.evidences.length, { count: row.evidences.length }, 'presence') )}
-                    modal={[MODAL_EVIDENCE, {
-                      parent: row,
-                      editable: false
-                    }]}
-                  />
-                )
-              }
+            if (row.evidences && row.evidences.length === 1) {
+              return (
+                <Button
+                  className="btn btn-link"
+                  type={DOWNLOAD_BUTTON}
+                  label={trans('download_evidence', {}, 'presence')}
+                  file={{url: ['apiv2_cursus_presence_evidence_download', {id: row.id, file: row.evidences[0]}]}}
+                />
+              )
             } else {
-              return transChoice('evidence_count', 0, { count: 0 }, 'presence')
+              return trans('no_evidence', {}, 'presence')
             }
           }
         }, {
diff --git a/src/plugin/cursus/Resources/translations/presence.en.json b/src/plugin/cursus/Resources/translations/presence.en.json
index 7d20e641fd9..eb79d3b6f9f 100644
--- a/src/plugin/cursus/Resources/translations/presence.en.json
+++ b/src/plugin/cursus/Resources/translations/presence.en.json
@@ -1,8 +1,15 @@
 {
-  "add_evidences": "Add evidence",
+  "add_evidence": "Add evidence",
   "evidence": "Evidence",
-  "evidences": "Evidences",
-  "evidence_count": "{0} No evidence | {1} 1 evidence | ]1,Inf[ %count% evidences",
+
+  "show_evidence": "Show evidence",
+
+  "download_evidence": "Download evidence",
+  "no_evidence": "No evidence",
+
+  "delete_evidence": "Delete evidence",
+  "delete_evidence_message": "Are you sure you want to delete this evidence?",
+
   "event_not_found": "Event not found",
   "event_not_found_desc": "This code does not correspond to any event.",
   "event_not_found_retry": "Enter again event code",
diff --git a/src/plugin/cursus/Resources/translations/presence.fr.json b/src/plugin/cursus/Resources/translations/presence.fr.json
index 3aafec7970e..6bb502a3716 100644
--- a/src/plugin/cursus/Resources/translations/presence.fr.json
+++ b/src/plugin/cursus/Resources/translations/presence.fr.json
@@ -1,8 +1,15 @@
 {
-  "add_evidences": "Ajouter un justificatif",
+  "add_evidence": "Ajouter un justificatif",
   "evidence": "Justificatif",
-  "evidences": "Justificatifs",
-  "evidence_count": "{0} Aucun justificatif | {1} 1 justificatif | ]1,Inf[ %count% justificatifs",
+
+  "show_evidence": "Afficher le justificatif",
+
+  "download_evidence": "Télécharger le justificatif",
+  "no_evidence": "Aucun justificatif",
+
+  "delete_evidence": "Supprimer le justificatif",
+  "delete_evidence_message": "Êtes-vous sûr de vouloir supprimer ce justificatif ?",
+
   "event_not_found": "Séance introuvable",
   "event_not_found_desc": "Ce code ne correspond à aucune séance.",
   "event_not_found_retry": "Saisir à nouveau le code de la séance",

From 6f887265edf94509f937812011b8a30d45ddf4c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9becca=20Tinchon?= <rebecca.tinchon@hotmail.fr>
Date: Fri, 18 Oct 2024 13:27:28 +0200
Subject: [PATCH 3/4] Evidence info

---
 .../Controller/EventPresenceController.php    |  2 +
 src/plugin/cursus/Entity/EventPresence.php    | 36 ++++++++++
 .../Migrations/Version20241018093354.php      | 47 +++++++++++++
 .../presence/about/components/modal.jsx       | 70 +++++++++++++++++++
 .../modules/modals/presence/about/index.js    | 17 +++++
 .../modules/presence/components/list.jsx      | 11 +--
 .../Resources/translations/presence.en.json   |  3 +
 .../Resources/translations/presence.fr.json   |  3 +
 .../Serializer/EventPresenceSerializer.php    | 11 +++
 9 files changed, 195 insertions(+), 5 deletions(-)
 create mode 100644 src/plugin/cursus/Installation/Migrations/Version20241018093354.php
 create mode 100644 src/plugin/cursus/Resources/modules/modals/presence/about/components/modal.jsx
 create mode 100644 src/plugin/cursus/Resources/modules/modals/presence/about/index.js

diff --git a/src/plugin/cursus/Controller/EventPresenceController.php b/src/plugin/cursus/Controller/EventPresenceController.php
index 46adff587d1..db1cf74d848 100644
--- a/src/plugin/cursus/Controller/EventPresenceController.php
+++ b/src/plugin/cursus/Controller/EventPresenceController.php
@@ -291,6 +291,8 @@ public function uploadEvidences(EventPresence $eventPresence, Request $request):
         }
 
         $eventPresence->setEvidences($evidences);
+        $eventPresence->setEvidenceAddedBy($this->tokenStorage->getToken()->getUser());
+        $eventPresence->setEvidenceAddedAt(new \DateTime());
 
         $this->om->persist($eventPresence);
         $this->om->flush();
diff --git a/src/plugin/cursus/Entity/EventPresence.php b/src/plugin/cursus/Entity/EventPresence.php
index e44ab0078a5..b86eb0b8799 100644
--- a/src/plugin/cursus/Entity/EventPresence.php
+++ b/src/plugin/cursus/Entity/EventPresence.php
@@ -74,6 +74,18 @@ class EventPresence
      */
     private ?\DateTimeInterface $presenceUpdatedAt = null;
 
+    /**
+     * @ORM\ManyToOne(targetEntity="Claroline\CoreBundle\Entity\User")
+     *
+     * @ORM\JoinColumn(name="evidence_added_by", referencedColumnName="id", nullable=true)
+     */
+    private ?User $evidenceAddedBy = null;
+
+    /**
+     * @ORM\Column(name="evidence_added_at", type="datetime", nullable=true)
+     */
+    private ?\DateTimeInterface $evidenceAddedAt = null;
+
     public function __construct()
     {
         $this->refreshUuid();
@@ -162,4 +174,28 @@ public function setPresenceUpdatedAt(?\DateTimeInterface $date): self
 
         return $this;
     }
+
+    public function getEvidenceAddedBy(): ?User
+    {
+        return $this->evidenceAddedBy;
+    }
+
+    public function setEvidenceAddedBy(?User $user): self
+    {
+        $this->evidenceAddedBy = $user;
+
+        return $this;
+    }
+
+    public function getEvidenceAddedAt(): ?\DateTimeInterface
+    {
+        return $this->evidenceAddedAt;
+    }
+
+    public function setEvidenceAddedAt(?\DateTimeInterface $date): self
+    {
+        $this->evidenceAddedAt = $date;
+
+        return $this;
+    }
 }
diff --git a/src/plugin/cursus/Installation/Migrations/Version20241018093354.php b/src/plugin/cursus/Installation/Migrations/Version20241018093354.php
new file mode 100644
index 00000000000..c1a77a57940
--- /dev/null
+++ b/src/plugin/cursus/Installation/Migrations/Version20241018093354.php
@@ -0,0 +1,47 @@
+<?php
+
+namespace Claroline\CursusBundle\Installation\Migrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Auto-generated migration based on mapping information: modify it with caution.
+ *
+ * Generation date: 2024/10/18 09:33:56
+ */
+final class Version20241018093354 extends AbstractMigration
+{
+    public function up(Schema $schema): void
+    {
+        $this->addSql('
+            ALTER TABLE claro_cursusbundle_presence_status 
+            ADD evidence_added_by INT DEFAULT NULL, 
+            ADD evidence_added_at DATETIME DEFAULT NULL
+        ');
+        $this->addSql('
+            ALTER TABLE claro_cursusbundle_presence_status 
+            ADD CONSTRAINT FK_DFE5E1FEEE7B114B FOREIGN KEY (evidence_added_by) 
+            REFERENCES claro_user (id)
+        ');
+        $this->addSql('
+            CREATE INDEX IDX_DFE5E1FEEE7B114B ON claro_cursusbundle_presence_status (evidence_added_by)
+        ');
+    }
+
+    public function down(Schema $schema): void
+    {
+        $this->addSql('
+            ALTER TABLE claro_cursusbundle_presence_status 
+            DROP FOREIGN KEY FK_DFE5E1FEEE7B114B
+        ');
+        $this->addSql('
+            DROP INDEX IDX_DFE5E1FEEE7B114B ON claro_cursusbundle_presence_status
+        ');
+        $this->addSql('
+            ALTER TABLE claro_cursusbundle_presence_status 
+            DROP evidence_added_by, 
+            DROP evidence_added_at
+        ');
+    }
+}
diff --git a/src/plugin/cursus/Resources/modules/modals/presence/about/components/modal.jsx b/src/plugin/cursus/Resources/modules/modals/presence/about/components/modal.jsx
new file mode 100644
index 00000000000..142ea80fa57
--- /dev/null
+++ b/src/plugin/cursus/Resources/modules/modals/presence/about/components/modal.jsx
@@ -0,0 +1,70 @@
+import React from 'react'
+import omit from 'lodash/omit'
+
+import {displayDate} from '#/main/app/intl'
+import {trans} from '#/main/app/intl/translation'
+
+import {ContentHtml} from '#/main/app/content/components/html'
+import {Modal} from '#/main/app/overlays/modal/components/modal'
+import {DetailsData} from '#/main/app/content/details/components/data'
+import {FileThumbnail} from '#/main/app/data/types/file/components/thumbnail'
+
+const EvidenceAboutModal = (props) =>
+  <Modal
+    {...omit(props)}
+    icon="fa fa-fw fa-file-invoice"
+    title={trans('Justificatif de présence')}
+  >
+    <div className="modal-body">
+      <div className="bg-body-secondary rounded-2 p-4">
+        <ContentHtml className="mb-3">
+          {trans('evidence_info', {
+            user: '<span class="text-uppercase">' + props.presence.user.name + '</span>',
+            event_title: '<span class="text-uppercase">' + props.presence.event.name + '</span>',
+            event_datetime_start: '<span class="fw-bold text-uppercase">' + displayDate(props.presence.event.start, true, true) + '</span>',
+            event_datetime_end: '<span class="fw-bold text-uppercase">' + displayDate(props.presence.event.end, true, true) + '</span>'
+          }, 'presence')}
+        </ContentHtml>
+      </div>
+
+      <DetailsData
+        flush={true}
+        data={props.presence}
+        definition={[
+          {
+            title: trans('general'),
+            primary: true,
+            fields: [
+              {
+                name: 'evidence_added_by',
+                type: 'user',
+                label: trans('evidence_added_by', {}, 'presence')
+              }, {
+                name: 'evidence_added_at',
+                type: 'date',
+                label: trans('evidence_added_at', {}, 'presence'),
+                displayed: true,
+                options: {
+                  time: true
+                }
+              }, {
+                name: 'file',
+                type: 'file',
+                label: trans('file'),
+                render: () => (
+                  <FileThumbnail
+                    file={props.presence.evidences[0]}
+                    download={{url: ['apiv2_cursus_presence_evidence_download', {id: props.presence.id, file: props.presence.evidences[0]}]}}
+                  />
+                )
+              }
+            ]
+          }
+        ]}
+      />
+    </div>
+  </Modal>
+
+export {
+  EvidenceAboutModal
+}
diff --git a/src/plugin/cursus/Resources/modules/modals/presence/about/index.js b/src/plugin/cursus/Resources/modules/modals/presence/about/index.js
new file mode 100644
index 00000000000..62a6b1ba8ef
--- /dev/null
+++ b/src/plugin/cursus/Resources/modules/modals/presence/about/index.js
@@ -0,0 +1,17 @@
+/**
+ * Evidence aboout modal.
+ */
+
+import {registry} from '#/main/app/modals/registry'
+
+// gets the modal component
+import {EvidenceAboutModal} from '#/plugin/cursus/modals/presence/about/components/modal'
+
+const MODAL_EVIDENCE_ABOUT = 'MODAL_EVIDENCE_ABOUT'
+
+// make the modal available for use
+registry.add(MODAL_EVIDENCE_ABOUT, EvidenceAboutModal)
+
+export {
+  MODAL_EVIDENCE_ABOUT
+}
diff --git a/src/plugin/cursus/Resources/modules/presence/components/list.jsx b/src/plugin/cursus/Resources/modules/presence/components/list.jsx
index a6970017f22..a21393ac481 100644
--- a/src/plugin/cursus/Resources/modules/presence/components/list.jsx
+++ b/src/plugin/cursus/Resources/modules/presence/components/list.jsx
@@ -8,11 +8,12 @@ import classes from 'classnames'
 import {trans} from '#/main/app/intl/translation'
 import {Button} from '#/main/app/action'
 import {constants} from '#/plugin/cursus/constants'
-import {DOWNLOAD_BUTTON} from '#/main/app/buttons'
+import {MODAL_BUTTON} from '#/main/app/buttons'
 import {ListData} from '#/main/app/content/list/containers/data'
 import {actions as listActions} from '#/main/app/content/list/store'
 import {selectors as securitySelectors} from '#/main/app/security/store'
 import {getActions, getDefaultAction} from '#/plugin/cursus/presence/utils'
+import {MODAL_EVIDENCE_ABOUT} from '#/plugin/cursus/modals/presence/about'
 
 const Presences = props => {
   const refresher = merge({
@@ -68,16 +69,16 @@ const Presences = props => {
         }, {
           name: 'evidences',
           type: 'number',
-          label: trans('evidence', {}, 'presence'),
+          label: trans('show_evidence', {}, 'presence'),
           displayed: true,
           render: (row) => {
             if (row.evidences && row.evidences.length === 1) {
               return (
                 <Button
                   className="btn btn-link"
-                  type={DOWNLOAD_BUTTON}
-                  label={trans('download_evidence', {}, 'presence')}
-                  file={{url: ['apiv2_cursus_presence_evidence_download', {id: row.id, file: row.evidences[0]}]}}
+                  type={MODAL_BUTTON}
+                  label={trans('show_evidence', {}, 'presence')}
+                  modal={[MODAL_EVIDENCE_ABOUT, {presence: row}]}
                 />
               )
             } else {
diff --git a/src/plugin/cursus/Resources/translations/presence.en.json b/src/plugin/cursus/Resources/translations/presence.en.json
index eb79d3b6f9f..0a808a97569 100644
--- a/src/plugin/cursus/Resources/translations/presence.en.json
+++ b/src/plugin/cursus/Resources/translations/presence.en.json
@@ -3,6 +3,9 @@
   "evidence": "Evidence",
 
   "show_evidence": "Show evidence",
+  "evidence_added_by": "Evidence added by :",
+  "evidence_added_at": "Added at :",
+  "evidence_info": "Evidence of absence of %user%, at the event \"%event_title%\" from %event_datetime_start% to %event_datetime_end%.",
 
   "download_evidence": "Download evidence",
   "no_evidence": "No evidence",
diff --git a/src/plugin/cursus/Resources/translations/presence.fr.json b/src/plugin/cursus/Resources/translations/presence.fr.json
index 6bb502a3716..9e1eb25688c 100644
--- a/src/plugin/cursus/Resources/translations/presence.fr.json
+++ b/src/plugin/cursus/Resources/translations/presence.fr.json
@@ -3,6 +3,9 @@
   "evidence": "Justificatif",
 
   "show_evidence": "Afficher le justificatif",
+  "evidence_added_by": "Justificatif ajouté par :",
+  "evidence_added_at": "Ajouté le :",
+  "evidence_info": "Justificatif de l'absence de %user%, à la séance \"%event_title%\" du %event_datetime_start% au %event_datetime_end%.",
 
   "download_evidence": "Télécharger le justificatif",
   "no_evidence": "Aucun justificatif",
diff --git a/src/plugin/cursus/Serializer/EventPresenceSerializer.php b/src/plugin/cursus/Serializer/EventPresenceSerializer.php
index f4c966444ee..0d840ce4aec 100644
--- a/src/plugin/cursus/Serializer/EventPresenceSerializer.php
+++ b/src/plugin/cursus/Serializer/EventPresenceSerializer.php
@@ -56,6 +56,8 @@ public function serialize(EventPresence $eventPresence, array $options = []): ar
             'evidences' => $eventPresence->getEvidences(),
             'presence_updated_by' => $eventPresence->getPresenceUpdatedBy() ? $this->userSerializer->serialize($eventPresence->getPresenceUpdatedBy(), [SerializerInterface::SERIALIZE_MINIMAL]) : null,
             'presence_updated_at' => DateNormalizer::normalize($eventPresence->getPresenceUpdatedAt()),
+            'evidence_added_by' => $eventPresence->getEvidenceAddedBy() ? $this->userSerializer->serialize($eventPresence->getEvidenceAddedBy(), [SerializerInterface::SERIALIZE_MINIMAL]) : null,
+            'evidence_added_at' => DateNormalizer::normalize($eventPresence->getEvidenceAddedAt()),
         ];
 
         if (!in_array(SerializerInterface::SERIALIZE_TRANSFER, $options)) {
@@ -99,6 +101,15 @@ public function deserialize(array $data, EventPresence $eventPresence): EventPre
             $eventPresence->setPresenceUpdatedAt(DateNormalizer::denormalize($data['presence_updated_at']));
         }
 
+        if (isset($data['evidence_added_by'])) {
+            $addedBy = $this->om->getRepository(User::class)->findOneBy(['uuid' => $data['evidence_added_by']['id']]);
+            $eventPresence->setEvidenceAddedBy($addedBy);
+        }
+
+        if (isset($data['evidence_added_at'])) {
+            $eventPresence->setEvidenceAddedAt(DateNormalizer::denormalize($data['evidence_added_at']));
+        }
+
         return $eventPresence;
     }
 }

From 64c1c68cfe6e70e569246fc5bc9faab69a7bd8df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9becca=20Tinchon?= <rebecca.tinchon@hotmail.fr>
Date: Fri, 25 Oct 2024 14:51:35 +0200
Subject: [PATCH 4/4] PR review

---
 .../Controller/EventPresenceController.php    | 24 +++++------
 src/plugin/cursus/Entity/EventPresence.php    | 41 ++++++-------------
 .../Migrations/Version20240408151719.php      |  4 +-
 .../Migrations/Version20241014084016.php      | 12 +++---
 .../modules/presence/components/list.jsx      | 20 ++++-----
 .../Resources/translations/presence.en.json   |  4 +-
 .../Resources/translations/presence.fr.json   |  4 +-
 .../Serializer/EventPresenceSerializer.php    | 26 +++++++-----
 8 files changed, 60 insertions(+), 75 deletions(-)

diff --git a/src/plugin/cursus/Controller/EventPresenceController.php b/src/plugin/cursus/Controller/EventPresenceController.php
index db1cf74d848..c4ef612bae9 100644
--- a/src/plugin/cursus/Controller/EventPresenceController.php
+++ b/src/plugin/cursus/Controller/EventPresenceController.php
@@ -93,8 +93,8 @@ public function signStatusAction(Request $request): JsonResponse
 
         $presence->setStatus(EventPresence::PRESENT);
         $presence->setSignature($signature);
-        $presence->setPresenceUpdatedBy($this->tokenStorage->getToken()->getUser());
-        $presence->setPresenceUpdatedAt(new \DateTime());
+        $presence->setUpdatedBy($this->tokenStorage->getToken()->getUser());
+        $presence->setUpdatedAt(new \DateTime());
 
         $this->om->persist($presence);
         $this->om->flush();
@@ -217,8 +217,8 @@ public function updateStatusAction(string $status, Request $request): JsonRespon
 
             $this->manager->setStatus([$presence], $status);
 
-            $presence->setPresenceUpdatedBy($this->tokenStorage->getToken()->getUser());
-            $presence->setPresenceUpdatedAt(new \DateTime());
+            $presence->setUpdatedBy($this->tokenStorage->getToken()->getUser());
+            $presence->setUpdatedAt(new \DateTime());
         }
 
         $this->om->endFlushSuite();
@@ -267,20 +267,20 @@ public function downloadUserPdfAction(EventPresence $eventPresence, Request $req
     }
 
     /**
-     * @Route("/{id}/evidences", name="apiv2_cursus_presence_evidence_upload", methods={"POST"})
+     * @Route("/{id}/evidence", name="apiv2_cursus_presence_evidence_upload", methods={"POST"})
      *
      * @EXT\ParamConverter("eventPresence", class="Claroline\CursusBundle\Entity\EventPresence", options={"mapping": {"id": "uuid"}})
      */
-    public function uploadEvidences(EventPresence $eventPresence, Request $request): JsonResponse
+    public function uploadEvidence(EventPresence $eventPresence, Request $request): JsonResponse
     {
         $this->checkPermission('EDIT', $eventPresence, [], true);
 
         $files = $request->files->all();
 
-        $evidences = [];
+        $evidence = [];
         foreach ($files as $index => $file) {
             $evidenceFile = $this->manager->uploadEvidence($file, $eventPresence);
-            $evidences[] = [
+            $evidence[] = [
                 'type' => $evidenceFile->getMimeType(),
                 'mimeType' => $evidenceFile->getMimeType(),
                 'name' => $evidenceFile->getFilename(),
@@ -290,7 +290,7 @@ public function uploadEvidences(EventPresence $eventPresence, Request $request):
             ];
         }
 
-        $eventPresence->setEvidences($evidences);
+        $eventPresence->setEvidence($evidence);
         $eventPresence->setEvidenceAddedBy($this->tokenStorage->getToken()->getUser());
         $eventPresence->setEvidenceAddedAt(new \DateTime());
 
@@ -301,7 +301,7 @@ public function uploadEvidences(EventPresence $eventPresence, Request $request):
     }
 
     /**
-     * @Route("/{id}/evidences", name="apiv2_cursus_presence_evidence_delete", methods={"DELETE"})
+     * @Route("/{id}/evidence", name="apiv2_cursus_presence_evidence_delete", methods={"DELETE"})
      *
      * @EXT\ParamConverter("eventPresence", class="Claroline\CursusBundle\Entity\EventPresence", options={"mapping": {"id": "uuid"}})
      */
@@ -309,7 +309,7 @@ public function deleteEvidenceAction(EventPresence $eventPresence): JsonResponse
     {
         $this->checkPermission('EDIT', $eventPresence, [], true);
 
-        $eventPresence->setEvidences(null);
+        $eventPresence->setEvidence(null);
 
         $this->om->persist($eventPresence);
         $this->om->flush();
@@ -318,7 +318,7 @@ public function deleteEvidenceAction(EventPresence $eventPresence): JsonResponse
     }
 
     /**
-     * @Route("/{id}/evidences", name="apiv2_cursus_presence_evidence_download", methods={"GET"})
+     * @Route("/{id}/evidence", name="apiv2_cursus_presence_evidence_download", methods={"GET"})
      *
      * @EXT\ParamConverter("eventPresence", class="Claroline\CursusBundle\Entity\EventPresence", options={"mapping": {"id": "uuid"}})
      */
diff --git a/src/plugin/cursus/Entity/EventPresence.php b/src/plugin/cursus/Entity/EventPresence.php
index b86eb0b8799..9f4b9a07bbb 100644
--- a/src/plugin/cursus/Entity/EventPresence.php
+++ b/src/plugin/cursus/Entity/EventPresence.php
@@ -4,6 +4,7 @@
 
 use Claroline\AppBundle\Entity\Identifier\Id;
 use Claroline\AppBundle\Entity\Identifier\Uuid;
+use Claroline\AppBundle\Entity\Meta\UpdatedAt;
 use Claroline\CoreBundle\Entity\User;
 use Doctrine\ORM\Mapping as ORM;
 
@@ -16,6 +17,7 @@ class EventPresence
 {
     use Id;
     use Uuid;
+    use UpdatedAt;
 
     public const UNKNOWN = 'unknown';
     public const PRESENT = 'present';
@@ -60,19 +62,14 @@ class EventPresence
     /**
      * @ORM\Column(type="json", nullable=true)
      */
-    private ?array $evidences = null;
+    private ?array $evidence = null;
 
     /**
      * @ORM\ManyToOne(targetEntity="Claroline\CoreBundle\Entity\User")
      *
-     * @ORM\JoinColumn(name="presence_updated_by", referencedColumnName="id", nullable=true)
+     * @ORM\JoinColumn(name="updatedBy", referencedColumnName="id", nullable=true)
      */
-    private ?User $presenceUpdatedBy = null;
-
-    /**
-     * @ORM\Column(name="presence_updated_at", type="datetime", nullable=true)
-     */
-    private ?\DateTimeInterface $presenceUpdatedAt = null;
+    private ?User $updatedBy = null;
 
     /**
      * @ORM\ManyToOne(targetEntity="Claroline\CoreBundle\Entity\User")
@@ -141,36 +138,24 @@ public function setValidationDate(?\DateTimeInterface $validationDate): void
         $this->validationDate = $validationDate;
     }
 
-    public function getEvidences(): ?array
-    {
-        return $this->evidences;
-    }
-
-    public function setEvidences(?array $evidences): void
+    public function getEvidence(): ?array
     {
-        $this->evidences = $evidences;
+        return $this->evidence;
     }
 
-    public function getPresenceUpdatedBy(): ?User
+    public function setEvidence(?array $evidence): void
     {
-        return $this->presenceUpdatedBy;
-    }
-
-    public function setPresenceUpdatedBy(?User $user): self
-    {
-        $this->presenceUpdatedBy = $user;
-
-        return $this;
+        $this->evidence = $evidence;
     }
 
-    public function getPresenceUpdatedAt(): ?\DateTimeInterface
+    public function getUpdatedBy(): ?User
     {
-        return $this->presenceUpdatedAt;
+        return $this->updatedBy;
     }
 
-    public function setPresenceUpdatedAt(?\DateTimeInterface $date): self
+    public function setUpdatedBy(?User $user): self
     {
-        $this->presenceUpdatedAt = $date;
+        $this->updatedBy = $user;
 
         return $this;
     }
diff --git a/src/plugin/cursus/Installation/Migrations/Version20240408151719.php b/src/plugin/cursus/Installation/Migrations/Version20240408151719.php
index adaef5af070..4a0c3ec1af2 100644
--- a/src/plugin/cursus/Installation/Migrations/Version20240408151719.php
+++ b/src/plugin/cursus/Installation/Migrations/Version20240408151719.php
@@ -16,7 +16,7 @@ public function up(Schema $schema): void
     {
         $this->addSql("
             ALTER TABLE claro_cursusbundle_presence_status 
-            ADD evidences LONGTEXT DEFAULT NULL COMMENT '(DC2Type:json)'
+            ADD evidence LONGTEXT DEFAULT NULL COMMENT '(DC2Type:json)'
         ");
     }
 
@@ -24,7 +24,7 @@ public function down(Schema $schema): void
     {
         $this->addSql('
             ALTER TABLE claro_cursusbundle_presence_status 
-            DROP evidences
+            DROP evidence
         ');
     }
 }
diff --git a/src/plugin/cursus/Installation/Migrations/Version20241014084016.php b/src/plugin/cursus/Installation/Migrations/Version20241014084016.php
index 0a33576739f..8b94edb607a 100644
--- a/src/plugin/cursus/Installation/Migrations/Version20241014084016.php
+++ b/src/plugin/cursus/Installation/Migrations/Version20241014084016.php
@@ -16,16 +16,16 @@ public function up(Schema $schema): void
     {
         $this->addSql('
             ALTER TABLE claro_cursusbundle_presence_status 
-            ADD presence_updated_by INT DEFAULT NULL, 
-            ADD presence_updated_at DATETIME DEFAULT NULL
+            ADD updatedBy INT DEFAULT NULL, 
+            ADD updatedAt DATETIME DEFAULT NULL
         ');
         $this->addSql('
             ALTER TABLE claro_cursusbundle_presence_status 
-            ADD CONSTRAINT FK_DFE5E1FE349A94C7 FOREIGN KEY (presence_updated_by) 
+            ADD CONSTRAINT FK_DFE5E1FE349A94C7 FOREIGN KEY (updatedBy) 
             REFERENCES claro_user (id)
         ');
         $this->addSql('
-            CREATE INDEX IDX_DFE5E1FE349A94C7 ON claro_cursusbundle_presence_status (presence_updated_by)
+            CREATE INDEX IDX_DFE5E1FE349A94C7 ON claro_cursusbundle_presence_status (updatedBy)
         ');
     }
 
@@ -40,8 +40,8 @@ public function down(Schema $schema): void
         ');
         $this->addSql('
             ALTER TABLE claro_cursusbundle_presence_status 
-            DROP presence_updated_by, 
-            DROP presence_updated_at
+            DROP updatedBy, 
+            DROP updatedAt
         ');
     }
 }
diff --git a/src/plugin/cursus/Resources/modules/presence/components/list.jsx b/src/plugin/cursus/Resources/modules/presence/components/list.jsx
index a21393ac481..6c14eb4eddf 100644
--- a/src/plugin/cursus/Resources/modules/presence/components/list.jsx
+++ b/src/plugin/cursus/Resources/modules/presence/components/list.jsx
@@ -46,26 +46,22 @@ const Presences = props => {
           ),
           displayed: true
         }, {
-          name: 'presence_updated_by',
+          name: 'meta.updatedBy',
           type: 'user',
-          label: trans('presence_updated_by', {}, 'presence'),
-          displayed: true
+          label: trans('updated_by', {}, 'presence'),
+          displayed: false
         }, {
-          name: 'presence_updated_at',
+          name: 'meta.updatedAt',
           type: 'date',
-          label: trans('presence_updated_at', {}, 'presence'),
-          displayed: true,
-          options: {
-            time: true
-          }
+          label: trans('updated_at', {}, 'presence'),
+          displayed: false,
+          options: {time: true}
         },{
           name: 'validation_date',
           type: 'date',
           label: trans('presence_confirmation_date', {}, 'presence'),
           displayed: true,
-          options: {
-            time: true
-          }
+          options: {time: true}
         }, {
           name: 'evidences',
           type: 'number',
diff --git a/src/plugin/cursus/Resources/translations/presence.en.json b/src/plugin/cursus/Resources/translations/presence.en.json
index 0a808a97569..37da68c1c63 100644
--- a/src/plugin/cursus/Resources/translations/presence.en.json
+++ b/src/plugin/cursus/Resources/translations/presence.en.json
@@ -30,8 +30,8 @@
   "presence_validation_date": "Validation date by tutor",
   "presence_info": "Me, %user%, was present at the event %event_title% from %event_date_start% to %event_date_end%.",
   "presence_validation": "Validate status",
-  "presence_updated_by": "Status updated by",
-  "presence_updated_at": "Update date",
+  "updated_by": "Status updated by",
+  "updated_at": "Update date",
 
   "validate": "Validate",
   "validation": "Validation"
diff --git a/src/plugin/cursus/Resources/translations/presence.fr.json b/src/plugin/cursus/Resources/translations/presence.fr.json
index 9e1eb25688c..7e22f15f187 100644
--- a/src/plugin/cursus/Resources/translations/presence.fr.json
+++ b/src/plugin/cursus/Resources/translations/presence.fr.json
@@ -30,8 +30,8 @@
   "presence_validation_date": "Date de validation par le formateur",
   "presence_info": "Moi, %user%, étais présent à la séance %event_title% du %event_datetime_start% au %event_datetime_end%.",
   "presence_validation": "Valider les statuts",
-  "presence_updated_by": "Statut mis à jour par",
-  "presence_updated_at": "Date de mise à jour",
+  "updated_by": "Statut mis à jour par",
+  "updated_at": "Date de mise à jour",
 
   "validate": "Valider",
   "validation": "Validation"
diff --git a/src/plugin/cursus/Serializer/EventPresenceSerializer.php b/src/plugin/cursus/Serializer/EventPresenceSerializer.php
index 0d840ce4aec..c829c38655e 100644
--- a/src/plugin/cursus/Serializer/EventPresenceSerializer.php
+++ b/src/plugin/cursus/Serializer/EventPresenceSerializer.php
@@ -53,9 +53,11 @@ public function serialize(EventPresence $eventPresence, array $options = []): ar
             'status' => $eventPresence->getStatus(),
             'signature' => $eventPresence->getSignature(),
             'validation_date' => DateNormalizer::normalize($eventPresence->getValidationDate()),
-            'evidences' => $eventPresence->getEvidences(),
-            'presence_updated_by' => $eventPresence->getPresenceUpdatedBy() ? $this->userSerializer->serialize($eventPresence->getPresenceUpdatedBy(), [SerializerInterface::SERIALIZE_MINIMAL]) : null,
-            'presence_updated_at' => DateNormalizer::normalize($eventPresence->getPresenceUpdatedAt()),
+            'evidence' => $eventPresence->getEvidence(),
+            'meta' => [
+                'updatedBy' => $eventPresence->getUpdatedBy() ? $this->userSerializer->serialize($eventPresence->getUpdatedBy(), [SerializerInterface::SERIALIZE_MINIMAL]) : null,
+                'updatedAt' => DateNormalizer::normalize($eventPresence->getUpdatedAt()),
+            ],
             'evidence_added_by' => $eventPresence->getEvidenceAddedBy() ? $this->userSerializer->serialize($eventPresence->getEvidenceAddedBy(), [SerializerInterface::SERIALIZE_MINIMAL]) : null,
             'evidence_added_at' => DateNormalizer::normalize($eventPresence->getEvidenceAddedAt()),
         ];
@@ -88,17 +90,19 @@ public function deserialize(array $data, EventPresence $eventPresence): EventPre
             $eventPresence->setUser($user);
         }
 
-        if (array_key_exists('evidences', $data)) {
-            $eventPresence->setEvidences($data['evidences'] ?? null);
+        if (array_key_exists('evidence', $data)) {
+            $eventPresence->setEvidence($data['evidence'] ?? null);
         }
 
-        if (isset($data['presence_updated_by'])) {
-            $updatedBy = $this->om->getRepository(User::class)->findOneBy(['uuid' => $data['presence_updated_by']['id']]);
-            $eventPresence->setPresenceUpdatedBy($updatedBy);
-        }
+        if (isset($data['meta'])) {
+            if (isset($data['meta']['updatedBy'])) {
+                $updatedBy = $this->om->getRepository(User::class)->findOneBy(['uuid' => $data['updatedBy']['id']]);
+                $eventPresence->setUpdatedBy($updatedBy);
+            }
 
-        if (isset($data['presence_updated_at'])) {
-            $eventPresence->setPresenceUpdatedAt(DateNormalizer::denormalize($data['presence_updated_at']));
+            if (isset($data['meta']['updatedAt'])) {
+                $eventPresence->setUpdatedAt(DateNormalizer::denormalize($data['meta']['updatedAt']));
+            }
         }
 
         if (isset($data['evidence_added_by'])) {