Commit bf2a6854 authored by metivier's avatar metivier
Browse files

Observation en place

parent 9eeb08a9

composer.json

+1 −1
Changes for composer.json: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 
        }

    ],

    "require": {

        "unicaen/app":           "^3.0",

        "unicaen/app":           "^3.1",

        "unicaen/auth":          "^3.0",

        "unicaen/bjy-authorize": "^3.0",

        "unicaen/ldap":          "^3.0",

module/Application/src/Application/Controller/EntretienProfessionnelController.php

+1 −1
Changes for module/Application/src/Application/Controller/EntretienProfessionnelController.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -503,7 +503,7 @@ class EntretienProfessionnelController extends AbstractActionController 
        }



        $vm = new ViewModel();

        $vm->setTemplate('application/default/default-form');

        $vm->setTemplate('application/entretien-professionnel/observation-form');

        $vm->setVariables([

            'title' => "Modification d'une observation",

            'form' => $form,

module/Application/src/Application/Entity/Db/FicheposteActiviteDescriptionRetiree.php

+13 −0
Changes for module/Application/src/Application/Entity/Db/FicheposteActiviteDescriptionRetiree.php: 13 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -98,4 +98,17 @@ class FicheposteActiviteDescriptionRetiree { 
        return $this;

    }



    /**

     * @param Activite $activite

     * @param FicheposteActiviteDescriptionRetiree[] $retirees

     * @return FicheposteActiviteDescriptionRetiree[]

     */

    static public function filtrer($activite, $retirees)

    {

        $result = [];

        foreach ($retirees as $retiree) {

            if ($activite->getId() === $retiree->getDescription()->getActivite()->getId()) $result[] = $retiree;

        }

        return $result;

    }

}
 
 No newline at end of file

module/Application/src/Application/Form/EntretienProfessionnelObservation/EntretienProfessionnelObservationForm.php

+2 −4
Changes for module/Application/src/Application/Form/EntretienProfessionnelObservation/EntretienProfessionnelObservationForm.php: 2 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -21,8 +21,7 @@ class EntretienProfessionnelObservationForm extends Form { 
                ],

            ],

            'attributes' => [

                'id' =>  'obs-entretien',

                'class' => 'type2 form-control',

                'class' => 'type2 form-control obs-entretien',

            ]

        ]);

        // perspective
@@ -36,8 +35,7 @@ class EntretienProfessionnelObservationForm extends Form { 
                ],

            ],

            'attributes' => [

                'id' => 'obs-perspective',

                'class' => 'type2 form-control',

                'class' => 'type2 form-control obs-perspective',

            ]

        ]);

        // button

module/Application/src/Application/View/Helper/partial/fiche-metier.phtml

+2 −7
Changes for module/Application/src/Application/View/Helper/partial/fiche-metier.phtml: 2 added lines, 7 removed lines.
Original line number Diff line number Diff line
@@ -160,17 +160,12 @@ $a=1; 
        </div>

    </div>



    <?php $allRetirees = []; if ($ficheposte) $allRetirees = $ficheposte->getDescriptionsRetirees(); ?>

    <?php foreach ($activites as $ficheActivite): ?>

        <?php if (array_search($ficheActivite->getActivite()->getId(), $activitesListe) !== false) : ?>

            <?php

                $retirees = [];

                if ($ficheposte) {

                    $allRetirees = $ficheposte->getDescriptionsRetirees();

                    /** @var FicheposteActiviteDescriptionRetiree $retiree */

                    foreach ($allRetirees as $retiree) {

                        if ($retiree->getHistoDestruction() === null AND $retiree->getActivite() === $activite->getActivite()) $retirees[] = $retiree;

                    }

                }

                if ($ficheposte) $retirees = FicheposteActiviteDescriptionRetiree::filtrer($ficheActivite->getActivite(), $allRetirees);

            ?>

            <?php echo $this->activite($ficheActivite, $options['mode'], ['ficheposte' => $ficheposte, 'fichemetier' => $fichemetier, 'retirees' => $retirees]); ?>

        <?php endif; ?>