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

Merge branch 'master' of git.unicaen.fr:open-source/inscription_suac

parents eec0c1c1 9b934c0f

00_requetes.sql→SQL/00_requetes.sql

+0 −0

File moved.

View file

SQL/01_schemas.sql

+3 −1
Original line number Diff line number Diff line
@@ -370,3 +370,5 @@ select * from etudiant_etudiant 
             -- id = 'ESAM_minapinpin479@gmail.com' ;



select * from unicaen_utilisateur_user where email = 'minapinpin479@gmail.com' ;



alter table public.unicaen_mail_mail add attachment_paths text ;
 
 No newline at end of file

module/Atelier/src/Controller/AtelierController.php

+2 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ class AtelierController extends AbstractActionController 
        $params = $this->params()->fromQuery();

        $villeAsOptions = $this->getVilleService()->getVillesAsOptions();

        $siteAsOptions = $this->getSiteService()->getSitesAsOptions();

        $archivageAsOptions = ['0' => 'Non historisés', '1' => 'Historisés'];



        $ateliers = $this->getAtelierService()->getAteliersWithFiltre($params, 'libelle','asc', true);
@@ -57,6 +58,7 @@ class AtelierController extends AbstractActionController 
            'params' => $params,

            'villeAsOptions' => $villeAsOptions,

            'siteAsOptions' => $siteAsOptions,

            'archivageAsOptions' => $archivageAsOptions,

        ]);

    }

module/Atelier/src/Entity/Db/Atelier.php

+25 −0
Original line number Diff line number Diff line
@@ -87,6 +87,31 @@ class Atelier implements HistoriqueAwareInterface 
        return  $villes->toArray();

    }



    public function getNomVilles(): string

    {

        $villes = $this->getVilles();

        $nomVilles = [];

        foreach ($villes as $ville) {

            $nomVilles[] = $ville->getNom();

        }

        $nomVilles = array_unique($nomVilles);

        //supprimer les valeurs null

        $nomVilles = array_filter($nomVilles);

        return implode(', ', $nomVilles);

    }



    public function getSites(): string

    {

        $sites = [];

        foreach ($this->getSessions() as $session) {

            $sites[] = $session->getSite()?->getLibelle();

        }

        $sites = array_unique($sites);

        //supprimer les valeurs null

        $sites = array_filter($sites);

        return implode(', ', $sites);

    }



    public function getLibelleEtVilles(): string

    {

        $libelle = $this->getLibelle();

module/Atelier/src/Service/Atelier/AtelierService.php

+8 −0
Original line number Diff line number Diff line
@@ -80,6 +80,14 @@ class AtelierService 
            $qb = $qb->andWhere('ville.id = :ville')->setParameter('ville', $params['ville']);

        }



        if(array_key_exists('archivage',$params)){

            if($params['archivage'] == '0') {

                $qb = $qb->andWhere('atelier.histoDestruction IS NULL');

            }else{

                $qb = $qb->andWhere('atelier.histoDestruction IS NOT NULL');

            }

        }



        return $qb;

    }