Commit 0c0a7678 authored by Laurent Lecluse's avatar Laurent Lecluse
Browse files

Meilleur chargement de la js services

parent 00a270b3

module/Enseignement/src/View/Helper/EnseignementSaisieFormViewHelper.php

+2 −0
Original line number Diff line number Diff line
@@ -143,6 +143,8 @@ class EnseignementSaisieFormViewHelper extends AbstractViewHelper 
    {

        $fservice = $this->form->get('service');



        echo $this->getView()->inlineScript()->appendFile($this->getView()->basePath() . '/js/service.js');



        $res = $this->getView()->form()->openTag($this->form);

        if ($fservice->has('intervenant')) {

            $res .= $this->getView()->formControlGroup($fservice->get('intervenant'));

module/Enseignement/src/View/Helper/EnseignementsViewHelper.php

+2 −0
Original line number Diff line number Diff line
@@ -133,6 +133,8 @@ class EnseignementsViewHelper extends AbstractViewHelper 
            'data-params' => json_encode($this->exportParams()),

        ];



        echo $this->getView()->inlineScript()->appendFile($this->getView()->basePath() . '/js/service.js');



        $out = '<div ' . $this->htmlAttribs($attribs) . '>';

        if (count($this->getServices()) > 150) {

            return $out . '<div class="alert alert-danger" role="alert">Le nombre de services à afficher est trop important. Merci d\'affiner vos critères de recherche.</div></div>';

module/Service/view/service/service/recherche.phtml

+2 −0
Original line number Diff line number Diff line
@@ -10,6 +10,8 @@ if ($rechercheForm): 
            margin-right: 3px;

        }

    </style>



    <?= $this->getView()->inlineScript()->appendFile($this->getView()->basePath() . '/js/service.js'); ?>

    <div class="service-filtres">

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

public/js/app.js

+3 −9
Original line number Diff line number Diff line
@@ -54,15 +54,9 @@ $(function () 
    });



    /* Services */

    WidgetInitializer.add('enseignements', 'enseignements', function () {

        WidgetInitializer.includeJs(Url('js/service.js'));

    });

    WidgetInitializer.add('service-form', 'serviceForm', function () {

        WidgetInitializer.includeJs(Url('js/service.js'));

    });

    WidgetInitializer.add('service-filtres', 'serviceFiltres', function () {

        WidgetInitializer.includeJs(Url('js/service.js'));

    });

    WidgetInitializer.add('enseignements', 'enseignements');

    WidgetInitializer.add('service-form', 'serviceForm');

    WidgetInitializer.add('service-filtres', 'serviceFiltres');



    /* Service référentiel */

    WidgetInitializer.add('referentiels', 'referentiels', function () {

public/js/service.js

+5 −3
Original line number Diff line number Diff line
@@ -123,6 +123,7 @@ $.widget("ose.enseignements", { 


    onAfterSaisie: function (serviceId) {

        var that = this;

        console.log('onAfterSaisie');

        if (that.element.find("#service-" + serviceId + "-ligne").length) { // simple modification

            that.element.find("#service-" + serviceId + "-ligne").refresh({

                details: that.element.find('#service-' + serviceId + '-volume-horaire-tr').css('display') == 'none' ? '0' : '1',
@@ -137,6 +138,7 @@ $.widget("ose.enseignements", { 
                'details': 1,

                params: that.params

            });

            console.log('nouveau');

            $.get(url, function (data) {

                that.element.find("table:first > tbody:last").append(data);

                that.onAfterChange();
@@ -282,9 +284,9 @@ $.widget("ose.enseignements", { 
                    serviceId = data[i].value;

                }

            }

            if (serviceId) {

            // if (serviceId) {

            that.onAfterSaisie(serviceId);

            }

            // }



        });