Commit 916b70ff authored by Thomas Hamel's avatar Thomas Hamel
Browse files

merge améliorations_module_formation

parents 39071fef 7c009c9d
Loading
Loading
Loading
Loading
+85 −0
Changes for doc/release-notes/8.2.0/01_formation.sql: 85 added lines, 0 removed lines.
Original line number Diff line number Diff line
-- Module Formation

--Ajout d'un paramètre pour spécifier le délai pour une annulation d'inscription
INSERT INTO public.unicaen_parametre_parametre (id, categorie_id, code, libelle, description, valeurs_possibles, valeur,
                                                ordre)
VALUES (20, 2, 'DELAI_ANNULATION_INSCRIPTION', 'Delai annulation', null, 'Number', '21', 20) ON CONFLICT DO NOTHING;


--Ajout d'un privilège pour voir le lieu des séances d'une session
INSERT INTO privilege(id, CATEGORIE_ID, CODE, LIBELLE, ORDRE)
WITH d(code, lib, ordre) AS (SELECT 'voir_lieu', 'Voir le lieu de la session', 8)
SELECT nextval('privilege_id_seq'), cp.id, d.code, d.lib, d.ordre
FROM d
         JOIN categorie_privilege cp ON cp.CODE = 'formation_session'
WHERE NOT EXISTS (SELECT 1
                  FROM PRIVILEGE p
                  WHERE p.CODE = d.code);
--
-- Accord du privilège aux profils ADMIN_TECH, MAISON DU DOCTORAT, FORMATEUR, RESPONSABLE_ED, DOCTORANT.
--
INSERT INTO PROFIL_PRIVILEGE (PRIVILEGE_ID, PROFIL_ID)
with data(categ, priv) as (select 'formation_session', 'voir_lieu')
select p.id as PRIVILEGE_ID, profil.id as PROFIL_ID
from data
         join PROFIL on profil.ROLE_ID in (
                                           'ADMIN_TECH',
                                           'BDD',
                                           'FORMATEUR',
                                           'RESP_ED',
                                           'DOCTORANT'
    )
         join CATEGORIE_PRIVILEGE cp on cp.CODE = data.categ
         join PRIVILEGE p on p.CATEGORIE_ID = cp.id and p.code = data.priv
where not exists (select * from PROFIL_PRIVILEGE where PRIVILEGE_ID = p.id and PROFIL_ID = profil.id);

insert into ROLE_PRIVILEGE (ROLE_ID, PRIVILEGE_ID)
select p2r.ROLE_ID, pp.PRIVILEGE_ID
from PROFIL_TO_ROLE p2r
         join profil pr on pr.id = p2r.PROFIL_ID
         join PROFIL_PRIVILEGE pp on pp.PROFIL_ID = pr.id
where not exists (select * from role_privilege where role_id = p2r.role_id and privilege_id = pp.privilege_id)
;

--
-- Accord de privilèges au profil Formateur pour accéder à l'index de ses formations.
--
INSERT INTO PROFIL_PRIVILEGE (PRIVILEGE_ID, PROFIL_ID)
with data(categ, priv) as (select 'formation', 'index_formateur')
select p.id as PRIVILEGE_ID, profil.id as PROFIL_ID
from data
         join PROFIL on profil.ROLE_ID in (
    'FORMATEUR'
    )
         join CATEGORIE_PRIVILEGE cp on cp.CODE = data.categ
         join PRIVILEGE p on p.CATEGORIE_ID = cp.id and p.code = data.priv
where not exists (select * from PROFIL_PRIVILEGE where PRIVILEGE_ID = p.id and PROFIL_ID = profil.id);

insert into ROLE_PRIVILEGE (ROLE_ID, PRIVILEGE_ID)
select p2r.ROLE_ID, pp.PRIVILEGE_ID
from PROFIL_TO_ROLE p2r
         join profil pr on pr.id = p2r.PROFIL_ID
         join PROFIL_PRIVILEGE pp on pp.PROFIL_ID = pr.id
where not exists (select * from role_privilege where role_id = p2r.role_id and privilege_id = pp.privilege_id)
;

--Ajout d'une macro pour afficher la dénomination du doctorant (civilité+nom Patronymique+prénom)
INSERT INTO unicaen_renderer_macro (code, description, variable_name, methode_name)
VALUES ('Doctorant#DenominationPatronymique',
        '<p>Retourne la dénomination du doctorant (civilité+nom Patronymique+prénom)</p>',
        'doctorant', 'getDenominationPatronymique')
    ON CONFLICT DO NOTHING;

--Changement en conséquence du template
UPDATE public.unicaen_renderer_template SET document_corps = '<h1 style="text-align: center;">Attestation de suivi de formation</h1><p></p><p>Bonjour ,</p><p>Je, sousigné·e, certifie que <strong>VAR[Doctorant#DenominationPatronymique]</strong> a participé à la formation <strong>VAR[Formation#Libelle]</strong> qui s''est déroulée sur la période du VAR[Session#Periode] (Durée : VAR[Session#Duree] heures).</p><p>VAR[Doctorant#DenominationPatronymique] a suivi VAR[Inscription#DureeSuivie] heure·s de formation.</p><p style="text-align: right;">Le·la responsable du module<br />VAR[Session#Responsable]<br /><br /></p><p style="text-align: right;">VAR[Signature#EtablissementFormation]</p>'
where code = 'FORMATION_ATTESTATION';

-- Template mail lors de la création d'une formation spécifique à destination des doctorants de l'ED
INSERT INTO public.unicaen_renderer_template (code, description, document_type, document_sujet, document_corps,
                                              document_css, namespace)
VALUES ('FORMATION_FORMATION_SPECIFIQUE_OUVERTE',
        '<p>Mail envoyé au doctorant·e appartenant aux structures valides déclarées lorsqu''une formation spécifique passe à l''état Inscription ouverte</p>', 'mail',
        'Nouvelle formation spécifique ouverte dans votre ED', e'<p>Bonjour,</p>
<p>La formation spécifique <strong>VAR[Formation#Libelle]</strong> vient d''ouvrir. Si vous voulez plus d''informations, rendez-vous dans l''application ESUP-SyGAL, onglet <em>''mes formations''.</em></p>
<p>En vous souhaitant une bonne journée,<br/>VAR[Formation#Responsable]</p>',
        null, 'Formation\Provider\Template') ON CONFLICT DO NOTHING;
 No newline at end of file
+0 −344
Changes for module/Admission/src/Application/Entity/Db/Financement.php: 0 added lines, 344 removed lines.
Original line number Diff line number Diff line
<?php

namespace Application\Entity\Db;

/**
 * Financement
 */
class Financement
{
    /**
     * @var int
     */
    private $annee;

    /**
     * @var string|null
     */
    private $sourceCode;

    /**
     * @var string|null
     */
    private $complementFinancement;

    /**
     * @var string|null
     */
    private $quotiteFinancement;

    /**
     * @var \DateTime|null
     */
    private $dateDebut;

    /**
     * @var \DateTime|null
     */
    private $dateFin;

    /**
     * @var string|null
     */
    private $codeTypeFinancement;

    /**
     * @var string|null
     */
    private $libelleTypeFinancement;

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

    /**
     * @var \Application\Entity\Db\Source
     */
    private $source;

    /**
     * @var \These\Entity\Db\These
     */
    private $these;

    /**
     * @var \Application\Entity\Db\OrigineFinancement
     */
    private $origineFinancement;


    /**
     * Set annee.
     *
     * @param int $annee
     *
     * @return Financement
     */
    public function setAnnee($annee)
    {
        $this->annee = $annee;

        return $this;
    }

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

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

        return $this;
    }

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

    /**
     * Set complementFinancement.
     *
     * @param string|null $complementFinancement
     *
     * @return Financement
     */
    public function setComplementFinancement($complementFinancement = null)
    {
        $this->complementFinancement = $complementFinancement;

        return $this;
    }

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

    /**
     * Set quotiteFinancement.
     *
     * @param string|null $quotiteFinancement
     *
     * @return Financement
     */
    public function setQuotiteFinancement($quotiteFinancement = null)
    {
        $this->quotiteFinancement = $quotiteFinancement;

        return $this;
    }

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

    /**
     * Set dateDebut.
     *
     * @param \DateTime|null $dateDebut
     *
     * @return Financement
     */
    public function setDateDebut($dateDebut = null)
    {
        $this->dateDebut = $dateDebut;

        return $this;
    }

    /**
     * Get dateDebut.
     *
     * @return \DateTime|null
     */
    public function getDateDebut()
    {
        return $this->dateDebut;
    }

    /**
     * Set dateFin.
     *
     * @param \DateTime|null $dateFin
     *
     * @return Financement
     */
    public function setDateFin($dateFin = null)
    {
        $this->dateFin = $dateFin;

        return $this;
    }

    /**
     * Get dateFin.
     *
     * @return \DateTime|null
     */
    public function getDateFin()
    {
        return $this->dateFin;
    }

    /**
     * Set codeTypeFinancement.
     *
     * @param string|null $codeTypeFinancement
     *
     * @return Financement
     */
    public function setCodeTypeFinancement($codeTypeFinancement = null)
    {
        $this->codeTypeFinancement = $codeTypeFinancement;

        return $this;
    }

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

    /**
     * Set libelleTypeFinancement.
     *
     * @param string|null $libelleTypeFinancement
     *
     * @return Financement
     */
    public function setLibelleTypeFinancement($libelleTypeFinancement = null)
    {
        $this->libelleTypeFinancement = $libelleTypeFinancement;

        return $this;
    }

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

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

    /**
     * Set source.
     *
     * @param \Application\Entity\Db\Source|null $source
     *
     * @return Financement
     */
    public function setSource(\Application\Entity\Db\Source $source = null)
    {
        $this->source = $source;

        return $this;
    }

    /**
     * Get source.
     *
     * @return \Application\Entity\Db\Source|null
     */
    public function getSource()
    {
        return $this->source;
    }

    /**
     * Set these.
     *
     * @param \These\Entity\Db\These|null $these
     *
     * @return Financement
     */
    public function setThese(\These\Entity\Db\These $these = null)
    {
        $this->these = $these;

        return $this;
    }

    /**
     * Get these.
     *
     * @return \These\Entity\Db\These|null
     */
    public function getThese()
    {
        return $this->these;
    }

    /**
     * Set origineFinancement.
     *
     * @param \Application\Entity\Db\OrigineFinancement|null $origineFinancement
     *
     * @return Financement
     */
    public function setOrigineFinancement(\Application\Entity\Db\OrigineFinancement $origineFinancement = null)
    {
        $this->origineFinancement = $origineFinancement;

        return $this;
    }

    /**
     * Get origineFinancement.
     *
     * @return \Application\Entity\Db\OrigineFinancement|null
     */
    public function getOrigineFinancement()
    {
        return $this->origineFinancement;
    }
}
+0 −344
Changes for module/Admission/src/Application/Entity/Db/Financement.php~: 0 added lines, 344 removed lines.
Original line number Diff line number Diff line
<?php

namespace Application\Entity\Db;

/**
 * Financement
 */
class Financement
{
    /**
     * @var int
     */
    private $annee;

    /**
     * @var string|null
     */
    private $sourceCode;

    /**
     * @var string|null
     */
    private $complementFinancement;

    /**
     * @var string|null
     */
    private $quotiteFinancement;

    /**
     * @var \DateTime|null
     */
    private $dateDebut;

    /**
     * @var \DateTime|null
     */
    private $dateFin;

    /**
     * @var string|null
     */
    private $codeTypeFinancement;

    /**
     * @var string|null
     */
    private $libelleTypeFinancement;

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

    /**
     * @var \Application\Entity\Db\Source
     */
    private $source;

    /**
     * @var \These\Entity\Db\These
     */
    private $these;

    /**
     * @var \Application\Entity\Db\OrigineFinancement
     */
    private $origineFinancement;


    /**
     * Set annee.
     *
     * @param int $annee
     *
     * @return Financement
     */
    public function setAnnee($annee)
    {
        $this->annee = $annee;

        return $this;
    }

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

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

        return $this;
    }

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

    /**
     * Set complementFinancement.
     *
     * @param string|null $complementFinancement
     *
     * @return Financement
     */
    public function setComplementFinancement($complementFinancement = null)
    {
        $this->complementFinancement = $complementFinancement;

        return $this;
    }

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

    /**
     * Set quotiteFinancement.
     *
     * @param string|null $quotiteFinancement
     *
     * @return Financement
     */
    public function setQuotiteFinancement($quotiteFinancement = null)
    {
        $this->quotiteFinancement = $quotiteFinancement;

        return $this;
    }

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

    /**
     * Set dateDebut.
     *
     * @param \DateTime|null $dateDebut
     *
     * @return Financement
     */
    public function setDateDebut($dateDebut = null)
    {
        $this->dateDebut = $dateDebut;

        return $this;
    }

    /**
     * Get dateDebut.
     *
     * @return \DateTime|null
     */
    public function getDateDebut()
    {
        return $this->dateDebut;
    }

    /**
     * Set dateFin.
     *
     * @param \DateTime|null $dateFin
     *
     * @return Financement
     */
    public function setDateFin($dateFin = null)
    {
        $this->dateFin = $dateFin;

        return $this;
    }

    /**
     * Get dateFin.
     *
     * @return \DateTime|null
     */
    public function getDateFin()
    {
        return $this->dateFin;
    }

    /**
     * Set codeTypeFinancement.
     *
     * @param string|null $codeTypeFinancement
     *
     * @return Financement
     */
    public function setCodeTypeFinancement($codeTypeFinancement = null)
    {
        $this->codeTypeFinancement = $codeTypeFinancement;

        return $this;
    }

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

    /**
     * Set libelleTypeFinancement.
     *
     * @param string|null $libelleTypeFinancement
     *
     * @return Financement
     */
    public function setLibelleTypeFinancement($libelleTypeFinancement = null)
    {
        $this->libelleTypeFinancement = $libelleTypeFinancement;

        return $this;
    }

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

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

    /**
     * Set source.
     *
     * @param \Application\Entity\Db\Source|null $source
     *
     * @return Financement
     */
    public function setSource(\Application\Entity\Db\Source $source = null)
    {
        $this->source = $source;

        return $this;
    }

    /**
     * Get source.
     *
     * @return \Application\Entity\Db\Source|null
     */
    public function getSource()
    {
        return $this->source;
    }

    /**
     * Set these.
     *
     * @param \These\Entity\Db\These|null $these
     *
     * @return Financement
     */
    public function setThese(\These\Entity\Db\These $these = null)
    {
        $this->these = $these;

        return $this;
    }

    /**
     * Get these.
     *
     * @return \These\Entity\Db\These|null
     */
    public function getThese()
    {
        return $this->these;
    }

    /**
     * Set origineFinancement.
     *
     * @param \Application\Entity\Db\OrigineFinancement|null $origineFinancement
     *
     * @return Financement
     */
    public function setOrigineFinancement(\Application\Entity\Db\OrigineFinancement $origineFinancement = null)
    {
        $this->origineFinancement = $origineFinancement;

        return $this;
    }

    /**
     * Get origineFinancement.
     *
     * @return \Application\Entity\Db\OrigineFinancement|null
     */
    public function getOrigineFinancement()
    {
        return $this->origineFinancement;
    }
}
+0 −199
Changes for module/Admission/src/Application/Entity/Db/OrigineFinancement.php: 0 added lines, 199 removed lines.
Original line number Diff line number Diff line
<?php

namespace Application\Entity\Db;

/**
 * OrigineFinancement
 */
class OrigineFinancement
{
    /**
     * @var string|null
     */
    private $sourceCode;

    /**
     * @var string
     */
    private $code;

    /**
     * @var string
     */
    private $libelleLong;

    /**
     * @var string
     */
    private $libelleCourt;

    /**
     * @var bool
     */
    private $visible;

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

    /**
     * @var \Application\Entity\Db\Source
     */
    private $source;


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

        return $this;
    }

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

    /**
     * Set code.
     *
     * @param string $code
     *
     * @return OrigineFinancement
     */
    public function setCode($code)
    {
        $this->code = $code;

        return $this;
    }

    /**
     * Get code.
     *
     * @return string
     */
    public function getCode()
    {
        return $this->code;
    }

    /**
     * Set libelleLong.
     *
     * @param string $libelleLong
     *
     * @return OrigineFinancement
     */
    public function setLibelleLong($libelleLong)
    {
        $this->libelleLong = $libelleLong;

        return $this;
    }

    /**
     * Get libelleLong.
     *
     * @return string
     */
    public function getLibelleLong()
    {
        return $this->libelleLong;
    }

    /**
     * Set libelleCourt.
     *
     * @param string $libelleCourt
     *
     * @return OrigineFinancement
     */
    public function setLibelleCourt($libelleCourt)
    {
        $this->libelleCourt = $libelleCourt;

        return $this;
    }

    /**
     * Get libelleCourt.
     *
     * @return string
     */
    public function getLibelleCourt()
    {
        return $this->libelleCourt;
    }

    /**
     * Set visible.
     *
     * @param bool $visible
     *
     * @return OrigineFinancement
     */
    public function setVisible($visible)
    {
        $this->visible = $visible;

        return $this;
    }

    /**
     * Get visible.
     *
     * @return bool
     */
    public function getVisible()
    {
        return $this->visible;
    }

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

    /**
     * Set source.
     *
     * @param \Application\Entity\Db\Source|null $source
     *
     * @return OrigineFinancement
     */
    public function setSource(\Application\Entity\Db\Source $source = null)
    {
        $this->source = $source;

        return $this;
    }

    /**
     * Get source.
     *
     * @return \Application\Entity\Db\Source|null
     */
    public function getSource()
    {
        return $this->source;
    }
}
+0 −199
Changes for module/Admission/src/Application/Entity/Db/OrigineFinancement.php~: 0 added lines, 199 removed lines.
Original line number Diff line number Diff line
<?php

namespace Application\Entity\Db;

/**
 * OrigineFinancement
 */
class OrigineFinancement
{
    /**
     * @var string|null
     */
    private $sourceCode;

    /**
     * @var string
     */
    private $code;

    /**
     * @var string
     */
    private $libelleLong;

    /**
     * @var string
     */
    private $libelleCourt;

    /**
     * @var bool
     */
    private $visible;

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

    /**
     * @var \Application\Entity\Db\Source
     */
    private $source;


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

        return $this;
    }

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

    /**
     * Set code.
     *
     * @param string $code
     *
     * @return OrigineFinancement
     */
    public function setCode($code)
    {
        $this->code = $code;

        return $this;
    }

    /**
     * Get code.
     *
     * @return string
     */
    public function getCode()
    {
        return $this->code;
    }

    /**
     * Set libelleLong.
     *
     * @param string $libelleLong
     *
     * @return OrigineFinancement
     */
    public function setLibelleLong($libelleLong)
    {
        $this->libelleLong = $libelleLong;

        return $this;
    }

    /**
     * Get libelleLong.
     *
     * @return string
     */
    public function getLibelleLong()
    {
        return $this->libelleLong;
    }

    /**
     * Set libelleCourt.
     *
     * @param string $libelleCourt
     *
     * @return OrigineFinancement
     */
    public function setLibelleCourt($libelleCourt)
    {
        $this->libelleCourt = $libelleCourt;

        return $this;
    }

    /**
     * Get libelleCourt.
     *
     * @return string
     */
    public function getLibelleCourt()
    {
        return $this->libelleCourt;
    }

    /**
     * Set visible.
     *
     * @param bool $visible
     *
     * @return OrigineFinancement
     */
    public function setVisible($visible)
    {
        $this->visible = $visible;

        return $this;
    }

    /**
     * Get visible.
     *
     * @return bool
     */
    public function getVisible()
    {
        return $this->visible;
    }

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

    /**
     * Set source.
     *
     * @param \Application\Entity\Db\Source|null $source
     *
     * @return OrigineFinancement
     */
    public function setSource(\Application\Entity\Db\Source $source = null)
    {
        $this->source = $source;

        return $this;
    }

    /**
     * Get source.
     *
     * @return \Application\Entity\Db\Source|null
     */
    public function getSource()
    {
        return $this->source;
    }
}
Loading