Commit 58445132 authored by Thomas Hamel's avatar Thomas Hamel
Browse files

Merge branch 'feature_rncp_portfolio' into test

parents d8f18e02 9c2f608a
Loading
Loading
Loading
Loading
+6 −6
Changes for composer.lock: 6 added lines, 6 removed lines.
Original line number Diff line number Diff line
@@ -12134,7 +12134,7 @@
            "source": {
                "type": "git",
                "url": "https://git.unicaen.fr/lib/unicaen/db-import.git",
                "reference": "2909be5f8fdfea33859cd13da8e4a5400d90d49e"
                "reference": "88d6dfef6e3acebb5707c4f711e36c7eb01f1240"
            },
            "require": {
                "beberlei/assert": "^3.3",
@@ -12153,20 +12153,20 @@
            },
            "type": "library",
            "autoload": {
                "psr-0": {
                    "UnicaenDbImport": "src/"
                "psr-4": {
                    "UnicaenDbImport\\": "src/"
                },
                "classmap": [
                    "./Module.php"
                ]
            },
            "autoload-dev": {
                "psr-0": {
                    "UnicaenDbImportUnitTest": "test/"
                "psr-4": {
                    "UnicaenDbImportUnitTest\\": "test/"
                }
            },
            "description": "Module d'import entre bases de données",
            "time": "2026-02-12T13:02:45+00:00"
            "time": "2026-02-19T09:12:35+00:00"
        },
        {
            "name": "unicaen/etat",
+2 −3
Changes for doc/release-notes/fiche_rncp/02_publications.sql: 2 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -114,7 +114,7 @@ FROM tmp_publication_hal tmp
WITH pick AS (
    SELECT DISTINCT ON (doc.individu_id)
    doc.individu_id,
    trim(d.hal_id)
    d.hal_id
FROM diffusion d
    JOIN these t       ON t.id = d.these_id
    JOIN doctorant doc ON doc.id = t.doctorant_id
@@ -124,8 +124,7 @@ ORDER BY doc.individu_id, d.histo_modification DESC
UPDATE individu i
SET id_hal = btrim(pick.hal_id)
    FROM pick
WHERE i.id = pick.individu_id
  AND i.id_hal IS NULL;
WHERE i.id = pick.individu_id;

SELECT t.id, ind.id_hal
FROM these t
+8 −0
Changes for module/Doctorant/src/Doctorant/Renderer/DoctorantTemplateVariable.php: 8 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -103,6 +103,14 @@ class DoctorantTemplateVariable extends AbstractTemplateVariable
        return $this->target->getIndividu()->getSupannId();
    }

    /**
     * @noinspection
     */
    public function getSupannId(): ?string
    {
        return $this->target->getIndividu()->getSupannId();
    }

    /**
     * @noinspection
     */
+1 −1
Changes for module/RapportActivite/src/RapportActivite/Controller/Avis/RapportActiviteAvisController.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -183,7 +183,7 @@ class RapportActiviteAvisController extends AbstractController
     * @param RapportActiviteAvisEvent $event
     * @param string $paramName
     */
    protected function flashMessengerAddMessagesFromEvent(EventInterface $event, string $paramName = 'logs')
    protected function flashMessengerAddMessagesFromEvent(EventInterface $event, string $paramName = 'logs'): void
    {
        if ($messages = $event->getMessages()) {
            foreach ($messages as $namespace => $message) {