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

[WIP] add scripts sql for creation import views...

parent 68899dae
Loading
Loading
Loading
Loading
+115 −1
Changes for module/Admission/Sql/admission.sql: 115 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ create table IF NOT EXISTS admission_inscription
    discipline_doctorat                       varchar(60),
    specialite_doctorat                       varchar(255),
    composante_doctorat_id                    bigint REFERENCES etablissement (id),
    ecole_doctorale_id                        bigint REFERENCES ecole_doct (id),
    ecole_doctorale_id                        bigint REFERENCES composante_ens (id),
    unite_recherche_id                        bigint REFERENCES unite_rech (id),
    etablissement_inscription_id              bigint REFERENCES etablissement (id),
    directeur_these_id                        bigint REFERENCES individu (id),
@@ -1605,3 +1605,117 @@ VALUES ('ADMISSION_DERNIERE_VALIDATION_AJOUTEE',
<p>Ceci est un mail envoyé automatiquement par l\'application ESUP-SyGAL.</p>
<p>Le <strong>dossier d\'admission</strong> de <strong>VAR[Individu#Denomination]</strong> a été <strong>validé</strong> par VAR[AdmissionAvis#Auteur], le VAR[AdmissionAvis#Date]</p>
<p>Le circuit de signature de votre dossier est maintenant terminé. </p>', null, 'Admission\Provider\Template');

--Ajout de la table Composante d'enseignement
INSERT INTO source(id, code, libelle, etablissement_id, importable)
VALUES (6, 'UCN::octopus', 'Octopus UCN', 2, true);
INSERT INTO type_structure(id, code, libelle)
VALUES (4, 'composante-enseignement', 'Composante d''enseignement');

drop table if exists tmp_composante_ens;
--Création de la table TEMP de Composante d'enseignement
create table public.tmp_composante_ens
(
    id                    bigserial,
    sigle                 varchar(64),
    libelle_long          varchar(200),
    insert_date           timestamp(0) default ('now'::text)::timestamp without time zone,
    source_id             bigint                                                             not null,
    source_code           varchar(64)                                                        not null,
    source_insert_date    timestamp    default ('now'::text)::timestamp without time zone,
    histo_creation        timestamp(0) default ('now'::text)::timestamp(0) without time zone not null,
    histo_modification    timestamp(0),
    histo_destruction     timestamp(0),
    histo_createur_id     bigint                                                             not null,
    histo_modificateur_id bigint,
    histo_destructeur_id  bigint
);

create index tmp_composante_ens_source_code_index
    on public.tmp_composante_ens (source_code);

create index tmp_composante_ens_source_id_index
    on public.tmp_composante_ens (source_id);

create unique index tmp_composante_ens_unique_index
    on public.tmp_composante_ens (source_id, source_code);

drop table if exists composante_ens;
create table public.composante_ens
(
    id                    bigserial                                                    not null
        primary key,
    structure_id          bigint references structure (id),
    histo_creation        timestamp default ('now'::text)::timestamp without time zone not null,
    histo_createur_id     bigint                                                       not null
        constraint composante_ens_hcfk
            references public.utilisateur
            on delete cascade,
    histo_modification    timestamp,
    histo_modificateur_id bigint
        constraint composante_ens_hmfk
            references public.utilisateur
            on delete cascade,
    histo_destruction     timestamp,
    histo_destructeur_id  bigint
        constraint composante_ens_hdfk
            references public.utilisateur
            on delete cascade,
    source_id             bigint                                                       not null
        constraint composante_ens_source_fk
            references public.source
            on delete cascade,
    source_code           varchar(64)                                                  not null
);

create index composante_ens_hc_idx
    on public.composante_ens (histo_createur_id);

create index composante_ens_hd_idx
    on public.composante_ens (histo_destructeur_id);

create index composante_ens_hm_idx
    on public.composante_ens (histo_modificateur_id);

create unique index composante_ens_source_code_un
    on public.composante_ens (source_code);

create index composante_ens_source_idx
    on public.composante_ens (source_id);

drop view v_diff_structure;
drop view src_structure;
create or replace view src_structure(id, source_code, code, source_id, type_structure_id, sigle, libelle) as
SELECT NULL::bigint                                                                               AS id,
       tmp.source_code,
       ltrim(substr(tmp.source_code::text, strpos(tmp.source_code::text, '::'::text)), ':'::text) AS code,
       src.id                                                                                     AS source_id,
       ts.id                                                                                      AS type_structure_id,
       tmp.sigle,
       tmp.libelle
FROM tmp_structure tmp
         JOIN type_structure ts ON ts.code::text = tmp.type_structure_id::text
         JOIN source src ON src.id = tmp.source_id
union
select NULL::bigint                                                                               AS id,
       tmp.source_code,
       ltrim(substr(tmp.source_code::text, strpos(tmp.source_code::text, '::'::text)), ':'::text) AS code,
       src.id                                                                                     AS source_id,
       ts.id                                                                                      AS type_structure_id,
       tmp.sigle,
       tmp.libelle_long                                                                           as libelle
FROM tmp_composante_ens tmp
         JOIN type_structure ts ON ts.code = 'composante-enseignement'
         JOIN source src ON src.id = tmp.source_id
;

drop view src_composante_ens;
create or replace view src_composante_ens(id, source_code, source_id) as
select NULL::bigint AS id,
       tmp.source_code,
       src.id       AS source_id,
       s.id         as structure_id
FROM tmp_composante_ens tmp
         JOIN structure s ON s.source_code = tmp.source_code
         JOIN source src ON src.id = tmp.source_id
;
 No newline at end of file
+3 −2
Changes for module/Admission/src/Admission/Controller/AdmissionController.php: 3 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -625,12 +625,13 @@ class AdmissionController extends AdmissionAbstractController {
        //Partie Informations sur l'inscription
        /** @see AdmissionController::rechercherIndividuAction() */
        $this->admissionForm->get('inscription')->setUrlIndividuThese($this->url()->fromRoute('admission/rechercher-individu', [], ["query" => []], true));
        /** @see EtablissementController::rechercherAction() */
        $this->admissionForm->get('inscription')->setUrlEtablissement($this->url()->fromRoute('etablissement/rechercher', [], ["query" => []], true));

        $disciplines = $this->disciplineService->getDisciplinesAsOptions('code','ASC','code');
        $this->admissionForm->get('inscription')->setSpecialites($disciplines);

        $composantes = $this->structureService->findAllStructuresAffichablesByType(TypeStructure::CODE_COMPOSANTE_ENSEIGNEMENT, 'libelle', false);
        $this->admissionForm->get('inscription')->setComposantesEnseignement($composantes);

        $ecoles = $this->structureService->findAllStructuresAffichablesByType(TypeStructure::CODE_ECOLE_DOCTORALE, 'libelle', false);
        $this->admissionForm->get('inscription')->setEcolesDoctorales($ecoles);

+21 −15
Changes for module/Admission/src/Admission/Form/Fieldset/Inscription/InscriptionFieldset.php: 21 added lines, 15 removed lines.
Original line number Diff line number Diff line
@@ -22,6 +22,8 @@ class InscriptionFieldset extends Fieldset implements InputFilterProviderInterfa
    private ?string $urlIndividuThese = null;
    private ?string $urlEtablissement = null;
    /** @var array */
    private $composantesEnseignement = null;
    /** @var array */
    private $ecolesDoctorales = null;
    /** @var array */
    private $unitesRecherche = null;
@@ -42,12 +44,6 @@ class InscriptionFieldset extends Fieldset implements InputFilterProviderInterfa
        $this->get('prenomCodirecteurThese')->setAutocompleteSource($this->urlIndividuThese);
    }

    public function setUrlEtablissement(string $urlEtablissement): void
    {
        $this->urlEtablissement = $urlEtablissement;
        $this->get('composanteDoctorat')->setAutocompleteSource($this->urlEtablissement);
    }

    public function setSpecialites(array $specialites): void
    {
        $this->specialites = $specialites;
@@ -67,6 +63,18 @@ class InscriptionFieldset extends Fieldset implements InputFilterProviderInterfa
        $this->get('ecoleDoctorale')->setValueOptions($this->ecolesDoctorales);
    }

    public function setComposantesEnseignement(array $composantesEnseignement): void
    {
        $options = [];

        foreach ($composantesEnseignement as $composanteEnseignement) {
            $options[$composanteEnseignement->getId()] = $composanteEnseignement->getStructure()->getLibelle();
        }
        $this->composantesEnseignement = $options;
        $this->get('composanteDoctorat')->setEmptyOption('Sélectionnez une option');
        $this->get('composanteDoctorat')->setValueOptions($this->composantesEnseignement);
    }

    public function setUnitesRecherche(array $unitesRecherche): void
    {
        $options = [];
@@ -164,18 +172,16 @@ class InscriptionFieldset extends Fieldset implements InputFilterProviderInterfa
                ])
        );

        $composanteDoctorat = new SearchAndSelect('composanteDoctorat', ['label' => "Composante de rattachement (U.F.R., instituts…)"]);
        $composanteDoctorat
            ->setAutocompleteSource($this->urlEtablissement )
        $this->add(
            (new Select("composanteDoctorat"))
                ->setLabel("Composante de rattachement (U.F.R., instituts…)")
                ->setLabelAttributes(['data-after' => " / Component of attachment"])
            ->setSelectionRequired()
                ->setOptions(['emptyOption' => 'Choisissez un élément',])
                ->setAttributes([
                'class' => 'selectpicker show-tick',
                    'class' => 'bootstrap-selectpicker show-tick',
                    'data-live-search' => 'true',
                'id' => 'composanteDoctorat',
                'placeholder' => "Entrez les deux premières lettres...",
            ]);
        $this->add($composanteDoctorat);
                ])
        );

        $this->add(
            (new Select("ecoleDoctorale"))
+17 −0
Changes for module/Structure/config/others/composante-enseignement.config.php: 17 added lines, 0 removed lines.
Original line number Diff line number Diff line
<?php

use Structure\Service\ComposanteEnseignement\ComposanteEnseignementService;
use Structure\Service\ComposanteEnseignement\ComposanteEnseignementServiceFactory;

return [
    'service_manager' => [
        'invokables' => [
        ],
        'factories' => [
            'ComposanteEnseignementService' => ComposanteEnseignementServiceFactory::class,
        ],
        'aliases' => [
            ComposanteEnseignementService::class => 'ComposanteEnseignementService',
        ]
    ],
];
+90 −0
Changes for module/Structure/src/Structure/Entity/Db/ComposanteEnseignement.php: 90 added lines, 0 removed lines.
Original line number Diff line number Diff line
<?php

namespace Structure\Entity\Db;

use Laminas\Permissions\Acl\Resource\ResourceInterface;
use UnicaenApp\Entity\HistoriqueAwareInterface;
use UnicaenApp\Entity\HistoriqueAwareTrait;
use UnicaenDbImport\Entity\Db\Interfaces\SourceAwareInterface;
use UnicaenDbImport\Entity\Db\Traits\SourceAwareTrait;

/**
 * ComposanteEnseignement
 */
class ComposanteEnseignement implements StructureConcreteInterface, HistoriqueAwareInterface, SourceAwareInterface, ResourceInterface
{
    use HistoriqueAwareTrait;
    use SourceAwareTrait;
    use StructureAwareTrait;
    /**
     * @var string|null
     */
    private $sourceCode;

    /**
     * @var int
     */
    private $id;

    /**
     * ComposanteEnseignement constructor.
     */
    public function __construct()
    {
        $this->structure = new Structure();
    }

    /**
     * Returns the string identifier of the Resource
     *
     * @return string
     */
    public function getResourceId()
    {
        return 'ComposanteEnseignement';
    }

    /**
     * Set sourceCode.
     *
     * @param string|null $sourceCode
     *
     * @return ComposanteEnseignement
     */
    public function setSourceCode($sourceCode = null)
    {
        $this->sourceCode = $sourceCode;

        return $this;
    }

    /**
     * Get sourceCode.
     *
     * @return string|null
     */
    public function getSourceCode()
    {
        return $this->sourceCode;
    }

    /**
     * Get id.
     *
     * @return int
     */
    public function getId()
    {
        return $this->id;
    }

    public function __toString(): string
    {
        $str = '';
        if ($sigle = $this->structure->getSigle()) {
            $str .= "$sigle - ";
        }
        $str .= $this->structure->getLibelle();
        return $str;
    }
}
Loading