Commit b4ae9926 authored by Antony Le Courtes's avatar Antony Le Courtes
Browse files

Merge remote-tracking branch 'origin/master'

parents 3e952db6 ce901995

.gitignore

+1 −0
Original line number Diff line number Diff line 
config.local.php

config/autoload/*.local.php

vendor/*

node_modules/*

cache/*

.idea

deploy.log

module/Application/src/Controller/EmployeurController.php

+11 −1
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ use Application\Entity\Db\Employeur; 
use Application\Form\Employeur\Traits\EmployeurSaisieFormAwareTrait;

use Application\Service\Traits\EmployeurServiceAwareTrait;

use Laminas\View\Model\JsonModel;

use UnicaenApp\View\Model\MessengerViewModel;



/**

 * Description of EmployeurController
@@ -28,6 +29,8 @@ class EmployeurController extends AbstractController 
        return compact('employeurs');

    }







    public function saisieAction()

    {

        $employeur = $this->getEvent()->getParam('employeur');
@@ -57,12 +60,18 @@ class EmployeurController extends AbstractController 
        return compact('form', 'title');

    }







    public function supprimerAction()

    {

        return true;

        $employeur = $this->getEvent()->getParam('employeur');

        $this->getServiceEmployeur()->delete($employeur, true);



        return new MessengerViewModel();

    }







    public function rechercheAction()

    {
@@ -78,6 +87,7 @@ class EmployeurController extends AbstractController 
    }







    public function rechercheJsonAction()

    {

        $critere = $this->params()->fromPost('critere');

module/Application/view/application/employeur/liste.phtml

+2 −2
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ $canEdit = true; 


<?php if ($canEdit): ?>

    <tr class="champ-triable">

        <a class="btn btn-primary ajax-modal " data-event="employeur-edition"

        <a class="btn btn-primary ajax-modal " data-event="employeur-saisie"

           href="<?= $this->url('employeur/saisie'); ?>"><i

                    class="fas fa-plus"></i>

            Ajout d'un employeur</a>
@@ -60,7 +60,7 @@ $canEdit = true; 


<script type="text/javascript">

    $(function () {

        $("body").on("employeur-edition", function (event, data) {

        $("body").on("employeur-saisie", function (event, data) {

            window.location.reload();

        });

    });

module/Intervenant/view/intervenant/statut/index.phtml

+1 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ $this->headTitle()->append($title = "Statuts des intervenants"); 
</div>



<?php if ($canEdit): ?>

    <br>

    <a class="btn btn-primary" href="<?= $this->url('statut/saisie') ?>" title="Ajouter un statut">

        <span class="fas fa-plus"></span> Ajouter un statut

    </a>