Loading config/application.config.php +2 −0 Original line number Diff line number Diff line Loading @@ -44,6 +44,8 @@ $modules = [ 'UnicaenAide', // 'UnicaenAlerte', 'UnicaenIndicateur', 'Referentiel', 'EntretienProfessionnel', 'Carriere', 'Metier', Loading module/Application/src/Application/Controller/FichePosteController.php +0 −2 Original line number Diff line number Diff line Loading @@ -222,7 +222,6 @@ class FichePosteController extends AbstractActionController { $applications = $this->getFichePosteService()->getApplicationsDictionnaires($fiche); $competences = $this->getFichePosteService()->getCompetencesDictionnaires($fiche); $formations = $this->getFichePosteService()->getFormationsDictionnaires($fiche); $activites = $this->getFichePosteService()->getActivitesDictionnaires($fiche); //TODO remettre en place après stabilisation Loading @@ -235,7 +234,6 @@ class FichePosteController extends AbstractActionController { 'structure' => $structure, 'applications' => $applications, 'competences' => $competences, 'formations' => $formations, 'activites' => $activites, 'parcours' => $parcours, ]); Loading module/Application/src/Application/Entity/Db/Traits/DbImportableAwareTrait.php +17 −0 Original line number Diff line number Diff line Loading @@ -27,4 +27,21 @@ trait DbImportableAwareTrait { $this->created_on = $date; } public function historise(?DateTime $now = null) : void { if ($now === null) { $now = new DateTime(); } $this->deleted_on = $now; } public function dehistorise(?DateTime $now = null) : void { if ($now === null) { $now = new DateTime(); } $this->updated_on = $now; $this->deleted_on = null; } } No newline at end of file module/Application/src/Application/View/Helper/partial/raisons.phtml +10 −4 Original line number Diff line number Diff line Loading @@ -9,6 +9,7 @@ use Application\Entity\Db\Agent; use FicheMetier\Entity\Db\FicheMetier; use FicheMetier\Entity\Db\FicheMetierMission; use FicheMetier\Entity\Db\Mission; use Formation\Entity\Db\Formation; Loading @@ -18,13 +19,18 @@ use Formation\Entity\Db\Formation; <?php $text = ""; switch ($raison) { case $raison instanceof FicheMetier : $text = $raison->getMetier()->getLibelle(); $text = "Obtenue grâce à la fiche métier [".$raison->getMetier()->getLibelle()."]"; $label = "FicheMétier"; $class = 'fiche-metier'; break; case $raison instanceof FicheMetierMission : $text = $raison->getMission()->getLibelle(); $label = "Activité"; $label = "Mission"; $class = 'activite'; break; case $raison instanceof Mission : $text = "Obtenue grâce à la mission [" . $raison->getLibelle()."]"; $label = "Mission"; $class = 'activite'; break; case $raison instanceof Formation : Loading @@ -39,12 +45,12 @@ use Formation\Entity\Db\Formation; break; default : // var_dump($raison); $text = "Provenance inconnue"; $text = "Provenance inconnue : (".get_class($raison).")"; $label = "???"; $class = 'inconnue'; } ?> <span class="<?php echo $class; ?>" title="<?php echo $text; ?>" data-bs-toggle="tooltip" data-bs-html="true"><?php echo $label; ?></span> <span class="<?php echo $class; ?>" title="<?php echo $text; ?>" ><?php echo $label; ?></span> <?php endforeach;?> <?php endif; ?> No newline at end of file module/Application/view/application/fiche-poste/afficher.phtml +1 −1 Original line number Diff line number Diff line Loading @@ -123,7 +123,7 @@ $canExport = $canAfficher; <!-- REGROUPE DES COMPETENCES, APPLICATIONS ET DES FORMATIONS -----------------------------------------------------> <div class="card panel-info"> <div class="card-header"> <h2>Compétences attendues - Formations proposées</h2> <h2>Compétences et applications attendues</h2> </div> <div class="card-body"> <?php echo $this->partial('partial/competences', ['fiche' => $fiche, 'competences' => $competences, 'mode' => 'affichage'], [], true); ?> Loading Loading
config/application.config.php +2 −0 Original line number Diff line number Diff line Loading @@ -44,6 +44,8 @@ $modules = [ 'UnicaenAide', // 'UnicaenAlerte', 'UnicaenIndicateur', 'Referentiel', 'EntretienProfessionnel', 'Carriere', 'Metier', Loading
module/Application/src/Application/Controller/FichePosteController.php +0 −2 Original line number Diff line number Diff line Loading @@ -222,7 +222,6 @@ class FichePosteController extends AbstractActionController { $applications = $this->getFichePosteService()->getApplicationsDictionnaires($fiche); $competences = $this->getFichePosteService()->getCompetencesDictionnaires($fiche); $formations = $this->getFichePosteService()->getFormationsDictionnaires($fiche); $activites = $this->getFichePosteService()->getActivitesDictionnaires($fiche); //TODO remettre en place après stabilisation Loading @@ -235,7 +234,6 @@ class FichePosteController extends AbstractActionController { 'structure' => $structure, 'applications' => $applications, 'competences' => $competences, 'formations' => $formations, 'activites' => $activites, 'parcours' => $parcours, ]); Loading
module/Application/src/Application/Entity/Db/Traits/DbImportableAwareTrait.php +17 −0 Original line number Diff line number Diff line Loading @@ -27,4 +27,21 @@ trait DbImportableAwareTrait { $this->created_on = $date; } public function historise(?DateTime $now = null) : void { if ($now === null) { $now = new DateTime(); } $this->deleted_on = $now; } public function dehistorise(?DateTime $now = null) : void { if ($now === null) { $now = new DateTime(); } $this->updated_on = $now; $this->deleted_on = null; } } No newline at end of file
module/Application/src/Application/View/Helper/partial/raisons.phtml +10 −4 Original line number Diff line number Diff line Loading @@ -9,6 +9,7 @@ use Application\Entity\Db\Agent; use FicheMetier\Entity\Db\FicheMetier; use FicheMetier\Entity\Db\FicheMetierMission; use FicheMetier\Entity\Db\Mission; use Formation\Entity\Db\Formation; Loading @@ -18,13 +19,18 @@ use Formation\Entity\Db\Formation; <?php $text = ""; switch ($raison) { case $raison instanceof FicheMetier : $text = $raison->getMetier()->getLibelle(); $text = "Obtenue grâce à la fiche métier [".$raison->getMetier()->getLibelle()."]"; $label = "FicheMétier"; $class = 'fiche-metier'; break; case $raison instanceof FicheMetierMission : $text = $raison->getMission()->getLibelle(); $label = "Activité"; $label = "Mission"; $class = 'activite'; break; case $raison instanceof Mission : $text = "Obtenue grâce à la mission [" . $raison->getLibelle()."]"; $label = "Mission"; $class = 'activite'; break; case $raison instanceof Formation : Loading @@ -39,12 +45,12 @@ use Formation\Entity\Db\Formation; break; default : // var_dump($raison); $text = "Provenance inconnue"; $text = "Provenance inconnue : (".get_class($raison).")"; $label = "???"; $class = 'inconnue'; } ?> <span class="<?php echo $class; ?>" title="<?php echo $text; ?>" data-bs-toggle="tooltip" data-bs-html="true"><?php echo $label; ?></span> <span class="<?php echo $class; ?>" title="<?php echo $text; ?>" ><?php echo $label; ?></span> <?php endforeach;?> <?php endif; ?> No newline at end of file
module/Application/view/application/fiche-poste/afficher.phtml +1 −1 Original line number Diff line number Diff line Loading @@ -123,7 +123,7 @@ $canExport = $canAfficher; <!-- REGROUPE DES COMPETENCES, APPLICATIONS ET DES FORMATIONS -----------------------------------------------------> <div class="card panel-info"> <div class="card-header"> <h2>Compétences attendues - Formations proposées</h2> <h2>Compétences et applications attendues</h2> </div> <div class="card-body"> <?php echo $this->partial('partial/competences', ['fiche' => $fiche, 'competences' => $competences, 'mode' => 'affichage'], [], true); ?> Loading