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

Merge branch 'master' into LAGAFF

parents 58b8b31b 9f4f542c
Loading
Loading
Loading
Loading
+0 −2
Changes for module/Application/config/merged/application.config.php: 0 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ use Application\Service\Application\ApplicationService;
use Application\Service\Application\ApplicationServiceFactory;
use Application\Service\Application\ApplicationGroupeServiceFactory;
use Application\View\Helper\ApplicationBlocViewHelper;
use Application\View\Helper\ApplicationGroupeViewHelper;
use UnicaenPrivilege\Guard\PrivilegeController;
use Zend\Router\Http\Literal;
use Zend\Router\Http\Segment;
@@ -276,7 +275,6 @@ return [
    ],
    'view_helpers' => [
        'invokables' => [
            'applicationGroupe' => ApplicationGroupeViewHelper::class,
            'applicationBloc' => ApplicationBlocViewHelper::class,
        ],
    ],
+0 −1
Changes for module/Application/config/merged/formation.config.php: 0 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -692,7 +692,6 @@ return [
    ],
    'view_helpers' => [
        'invokables' => [
            'formationGroupe' => FormationGroupeViewHelper::class,
        ],
    ],
];
 No newline at end of file
+2 −0
Changes for module/Application/src/Application/Controller/AgentController.php: 2 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -72,6 +72,7 @@ class AgentController extends AbstractActionController
        $entretiens = $this->getEntretienProfessionnelService()->getEntretiensProfessionnelsParAgent($agent);
        $user = $this->getUserService()->getConnectedUser();
        $role = $this->getUserService()->getConnectedRole();
        $responsables = $this->getAgentService()->getClosestResponsablesByAgent($agent);

        return new ViewModel([
            'title' => 'Afficher l\'agent',
@@ -79,6 +80,7 @@ class AgentController extends AbstractActionController
            'role'  => $role,
            'user'  => $user,
            'entretiens' => $entretiens,
            'responsables' => $responsables,
        ]);
    }

+7 −2
Changes for module/Application/src/Application/Controller/EntretienProfessionnelController.php: 7 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ class EntretienProfessionnelController extends AbstractActionController
                $this->getEntretienProfessionnelService()->create($entretien);
                $this->getEntretienProfessionnelService()->recopiePrecedent($entretien);
                $this->getMailingService()->sendMailType("ENTRETIEN_CONVOCATION_AGENT", ['campagne' => $entretien->getCampagne(), 'entretien' => $entretien, 'user' => $entretien->getAgent()->getUtilisateur()]);
                return $this->redirect()->toRoute('entretien-professionnel/renseigner', ['entretien' => $entretien->getId()], [], true);
                //return $this->redirect()->toRoute('entretien-professionnel/renseigner', ['entretien' => $entretien->getId()], [], true);
            }
        }

@@ -298,7 +298,10 @@ class EntretienProfessionnelController extends AbstractActionController
                switch ($type) {
                    case 'Agent' :
                        $entretien->setValidationAgent($validation);
                        $this->getMailingService()->sendMailType("ENTRETIEN_VALIDATION_AGENT", ['campagne' => $entretien->getCampagne(), 'entretien' => $entretien, 'mailing' => 'zzz'.'DRH@unicaen.fr']);
                        $responsables = $this->getAgentService()->getClosestResponsablesByAgent($entretien->getAgent());
                        $array = [];
                        foreach ($responsables as $responsable) $array[] = $responsable->getEmail();
                        $this->getMailingService()->sendMailType("ENTRETIEN_VALIDATION_AGENT", ['campagne' => $entretien->getCampagne(), 'entretien' => $entretien, 'mailing' => $array]);
                        break;
                    case 'Responsable' :
                        $entretien->setValidationResponsable($validation);
@@ -354,10 +357,12 @@ class EntretienProfessionnelController extends AbstractActionController
    public function exporterAction()
    {
        $entretien = $this->getEntretienProfessionnelService()->getRequestedEntretienProfessionnel($this, 'entretien');
        $formations = $this->getAgentService()->getFormationsSuiviesByAnnee($entretien->getAgent(), $entretien->getAnnee());

        $exporter = new EntretienProfessionnelPdfExporter($this->renderer, 'A4');
        $exporter->setVars([
            'entretien' => $entretien,
            'formations' => $formations,
        ]);

        $agent = $entretien->getAgent()->getDenomination();
+1 −0
Changes for module/Application/src/Application/Controller/StructureController.php: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -291,6 +291,7 @@ class StructureController extends AbstractActionController {
        $structure = $this->getStructureService()->getRequestedStructure($this);

        $users = $this->getStructureService()->getGestionnairesByStructure($structure);

        $selected = [];

        $term = $this->params()->fromQuery('term');
Loading