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

Mes formations + Raison d'être des fiches métiers

parent 582e39e3
Loading
Loading
Loading
Loading
+1
Changes for documentation/110_DB_EMC2_FICHEMETIER.sql: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ create table fichemetier
    metier_id             integer   not null
        constraint fichetype_metier__fk
        references metier_metier,
    raison                text,
    expertise             boolean default false,
    etat_id               integer default 0
        constraint fichemetier_unicaen_etat_etat_id_fk
+17
Changes for documentation/release/3.1.4.md: 17 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -5,11 +5,28 @@
**Changements**

* Retrait de mention UniCaen dans la fiche de poste pour des termes plus généraux
* Ajout de la raison d'être sur les fiches metiers


**Modifications de la base de donnée**

```sql
-- ajout des ''raison d être'' aux fiches metier 
alter table fichemetier add raison text;

-- modélisation concrete de la notion de plan de formation 
create table formation_plan_formation
(
    id    serial constraint formation_plan_formation_pk primary key,
    annee varchar(128) not null
);

create table formation_action_plan
(
    action_id integer not null constraint formation_action_plan_formation_id_fk references formation,
    plan_id   integer not null constraint formation_action_plan_formation_plan_formation_id_fk references formation_plan_formation,
    constraint formation_action_plan_pk primary key (action_id, plan_id)
);
```

**Évolution des bibliothèques**
+18
Changes for module/Application/config/merged/fiche-metier.config.php: 18 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -12,6 +12,10 @@ use Application\Form\FicheMetierImportation\FicheMetierImportationForm;
use Application\Form\FicheMetierImportation\FicheMetierImportationFormFactory;
use Application\Form\FicheMetierImportation\FichierMetierImportationHydrator;
use Application\Form\FicheMetierImportation\FichierMetierImportationHydratorFactory;
use Application\Form\Raison\RaisonForm;
use Application\Form\Raison\RaisonFormFactory;
use Application\Form\Raison\RaisonHydrator;
use Application\Form\Raison\RaisonHydratorFactory;
use Application\Form\SelectionFicheMetier\SelectionFicheMetierForm;
use Application\Form\SelectionFicheMetier\SelectionFicheMetierFormFactory;
use Application\Provider\Privilege\FicheMetierPrivileges;
@@ -71,6 +75,7 @@ return [
                        'editer',

                        'editer-libelle',
                        'editer-raison',
                        'retirer-activite',
                        'deplacer-activite',
                        'ajouter-nouvelle-activite',
@@ -437,6 +442,17 @@ return [
                        ],
                        'may_terminate' => true,
                    ],
                    'editer-raison' => [
                        'type'  => Segment::class,
                        'options' => [
                            'route'    => '/editer-libelle/:fiche-metier',
                            'defaults' => [
                                'controller' => FicheMetierController::class,
                                'action'     => 'editer-raison',
                            ],
                        ],
                        'may_terminate' => true,
                    ],
                    'retirer-activite' => [
                        'type'  => Segment::class,
                        'options' => [
@@ -525,12 +541,14 @@ return [
            LibelleForm::class => LibelleFormFactory::class,
            SelectionFicheMetierForm::class => SelectionFicheMetierFormFactory::class,
            FicheMetierImportationForm::class => FicheMetierImportationFormFactory::class,
            RaisonForm::class => RaisonFormFactory::class,
        ],
    ],
    'hydrators' => [
        'factories' => [
            LibelleHydrator::class => LibelleHydratorFactory::class,
            FichierMetierImportationHydrator::class => FichierMetierImportationHydratorFactory::class,
            RaisonHydrator::class => RaisonHydratorFactory::class,
        ],
    ],
    'view_helpers' => [
+30
Changes for module/Application/src/Application/Controller/FicheMetierController.php: 30 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ use Application\Form\Activite\ActiviteFormAwareTrait;
use Application\Form\FicheMetier\LibelleForm;
use Application\Form\FicheMetier\LibelleFormAwareTrait;
use Application\Form\FicheMetierImportation\FicheMetierImportationFormAwareTrait;
use Application\Form\Raison\RaisonFormAwareTrait;
use Application\Form\SelectionFicheMetier\SelectionFicheMetierFormAwareTrait;
use Application\Provider\Etat\FicheMetierEtats;
use Application\Provider\Template\PdfTemplate;
@@ -67,6 +68,7 @@ class FicheMetierController extends AbstractActionController
    use ActiviteFormAwareTrait;
    use LibelleFormAwareTrait;
    use FicheMetierImportationFormAwareTrait;
    use RaisonFormAwareTrait;
    use SelectionApplicationFormAwareTrait;
    use SelectionCompetenceFormAwareTrait;
    use SelectionEtatFormAwareTrait;
@@ -247,6 +249,34 @@ class FicheMetierController extends AbstractActionController

    /** Action lier à l'édition d'une fiche métier ********************************************************************/

    public function editerRaisonAction() : ViewModel
    {
        $fiche = $this->getFicheMetierService()->getRequestedFicheMetier($this, 'fiche-metier');

        $form = $this->getRaisonForm();
        $form->setAttribute('action', $this->url()->fromRoute('fiche-metier-type/editer-raison', ['fiche-metier' => $fiche->getId()], [], true));
        $form->bind($fiche);

        $request = $this->getRequest();
        if ($request->isPost()) {
            $data = $request->getPost();
            $form->setData($data);
            if ($form->isValid()) {
                $this->getFicheMetierService()->update($fiche);
                $this->flashMessenger()->addSuccessMessage("Mise à jour de la \"raison d'être du métier\" effectuée.");
                exit();
            }
        }

        $vm =  new ViewModel([
            'title' => "Modification de la raison d'être du métier",
            'form' => $form,
            'info' => "Laisser vide si aucun raison n'est nécessaire",
        ]);
        $vm->setTemplate('application/default/default-form');
        return $vm;
    }

    public function editerLibelleAction() : ViewModel
    {
        $fiche = $this->getFicheMetierService()->getRequestedFicheMetier($this, 'id', true);
+4
Changes for module/Application/src/Application/Controller/FicheMetierControllerFactory.php: 4 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ namespace Application\Controller;
use Application\Form\Activite\ActiviteForm;
use Application\Form\FicheMetier\LibelleForm;
use Application\Form\FicheMetierImportation\FicheMetierImportationForm;
use Application\Form\Raison\RaisonForm;
use Application\Service\ActiviteDescription\ActiviteDescriptionService;
use Element\Form\SelectionApplication\SelectionApplicationForm;
use Element\Form\SelectionCompetence\SelectionCompetenceForm;
@@ -71,6 +72,7 @@ class FicheMetierControllerFactory
         * @var LibelleForm $libelleForm
         * @var FicheMetierImportationForm $ficheMetierImportationForm
         * @var ActiviteForm $activiteForm
         * @var RaisonForm $raisonForm
         * @var SelectionApplicationForm $selectionApplicationForm
         * @var SelectionCompetenceForm $selectionCompetenceForm
         * @var SelectionFormationForm $selectionFormationForm
@@ -79,6 +81,7 @@ class FicheMetierControllerFactory
         */
        $libelleForm = $container->get('FormElementManager')->get(LibelleForm::class);
        $activiteForm = $container->get('FormElementManager')->get(ActiviteForm::class);
        $raisonForm = $container->get('FormElementManager')->get(RaisonForm::class);
        $selectionApplicationForm = $container->get('FormElementManager')->get(SelectionApplicationForm::class);
        $selectionCompetenceForm = $container->get('FormElementManager')->get(SelectionCompetenceForm::class);
        $selectionFormationForm = $container->get('FormElementManager')->get(SelectionFormationForm::class);
@@ -105,6 +108,7 @@ class FicheMetierControllerFactory

        $controller->setLibelleForm($libelleForm);
        $controller->setActiviteForm($activiteForm);
        $controller->setRaisonForm($raisonForm);
        $controller->setSelectionApplicationForm($selectionApplicationForm);
        $controller->setSelectionCompetenceForm($selectionCompetenceForm);
        $controller->setSelectionFormationForm($selectionFormationForm);
Loading