Commit 4c70c4b4 authored by Florian Joriot's avatar Florian Joriot
Browse files

Merge remote-tracking branch 'origin/b24' into b24

parents 178d82c2 de39a66b

data/ddl/view/V_EXPORT_SERVICE.sql

+1 −1
Original line number Diff line number Diff line
@@ -311,7 +311,7 @@ FROM 
  LEFT JOIN histo_intervenant_service   his ON his.intervenant_id = i.id AND his.type_volume_horaire_id = tvh.id AND his.referentiel = 0

  LEFT JOIN grade                         g ON g.id     = i.grade_id

  LEFT JOIN discipline                   di ON di.id    = i.discipline_id

  LEFT JOIN STRUCTURE                  saff ON saff.id  = i.structure_id AND ti.code = 'P'

  LEFT JOIN STRUCTURE                  saff ON saff.id  = i.structure_id

  LEFT JOIN element_pedagogique          ep ON ep.id    = t.element_pedagogique_id

  LEFT JOIN discipline                   de ON de.id    = ep.discipline_id

  LEFT JOIN STRUCTURE                  sens ON sens.id  = NVL(t.structure_ens_id, ep.structure_id)

public/js/service.js

+2 −2
Original line number Diff line number Diff line
@@ -481,12 +481,12 @@ $.widget("ose.serviceFiltres", { 
        });

        this.getElementIntervenant().autocomplete("option", "source", url);



        if (this.getElementTypeIntervenantSelected().val() !== undefined && this.getElementTypeIntervenantSelected().data('intervenant-exterieur-id') == this.getElementTypeIntervenantSelected().val()) {

        /*if (this.getElementTypeIntervenantSelected().val() !== undefined && this.getElementTypeIntervenantSelected().data('intervenant-exterieur-id') == this.getElementTypeIntervenantSelected().val()) {

            this.element.find('#structure-aff-div').hide();

            this.getElementStructureAff().val('');

        } else {

            this.element.find('#structure-aff-div').show();

        }

        }*/

    },



    getElementStructureAff: function () {