[Cursus] Presences

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->setUpdatedBy($this->tokenStorage->getToken()->getUser());
+        $presence->setUpdatedAt(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->setUpdatedBy($this->tokenStorage->getToken()->getUser());
+            $presence->setUpdatedAt(new \DateTime());
         }
 
         $this->om->endFlushSuite();
@@ -259,20 +267,20 @@ public function downloadUserPdfAction(EventPresence $eventPresence, Request $req
     }
 
     /**
-     * @Route("/{id}/evidences", name="apiv2_cursus_presence_evidences_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(),
@@ -282,7 +290,9 @@ public function uploadEvidences(EventPresence $eventPresence, Request $request):
             ];
         }
 
-        $eventPresence->setEvidences($evidences);
+        $eventPresence->setEvidence($evidence);
+        $eventPresence->setEvidenceAddedBy($this->tokenStorage->getToken()->getUser());
+        $eventPresence->setEvidenceAddedAt(new \DateTime());
 
         $this->om->persist($eventPresence);
         $this->om->flush();
@@ -291,7 +301,24 @@ public function uploadEvidences(EventPresence $eventPresence, Request $request):
     }
 
     /**
-     * @Route("/{id}/evidences", name="apiv2_cursus_presence_evidence_download", methods={"GET"})
+     * @Route("/{id}/evidence", 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->setEvidence(null);
+
+        $this->om->persist($eventPresence);
+        $this->om->flush();
+
+        return new JsonResponse(['success' => true]);
+    }
+
+    /**
+     * @Route("/{id}/evidence", name="apiv2_cursus_presence_evidence_download", methods={"GET"})
      *
      * @EXT\ParamConverter("eventPresence", class="Claroline\CursusBundle\Entity\EventPresence", options={"mapping": {"id": "uuid"}})
      */

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,7 +62,26 @@ 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="updatedBy", referencedColumnName="id", nullable=true)
+     */
+    private ?User $updatedBy = 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()
     {
@@ -117,13 +138,49 @@ public function setValidationDate(?\DateTimeInterface $validationDate): void
         $this->validationDate = $validationDate;
     }
 
-    public function getEvidences(): ?array
+    public function getEvidence(): ?array
+    {
+        return $this->evidence;
+    }
+
+    public function setEvidence(?array $evidence): void
+    {
+        $this->evidence = $evidence;
+    }
+
+    public function getUpdatedBy(): ?User
+    {
+        return $this->updatedBy;
+    }
+
+    public function setUpdatedBy(?User $user): self
+    {
+        $this->updatedBy = $user;
+
+        return $this;
+    }
+
+    public function getEvidenceAddedBy(): ?User
     {
-        return $this->evidences;
+        return $this->evidenceAddedBy;
     }
 
-    public function setEvidences(?array $evidences): void
+    public function setEvidenceAddedBy(?User $user): self
     {
-        $this->evidences = $evidences;
+        $this->evidenceAddedBy = $user;
+
+        return $this;
+    }
+
+    public function getEvidenceAddedAt(): ?\DateTimeInterface
+    {
+        return $this->evidenceAddedAt;
+    }
+
+    public function setEvidenceAddedAt(?\DateTimeInterface $date): self
+    {
+        $this->evidenceAddedAt = $date;
+
+        return $this;
     }
 }

src/plugin/cursus/Installation/Migrations/Version20240408151719.php

@@ -16,15 +16,15 @@ 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)'
         ");
     }
 
     public function down(Schema $schema): void
     {
         $this->addSql('
             ALTER TABLE claro_cursusbundle_presence_status 
-            DROP evidences
+            DROP evidence
         ');
     }
 }

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 updatedBy INT DEFAULT NULL, 
+            ADD updatedAt DATETIME DEFAULT NULL
+        ');
+        $this->addSql('
+            ALTER TABLE claro_cursusbundle_presence_status 
+            ADD CONSTRAINT FK_DFE5E1FE349A94C7 FOREIGN KEY (updatedBy) 
+            REFERENCES claro_user (id)
+        ');
+        $this->addSql('
+            CREATE INDEX IDX_DFE5E1FE349A94C7 ON claro_cursusbundle_presence_status (updatedBy)
+        ');
+    }
+
+    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 updatedBy, 
+            DROP updatedAt
+        ');
+    }
+}

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
+        ');
+    }
+}

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);

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']
   }