Commit 6cfdcbd0 authored by Bertrand Gauthier's avatar Bertrand Gauthier Committed by Thomas Hamel
Browse files

WIP saisie direction these

parent 76c53f45
Loading
Loading
Loading
Loading
+86
Changes for doc/release-notes/v6.x.md: 86 added lines, 0 removed lines.
Original line number Diff line number Diff line
# Version XXXXXXXXXXXXXXXXXXXXXXXXXXXXX

## 1. Sur le serveur d'application

- Placez-vous dans le répertoire de l'application puis lancez la commande suivante
  pour installer la nouvelle version :

```bash
git fetch --tags && git checkout --force XXXXXXXXXXXXXXXXXXXXXXXXXXXXX && bash ./install.sh
```

- Selon le moteur PHP que vous avez installé, rechargez le service, exemple :
    - php7.4-fpm         : `service php7.4-fpm reload`
    - apache2-mod-php7.4 : `service apache2 reload`


## 2. Dans la base de données

```sql

-- Modif table ACTEUR
alter table acteur add acteur_ecoledoct_id bigint;
alter table acteur add constraint acteur_ecole_doct_id_fk foreign key (acteur_ecoledoct_id) references ecole_doct;
alter table acteur add principal boolean default false not null;
alter table acteur add exterieur boolean default false not null;



create table discipline_sise
(
  id bigserial constraint discipline_sise_pkey primary key,
  code varchar(50) not null,
  libelle varchar(100) not null
);

create unique index discipline_sise_un on discipline_sise (code);

INSERT INTO discipline_sise (code, libelle) VALUES ('4200001', 'MATHEMATIQUES');
INSERT INTO discipline_sise (code, libelle) VALUES ('4200002', 'PHYSIQUE');
INSERT INTO discipline_sise (code, libelle) VALUES ('4200003', 'CHIMIE');
INSERT INTO discipline_sise (code, libelle) VALUES ('4200004', 'MATHEMATIQUES APPLIQUEES ET SCIENCES SOCIALES');
INSERT INTO discipline_sise (code, libelle) VALUES ('4200005', 'SCIENCES DE L''UNIVERS');
INSERT INTO discipline_sise (code, libelle) VALUES ('4200006', ' ASPECTS MOLECULAIRES ET CELLULAIRES DE LA BIOLOGIE');
INSERT INTO discipline_sise (code, libelle) VALUES ('4200007', 'PHYSIOLOGIE ET BIOLOGIE DES ORGANISMES - POPULATIONS - INTERACTIONS');
INSERT INTO discipline_sise (code, libelle) VALUES ('4200008', 'RECHERCHE CLINIQUE, INNOVATION TECHNOLOGIQUE, SANTE PUBLIQUE');
INSERT INTO discipline_sise (code, libelle) VALUES ('4200009', 'SCIENCES AGRONOMIQUES, BIOTECHNOLOGIES AGRO-ALIMENTAIRES');
INSERT INTO discipline_sise (code, libelle) VALUES ('4200010', 'MEDECINE');
INSERT INTO discipline_sise (code, libelle) VALUES ('4200011', 'ODONTOLOGIE');
INSERT INTO discipline_sise (code, libelle) VALUES ('4200012', 'PHARMACIE');
INSERT INTO discipline_sise (code, libelle) VALUES ('4200013', 'STAPS');
INSERT INTO discipline_sise (code, libelle) VALUES ('4200014', 'MECANIQUE DES FLUIDES, ENERGETIQUE, THERMIQUE, COMBUSTION, ACOUSTIQUE');
INSERT INTO discipline_sise (code, libelle) VALUES ('4200015', 'MECANIQUE DES SOLIDES, GENIE MECANIQUE, PRODUCTIQUE, TRANSPORT ET GENIE CIVIL');
INSERT INTO discipline_sise (code, libelle) VALUES ('4200016', 'GENIE CIVIL');
INSERT INTO discipline_sise (code, libelle) VALUES ('4200017', 'GENIE DES PROCEDES');
INSERT INTO discipline_sise (code, libelle) VALUES ('4200018', 'INFORMATIQUE');
INSERT INTO discipline_sise (code, libelle) VALUES ('4200019', 'GENIE ELECTRIQUE');
INSERT INTO discipline_sise (code, libelle) VALUES ('4200020', 'ELECTRONIQUE, MICROELECTRONIQUE, OPTIQUE ET LASERS, OPTOELECTRONIQUE MICROONDES');
INSERT INTO discipline_sise (code, libelle) VALUES ('4200021', 'SCIENCES ET TECHNOLOGIE INDUSTRIELLES');
INSERT INTO discipline_sise (code, libelle) VALUES ('4200022', 'SCIENCES DU LANGAGE - LINGUISTIQUE');
INSERT INTO discipline_sise (code, libelle) VALUES ('4200023', 'LANGUES ET LITTERATURES ANCIENNES');
INSERT INTO discipline_sise (code, libelle) VALUES ('4200024', 'LANGUES ET LITTERATURES FRANCAISES');
INSERT INTO discipline_sise (code, libelle) VALUES ('4200025', 'LITTERATURE GENERALE ET COMPAREE');
INSERT INTO discipline_sise (code, libelle) VALUES ('4200026', 'ARTS PLASTIQUES, MUSICOLOGIE');
INSERT INTO discipline_sise (code, libelle) VALUES ('4200027', 'FRANCAIS, LANGUE ETRANGERE');
INSERT INTO discipline_sise (code, libelle) VALUES ('4200028', 'LANGUES ET LITTERATURES ETRANGERES');
INSERT INTO discipline_sise (code, libelle) VALUES ('4200029', 'LANGUES ETRANGERES APPLIQUEES');
INSERT INTO discipline_sise (code, libelle) VALUES ('4200030', 'CULTURES ET LANGUES REGIONALES');
INSERT INTO discipline_sise (code, libelle) VALUES ('4200031', 'PHILOSOPHIE, EPISTEMOLOGIE');
INSERT INTO discipline_sise (code, libelle) VALUES ('4200032', 'HISTOIRE, HISTOIRE DE L’ART ET ARCHEOLOGIE');
INSERT INTO discipline_sise (code, libelle) VALUES ('4200033', 'GEOGRAPHIE');
INSERT INTO discipline_sise (code, libelle) VALUES ('4200034', 'AMENAGEMENT');
INSERT INTO discipline_sise (code, libelle) VALUES ('4200035', 'ARCHEOLOGIE, ETHNOLOGIE, PREHISTOIRE');
INSERT INTO discipline_sise (code, libelle) VALUES ('4200036', 'SCIENCES RELIGIEUSES');
INSERT INTO discipline_sise (code, libelle) VALUES ('4200037', 'PSYCHOLOGIE');
INSERT INTO discipline_sise (code, libelle) VALUES ('4200038', 'SOCIOLOGIE, DEMOGRAPHIE');
INSERT INTO discipline_sise (code, libelle) VALUES ('4200039', 'SCIENCES DE L''EDUCATION');
INSERT INTO discipline_sise (code, libelle) VALUES ('4200040', 'SCIENCES DE L''INFORMATION ET DE LA COMMUNICATION');
INSERT INTO discipline_sise (code, libelle) VALUES ('4200041', 'SCIENCES JURIDIQUES');
INSERT INTO discipline_sise (code, libelle) VALUES ('4200042', 'SCIENCES POLITIQUES');
INSERT INTO discipline_sise (code, libelle) VALUES ('4200043', 'SCIENCES ECONOMIQUES');
INSERT INTO discipline_sise (code, libelle) VALUES ('4200044', 'SCIENCES DE GESTION');
INSERT INTO discipline_sise (code, libelle) VALUES ('4200045', 'ADMINISTRATION ECONOMIQUE ET SOCIALE (AES)');
INSERT INTO discipline_sise (code, libelle) VALUES ('4200046', 'AUTOMATIQUE, SIGNAL, PRODUCTIQUE, ROBOTIQUE');
INSERT INTO discipline_sise (code, libelle) VALUES ('4200047', 'SCIENCES DE LA VIE ET DE LA SANTE');

```
 No newline at end of file
+1
Changes for module/Soutenance/src/Soutenance/Service/Proposition/PropositionService.php: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -160,6 +160,7 @@ class PropositionService extends BaseService
            ->addSelect('membre')->leftJoin('proposition.membres', 'membre')
            ->addSelect('qualite')->leftJoin('membre.qualite', 'qualite')
            ->addSelect('acteur')->leftJoin('membre.acteur', 'acteur')
            ->addSelect('amembre')->leftJoin('acteur.membre', 'amembre')
            ->addSelect('justificatif')->leftJoin('proposition.justificatifs', 'justificatif')
            ->addSelect('avis')->leftJoin('proposition.avis', 'avis')
            ->andWhere('proposition.histoDestruction is null')
+19 −11
Changes for module/These/config/others/these-saisie.config.php: 19 added lines, 11 removed lines.
Original line number Diff line number Diff line
@@ -9,6 +9,8 @@ use These\Controller\TheseRechercheController;
use These\Controller\TheseSaisieController;
use These\Fieldset\Confidentialite\ConfidentialiteHydrator;
use These\Fieldset\Confidentialite\ConfidentialiteHydratorFactory;
use These\Fieldset\Direction\DirectionHydrator;
use These\Fieldset\Direction\DirectionHydratorFactory;
use These\Fieldset\Encadrement\EncadrementHydrator;
use These\Fieldset\Encadrement\EncadrementHydratorFactory;
use These\Fieldset\Generalites\GeneralitesHydrator;
@@ -31,6 +33,8 @@ use These\Form\Generalites\GeneralitesForm;
use These\Form\Generalites\GeneralitesFormFactory;
use These\Form\Structures\StructuresForm;
use These\Form\Structures\StructuresFormFactory;
use These\Form\TheseFormsManager;
use These\Form\TheseFormsManagerFactory;
use These\Form\TheseSaisie\TheseSaisieForm;
use These\Form\TheseSaisie\TheseSaisieFormFactory;
use These\Form\TheseSaisie\TheseSaisieHydrator;
@@ -48,6 +52,7 @@ return [
                        'ajouter',
                        'supprimer',
                        'generalites',
                        'direction',
                        'structures',
                        'encadrement',
                    ],
@@ -118,6 +123,16 @@ return [
                                    ],
                                ],
                            ],
                            'direction' => [
                                'type' => Literal::class,
                                'options' => [
                                    'route' => '/direction',
                                    'defaults' => [
                                        /** @see TheseSaisieController::directionAction() */
                                        'action' => 'direction',
                                    ],
                                ],
                            ],
                            'structures' => [
                                'type' => Literal::class,
                                'options' => [
@@ -167,16 +182,6 @@ return [
    'form_elements' => [
        'factories' => [
            TheseSaisieForm::class => TheseSaisieFormFactory::class,

            ConfidentialiteFieldset::class => ConfidentialiteFieldsetFactory::class,
            EncadrementFieldset::class => EncadrementFieldsetFactory::class,
            GeneralitesFieldset::class => GeneralitesFieldsetFactory::class,
            StructuresFieldset::class => StructuresFieldsetFactory::class,

            ConfidentialiteForm::class => ConfidentialiteFormFactory::class,
            EncadrementForm::class => EncadrementFormFactory::class,
            GeneralitesForm::class => GeneralitesFormFactory::class,
            StructuresForm::class => StructuresFormFactory::class,
        ],
    ],
    'hydrators' => [
@@ -186,11 +191,14 @@ return [
            ConfidentialiteHydrator::class => ConfidentialiteHydratorFactory::class,
            EncadrementHydrator::class => EncadrementHydratorFactory::class,
            GeneralitesHydrator::class => GeneralitesHydratorFactory::class,
            DirectionHydrator::class => DirectionHydratorFactory::class,
            StructuresHydrator::class => StructuresHydratorFactory::class,
        ],
    ],
    'service_manager' => [
        'factories' => [],
        'factories' => [
            TheseFormsManager::class => TheseFormsManagerFactory::class,
        ],
    ],
    'view_helpers' => [
        'factories' => [],
+7
Changes for module/These/config/others/these.config.php: 7 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -18,6 +18,8 @@ use These\Controller\Factory\TheseRechercheControllerFactory;
use These\Controller\Plugin\Url\UrlThesePluginFactory;
use These\Controller\TheseController;
use These\Controller\TheseRechercheController;
use These\Hydrator\ActeurHydrator;
use These\Hydrator\ActeurHydratorFactory;
use These\Provider\Privilege\ThesePrivileges;
use These\Service\Exporter\CoEncadrements\CoEncadrementsExporter;
use These\Service\Exporter\CoEncadrements\CoEncadrementsExporterFactory;
@@ -365,6 +367,11 @@ return [
            ServiceAwareInitializer::class,
        ]
    ],
    'hydrators' => array(
        'factories' => array(
            ActeurHydrator::class => ActeurHydratorFactory::class,
        )
    ),
    'service_manager' => [
        'factories' => [
            UrlTheseService::class => UrlTheseServiceFactory::class,
+36
Changes for module/These/src/These/Controller/Factory/TheseSaisieControllerFactory.php.new: 36 added lines, 0 removed lines.
Original line number Diff line number Diff line
<?php

namespace These\Controller\Factory;

use Interop\Container\ContainerInterface;
use Psr\Container\ContainerExceptionInterface;
use Psr\Container\NotFoundExceptionInterface;
use These\Controller\TheseSaisieController;
use These\Form\TheseFormsManager;
use These\Service\These\TheseService;

class TheseSaisieControllerFactory
{
    /**
     * @param ContainerInterface $container
     * @return TheseSaisieController
     * @throws ContainerExceptionInterface
     * @throws NotFoundExceptionInterface
     */
    public function __invoke(ContainerInterface $container): TheseSaisieController
    {
        $controller = new TheseSaisieController();

        /** @var TheseService $theseService */
        $theseService = $container->get(TheseService::class);
        $controller->setTheseService($theseService);

        // Injection d'un 'form manager' plutôt que l'injection de tous les formulaires :
        // cela permet d'obtenir au sein d'une action le formulaire effectivement nécessaire et évite ainsi
        // des requêtes Doctrine inutiles (pour listes déroulantes).
        $theseFormsManager = $container->get(TheseFormsManager::class);
        $controller->setTheseFormsManager($theseFormsManager);

        return $controller;
    }
}
Loading