Commit eb735dca authored by Antony Le Courtes's avatar Antony Le Courtes
Browse files

Merge remote-tracking branch 'origin/b22' into b22

parents f870fdf4 b7e1bd1e

admin/actions/calcul-feuille-de-route.php

0 → 100644
+34 −0
Original line number Diff line number Diff line 
<?php



/** @var \Application\Service\WorkflowService $ws */

$ws = $oa->getContainer()->get(\Application\Service\WorkflowService::class);



$id = (int)$c->getArg(2);



if (0 === $id){

    $c->printDie('L\'ID valide d\'un intervenant doit être transmis en argument');

}



$intervenant = $ws->getEntityManager()->find(\Application\Entity\Db\Intervenant::class, $id);



if (!$intervenant){

    $c->printDie('L\'intervenant dont l\'ID est '.$id.' n\'existe pas');

}



$c->printMainTitle('Feuille de route de '.$intervenant);



$c->println('Année universitaire '.$intervenant->getAnnee());

$c->println('Statut '.lcfirst($intervenant->getStatut()));





$c->print('Calcul en cours ...');

$ws->calculerTableauxBord([], $intervenant);

$c->print("\r");



if (empty($errors)) {

    $c->println('Feuille de route actualisée', $c::COLOR_GREEN );

} else {

    foreach ($errors as $error) {

        $c->error($error);

    }

}
 
 No newline at end of file

admin/migration/v223Privileges.php

0 → 100644
+25 −0
Original line number Diff line number Diff line 
<?php



class v223Privileges extends AbstractMigration

{



    public function description(): string

    {

        return "Mise à jour de l'état de sortie de synthèse des privilèges pour se brancher sur la nouvelle vue";

    }







    public function utile(): bool

    {

        return $this->manager->hasNew('view', 'V_SYNTHESE_PRIVILEGE');

    }







    public function after()

    {

        $sql = "UPDATE etat_sortie SET REQUETE = 'SELECT * FROM v_synthese_privilege' WHERE code = 'synthese-privilege'";

        $this->manager->getBdd()->exec($sql);

    }

}
 
 No newline at end of file

composer.json

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
        "unicaen/utilisateur"                         : "6.0.4",

        "laminas/laminas-file"                        : "^2.8",

        "unicaen/code"                                : "6.0.10",

        "unicaen/import"                              : "6.0.1",

        "unicaen/import"                              : "6.0.2",

        "unicaen/tbl"                                 : "6.1.0",

        "unicaen/open-document"                       : "6.0.2",

        "unicaen/siham"                               : "6.0.2",

composer.lock

+5 −5
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",

        "This file is @generated automatically"

    ],

    "content-hash": "0299d6044b14d67c20d09c859f66fda1",

    "content-hash": "590b1ceac47297618f203ebef6d767c1",

    "packages": [

        {

            "name": "beberlei/assert",
@@ -7157,11 +7157,11 @@ 
        },

        {

            "name": "unicaen/import",

            "version": "6.0.1",

            "version": "6.0.2",

            "source": {

                "type": "git",

                "url": "https://git.unicaen.fr/lib/unicaen/import.git",

                "reference": "5676fabb0a5d506a5312714a614443a8d6dc8b10"

                "reference": "f5ca4f2ccd9a4684ab8bee7d9d7852f59634e396"

            },

            "require": {

                "unicaen/authentification": "^6.0",
@@ -7180,7 +7180,7 @@ 
                ]

            },

            "description": "Module d'import de données vers une base Oracle",

            "time": "2023-03-21T10:15:46+00:00"

            "time": "2023-11-29T09:07:23+00:00"

        },

        {

            "name": "unicaen/mail",
@@ -10445,5 +10445,5 @@ 
        "php": ">=8.0"

    },

    "platform-dev": [],

    "plugin-api-version": "2.3.0"

    "plugin-api-version": "2.6.0"

}

data/ddl/package/FORMULE_AVIGNON/body.sql

+2 −2
Original line number Diff line number Diff line
@@ -880,8 +880,8 @@ CREATE OR REPLACE PACKAGE BODY FORMULE_AVIGNON AS 
      NULL param_5

    FROM

      V_FORMULE_VOLUME_HORAIRE fvh

      JOIN volume_horaire vh ON vh.id = fvh.volume_horaire_id

      JOIN periode p ON p.id = vh.periode_id

      LEFT JOIN volume_horaire vh ON vh.id = fvh.volume_horaire_id

      LEFT JOIN periode p ON p.id = vh.periode_id

      LEFT JOIN service s ON s.id = fvh.service_id

      LEFT JOIN element_pedagogique ep ON ep.id = s.element_pedagogique_id

      LEFT JOIN etape e ON e.id = ep.etape_id