Commit c5c23e50 authored by Jean-Philippe Metivier's avatar Jean-Philippe Metivier
Browse files

Merge branch 'develop' of git.unicaen.fr:dsi/sygal into develop

parents f61038df 0bc762d6
Loading
Loading
Loading
Loading
+32 −2
Changes for data/SQL/profil.sql: 32 added lines, 2 removed lines.
Original line number Diff line number Diff line

rename ROLE_MODELE to PROFIL;
rename ROLE_MODELE_PRIVILEGE to PROFIL_PRIVILEGE;
rename ROLE_PRIVILEGE_MODELE to PROFIL_PRIVILEGE;

alter table PROFIL add description varchar2(1024);

create sequence PROFIL_ID_SEQ;

--
-- Avance d'une sequence.
--
@@ -18,11 +22,37 @@ end;

create unique index PROFIL_ROLE_ID_uindex on PROFIL (ROLE_ID);

alter table PROFIL_PRIVILEGE rename column ROLE_ID to PROFIL_ID;
truncate table PROFIL_PRIVILEGE;

alter table PROFIL modify STructure_type null;

alter table PROFIL_PRIVILEGE drop constraint ROLE_PRIV_MOD_PK;
alter table PROFIL_PRIVILEGE drop column ROLE_CODE;
alter table PROFIL_PRIVILEGE add PROFIL_ID number;
alter table PROFIL_PRIVILEGE add constraint PROFIL_PRIVILEGE_PROFIL_ID_fk foreign key (PROFIL_ID) references PROFIL;
alter table PROFIL_PRIVILEGE add constraint PROFIL_PRIVILEGE_PK primary key (PROFIL_ID, PRIVILEGE_ID);

create table PROFIL_TO_ROLE (
                              PROFIL_ID integer not null constraint PROFIL_TO_ROLE_PROFIL_ID_fk references PROFIL,
                              ROLE_ID integer not null constraint PROFIL_TO_ROLE_ROLE_ID_fk references ROLE,
                              constraint PROFIL_TO_ROLE_pk primary key (PROFIL_ID, ROLE_ID)
);

-- INSERT INTO PROFIL (ID, LIBELLE, ROLE_ID, STRUCTURE_TYPE, DESCRIPTION) VALUES (1, 'Unité de recherche', 'UR', 3, null);
-- INSERT INTO PROFIL (ID, LIBELLE, ROLE_ID, STRUCTURE_TYPE, DESCRIPTION) VALUES (2, 'École doctorale', 'ED', 2, null);
-- INSERT INTO PROFIL (ID, LIBELLE, ROLE_ID, STRUCTURE_TYPE, DESCRIPTION) VALUES (3, 'Administrateur', 'ADMIN', 1, 'Administrateur d''établissement');
-- INSERT INTO PROFIL (ID, LIBELLE, ROLE_ID, STRUCTURE_TYPE, DESCRIPTION) VALUES (4, 'Bureau des doctorats', 'BDD', 1, null);
-- INSERT INTO PROFIL (ID, LIBELLE, ROLE_ID, STRUCTURE_TYPE, DESCRIPTION) VALUES (5, 'Bibliothèque universitaire', 'BU', 1, null);
INSERT INTO PROFIL (ID, LIBELLE, ROLE_ID, STRUCTURE_TYPE, DESCRIPTION) VALUES (6, 'Administrateur technique', 'ADMIN_TECH', null, null);
INSERT INTO PROFIL (ID, LIBELLE, ROLE_ID, STRUCTURE_TYPE, DESCRIPTION) VALUES (7, 'Doctorant', 'DOCTORANT', null, null);
INSERT INTO PROFIL (ID, LIBELLE, ROLE_ID, STRUCTURE_TYPE, DESCRIPTION) VALUES (8, 'Observateur', 'OBSERV', null, null);
INSERT INTO PROFIL (ID, LIBELLE, ROLE_ID, STRUCTURE_TYPE, DESCRIPTION) VALUES (9, 'Directeur', 'D', null, null);
INSERT INTO PROFIL (ID, LIBELLE, ROLE_ID, STRUCTURE_TYPE, DESCRIPTION) VALUES (10, 'Co-directeur', 'K', null, null);
INSERT INTO PROFIL (ID, LIBELLE, ROLE_ID, STRUCTURE_TYPE, DESCRIPTION) VALUES (11, 'Rapporteur', 'R', null, null);
INSERT INTO PROFIL (ID, LIBELLE, ROLE_ID, STRUCTURE_TYPE, DESCRIPTION) VALUES (12, 'Membre', 'M', null, null);
INSERT INTO PROFIL (ID, LIBELLE, ROLE_ID, STRUCTURE_TYPE, DESCRIPTION) VALUES (61, 'Doctorant sans dépôt', 'NODEPOT', null, 'Rôle de doctorant temporaire');

INSERT INTO PRIVILEGE (ID, CATEGORIE_ID, CODE, LIBELLE, ORDRE) VALUES (36, 19, 'consultation-toutes-structures', 'Consultation de toutes les substitutions', 200);
INSERT INTO PRIVILEGE (ID, CATEGORIE_ID, CODE, LIBELLE, ORDRE) VALUES (37, 19, 'consultation-sa-structure', 'Consultation de la substitution de sa structure', 300);
INSERT INTO PRIVILEGE (ID, CATEGORIE_ID, CODE, LIBELLE, ORDRE) VALUES (38, 19, 'modification-toutes-structures', 'Modification de toutes les substitutions ', 400);
INSERT INTO PRIVILEGE (ID, CATEGORIE_ID, CODE, LIBELLE, ORDRE) VALUES (39, 19, 'modification-sa-structure', 'Modification de la substitution de sa structure', 500);
+11 −0
Changes for module/Import/Module.php: 11 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -56,6 +56,17 @@ class Module
            ['--synchronize',            "Facultatif. Réaliser ou non la synchro SRC_XXX => XXX. Valeurs possibles: 0, 1. Valeur par défaut: 1."],
            ['--em',                     "Facultatif. Nom de l'EntityManager à utiliser. Valeur par défaut: 'orm_default'."],

            // command
            'synchronize --service= [--em=]' => "Lancer la synchro UnicaenImport pour un seul service.",
            // parameters
            ['--service', "Requis. Identifiant du service, ex: 'variable'"],
            ['--em',      "Facultatif. Nom de l'EntityManager à utiliser. Valeur par défaut: 'orm_default'."],

            // command
            'synchronize-all [--em=]' => "Lancer la synchro UnicaenImport pour tous les services.",
            // parameters
            ['--em', "Facultatif. Nom de l'EntityManager à utiliser. Valeur par défaut: 'orm_default'."],

            // command
            'process-observed-import-results --etablissement= [--import-observ=] [--source-code=]' => "Traitement des résultats d'observation de certains changements durant la synchro.",
            // parameters
+21 −0
Changes for module/Import/config/synchro.config.php: 21 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ use Import\Service\ImportObserv\ImportObservService;
use Import\Service\ImportObservResult\ImportObservResultServiceFactory;
use Import\Service\SchemaService;
use UnicaenAuth\Guard\PrivilegeController;
use Zend\Mvc\Router\Console\Simple;

return [
    'bjyauthorize'    => [
@@ -46,6 +47,26 @@ return [
    'console' => [
        'router' => [
            'routes' => [
                'synchronizeConsole' => [
                    'type' => Simple::class,
                    'options' => [
                        'route'    => 'synchronize --service= [--em=]',
                        'defaults' => [
                            'controller' => SynchroController::class,
                            'action'     => 'synchronizeConsole',
                        ],
                    ],
                ],
                'synchronizeAllConsole' => [
                    'type' => Simple::class,
                    'options' => [
                        'route'    => 'synchronize-all [--em=]',
                        'defaults' => [
                            'controller' => SynchroController::class,
                            'action'     => 'synchronizeAllConsole',
                        ],
                    ],
                ],
                'process-observed-import-results' => [
                    'options' => [
                        'route'    => 'process-observed-import-results --etablissement= [--import-observ=] [--source-code=] [--force]',
+10 −3
Changes for module/Import/src/Import/Controller/Factory/SynchroControllerFactory.php: 10 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -2,9 +2,10 @@

namespace Import\Controller\Factory;

use Import\Controller\SynchroController;
use Application\Service\Notification\NotifierService;
use Application\Service\These\TheseService;
use Import\Controller\SynchroController;
use Import\Service\SynchroService;
use Zend\Mvc\Controller\ControllerManager;

class SynchroControllerFactory
@@ -17,14 +18,20 @@ class SynchroControllerFactory
     */
    public function __invoke(ControllerManager $controllerManager)
    {
        $sl = $controllerManager->getServiceLocator();

        /**
         * @var TheseService $theseService
         * @var NotifierService $notifierService
         */
        $theseService = $controllerManager->getServiceLocator()->get('TheseService');
        $notifierService = $controllerManager->getServiceLocator()->get(NotifierService::class);
        $theseService = $sl->get('TheseService');
        $notifierService = $sl->get(NotifierService::class);

        /** @var SynchroService $synchroService */
        $synchroService = $sl->get(SynchroService::class);

        $controller = new SynchroController();
        $controller->setSynchroService($synchroService);
        $controller->setTheseService($theseService);
        $controller->setNotifierService($notifierService);

+2 −3
Changes for module/Import/src/Import/Controller/ImportController.php: 2 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -8,7 +8,6 @@ use Application\Filter\EtablissementPrefixFilter;
use Application\Service\Etablissement\EtablissementServiceAwareTrait;
use Application\Service\These\TheseServiceAwareTrait;
use Assert\Assertion;
use Doctrine\DBAL\Connection;
use Doctrine\ORM\EntityManager;
use Import\Exception\CallException as ImportCallException;
use Import\Service\Traits\ImportServiceAwareTrait;
@@ -247,7 +246,7 @@ class ImportController extends AbstractActionController
        $_fin = microtime(true);

        echo sprintf(
            "Importation des données du service '%s' de l'établissement '%s' effectuée en %.2f.",
            "Importation des données du service '%s' de l'établissement '%s' effectuée en %.2f secondes.",
            $service,
            $etablissement,
            $_fin - $_deb
@@ -274,7 +273,7 @@ class ImportController extends AbstractActionController
        $_fin = microtime(true);

        echo sprintf(
            "Importation de toutes les données de l'établissement '%s' effectuée en %.2f.",
            "Importation de toutes les données de l'établissement '%s' effectuée en %.2f secondes.",
            $etablissement,
            $_fin - $_deb
        ) . PHP_EOL;
Loading