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

Fixing

parent 684033dc

module/Agent/view/agent/agent-mobilite/partial/filtre.phtml

+4 −6
Changes for module/Agent/view/agent/agent-mobilite/partial/filtre.phtml: 4 added lines, 6 removed lines.
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ use UnicaenApp\Form\Element\SearchAndSelect; 


<div class="card">

    <div class="card-header bg-default">

        Filtre des demandes de mobilité

        Filtre de recherche des demandes de mobilité

    </div>

    <div class="card-body">

        <form method="get" action="<?php echo $this->url(); ?>">
@@ -30,7 +30,6 @@ use UnicaenApp\Form\Element\SearchAndSelect; 
                            $agentF = new SearchAndSelect('agent');

                            $agentF

                                ->setAutocompleteSource($this->url('agent/rechercher'))

                                ->setSelectionRequired(true)

                                ->setAttributes([

                                    'id' => 'agent',

                                    'placeholder' => "Sélectionner un·e agent·e",
@@ -45,7 +44,6 @@ use UnicaenApp\Form\Element\SearchAndSelect; 
                            $structureF = new SearchAndSelect('structure');

                            $structureF

                                ->setAutocompleteSource($this->url('structure/rechercher'))

                                ->setSelectionRequired(true)

                                ->setAttributes([

                                    'id' => 'structure',

                                    'placeholder' => "Sélectionner une structure",
@@ -54,9 +52,9 @@ use UnicaenApp\Form\Element\SearchAndSelect; 
                            <?php echo $this->formControlGroup($structureF); ?>

                        </div>

                        <div class="col-md-4">

                            <label for="mobilite">Type de mobilité</label>

                            <select id="mobilite" name="mobilite" data-live-search="true">

                                <option>Tous les type de mobilités</option>

                            <label for="mobilite">Type de mobilité : </label>

                            <select id="mobilite" name="mobilite" data-live-search="true" class="form-control">

                                <option>Tous les types de mobilités</option>

                                <?php foreach($mobilites as $mobilite_): ?>

                                    <option value="<?php echo $mobilite_->getId();?>"

                                    >

module/Carriere/src/Carriere/Service/Corps/CorpsService.php

+1 −1
Changes for module/Carriere/src/Carriere/Service/Corps/CorpsService.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ class CorpsService 
            $qb = $qb->addSelect('agentGrade')->join('corps.agentGrades', 'agentGrade')

                ->addSelect('agent')->join('agentGrade.agent', 'agent')

                ->andWhere('agent.deletedOn IS NULL')

                ->andWhere('agentgrade.deletedOn IS NULL');

                ->andWhere('agentGrade.deletedOn IS NULL');

            $qb = AgentGrade::decorateWithActif($qb, 'agentGrade');

        }

module/Carriere/src/Carriere/Service/Correspondance/CorrespondanceService.php

+1 −1
Changes for module/Carriere/src/Carriere/Service/Correspondance/CorrespondanceService.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ class CorrespondanceService { 
        if ($avecAgent) {

            $qb = $qb

                ->addSelect('agentGrade')->join('correspondance.agentGrades', 'agentGrade')

                ->andWhere('agentgrade.deletedOn IS NULL')

                ->andWhere('agentGrade.deletedOn IS NULL')

                ->addSelect('agent')->join('agentGrade.agent','agent')

                ->andWhere('agent.deletedOn IS NULL')

            ;

module/Carriere/src/Carriere/Service/EmploiType/EmploiTypeService.php

+1 −1
Changes for module/Carriere/src/Carriere/Service/EmploiType/EmploiTypeService.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ class EmploiTypeService 
            $qb = $qb->addSelect('agentGrade')->join('emploitype.agentGrades', 'agentGrade')

                ->addSelect('agent')->join('agentGrade.agent', 'agent')

                ->andWhere('agent.deletedOn IS NULL')

                ->andWhere('agentgrade.deletedOn IS NULL');

                ->andWhere('agentGrade.deletedOn IS NULL');

            $qb = AgentGrade::decorateWithActif($qb, 'agentGrade');

        }

module/Carriere/src/Carriere/Service/Grade/GradeService.php

+1 −1
Changes for module/Carriere/src/Carriere/Service/Grade/GradeService.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ class GradeService 
            ->join('grade.agentGrades', 'agentGrade')->addSelect('agentGrade')

            ->join('agentGrade.agent', 'agent')->addSelect('agent')

            ->andWhere('agent.deletedOn IS NULL')

            ->andWhere('agentgrade.deletedOn IS NULL');

            ->andWhere('agentGrade.deletedOn IS NULL');

        return $qb;

    }