Merge branch 'master' into dist/envole/6/master

This commit is contained in:
Arnaud Fornerot 2022-05-10 09:32:08 +02:00
commit d42fdbfedd
3 changed files with 42 additions and 3 deletions

View File

@ -142,6 +142,19 @@ class SynchroCommand extends Command
$this->writeln(" - $label"); $this->writeln(" - $label");
if(!$simulate) $this->addmodGroup($label,$ldapfilter,$scribe_group); 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 // Classes
$this->writeln(''); $this->writeln('');
$this->writeln('== CLASSES =========================================='); $this->writeln('== CLASSES ==========================================');
@ -155,6 +168,32 @@ class SynchroCommand extends Command
if(!$simulate) $this->addmodGroup($label,$ldapfilter,$scribe_group); 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 - ".$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 - ".$result["cn"];
$this->writeln(" - $label");
if(!$simulate) $this->addmodGroup($label,$ldapfilter,false);
}
// Options // Options
$this->writeln(''); $this->writeln('');
$this->writeln('== OPTIONS =========================================='); $this->writeln('== OPTIONS ==========================================');

View File

@ -124,7 +124,7 @@ class ItemController extends Controller
"labelniveau01" => $this->GetParameter("labelsniveau01"), "labelniveau01" => $this->GetParameter("labelsniveau01"),
"ssosynchroitem" => $this->GetParameter("ssosynchroitem"), "ssosynchroitem" => $this->GetParameter("ssosynchroitem"),
"user_attr_cas_item" => $this->GetParameter("user_attr_cas_item"), "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 // Récupération des data du formulaire

View File

@ -151,13 +151,13 @@ class ItemType extends AbstractType
if($options["activate_widsonde"]) { if($options["activate_widsonde"]) {
$builder $builder
->add('clicksonde', CheckboxType::class, [ ->add('clicksonde', CheckboxType::class, [
"label" => "Exécuter une sonde statistique sur le click", "label" => "Exécuter une sonde statistique sur le clic",
"required" => false "required" => false
]) ])
->add('clicksondeservice', ChoiceType::class, [ ->add('clicksondeservice', ChoiceType::class, [
"label" => 'Type de Service associé à la sonde', "label" => 'Type de Service associé à la sonde',
"placeholder" => 'Selectionner un service', "placeholder" => 'Sélectionner un service',
"required" => false, "required" => false,
"choices" => [ "choices" => [
"ACCUEIL" => "ACCUEIL", "ACCUEIL" => "ACCUEIL",