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

Up

parent 4b50f90b

composer.json

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 
  "minimum-stability": "dev",

  "require": {

    "unicaen/app": "3.2.0",

    "unicaen/authentification": "dev-master",

    "unicaen/authentification": "^1.1.0",

    "unicaen/utilisateur": "dev-master",

    "unicaen/privilege": "dev-master",

    "unicaen/renderer": "dev-master",

documentation/001-BD_BIBLIOTHEQUE.sql

+1 −1
Original line number Diff line number Diff line
@@ -453,7 +453,7 @@ create table unicaen_autoform_validation_reponse 


create unique index validation_reponse_id_uindex on unicaen_autoform_validation_reponse (id);



-- ---------------------------------------------------------------------------------------------------------------------

-- FICHIER -------------------------------------------------------------------------------------------------------------



create table fichier_nature

(

documentation/002-BD_EMC2.sql

+0 −2
Original line number Diff line number Diff line
@@ -511,8 +511,6 @@ create table formation_instance_formateur 
    nom varchar(256) not null,

    email varchar(1024),

    attachement varchar(1024),

    volume double precision,

    montant double precision,

    histo_creation timestamp not null,

    histo_createur_id integer not null constraint formation_instance_formateur_user_id_fk references unicaen_utilisateur_user,

    histo_modification timestamp,

module/Application/src/Application/View/Helper/partial/fiches-postes-as-table.phtml

+2 −2
Original line number Diff line number Diff line
@@ -65,8 +65,8 @@ if ($retour) $query['retour'] = $retour; 
            $destruction = $fiche->getHistoDestruction();

            $agentId = ($fiche->getAgent())?$fiche->getAgent()->getId():null;

            $agent = ($fiche->getAgent())?$fiche->getAgent()->getDenomination():null;

            $structureId = ($fiche->getAgent())?$fiche->getAgent()->getAffectationPrincipale()->getStructure()->getId():null;

            $structure = ($fiche->getAgent())?$fiche->getAgent()->getAffectationPrincipale()->getStructure()->getLibelleCourt():null;

            $structureId = ($fiche->getAgent() AND $fiche->getAgent()->getAffectationPrincipale())?$fiche->getAgent()->getAffectationPrincipale()->getStructure()->getId():null;

            $structure = ($fiche->getAgent() AND $fiche->getAgent()->getAffectationPrincipale())?$fiche->getAgent()->getAffectationPrincipale()->getStructure()->getLibelleCourt():null;

            $fichePrincipale = ($fiche->toStringFicheMetierPrincipal() !== '')?$fiche->toStringFicheMetierPrincipal():null;

            $ficheLibelle = ($fiche->getLibelle() !== '')?$fiche->getLibelle():null;

            $isEnCours = $fiche->isEnCours();

module/Element/config/merged/application-element.config.php

+5 −1
Original line number Diff line number Diff line
@@ -4,6 +4,8 @@ namespace Element; 


use Element\Form\ApplicationElement\ApplicationElementForm;

use Element\Form\ApplicationElement\ApplicationElementFormFactory;

use Element\Form\ApplicationElement\ApplicationElementHydrator;

use Element\Form\ApplicationElement\ApplicationElementHydratorFactory;

use Element\Service\ApplicationElement\ApplicationElementService;

use Element\Service\ApplicationElement\ApplicationElementServiceFactory;

use UnicaenPrivilege\Guard\PrivilegeController;
@@ -39,7 +41,9 @@ return [ 
        ],

    ],

    'hydrators' => [

        'factories' => [],

        'factories' => [

            ApplicationElementHydrator::class => ApplicationElementHydratorFactory::class,

        ],

    ]



];
 
 No newline at end of file