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

Merge branch 'ModuleFormation_4.0.0' of git.unicaen.fr:open-source/sygal into ModuleFormation_4.0.0

parents db4adf1c 7551042f
Loading
Loading
Loading
Loading
+2 −2
Changes for module/Formation/src/Formation/Service/EnqueteReponse/Search/EnqueteReponseSearchService.php: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -82,8 +82,8 @@ class EnqueteReponseSearchService extends SearchService
            ->join("sess.formation", 'form')
            ->join("sess.formateurs", 'formateur')
            ->join("formateur.individu", 'indf')
            ->join("form.responsable", 'resp')
            ->join("form.site", 'site')
            ->leftJoin("form.responsable", 'resp')
            ->leftJoin("form.site", 'site')
            ->andWhere('er.histoDestruction is null')
            ->addOrderBy('q.id');
    }
+2 −2
Changes for module/Formation/src/Formation/Service/Formation/Search/FormationSearchService.php: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -60,8 +60,8 @@ class FormationSearchService extends SearchService
        // ATTENTION à bien sélectionner les relations utilisées par les filtres/tris et parcourues côté vue.
        return $this->formationRepository->createQueryBuilder('f')
            ->addSelect('resp, site, struct')
            ->join("f.responsable", 'resp')
            ->join("f.site", 'site')
            ->leftJoin("f.responsable", 'resp')
            ->leftJoin("f.site", 'site')
            ->leftJoin("f.typeStructure", 'struct');
    }

+3 −0
Changes for public/css/formation.css: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line
div.index-result {
  padding-top: 1rem; }

span.formation-typage {
  border: 1px solid lightgrey;
  border-radius: 5px;
+1 −1
Changes for public/css/formation.css.map: 1 added line, 1 removed line.
Original line number Diff line number Diff line
{
"version": 3,
"mappings": "AACA,qBAAsB;EACpB,MAAM,EAAE,mBAAmB;EAC3B,aAAa,EAAE,GAAG;EAClB,OAAO,EAAE,KAAK;EACd,WAAW,EAAE,GAAG;;AAIlB,uBAAwB;EACtB,QAAQ,EAAC,QAAQ;EACjB,IAAI,EAAC,QAAQ;EACb,GAAG,EAAC,OAAO;EACX,WAAW,EAAC,MAAM;EAClB,SAAS,EAAE,QAAQ;EACnB,WAAW,EAAE,0HAA0H;;AAGzI,uBAAwB;EACtB,KAAK,EAAE,iBAAiB;;AAG1B,wBAAyB;EACvB,0BAA0B;EAC1B,eAAe,EAAE,YAAY;;AAI/B,mBAAoB;EAClB,UAAU,EAAE,cAAc;EAC1B,SAAS,EAAE,KAAK;;AAGlB,iBAAkB;EAChB,UAAU,EAAE,MAAM;EAClB,KAAK,EAAC,IAAI;;AAGZ,oBAAqB;EACnB,KAAK,EAAC,KAAK;;AAEb,iBAAkB;EAChB,gBAAgB;EAChB,SAAS,EAAE,KAAK;EAChB,SAAS,EAAE,KAAK;;AAElB,wBAAyB;EACvB,gBAAgB;EAChB,SAAS,EAAE,KAAK;EAChB,SAAS,EAAE,KAAK;;AAElB,kBAAmB;EACjB,gBAAgB;EAChB,SAAS,EAAC,KAAK;EACf,SAAS,EAAC,KAAK;;AAIjB,wBAAyB;EACvB,6BAA6B;;AAG/B,8BAA+B;EAC7B,MAAM,EAAG,eAAe;;AAG1B,yCAAyC;EACvC,MAAM,EAAG,CAAC;;AAEZ,sCAAsC;EACpC,YAAY,EAAE,WAAW;EACzB,gBAAgB,EAAE,KAAK;EACvB,WAAW,EAAC,KAAK;EACjB,cAAc,EAAC,IAAI;EACnB,UAAU,EAAE,OAAO;EACnB,KAAK,EAAC,KAAK;EACX,KAAK,EAAE,IAAI;;AAGb,sCAAsC;EACpC,YAAY,EAAC,KAAK;EAClB,aAAa,EAAC,IAAI;EAClB,UAAU,EAAE,OAAO;EACnB,KAAK,EAAC,KAAK;EACX,MAAM,EAAE,IAAI;EACZ,KAAK,EAAE,KAAK;;AAGd,sCAAuC;EACrC,cAAc,EAAE,MAAM;EACtB,UAAU,EAAE,MAAM;EAClB,SAAS,EAAE,IAAI;EACf,UAAU,EAAE,IAAI",
"mappings": "AAAA,gBAAiB;EACf,WAAW,EAAE,IAAI;;AAGnB,qBAAsB;EACpB,MAAM,EAAE,mBAAmB;EAC3B,aAAa,EAAE,GAAG;EAClB,OAAO,EAAE,KAAK;EACd,WAAW,EAAE,GAAG;;AAIlB,uBAAwB;EACtB,QAAQ,EAAC,QAAQ;EACjB,IAAI,EAAC,QAAQ;EACb,GAAG,EAAC,OAAO;EACX,WAAW,EAAC,MAAM;EAClB,SAAS,EAAE,QAAQ;EACnB,WAAW,EAAE,0HAA0H;;AAGzI,uBAAwB;EACtB,KAAK,EAAE,iBAAiB;;AAG1B,wBAAyB;EACvB,0BAA0B;EAC1B,eAAe,EAAE,YAAY;;AAI/B,mBAAoB;EAClB,UAAU,EAAE,cAAc;EAC1B,SAAS,EAAE,KAAK;;AAGlB,iBAAkB;EAChB,UAAU,EAAE,MAAM;EAClB,KAAK,EAAC,IAAI;;AAGZ,oBAAqB;EACnB,KAAK,EAAC,KAAK;;AAEb,iBAAkB;EAChB,gBAAgB;EAChB,SAAS,EAAE,KAAK;EAChB,SAAS,EAAE,KAAK;;AAElB,wBAAyB;EACvB,gBAAgB;EAChB,SAAS,EAAE,KAAK;EAChB,SAAS,EAAE,KAAK;;AAElB,kBAAmB;EACjB,gBAAgB;EAChB,SAAS,EAAC,KAAK;EACf,SAAS,EAAC,KAAK;;AAIjB,wBAAyB;EACvB,6BAA6B;;AAG/B,8BAA+B;EAC7B,MAAM,EAAG,eAAe;;AAG1B,yCAAyC;EACvC,MAAM,EAAG,CAAC;;AAEZ,sCAAsC;EACpC,YAAY,EAAE,WAAW;EACzB,gBAAgB,EAAE,KAAK;EACvB,WAAW,EAAC,KAAK;EACjB,cAAc,EAAC,IAAI;EACnB,UAAU,EAAE,OAAO;EACnB,KAAK,EAAC,KAAK;EACX,KAAK,EAAE,IAAI;;AAGb,sCAAsC;EACpC,YAAY,EAAC,KAAK;EAClB,aAAa,EAAC,IAAI;EAClB,UAAU,EAAE,OAAO;EACnB,KAAK,EAAC,KAAK;EACX,MAAM,EAAE,IAAI;EACZ,KAAK,EAAE,KAAK;;AAGd,sCAAuC;EACrC,cAAc,EAAE,MAAM;EACtB,UAAU,EAAE,MAAM;EAClB,SAAS,EAAE,IAAI;EACf,UAAU,EAAE,IAAI",
"sources": ["formation.scss"],
"names": [],
"file": "formation.css"