ajout error doublon mail

dicos/91_ninegate.xml

@@ -37,6 +37,7 @@
             <variable name="ninegate_test_ninegate" type="oui/non" hidden='True' exists='False'><value>non</value></variable>
             <variable name="activer_adminer" type="oui/non" description="Activer Adminer" hidden='True' exists='False'><value>non</value></variable>
             <variable name="activer_balado" type="oui/non" description="Activer Balado" hidden='True' exists='False'><value>non</value></variable>
+            <variable name="activer_cdt" type="oui/non" description="Activer CdT" hidden='True' exists='False'><value>non</value></variable>
             <variable name="activer_dokuwiki" type="oui/non" description="Activer Dokuwiki" hidden='True' exists='False'><value>non</value></variable>
             <variable name="activer_econnect" type="oui/non" description="Activer eConnect" hidden='True' exists='False'><value>non</value></variable>
             <variable name="activer_ead_web" type="oui/non" description="Activer EAD" hidden='True' exists='False'><value>non</value></variable>
@@ -195,6 +196,13 @@
             <variable type='string'  name='ninegate_widbalado_url' description='URL complète de votre Balado'  mandatory='True' />
             <variable type='string'  name='ninegate_widbalado_syncenvole' description='URL Posh-Profil pour synchronisation Balado' mandatory='True' />
 
+            <!-- CDT -->
+            <variable type="oui/non" name='ninegate_activate_widcdt' description='Activer CdT'  mandatory='True'>
+                <value>non</value>
+            </variable>
+            <variable type='string'  name='ninegate_widcdt_url' description='URL complète de votre CdT'  mandatory='True' />
+            <variable type='string'  name='ninegate_widcdt_syncenvole' description='URL Posh-Profil pour synchronisation CdT' mandatory='True' />
+
             <!-- DOKUWIKI -->
             <variable type="oui/non" name='ninegate_activate_widdokuwiki' description='Activer Dokuwiki'  mandatory='True'>
                 <value>non</value>
@@ -400,6 +408,7 @@
             <separator name="ninegate_activate_portal">Paramètres associés aux modules à activer</separator>
             <separator name="ninegate_activate_widadminer">Paramètres associés à Adminer</separator>
             <separator name="ninegate_activate_widbalado">Paramètres associés à Balado</separator>
+            <separator name="ninegate_activate_widcdt">Paramètres associés à CdT</separator>
             <separator name="ninegate_activate_widdokuwiki">Paramètres associés à Dokuwiki</separator>
             <separator name="ninegate_activate_wideconnect">Paramètres associés à eConnect</separator>
             <separator name="ninegate_activate_widead">Paramètres associés à EAD</separator>
@@ -716,6 +725,7 @@
 
             <target type='variable'>ninegate_activate_widadminer</target>
             <target type='variable'>ninegate_activate_widbalado</target>
+            <target type='variable'>ninegate_activate_widcdt</target>
             <target type='variable'>ninegate_activate_widdokuwiki</target>
             <target type='variable'>ninegate_activate_wideconnect</target>
             <target type='variable'>ninegate_activate_widead</target>
@@ -765,6 +775,7 @@
             <param>non</param>
 
             <target type='variable'>ninegate_widbalado_syncenvole</target>
+            <target type='variable'>ninegate_widcdt_syncenvole</target>
             <target type='variable'>ninegate_widgepi_syncenvole</target>
             <target type='variable'>ninegate_widlimesurvey_syncenvole</target>
             <target type='variable'>ninegate_widmoodle_syncenvole</target>
@@ -783,6 +794,7 @@
         <condition name='hidden_if_in' source='poshprofil_typesynchro'>
             <param>Annuaire</param>
             <target type='variable'>ninegate_widbalado_syncenvole</target>
+            <target type='variable'>ninegate_widcdt_syncenvole</target>
             <target type='variable'>ninegate_widgepi_syncenvole</target>
             <target type='variable'>ninegate_widnextcloud_syncenvole</target>
             <target type='variable'>ninegate_widsacoche_syncenvole</target>
@@ -812,7 +824,7 @@
 
 
 
-        <!-- AFFICHAGE EN FONCTION DU WIDGET BALADAO -->
+        <!-- AFFICHAGE EN FONCTION DU WIDGET BALADO -->
         <fill name='calc_multi_condition' target='ninegate_activate_widbalado'>
             <param>oui</param>
             <param type='eole' name='condition_1' hidden='False'>activer_balado</param>
@@ -843,6 +855,39 @@
         </fill>
 
 
+
+        <!-- AFFICHAGE EN FONCTION DU WIDGET CDT -->
+        <fill name='calc_multi_condition' target='ninegate_activate_widcdt'>
+            <param>oui</param>
+            <param type='eole' name='condition_1' hidden='False'>activer_cdt</param>
+            <param name='match'>oui</param>
+            <param name='mismatch'>non</param>
+            <param name='default_mismatch'>non</param>
+        </fill>
+
+        <condition name='hidden_if_in' source='ninegate_activate_widcdt'>
+            <param>non</param>
+
+            <target type='variable'>ninegate_widcdt_url</target>
+            <target type='variable'>ninegate_widcdt_syncenvole</target>
+        </condition>   
+
+        <fill name='calc_multi_condition' target='ninegate_widcdt_url'>
+            <param>oui</param>
+            <param type='eole' name='condition_1' hidden='False'>activer_cdt</param>
+            <param name='match'>/cdt</param>
+            <param name='default_mismatch'>None</param>
+        </fill>
+
+        <fill name='calc_multi_condition' target='ninegate_widcdt_syncenvole'>
+            <param>oui</param>
+            <param type='eole' name='condition_1' hidden='False'>activer_cdt</param>
+            <param name='match'>/posh-profil</param>
+            <param name='default_mismatch'>None</param>
+        </fill>
+
+
+
         <!-- AFFICHAGE EN FONCTION DU WIDGET DOKUWIKI -->
         <fill name='calc_multi_condition' target='ninegate_activate_widdokuwiki'>
             <param>oui</param>

src/ninegate-1.0/src/Cadoles/CASBundle/Controller/SecurityController.php

@@ -86,6 +86,20 @@ class SecurityController extends Controller
             if($masteridentity=="SSO") {
                 if(empty($email)) $email = $username."@nomail.com";
 
+                // On s'assure qu'il n'y a pas déjà un utilisateur avec le même mail
+                $usermail = $em->getRepository('CadolesCoreBundle:User')->findOneBy(array("email"=>$email));
+                if($usermail) {
+                    return $this->render('CadolesCoreBundle:Registration:info.html.twig', [
+                        'useheader'         => true,
+                        'usemenu'           => false,
+                        'usesidebar'        => false,                   
+                        'infotitle'         => "Première connexion",
+                        'info'              => "Votre compte ne peut être activé car votre adresse mel est déjà utilisée par un autre compte utilisateur.<br>Nous sommes désolés du désagrément et vous invitons à contacter un administrateur.",
+                        'mode'              => "error",
+                        'redirectto'         => "",
+                    ]);
+                }
+
                 // Là c'est normal que potentiellement il n'existe pas il faut donc l'autogénérer
                 $user = new User();
 

src/ninegate-1.0/src/Cadoles/CoreBundle/Command/InitDataCommand.php

@@ -228,9 +228,17 @@ class InitDataCommand extends ContainerAwareCommand
             $this->addModeration($profil,'cadoles_portal_config_flux',1);
             $this->addModeration($profil,'cadoles_portal_config_notice',1);
             $this->addModeration($profil,'cadoles_portal_config_icon',1);
+            $this->addModeration($profil,'cadoles_portal_config_syncbalado',0);
+            $this->addModeration($profil,'cadoles_portal_config_synccdt',0);
+            $this->addModeration($profil,'cadoles_portal_config_syncgepiannu',0);
+            $this->addModeration($profil,'cadoles_portal_config_syncgepisiecle',0);
             $this->addModeration($profil,'cadoles_portal_config_synclimesurvey',0);
             $this->addModeration($profil,'cadoles_portal_config_syncmoodle',0);
+            $this->addModeration($profil,'cadoles_portal_config_syncnextcloud',0);
+            $this->addModeration($profil,'cadoles_portal_config_syncsacoche',0);
+            $this->addModeration($profil,'cadoles_portal_config_syncpiwik',0);
             $this->addModeration($profil,'cadoles_portal_config_syncwordpress',0);
+
             $this->addModeration($profil,'cadoles_core_config_statistic',1);
             $this->addModeration($profil,'cadoles_core_config_mailing',1);
             $this->addModeration($profil,'cadoles_core_config_importuser',0);

src/ninegate-1.0/src/Cadoles/CoreBundle/Command/ScriptCommand.php

@@ -180,6 +180,20 @@ class ScriptCommand extends Command
             $this->writeln("");
         }
 
+        if($this->container->getParameter('ldap_template')=="scribe") {
+            $script=$this->em->getRepository("CadolesCoreBundle:Script")->findOneBy(["name"=>"purgepageprofil"]);
+            if(!$script) {
+                $this->writeln("== SCRIPT = purgepageprofil");
+                $this->purgepageprofil();
+                
+                $script=new Script();
+                $script->setName("purgepageprofil");
+                $this->em->persist($script);
+                $this->em->flush();                  
+                $this->writeln("");
+            }
+        }
+
         return 1;
     }
 
@@ -434,6 +448,20 @@ class ScriptCommand extends Command
         }
     }
 
+    private function purgepageprofil() {
+        $page=$this->em->getRepository('CadolesPortalBundle:Page')->findOneBy(['name'=>'PROFIL - Enseignants']);
+        if($page) {
+            $this->em->remove($page);
+            $this->em->flush();
+        }
+
+        $page=$this->em->getRepository('CadolesPortalBundle:Page')->findOneBy(['name'=>'PROFIL - Administratifs']);
+        if($page) {
+            $this->em->remove($page);
+            $this->em->flush();
+        }
+    }
+
 
 
 

src/ninegate-1.0/src/Cadoles/CoreBundle/Command/SynchroCommand.php

@@ -128,7 +128,7 @@ class SynchroCommand extends Command
                     $ldapfilter="(|(&(uid=*)(ENTPersonProfils=enseignant))(&(uid=*)(typeadmin=0))(&(uid=*)(typeadmin=2)))";
                     $label="PROFIL - Enseignants";
                     $this->writeln("    - $label");
-                    if(!$simulate) $this->addmodGroup($label,$ldapfilter,$scribe_group);
+                    if(!$simulate) $this->addmodGroup($label,$ldapfilter,false);
 
                     // Responsables
                     $ldapfilter="(&(uid=*)(ENTPersonProfils=responsable))";
@@ -140,7 +140,20 @@ class SynchroCommand extends Command
                     $ldapfilter="(&(uid=*)(ENTPersonProfils=administratif))";
                     $label="PROFIL - Administratifs";
                     $this->writeln("    - $label");
-                    if(!$simulate) $this->addmodGroup($label,$ldapfilter,$scribe_group);
+                    if(!$simulate) $this->addmodGroup($label,$ldapfilter,false);
+
+                    // 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('');
@@ -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 - ".$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
                     $this->writeln('');
                     $this->writeln('== OPTIONS ==========================================');

src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/PermmodoprofilController.php

@@ -331,8 +331,15 @@ class PermmodoprofilController extends Controller
         $this->addModeration($profil,'cadoles_portal_config_flux',1);
         $this->addModeration($profil,'cadoles_portal_config_notice',1);
         $this->addModeration($profil,'cadoles_portal_config_icon',1);
+        $this->addModeration($profil,'cadoles_portal_config_syncbalado',0);
+        $this->addModeration($profil,'cadoles_portal_config_synccdt',0);
+        $this->addModeration($profil,'cadoles_portal_config_syncgepiannu',0);
+        $this->addModeration($profil,'cadoles_portal_config_syncgepisiecle',0);
         $this->addModeration($profil,'cadoles_portal_config_synclimesurvey',0);
         $this->addModeration($profil,'cadoles_portal_config_syncmoodle',0);
+        $this->addModeration($profil,'cadoles_portal_config_syncnextcloud',0);
+        $this->addModeration($profil,'cadoles_portal_config_syncsacoche',0);
+        $this->addModeration($profil,'cadoles_portal_config_syncpiwik',0);
         $this->addModeration($profil,'cadoles_portal_config_syncwordpress',0);
         $this->addModeration($profil,'cadoles_core_config_statistic',1);
         $this->addModeration($profil,'cadoles_core_config_mailing',1);

src/ninegate-1.0/src/Cadoles/CoreBundle/EventListener/sessionListener.php

@@ -94,6 +94,7 @@
             $app["activate_widwordpress"]               =$this->container->getParameter('activate_widwordpress');
 
             $app["widbalado_activate_syncenvole"]       =$this->container->getParameter('widbalado_activate_syncenvole');
+            $app["widcdt_activate_syncenvole"]          =$this->container->getParameter('widcdt_activate_syncenvole');
             $app["widgepi_activate_syncenvole"]         =$this->container->getParameter('widgepi_activate_syncenvole');
             $app["widnextcloud_activate_syncenvole"]    =$this->container->getParameter('widnextcloud_activate_syncenvole');
             $app["widpiwik_activate_syncenvole"]        =$this->container->getParameter('widpiwik_activate_syncenvole');

src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Registration/info.html.twig

@@ -1,13 +1,25 @@
 {% extends '@CadolesCore/base.html.twig' %}
 
 {% block pagewrapper %}
-    <h1 class="page-header">Inscriptions</h1>
+    <h1 class="page-header">{%if infotitle is defined%}{{infotitle}}{%else%}Inscriptions{%endif%}</h1>
 
     <div style="padding-top:50px;max-width: 1000px; margin:auto; font-size:18px;">
         <div class='alert alert-{{ mode }}' style='margin: 5px 0px'>
             {% autoescape %}
             <p>{{ info|raw }}</p>
             {% endautoescape %}
+
+            {% if mode=="error" %}
+                {% if mode_auth == "SAML" %}
+                <a class="btn btn-primary" href="{{ path("lightsaml_sp.logout") }}">Déconnexion</a>
+                {% elseif mode_auth == "CAS"  %}
+                <a class="btn btn-primary" href="{{ path("cas_sp.logout") }}">Déconnexion</a>
+                {% elseif mode_auth == "SQL"  %}
+                <a class="btn btn-primary" href="{{ path("cadoles_core_logout") }}">Déconnexion</a>
+                {% elseif mode_auth == "LDAP"  %}
+                <a class="btn btn-primary" href="{{ path("cadoles_core_ldap_logout") }}">Déconnexion</a>
+                {% endif %}
+            {% endif %}
         </div>
     </div>
 {% endblock %}

src/ninegate-1.0/src/Cadoles/PortalBundle/Command/InitDataCommand.php

@@ -43,6 +43,7 @@ class InitDataCommand extends ContainerAwareCommand
 
         $activate_widadminer        = $this->getContainer()->getParameter('activate_widadminer');
         $activate_widbalado         = $this->getContainer()->getParameter('activate_widbalado');
+        $activate_widcdt            = $this->getContainer()->getParameter('activate_widcdt');
         $activate_widdokuwiki       = $this->getContainer()->getParameter('activate_widdokuwiki');
         $activate_wideconnect       = $this->getContainer()->getParameter('activate_wideconnect');
         $activate_widead            = $this->getContainer()->getParameter('activate_widead');
@@ -414,6 +415,29 @@ class InitDataCommand extends ContainerAwareCommand
             $em->persist($entityItem);            
         }
 
+        // Item CdT
+        if($activate_widcdt) {
+            $widcdt_url =$this->getContainer()->getParameter('widcdt_url');
+            $entityItem = $em->getRepository('CadolesPortalBundle:Item')->find(-391);
+            if(!$entityItem) {
+                $entityicon = $em->getRepository('CadolesPortalBundle:Icon')->findoneby(["label"=>"uploads/icon/icon_cdt.png"]);
+
+                $entityItem = new Item();
+                $entityItem->setId(-391);
+                $entityItem->setRowOrder(0);
+                $entityItem->setTitle('CdT');
+                $entityItem->setSubtitle("Application complète de gestion de cahier de texte scolaire");
+                $entityItem->SetContent("Application complète de gestion de cahier de texte scolaire");
+                $entityItem->setIcon($entityicon);
+                $entityItem->setTarget("_blank");
+                $entityItem->setItemcategory($entityItemcategoryapp);
+                $entityItem->setEssential(true);
+                $entityItem->addGroup($groupall);
+            }
+            $entityItem->setUrl($widcdt_url);
+            $em->persist($entityItem);            
+        }
+
         // Item Dokuwiki
         if($activate_widdokuwiki) {
             $widdokuwiki_url =$this->getContainer()->getParameter('widdokuwiki_url');

src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/ItemController.php

@@ -65,7 +65,11 @@ class ItemController extends Controller
     {
         // Initialisation de l'enregistrement
         $data = new Item();
-        
+        if($this->GetParameter("activate_widsonde")) {
+            $data->setClicksonde(true);
+            $data->setClicksondeservice("PAGE_ENT");
+        }
+
         // Création du formulaire
         $form = $this->createForm(ItemType::class,$data,array(
             "mode"                  => "submit",
@@ -124,7 +128,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
@@ -206,6 +210,26 @@ class ItemController extends Controller
         return $response;        
     }
 
+
+    public function forceorderAction(Request $request)
+    {
+        $em = $this->getDoctrine()->getManager();
+        $categorys=$em->getRepository("CadolesPortalBundle:Itemcategory")->findAll();
+        
+        foreach($categorys as $category) {
+            $i=0;
+            $items=$em->getRepository("CadolesPortalBundle:Item")->findBy(["itemcategory"=>$category],["title"=>"ASC"]);
+            foreach($items as $item) {
+                $i++;
+                $item->setRowOrder($i);
+                $em->flush();
+            }
+        }
+
+        // Retour à la liste
+        return $this->redirectToRoute($this->labelroute);
+    }
+
     protected function getDatas()
     {
         $em = $this->getDoctrine()->getManager();

src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/SyncenvoleController.php

@@ -39,6 +39,20 @@ class SyncenvoleController extends Controller
         ]);        
     }
 
+    public function cdtAction()
+    {
+        $url=$this->getParameter("widcdt_syncenvole");
+        $color=$this->get('session')->get('colormain');
+        $themename=$this->get('session')->get("theme");
+
+        return $this->render('CadolesPortalBundle:Tool:frame.html.twig', [
+            'useheader'         => true,
+            'usemenu'           => false,
+            'usesidebar'        => true,              
+            'url'               => $url."/synchro.php?app=cdt&color=#color#"
+        ]);        
+    }
+
     public function gepiannuAction()
     {
         $url=$this->getParameter("widgepi_syncenvole");

src/ninegate-1.0/src/Cadoles/PortalBundle/Form/ItemType.php

@@ -150,14 +150,17 @@ 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',     
+                "label_attr" => array("style" => "display:inline"),
+                "placeholder" => 'Sélectionner un service',     
                 "required" => false,
                 "choices" => [
                     "ACCUEIL" => "ACCUEIL",

src/ninegate-1.0/src/Cadoles/PortalBundle/Repository/ItemRepository.php

@@ -7,7 +7,7 @@ use Doctrine\Common\Collections\ArrayCollection;
 
 class ItemRepository extends EntityRepository
 {
-    public function getUserItems($user,&$bookmarks,&$itemsordered,&$itemcategorys,$iditemcategory=null,$ssoitems,$withbookmark=1,$fgessential=false) {
+    public function getUserItems($user,&$bookmarks,&$itemsordered,&$itemcategorys,$iditemcategory=null,$ssoitems=[],$withbookmark=1,$fgessential=false) {
         // Profilage
         $roles=($user?$user->getRoles():["ROLE_ANONYME"]);
         $groups=($user?$user->getGroups():[]);
@@ -114,26 +114,28 @@ class ItemRepository extends EntityRepository
 
         // Récupération des items par ssoitem
         $itemsssoitems=[];
-        foreach($ssoitems as $ssoitem) {
-            $qb = $this->getEntityManager()->createQueryBuilder();
-            $qb->select('item')
-                ->from("CadolesPortalBundle:Item", 'item')
-                ->where("item.ssoitem=:ssoitem ")
-                ->setParameter("ssoitem",$ssoitem);
-            
-            if($iditemcategory && $itemcategoryfilter) {
-                $qb->andWhere("item.itemcategory=:itemcategory")
-                   ->setParameter("itemcategory",$itemcategoryfilter);
-            }
-
-            $itemsssoitems=$qb->getQuery()->getResult();
-            foreach($itemsssoitems as $itemssoitem) {
-                if(!$bookmarksitems->contains($itemssoitem) && !$items->contains($itemssoitem)) {
-                    if(!$fgessential || ($fgessential && $itemssoitem->getEssential()))
-                        $items->add($itemssoitem);
+        if(is_array($ssoitems)) {
+            foreach($ssoitems as $ssoitem) {
+                $qb = $this->getEntityManager()->createQueryBuilder();
+                $qb->select('item')
+                    ->from("CadolesPortalBundle:Item", 'item')
+                    ->where("item.ssoitem=:ssoitem ")
+                    ->setParameter("ssoitem",$ssoitem);
+                
+                if($iditemcategory && $itemcategoryfilter) {
+                    $qb->andWhere("item.itemcategory=:itemcategory")
+                    ->setParameter("itemcategory",$itemcategoryfilter);
                 }
 
-                if(!$itemalls->contains($itemssoitem)) $itemalls->add($itemssoitem);
+                $itemsssoitems=$qb->getQuery()->getResult();
+                foreach($itemsssoitems as $itemssoitem) {
+                    if(!$bookmarksitems->contains($itemssoitem) && !$items->contains($itemssoitem)) {
+                        if(!$fgessential || ($fgessential && $itemssoitem->getEssential()))
+                            $items->add($itemssoitem);
+                    }
+
+                    if(!$itemalls->contains($itemssoitem)) $itemalls->add($itemssoitem);
+                }
             }
         }
 

src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/config/routing.yml

@@ -8,7 +8,11 @@ cadoles_portal_config_syncdelegation:
 cadoles_portal_config_syncbalado:
     path: /config/syncenvole/balado
     defaults: { _controller: CadolesPortalBundle:Syncenvole:balado }
-    
+
+cadoles_portal_config_synccdt:
+    path: /config/syncenvole/cdt
+    defaults: { _controller: CadolesPortalBundle:Syncenvole:cdt }
+
 cadoles_portal_config_syncgepiannu:
     path: /config/syncenvole/gepiannu
     defaults: { _controller: CadolesPortalBundle:Syncenvole:gepiannu }
@@ -113,6 +117,10 @@ cadoles_portal_config_item_order:
     path: /config/item/order
     defaults: { _controller: CadolesPortalBundle:Item:order }  
 
+cadoles_portal_config_item_forceorder:
+    path: /config/item/forceorder
+    defaults: { _controller: CadolesPortalBundle:Item:forceorder }  
+
 cadoles_portal_config_ajax_item_seleclist:
     path: /config/item/ajax/selectlist
     defaults: { _controller: CadolesPortalBundle:Item:ajaxseleclist }

src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Item/dnma.html.twig

@@ -0,0 +1,138 @@
+<table class="table table-striped table-bordered table-hover dataTable no-footer">
+    <thead>
+        <tr>
+            <td>Libellé du service</td>
+            <td>Description</td>
+        </tr>
+    </thead>
+
+    <tr>
+        <td>ACCUEIL</td>
+        <td></td>
+    </tr>
+
+    <tr>
+        <td>ACTUALITES</td>
+        <td>Création ou publication d’actualités, publiques ou privées. Le marquage de ce service ne comprend pas l’accès en consultation à ces actualités, qu’elles soient publiques ou privées</td>
+    </tr>
+
+    <tr>
+        <td>CAHIER_TEXTES</td>
+        <td>Description du travail fait en classe par séquence, des points du programme abordés, des modalités pédagogiques utilisées…<br><br>Programmation du travail à faire en dehors de la classe (Devoirs).</td>
+    </tr>
+
+    <tr>
+        <td>CAHIER_LIAISON</td>
+        <td></td>
+    </tr>
+
+    <tr>
+        <td>COURRIER_ELECTRONIQUE</td>
+        <td>Courrier électronique, Carnet d'adresses, Annuaire, Liste de diffusion.</td>
+    </tr>
+
+    <tr>
+        <td>MESSAGERIE_INSTANTANEE</td>
+        <td></td>
+    </tr>
+
+    <tr>
+        <td>VISIOCONFERENCE</td>
+        <td>Services associés à l’organisation et l’animation de visioconférences.  </td>
+    </tr>
+
+    <tr>
+        <td>STOCKAGE_PARTAGE</td>
+        <td>Chargement, stockage de fichiers pouvant ou non être partagés avec d’autres utilisateurs</td>
+    </tr>
+
+    <tr>
+        <td>PRODUCTION_COLLABORATIVE</td>
+        <td></td>
+    </tr>
+
+    <tr>
+        <td>DOCUMENTATION_CDI</td>
+        <td>Accès au catalogue de ressources proposées par le CDI, consultation et gestion des ressources, prêts, …</td>
+    </tr>
+
+    <tr>
+        <td>PARCOURS_PEDAGOGIQUE</td>
+        <td>Utilisation des outils permettant la production de nouvelles ressources pédagogiques (LMS).</td>
+    </tr>
+
+    <tr>
+        <td>RESERVATION_SALLES_MATERIELS</td>
+        <td></td>
+    </tr>
+
+    <tr>
+        <td>SERVICE_COLLECTIVITE</td>
+        <td>Utilisation des services proposés par les collectivités aux établissements ou aux familles (Exemples : cantine, transports, bourses, …).</td>
+    </tr>
+
+    <tr>
+        <td>SERVICES_VIE_SCOLAIRE</td>
+        <td>Accès à des logiciels de vie scolaire ne permettant pas de marquer finement le type de services utilisés.</td>
+    </tr>
+
+    <tr>
+        <td>GESTION_TEMPS</td>
+        <td>Gestion de l’agenda et des tâches personnelles ou de groupe. Visualisation de l’emploi du temps.</td>
+    </tr>
+
+    <tr>
+        <td>ABSENCES</td>
+        <td>Saisie ou visualisation des absences.</td>
+    </tr>
+
+    <tr>
+        <td>GESTION_COMPETENCES</td>
+        <td>Mise à jour, validation ou visualisation de compétences.</td>
+    </tr>
+
+    <tr>
+        <td>NOTES</td>
+        <td>Saisie ou visualisation des notes (relevés de notes, bulletins).</td>
+    </tr>
+
+    <tr>
+        <td>MANUEL_NUMERIQUE</td>
+        <td></td>
+    </tr>
+
+    <tr>
+        <td>RESSOURCE_MULTIMEDIA</td>
+        <td></td>
+    </tr>
+
+    <tr>
+        <td>RESSOURCE_ORIENTATION</td>
+        <td>Accès aux contenus et services proposés dans le cadre des actions d’orientation.</td>
+    </tr>
+
+    <tr>
+        <td>RESSOURCE_PRODUCTION</td>
+        <td></td>
+    </tr>
+
+    <tr>
+        <td>RESSOURCE_ACCOMPAGNEMENT_ENTRAINEMENT</td>
+        <td></td>
+    </tr>
+
+    <tr>
+        <td>RESSOURCE_REFERENCE_DICTIONNAIRE</td>
+        <td></td>
+    </tr>
+
+    <tr>
+        <td>RESSOURCE_DOCUMENTAIRE</td>
+        <td></td>
+    </tr>
+
+    <tr>
+        <td>PAGE_ENT</td>
+        <td></td>
+    </tr>                    
+</table>

src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Item/edit.html.twig

@@ -67,11 +67,10 @@
                 {{ form_row(form.ssoitem) }}
             {% endif %}
 
-            {% if form.clicksonde is defined %}
-                {{ form_row(form.clicksonde) }}
-                <div id="divclicksondeservice">
-                {{ form_row(form.clicksondeservice) }}
-                </div>
+            {% if form.clicksondeservice is defined %}
+                {{ form_label(form.clicksondeservice) }}
+                <a id="dnmainfo" type="button" class="btn btn-link" data-toggle="modal" data-target="#dnma" style="float:right"><i class="fa fa-info"></i></a>                
+                {{ form_widget(form.clicksondeservice) }}<br>
             {% endif %}
 
             {{ form_row(form.color) }}
@@ -90,6 +89,23 @@
         </div>
     </div>   
 {{ form_end(form) }}
+
+<div id="dnma" class="modal fade bs-item-modal" tabindex="-1" role="dialog" aria-labelledby="myLargeModalLabel" aria-hidden="true">
+    <div class="modal-dialog modal-lg">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+                <h4 class="modal-title">Services</h4>
+            </div>
+
+            <div class="modal-body">
+                {{ include('@CadolesPortal/Item/dnma.html.twig') }}
+            </div>
+        </div>
+    </div>
+</div>
+
+
 {% endblock %}
 
 {% block localjavascript %}
@@ -133,13 +149,5 @@
         if($("#item_target").val()=="frame") {
             $("#divhelp").show();
         }
-        
-
-        if($("#item_clicksonde").is(':checked')) {
-            $("#divclicksondeservice").show();
-        }
-        else {
-            $("#divclicksondeservice").hide();
-        }
     }
 {% endblock %}

src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Item/list.html.twig

@@ -11,6 +11,8 @@
             <p>
                 <a href="{{ path('cadoles_portal_config_item_submit') }}" class="btn btn-success">Ajouter un Item</a>
                 <a href="{{ path('cadoles_portal_config_itemcategory_submit') }}" class="btn btn-success">Ajouter une Categorie</a>
+
+                <a href="{{ path('cadoles_portal_config_item_forceorder') }}" class="btn btn-success pull-right">Ordonner les items en alpha</a>
             </p>
 
             <div class="category-list">

tmpl/ninegate-init-01.sql

@@ -67,6 +67,7 @@ INSERT IGNORE INTO `sidebar` (`id`, `parent_id`, `roworder`, `label`, `path`, `f
 (3000,	NULL,	3000,	'SYNCHRONISATION',      NULL,	                                    'fa fa-exchange-alt',       'ROLE_ADMIN,ROLE_MODO', 'syncenvole_activate'),
 (3001,	3000,	3001,	'Délégation',           'cadoles_portal_config_syncdelegation',     'fa fa-balance-scale',      'ROLE_ADMIN,ROLE_MODO', 'syncenvole_activate'),
 (3110,	3000,	3110,	'Balado',               'cadoles_portal_config_syncbalado',         'fa fa-microphone',         'ROLE_ADMIN,ROLE_MODO', 'widbalado_activate_syncenvole'),
+(3112,	3000,	3112,	'CdT',                  'cadoles_portal_config_synccdt',            'fa fa-star',               'ROLE_ADMIN,ROLE_MODO', 'widcdt_activate_syncenvole'),
 (3115,	3000,	3115,	'GEPI via Annuaire',    'cadoles_portal_config_syncgepiannu',       'fa fa-tags',               'ROLE_ADMIN,ROLE_MODO', 'widgepi_activate_syncenvole'),
 (3116,	3000,	3116,	'GEPI via SIECLE',      'cadoles_portal_config_syncgepisiecle',     'fa fa-tags',               'ROLE_ADMIN,ROLE_MODO', 'widgepi_activate_syncenvole'),
 (3120,	3000,	3120,	'Limesurvey',           'cadoles_portal_config_synclimesurvey',     'fa fa-question',           'ROLE_ADMIN,ROLE_MODO', 'activate_widlimesurvey'),

tmpl/ninegate-template.yml

@@ -284,6 +284,20 @@ parameters:
     widbalado_activate_syncenvole: false
 %end if
 
+%if %%getVar("ninegate_activate_widcdt", 'non') == "oui" 
+    activate_widcdt: true
+    widcdt_url: %%ninegate_widcdt_url
+    %if %%getVar("poshprofil_typesynchro", "") == "ENT"
+    widcdt_activate_syncenvole: true
+    widcdt_syncenvole: %%ninegate_widcdt_syncenvole  
+    %else
+    widcdt_activate_syncenvole: false
+    %end if      
+%else 
+    activate_widcdt: false
+    widcdt_activate_syncenvole: false
+%end if
+
 %if %%getVar("ninegate_activate_widdokuwiki", 'non') == "oui" 
     activate_widdokuwiki: true
     widdokuwiki_url: %%ninegate_widdokuwiki_url