From 0129fc59adfbbd3c109b247d74028a3d482987d5 Mon Sep 17 00:00:00 2001
From: afornerot <afornerot@cadoles.com>
Date: Mon, 28 Sep 2020 16:39:42 +0200
Subject: [PATCH] =?UTF-8?q?gerer=20cadolesldap=20install=C3=A9=20sur=20mem?=
 =?UTF-8?q?e=20serveur=20(ref=20#214)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dicos/91_ninegate.xml | 69 +++++++++++++++++++++++++++++++++++--------
 1 file changed, 57 insertions(+), 12 deletions(-)

diff --git a/dicos/91_ninegate.xml b/dicos/91_ninegate.xml
index dc2cec62..1162f8e6 100644
--- a/dicos/91_ninegate.xml
+++ b/dicos/91_ninegate.xml
@@ -28,6 +28,14 @@
 
     <variables>
         <family name='Ninegate'>
+            <variable type='oui/non' name='activer_cadolesldap' description='Activer Annuaire Cadoles' hidden='True' exists='False'/>
+            <variable type='string' name='cadolesldap_pwdadmin' description="Mot de passe du compte admin durant l'instance" hidden='True' exists='False'/>
+            <variable type='string' name='cadolesldap_organization' description="Nom de l'organisation principale" hidden='True' exists='False'/>
+            <variable type='string' name='cadolesldap_niveau01branche' description="Nom de la branche de Niveau 01" hidden='True' exists='False'><value>niveau01</value></variable>
+            <variable type='string' name='cadolesldap_niveau02branche' description="Nom de la branche de Niveau 02" hidden='True' exists='False'><value>niveau02</value></variable>
+            <variable type='string' name='cadolesldap_niveau01name' description="Nom de la première orgranisation de Niveau 01" hidden='True' exists='False'/>
+            <variable type='string' name='cadolesldap_niveau01siren' description="SIREN de la première orgranisation de Niveau 01" hidden='True' exists='False'/>
+
             <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>
@@ -76,17 +84,17 @@
             <variable type='string' name='ninegate_mode_auth' description="Mode Authentification" mandatory='True'><value>CAS</value></variable>
             <variable type='string' name='ninegate_api_key' description="Clé d'accès API" mandatory='True'><value>APIKeyNinegate</value></variable>
 
-            <variable type='oui/non' name='ninegate_syncldap' description="Synchroniser Ninegate vers votre annuaire"><value>non</value></variable>
+            <variable type='oui/non' name='ninegate_syncldap' description="Synchroniser Ninegate vers votre Annuaire CadolesLDAP"><value>non</value></variable>
             <variable type='string' name='ninegate_ldaptemplate' description="Modèle d'annuaire"><value>scribe</value></variable>
             <variable type='oui/non' name='ninegate_scribegroup' description="Considérer les classes/options comme des groupes de travail"><value>oui</value></variable>
             <variable type='oui/non' name='ninegate_scribemaster' description="Placer les professeurs comme manager des groupes classes/options"><value>oui</value></variable>
 
-            <variable type='string' name='ninegate_pwdadmin' description="Mot de passe du compte admin durant l'instance (idem valeur Cadoles ldap)" mandatory='True'><value>cadoles</value></variable>
-            <variable type='string' name='ninegate_organization' description="Nom de l'organisation principale (idem valeur Cadoles ldap)" mandatory='True'><value>cadoles</value></variable>
+            <variable type='string' name='ninegate_pwdadmin' description="Mot de passe du compte admin durant l'instance (idem valeur Cadoles ldap)" mandatory='True'><value></value></variable>
+            <variable type='string' name='ninegate_organization' description="Nom de l'organisation principale (idem valeur Cadoles ldap)" mandatory='True'><value></value></variable>
             <variable type='string' name='ninegate_niveau01branche' description="Nom de la branche de Niveau 01 (idem valeur Cadoles ldap)" mandatory='True'><value>niveau01</value></variable>
             <variable type='string' name='ninegate_niveau02branche' description="Nom de la branche de Niveau 02 (idem valeur Cadoles ldap)" mandatory='True'><value>niveau02</value></variable>
-            <variable type='string' name='ninegate_niveau01name' description="Nom de la première orgranisation de Niveau 01 (idem valeur Cadoles ldap)" mandatory='True'><value>cadoles</value></variable>
-            <variable type='string' name='ninegate_niveau01siren' description="SIREN de la première orgranisation de Niveau 01 (idem valeur Cadoles ldap)" mandatory='True'><value>cadoles</value></variable>
+            <variable type='string' name='ninegate_niveau01name' description="Nom de la première orgranisation de Niveau 01 (idem valeur Cadoles ldap)" mandatory='True'><value></value></variable>
+            <variable type='string' name='ninegate_niveau01siren' description="SIREN de la première orgranisation de Niveau 01 (idem valeur Cadoles ldap)"><value></value></variable>
 
             <variable type='string' name='ninegate_niveau01label' description="Label singulier du niveau 01 d'organisation"  mandatory='True'><value>Ecole</value></variable>
             <variable type='string' name='ninegate_niveau01labels' description="Label pluriel du niveau 01 d'organisation"  mandatory='True'><value>Ecoles</value></variable>
@@ -507,6 +515,14 @@
             <target type='variable'>ninegate_niveau01siren</target>
         </condition>   
 
+        <fill name='calc_multi_condition' target='activer_admin_passfile'>
+            <param>non</param>
+            <param type='eole' name='condition_1' hidden='False'>ninegate_syncldap</param>
+            <param name='match'>non</param>
+            <param name='mismatch'>oui</param>
+            <param name='default_mismatch'>non</param>
+        </fill>
+        
         <auto name='calc_multi_condition' target='ninegate_test_conf_cadolesldap'>
             <param>CadolesLDAP</param>
             <param type='eole' name='condition_1' hidden='False'>ninegate_ldaptemplate</param>
@@ -548,14 +564,43 @@
         </auto>
 
 
-        
-        <!-- AFFICHAGE EN FONCTION DU MODE SCRIBE -->
-            <condition name='hidden_if_not_in' source='ninegate_ldaptemplate'>
-                <param>scribe</param>
 
-                <target type='variable'>ninegate_scribegroup</target>
-                <target type='variable'>ninegate_scribemaster</target>
-            </condition>
+        <!-- AFFICHAGE EN FONCTION DE CADOLESLDAP -->
+        <fill name='calc_val' target='ninegate_pwdadmin'>
+            <param type='eole' hidden='False'>cadolesldap_pwdadmin</param>
+        </fill>
+
+        <fill name='calc_val_first_value' target='ninegate_organization'>
+            <param type='eole' optional='True' hidden='False'>cadolesldap_organization</param>
+            <param type='eole'>libelle_etab</param>
+        </fill>
+
+        <fill name='calc_val_first_value' target='ninegate_niveau01branche'>
+            <param type='eole' hidden='False'>cadolesldap_niveau01branche</param>
+            <param>niveau01</param>
+        </fill>
+
+        <fill name='calc_val_first_value' target='ninegate_niveau02branche'>
+            <param type='eole' hidden='False'>cadolesldap_niveau02branche</param>
+            <param>niveau01</param>
+        </fill>
+
+        <fill name='calc_val_first_value' target='ninegate_niveau01name'>
+            <param type='eole' optional='True' hidden='False'>cadolesldap_niveau01name</param>
+            <param type='eole'>libelle_etab</param>
+        </fill>
+
+        <fill name='calc_val' target='ninegate_niveau01siren'>
+            <param type='eole' hidden='False'>cadolesldap_niveau01siren</param>
+        </fill>
+
+        <!-- AFFICHAGE EN FONCTION DU MODE SCRIBE -->
+        <condition name='hidden_if_not_in' source='ninegate_ldaptemplate'>
+            <param>scribe</param>
+
+            <target type='variable'>ninegate_scribegroup</target>
+            <target type='variable'>ninegate_scribemaster</target>
+        </condition>