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

dicos/90_ninegate.xml

@@ -30,6 +30,9 @@
             <variable name="activer_balado" type="oui/non" description="Activer Balado" 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_eoe" type="oui/non" description="Activer EOE" hidden='True' exists='False'><value>non</value></variable>
+            <variable name="activer_eop" type="oui/non" description="Activer EOP" hidden='True' exists='False'><value>non</value></variable>
+            <variable name="activer_etherhome" type="oui/non" description="Activer Etherhome" hidden='True' exists='False'><value>non</value></variable>
             <variable name="activer_etherhome" type="oui/non" description="Activer Etherhome" hidden='True' exists='False'><value>non</value></variable>
             <variable name="activer_fluxbb" type="oui/non" description="Activer Fluxbb" hidden='True' exists='False'><value>non</value></variable>
             <variable name="activer_gepi" type="oui/non" description="Activer GEPI" hidden='True' exists='False'><value>non</value></variable>
@@ -40,6 +43,7 @@
             <variable name="activer_mindmaps" type="oui/non" description="Activer Mindmaps" hidden='True' exists='False'><value>non</value></variable>
             <variable name="activer_moodle" type="oui/non" description="Activer Moodle" hidden='True' exists='False'><value>non</value></variable>
             <variable name="activer_nextcloud" type="oui/non" description="Activer Nextcloud" hidden='True' exists='False'><value>non</value></variable>
+            <variable name="activer_nineboard" type="oui/non" description="Activer Nineboard" hidden='True' exists='False'><value>non</value></variable>
             <variable name="activer_opensondage" type="oui/non" description="Activer Opensondage" hidden='True' exists='False'><value>non</value></variable>
             <variable name="activer_phpldapadmin" type="oui/non" description="Activer phpLdapAdmin" hidden='True' exists='False'><value>non</value></variable>
             <variable name="activer_piwik" type="oui/non" description="Activer Piwik" hidden='True' exists='False'><value>non</value></variable>
@@ -172,6 +176,18 @@
             </variable>
             <variable type='string' name='ninegate_wideconnect_url' description='URL complète de votre eConnect'  mandatory='True' />
 
+            <!-- EOE -->
+            <variable type="oui/non" name='ninegate_activate_wideoe' description='Activer EOE'  mandatory='True'>
+                <value>non</value>
+            </variable>
+            <variable type='string' name='ninegate_wideoe_url' description='URL complète de votre EOE'  mandatory='True' />
+            
+            <!-- EOP -->
+            <variable type="oui/non" name='ninegate_activate_wideop' description='Activer EOP'  mandatory='True'>
+                <value>non</value>
+            </variable>
+            <variable type='string' name='ninegate_wideop_url' description='URL complète de votre EOP'  mandatory='True' />
+            
             <!-- ETHERHOME -->
             <variable type="oui/non" name='ninegate_activate_widetherhome' description='Activer Etherhome'  mandatory='True'>
                 <value>non</value>
@@ -239,6 +255,12 @@
             <variable type='string' name='ninegate_widnextcloud_url' description='URL complète de votre Nextcloud'  mandatory='True' />
             <variable type='string' name='ninegate_widnextcloud_syncenvole' description='URL Posh-Profil pour synchronisation Nextcloud' mandatory='True' />
 
+            <!-- NINEBOARD -->
+            <variable type="oui/non" name='ninegate_activate_widnineboard' description='Activer Nineboard'  mandatory='True'>
+                <value>non</value>
+            </variable>
+            <variable type='string' name='ninegate_widnineboard_url' description='URL complète de votre Nineboard'  mandatory='True' />
+
             <!-- ONLY OFFICE -->
             <variable type="oui/non" name='ninegate_activate_widonlyoffice' description='Activer OnlyOffice'  mandatory='True'>
                 <value>non</value>
@@ -333,6 +355,8 @@
             <separator name="ninegate_activate_widbalado">Paramètres associés à Balado</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_wideoe">Paramètres associés à EOE</separator>
+            <separator name="ninegate_activate_wideop">Paramètres associés à EOP</separator>
             <separator name="ninegate_activate_widetherhome">Paramètres associés à Etherhome</separator>
             <separator name="ninegate_activate_widfluxbb">Paramètres associés à Fluxbb</separator>
             <separator name="ninegate_activate_widgepi">Paramètres associés à GEPI</separator>
@@ -343,6 +367,7 @@
             <separator name="ninegate_activate_widmindmaps">Paramètres associés à Mindmaps</separator>
             <separator name="ninegate_activate_widmoodle">Paramètres associés à Moodle</separator>
             <separator name="ninegate_activate_widnextcloud">Paramètres associés à Nextcloud</separator>
+            <separator name="ninegate_activate_widnineboard">Paramètres associés à Nineboard</separator>
             <separator name="ninegate_activate_widonlyoffice">Paramètres associés à Only Office</separator>
             <separator name="ninegate_activate_widopensondage">Paramètres associés à Opensondage</separator>
             <separator name="ninegate_activate_widphpldapadmin">Paramètres associés à phpLdapAdmin</separator>
@@ -494,6 +519,8 @@
             <target type='variable'>ninegate_activate_widbalado</target>
             <target type='variable'>ninegate_activate_widdokuwiki</target>
             <target type='variable'>ninegate_activate_wideconnect</target>
+            <target type='variable'>ninegate_activate_wideoe</target>
+            <target type='variable'>ninegate_activate_wideop</target>
             <target type='variable'>ninegate_activate_widetherhome</target>
             <target type='variable'>ninegate_activate_widfluxbb</target>
             <target type='variable'>ninegate_activate_widgepi</target>
@@ -504,6 +531,7 @@
             <target type='variable'>ninegate_activate_widmindmaps</target>
             <target type='variable'>ninegate_activate_widmoodle</target>
             <target type='variable'>ninegate_activate_widnextcloud</target>
+            <target type='variable'>ninegate_activate_widnineboard</target>
             <target type='variable'>ninegate_activate_widonlyoffice</target>
             <target type='variable'>ninegate_activate_widopensondage</target>
             <target type='variable'>ninegate_activate_widphpldapadmin</target>
@@ -678,6 +706,54 @@
 
 
 
+        <!-- AFFICHAGE EN FONCTION DU WIDGET EOE -->
+        <fill name='calc_multi_condition' target='ninegate_activate_wideoe'>
+            <param>oui</param>
+            <param type='eole' name='condition_1' hidden='False'>activer_eoe</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_wideoe'>
+            <param>non</param>
+
+            <target type='variable'>ninegate_wideoe_url</target>
+        </condition>   
+
+        <fill name='calc_multi_condition' target='ninegate_wideoe_url'>
+            <param>oui</param>
+            <param type='eole' name='condition_1' hidden='False'>activer_eoe</param>
+            <param name='match'>/eoleapps/eleves/passperso</param>
+            <param name='default_mismatch'>None</param>
+        </fill>
+
+
+
+        <!-- AFFICHAGE EN FONCTION DU WIDGET EOP -->
+        <fill name='calc_multi_condition' target='ninegate_activate_wideop'>
+            <param>oui</param>
+            <param type='eole' name='condition_1' hidden='False'>activer_eop</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_wideop'>
+            <param>non</param>
+
+            <target type='variable'>ninegate_wideop_url</target>
+        </condition>   
+
+        <fill name='calc_multi_condition' target='ninegate_wideop_url'>
+            <param>oui</param>
+            <param type='eole' name='condition_1' hidden='False'>activer_eop</param>
+            <param name='match'>/eoleapps/eop</param>
+            <param name='default_mismatch'>None</param>
+        </fill>
+
+
+
         <!-- AFFICHAGE EN FONCTION DU WIDGET ETHERHOME -->
         <fill name='calc_multi_condition' target='ninegate_activate_widetherhome'>
             <param>oui</param>
@@ -976,6 +1052,30 @@
 
 
        
+        <!-- AFFICHAGE EN FONCTION DU WIDGET NINEBOARD -->
+        <fill name='calc_multi_condition' target='ninegate_activate_widnineboard'>
+            <param>oui</param>
+            <param type='eole' name='condition_1' hidden='False'>activer_nineboard</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_widnineboard'>
+            <param>non</param>
+
+            <target type='variable'>ninegate_widnineboard_url</target>
+        </condition>   
+
+        <fill name='calc_multi_condition' target='ninegate_widnineboard_url'>
+            <param>oui</param>
+            <param type='eole' name='condition_1' hidden='False'>activer_nineboard</param>
+            <param name='match'>/nineboard</param>
+            <param name='default_mismatch'>None</param>
+        </fill>
+
+
+       
         <!-- AFFICHAGE EN FONCTION DU WIDGET OPENSONDAGE -->
         <fill name='calc_multi_condition' target='ninegate_activate_widopensondage'>
             <param>oui</param>

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

@@ -44,6 +44,8 @@ class InitDataCommand extends ContainerAwareCommand
         $activate_widbalado         = $this->getContainer()->getParameter('activate_widbalado');
         $activate_widdokuwiki       = $this->getContainer()->getParameter('activate_widdokuwiki');
         $activate_wideconnect       = $this->getContainer()->getParameter('activate_wideconnect');
+        $activate_wideoe            = $this->getContainer()->getParameter('activate_wideoe');
+        $activate_wideop            = $this->getContainer()->getParameter('activate_wideop');
         $activate_widetherhome      = $this->getContainer()->getParameter('activate_widetherhome');
         $activate_widfluxbb         = $this->getContainer()->getParameter('activate_widfluxbb');
         $activate_widgepi           = $this->getContainer()->getParameter('activate_widgepi');
@@ -54,6 +56,7 @@ class InitDataCommand extends ContainerAwareCommand
         $activate_widmindmaps       = $this->getContainer()->getParameter('activate_widmindmaps');
         $activate_widmoodle         = $this->getContainer()->getParameter('activate_widmoodle');
         $activate_widnextcloud      = $this->getContainer()->getParameter('activate_widnextcloud');
+        $activate_widnineboard      = $this->getContainer()->getParameter('activate_widnineboard');
         $activate_widonlyoffice     = $this->getContainer()->getParameter('activate_widonlyoffice');
         $activate_widopensondage    = $this->getContainer()->getParameter('activate_widopensondage');
         $activate_widphpldapadmin   = $this->getContainer()->getParameter('activate_widphpldapadmin');
@@ -429,6 +432,50 @@ class InitDataCommand extends ContainerAwareCommand
             $em->persist($entityItem);            
         }
 
+        // Item EOE
+        if($activate_wideoe) {
+            $wideoe_url =$this->getContainer()->getParameter('wideoe_url');
+            $entityItem = $em->getRepository('CadolesPortalBundle:Item')->find(-370);
+            if(!$entityItem) {
+                $entityicon = $em->getRepository('CadolesPortalBundle:Icon')->findoneby(["label"=>"uploads/icon/icon_eoe.png"]);
+
+                $entityItem = new Item();
+                $entityItem->setId(-370);
+                $entityItem->setRowOrder(0);
+                $entityItem->setTitle('EOE');
+                $entityItem->SetSubtitle("EOLE Outils Elève");
+                $entityItem->setIcon($entityicon);
+                $entityItem->setTarget("_blank");
+                $entityItem->setItemcategory($entityItemcategoryapp);
+                $entityItem->setEssential(true);
+                $entityItem->addGroup($groupall);
+            }
+            $entityItem->setUrl($wideoe_url);
+            $em->persist($entityItem);            
+        }
+
+        // Item EOP
+        if($activate_wideop) {
+            $wideop_url =$this->getContainer()->getParameter('wideop_url');
+            $entityItem = $em->getRepository('CadolesPortalBundle:Item')->find(-371);
+            if(!$entityItem) {
+                $entityicon = $em->getRepository('CadolesPortalBundle:Icon')->findoneby(["label"=>"uploads/icon/icon_eop.png"]);
+
+                $entityItem = new Item();
+                $entityItem->setId(-371);
+                $entityItem->setRowOrder(0);
+                $entityItem->setTitle('EOP');
+                $entityItem->SetSubtitle("EOLE Outils Professeur");
+                $entityItem->setIcon($entityicon);
+                $entityItem->setTarget("_blank");
+                $entityItem->setItemcategory($entityItemcategoryapp);
+                $entityItem->setEssential(true);
+                $entityItem->addGroup($groupall);
+            }
+            $entityItem->setUrl($wideop_url);
+            $em->persist($entityItem);            
+        }
+
         // Item etherhome
         if($activate_widetherhome) {
             $widetherhome_url =$this->getContainer()->getParameter('widetherhome_url');
@@ -649,6 +696,28 @@ class InitDataCommand extends ContainerAwareCommand
             $em->persist($entityItem);            
         } 
 
+        // Item Nineboard
+        if($activate_widnineboard) {
+            $widnineboard_url =$this->getContainer()->getParameter('widnineboard_url');
+            $entityItem = $em->getRepository('CadolesPortalBundle:Item')->find(-361);
+            if(!$entityItem) {
+                $entityicon = $em->getRepository('CadolesPortalBundle:Icon')->findoneby(["label"=>"uploads/icon/icon_nineboard.png"]);
+
+                $entityItem = new Item();
+                $entityItem->setId(-361);
+                $entityItem->setRowOrder(0);
+                $entityItem->setTitle('Nineboard');
+                $entityItem->SetSubtitle("Gestionnaire de tableau de bord collaboratif");
+                $entityItem->setIcon($entityicon);
+                $entityItem->setTarget("_blank");
+                $entityItem->setItemcategory($entityItemcategoryapp);
+                $entityItem->setEssential(true);
+                $entityItem->addGroup($groupall);
+            }
+            $entityItem->setUrl($widnineboard_url);
+            $em->persist($entityItem);            
+        }
+
         // Item Onlyoffice
         if($activate_widonlyoffice) {
             $widonlyoffice_url =$this->getContainer()->getParameter('widonlyoffice_url');

tmpl/ninegate-template.yml

@@ -220,6 +220,20 @@ parameters:
     activate_wideconnect: false
 %end if
 
+%if %%getVar("ninegate_activate_wideoe", 'non') == "oui" 
+    activate_wideoe: true
+    wideoe_url: %%ninegate_wideoe_url
+%else 
+    activate_wideoe: false
+%end if
+
+%if %%getVar("ninegate_activate_wideop", 'non') == "oui" 
+    activate_wideop: true
+    wideop_url: %%ninegate_wideop_url
+%else 
+    activate_wideop: false
+%end if
+
 %if %%getVar("ninegate_activate_widetherhome", 'non') == "oui" 
     activate_widetherhome: true
     widetherhome_url: %%ninegate_widetherhome_url
@@ -309,6 +323,13 @@ parameters:
     widnextcloud_activate_syncenvole: false
 %end if
 
+%if %%getVar("ninegate_activate_widnineboard", 'non') == "oui" 
+    activate_widnineboard: true
+    widnineboard_url: %%ninegate_widnineboard_url
+%else 
+    activate_widnineboard: false
+%end if
+
 %if %%getVar("ninegate_activate_widonlyoffice", 'non') == "oui" 
     activate_widonlyoffice: true
     widonlyoffice_url: %%ninegate_widonlyoffice_url