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

Correction sql + bug etatisntance

parent de44fcd5

documentation/SQL/012_FORMATION.sql

+1 −1
Original line number Diff line number Diff line
@@ -1592,7 +1592,7 @@ FROM d 
JOIN unicaen_privilege_categorie cp ON cp.CODE = 'formationinstanceinscrit';





INSERT INTO unicaen_privilege_categorie (code, libelle, ordre, namespace)

INSERT INTO unicaen_privilege_categorie (code, libelle, namespace, ordre)

VALUES ('stagiaireexterne', 'Gestion des stagiaires externes', 'Formation\Provider\Privilege', 100402);

INSERT INTO unicaen_privilege_privilege(CATEGORIE_ID, CODE, LIBELLE, ORDRE)

WITH d(code, lib, ordre) AS (

documentation/release/4.3.0.md

+3 −3
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ create table formation_stagiaire_externe 
            references unicaen_utilisateur_user

);



INSERT INTO unicaen_privilege_categorie (code, libelle, ordre, namespace)

INSERT INTO unicaen_privilege_categorie (code, libelle, namespace, ordre)

VALUES ('stagiaireexterne', 'Gestion des stagiaires externes', 'Formation\Provider\Privilege', 100402);

INSERT INTO unicaen_privilege_privilege(CATEGORIE_ID, CODE, LIBELLE, ORDRE)

WITH d(code, lib, ordre) AS (
@@ -146,8 +146,8 @@ create table formation_inscription_frais 
);





insert into formation_inscription_frais (id, inscription_id, frais_repas, frais_hebergement, frais_transport, histo_creation, source_id, id_source, histo_createur_id, histo_modification, histo_modificateur_id, histo_destruction, histo_destructeur_id)

select id, inscrit_id, frais_repas, frais_hebergement, frais_transport, histo_creation, histo_createur_id, histo_modification, histo_modificateur_id, histo_destruction, histo_destructeur_id from formation_instance_frais;

insert into formation_inscription_frais (id, inscription_id, frais_repas, frais_hebergement, frais_transport, source_id, id_source, histo_creation, histo_createur_id, histo_modification, histo_modificateur_id, histo_destruction, histo_destructeur_id)

select id, inscrit_id, frais_repas, frais_hebergement, frais_transport, source_id, id_source, histo_creation, histo_createur_id, histo_modification, histo_modificateur_id, histo_destruction, histo_destructeur_id from formation_instance_frais;



--TODO reposition sequence ...

-- select max(id) from formation_inscription_frais;

module/Formation/view/formation/structure/partial/liste-formation.phtml

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ usort($dictionnaryDemandes, 


                    <?php foreach ($ds as $d) : ?>

                        <br/>

                        <?php echo $this->etatisntance($d->getEtatActif()); ?>

                        <?php echo $this->etatinstance($d->getEtatActif()); ?>

                        <?php echo $d->getSession()->getFormation()->getLibelle(); ?>

                        (<?php echo $d->getSession()->getPeriode(); ?>)

                    <?php endforeach; ?>