From 27e23fffaf978e6b2c2651fdd64c2c486459f23b Mon Sep 17 00:00:00 2001 From: afornerot Date: Mon, 9 May 2022 11:43:01 +0200 Subject: [PATCH 1/3] =?UTF-8?q?ne=20pas=20afficher=20le=20clic=20sonde=20s?= =?UTF-8?q?ur=20les=20app=20autog=C3=A9n=C3=A9r=C3=A9es=20par=20envole=20(?= =?UTF-8?q?fixes=20#33944)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/Cadoles/PortalBundle/Controller/ItemController.php | 2 +- src/ninegate-1.0/src/Cadoles/PortalBundle/Form/ItemType.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/ItemController.php b/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/ItemController.php index 7527ba8d..6b415c20 100644 --- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/ItemController.php +++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/ItemController.php @@ -124,7 +124,7 @@ class ItemController extends Controller "labelniveau01" => $this->GetParameter("labelsniveau01"), "ssosynchroitem" => $this->GetParameter("ssosynchroitem"), "user_attr_cas_item" => $this->GetParameter("user_attr_cas_item"), - "activate_widsonde" => $this->GetParameter("activate_widsonde"), + "activate_widsonde" => ($this->GetParameter("activate_widsonde")&&$data->getId()>0), )); // Récupération des data du formulaire diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Form/ItemType.php b/src/ninegate-1.0/src/Cadoles/PortalBundle/Form/ItemType.php index 45a675dd..11234434 100644 --- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Form/ItemType.php +++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Form/ItemType.php @@ -151,13 +151,13 @@ class ItemType extends AbstractType if($options["activate_widsonde"]) { $builder ->add('clicksonde', CheckboxType::class, [ - "label" => "Exécuter une sonde statistique sur le click", + "label" => "Exécuter une sonde statistique sur le clic", "required" => false ]) ->add('clicksondeservice', ChoiceType::class, [ "label" => 'Type de Service associé à la sonde', - "placeholder" => 'Selectionner un service', + "placeholder" => 'Sélectionner un service', "required" => false, "choices" => [ "ACCUEIL" => "ACCUEIL", From 75d935aa57e6771073442188eae3b7c42e681516 Mon Sep 17 00:00:00 2001 From: afornerot Date: Mon, 9 May 2022 13:51:33 +0200 Subject: [PATCH 2/3] Synchronisation scribe niveaux + eleves classes + profs classes (ref #34132) --- .../CoreBundle/Command/SynchroCommand.php | 39 +++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Command/SynchroCommand.php b/src/ninegate-1.0/src/Cadoles/CoreBundle/Command/SynchroCommand.php index 50459f9d..362b2335 100644 --- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Command/SynchroCommand.php +++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Command/SynchroCommand.php @@ -142,6 +142,19 @@ class SynchroCommand extends Command $this->writeln(" - $label"); if(!$simulate) $this->addmodGroup($label,$ldapfilter,$scribe_group); + // Niveaux + $this->writeln(''); + $this->writeln('== NIVEAUX =========================================='); + $results = $this->ldap->search("type=Niveau", ['cn','description','gidNumber'], $this->ldap_basedn); + foreach($results as $result) { + $cn=$result["cn"]; + $ldapfilter="(&(type=Niveau)(cn=$cn))"; + + $label="NIVEAU - ".$result["cn"]; + $this->writeln(" - $label"); + if(!$simulate) $this->addmodGroup($label,$ldapfilter,false); + } + // Classes $this->writeln(''); $this->writeln('== CLASSES =========================================='); @@ -155,6 +168,32 @@ class SynchroCommand extends Command if(!$simulate) $this->addmodGroup($label,$ldapfilter,$scribe_group); } + // Elèves des Classes + $this->writeln(''); + $this->writeln('== ELEVES DES CLASSES =========================================='); + $results = $this->ldap->search("type=Classe", ['cn','description','gidNumber'], $this->ldap_basedn); + foreach($results as $result) { + $cn=$result["cn"]; + $ldapfilter="(&(type=Classe)(cn=$cn))"; + + $label="ELEVES DE LA CLASSE - ".$result["cn"]; + $this->writeln(" - $label"); + if(!$simulate) $this->addmodGroup($label,$ldapfilter,false); + } + + // Professeurs des Classes + $this->writeln(''); + $this->writeln('== PROFESSEURS DES CLASSES =========================================='); + $results = $this->ldap->search("type=Classe", ['cn','description','gidNumber'], $this->ldap_basedn); + foreach($results as $result) { + $cn=$result["cn"]; + $ldapfilter="(|(&(type=Equipe)(cn=profs-$cn))(&(ENTPersonProfils=Administratif)(divcod=$cn)))"; + + $label="PROFESSEURS DE LA CLASSE - ".$result["cn"]; + $this->writeln(" - $label"); + if(!$simulate) $this->addmodGroup($label,$ldapfilter,false); + } + // Options $this->writeln(''); $this->writeln('== OPTIONS =========================================='); From 4f2fa1db4f67a0cbd45667c9c9daa3c03f79b1ef Mon Sep 17 00:00:00 2001 From: afornerot Date: Tue, 10 May 2022 09:12:21 +0200 Subject: [PATCH 3/3] Synchronisation scribe niveaux + eleves classes + profs classes (ref #34132) --- .../src/Cadoles/CoreBundle/Command/SynchroCommand.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Command/SynchroCommand.php b/src/ninegate-1.0/src/Cadoles/CoreBundle/Command/SynchroCommand.php index 362b2335..58711ec7 100644 --- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Command/SynchroCommand.php +++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Command/SynchroCommand.php @@ -176,7 +176,7 @@ class SynchroCommand extends Command $cn=$result["cn"]; $ldapfilter="(&(type=Classe)(cn=$cn))"; - $label="ELEVES DE LA CLASSE - ".$result["cn"]; + $label="ELEVES - ".$result["cn"]; $this->writeln(" - $label"); if(!$simulate) $this->addmodGroup($label,$ldapfilter,false); } @@ -189,7 +189,7 @@ class SynchroCommand extends Command $cn=$result["cn"]; $ldapfilter="(|(&(type=Equipe)(cn=profs-$cn))(&(ENTPersonProfils=Administratif)(divcod=$cn)))"; - $label="PROFESSEURS DE LA CLASSE - ".$result["cn"]; + $label="PROFESSEURS - ".$result["cn"]; $this->writeln(" - $label"); if(!$simulate) $this->addmodGroup($label,$ldapfilter,false); }