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

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/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/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/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/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/Resources/config/routing.yml

@@ -9,6 +9,10 @@ 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 }

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