From 3f1eab00ad72592b62003cb89ae0b5f4817d2427 Mon Sep 17 00:00:00 2001
From: afornerot <afornerot@cadoles.com>
Date: Mon, 15 Feb 2021 11:29:02 +0100
Subject: [PATCH 1/3] gestion du menu grouppage

---
 .../CoreBundle/Resources/public/css/style.css |   5 -
 .../Resources/views/Page/menugroupe.html.twig | 109 +++++++++++++++
 .../Resources/views/Page/pages.html.twig      | 125 ++++++------------
 3 files changed, 150 insertions(+), 89 deletions(-)
 create mode 100644 src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Page/menugroupe.html.twig

diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/css/style.css b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/css/style.css
index 76925c6d..594118f9 100644
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/css/style.css
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/css/style.css
@@ -127,11 +127,6 @@ body {
     border-bottom: 5px solid #FFF;
 }
 
-.dropdown-menu {
-    max-height: 450px;
-    overflow-y: auto;
-}
-
 .dropdown-submenu {
     position: relative;
 }
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Page/menugroupe.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Page/menugroupe.html.twig
new file mode 100644
index 00000000..4b4afe79
--- /dev/null
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Page/menugroupe.html.twig
@@ -0,0 +1,109 @@
+        {% if not inmenu %}        
+            <ul class="list-group" id="listgrouppage">
+                {% for groupshared in groupsshared %}
+                    {% for page in groupshared.pagesshared %} 
+                        {% set forcereload=true %}
+                        {% if page.pagecategory.id==1 %}
+                            {% set forcereload=false %}
+                        {% endif %}            
+
+                        {% set isactive="" %}
+                        {% if entity.id is defined and page.id==entity.id %}
+                            {% set isactive="active" %}
+                        {% endif %}
+                        
+                        <li id="menupage-{{page.id}}" {{ isactive }} class="list-group-item {{isactive}}" onClick="$('#listgrouppage li').removeClass('active'); $(this).addClass('active') " style="cursor:pointer">
+                            <a data-group="{{groupshared.id}}" onClick="$('#selgrouppages').modal('hide'); showPage({{ page.id }},{{ page.pagecategory.id }},'{{ page.canupdate }}','group','{{forcereload}}','{{groupshared.id}}')">
+                                {% if page.fonticon %}
+                                    <i class="{{ page.fonticon }} fa-faw"></i>
+                                {% else %}
+                                    <i class="fa fa-users fa-fw"></i>
+                                {% endif %}
+                                &nbsp;{{ page.name }}
+
+                                {% if loop.first and page.counterread > 0 %}
+                                    <span id="badge-{{groupshared.id}}" class="badge">{{page.counterread}}</span>
+                                {% endif %}
+                            </a>
+                        
+                        {% if loop.first and groupshared.pagesshared|length > 1 %}
+                            <ul class="list-group" style="margin-top:15px">
+                        {% endif %}
+
+                        {% if groupshared.pagesshared|length > 1 and loop.last %}
+                            </ul>
+                        {% endif %}
+
+                        {% if loop.last %}
+                            </li>
+                        {% endif %}
+                    {% endfor %}
+                {% endfor %}
+            </ul>
+        {% else %}
+            {% for groupshared in groupsshared %}
+                {% if groupshared.pagesshared|length == 1 %}
+                    {% set page = groupshared.pagesshared[0] %}
+                    {% set forcereload=true %}
+                    {% if page.pagecategory.id==1 %}
+                        {% set forcereload=false %}
+                    {% endif %}            
+
+                    {% set isactive="" %}
+                    {% if entity.id is defined and page.id==entity.id %}
+                        {% set isactive="class='active'" %}
+                    {% endif %}
+                    
+                    <li id="menupage-{{page.id}}" {{ isactive }}  style="cursor:pointer">
+                        <a data-group="{{groupshared.id}}" onClick="showPage({{ page.id }},{{ page.pagecategory.id }},'{{ page.canupdate }}','group','{{forcereload}}','{{groupshared.id}}')">
+                            {% if page.fonticon %}
+                                <i class="{{ page.fonticon }} fa-faw"></i>
+                            {% else %}
+                                <i class="fa fa-users fa-fw"></i>
+                            {% endif %}
+                            &nbsp;{{ groupshared.label }}
+
+                            {% if page.counterread > 0 %}
+                                <span id="badge-{{groupshared.id}}" class="badge">{{page.counterread}}</span>
+                            {% endif %}
+                        </a>
+                    </li>
+                {% else %}
+                    <ul id="pagesshared" class="nav navbar-top-links navbar-left">
+                        <li class="dropdown">
+                            <a data-group="{{groupshared.id}}" href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
+                                <i class="fa fa-users fa-fw"></i>
+                                &nbsp;{{ groupshared.label }}
+                                <span class="caret"></span>
+                                {% if groupshared.pagesshared[0].counterread > 0 %}
+                                    <span id="badge-{{groupshared.id}}" class="badge">{{groupshared.pagesshared[0].counterread}}</span>
+                                {% endif %}
+                            </a>
+
+                            <ul class="dropdown-menu">
+                                {% for page in groupshared.pagesshared %} 
+                                    {% set forcereload=true %}
+                                    {% if page.pagecategory.id==1 %}
+                                        {% set forcereload=false %}
+                                    {% endif %}
+
+                                    {% set isactive="" %}
+                                    {% if entity.id is defined and page.id==entity.id %}
+                                        {% set isactive="class='active'" %}
+                                    {% endif %}
+
+                                    <li id="menupage-{{page.id}}" {{isactive}} style="cursor:pointer">
+                                        <a onClick="showPage({{ page.id }},{{ page.pagecategory.id }},'{{ page.canupdate }}','group','{{forcereload}}','{{groupshared.id}}')">
+                                            {% if page.fonticon %}
+                                                <i class="{{ page.fonticon }} fa-faw"></i>
+                                            {% endif %}
+                                            {{ page.name }}
+                                        </a>
+                                    </li>
+                                {% endfor %}
+                            </ul>
+                        </li>
+                    </ul>
+                {% endif %}
+            {% endfor %}
+        {% endif %}
\ No newline at end of file
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Page/pages.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Page/pages.html.twig
index ff5a605f..99797a38 100644
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Page/pages.html.twig
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Page/pages.html.twig
@@ -70,94 +70,21 @@
 
     <ul id="pagesgroup" class="nav navbar-top-links navbar-left">
 
-    <!-- On regroupe l'ensemble des pages si plus de 10 groupes -->
-    {% set submenu="" %}
-    {% if groupsshared|length > 5 %} 
-        {% set submenu="-submenu" %}
+    <!-- On regroupe l'ensemble des pages si plus de x groupes -->
+    {% set nbgroupregrouped=5 %}
+    {% if groupsshared|length > nbgroupregrouped %} 
         <ul id="pagesshared" class="nav navbar-top-links navbar-left">
-            <li class="dropdown">
-                <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
+            <li>
+                <a id="menugrouppages" style='cursor:pointer' data-toggle='modal' data-target='#selgrouppages'>
                     <i class="fa fa-users fa-fw"></i>&nbsp;Mes Groupes
                     <span class="caret"></span>
-                </a>
-
-                 <ul class="dropdown-menu">
-    {%endif%}
-
-    {% for groupshared in groupsshared %}
-        {% if groupshared.pagesshared|length == 1 %}
-            {% set page = groupshared.pagesshared[0] %}
-            {% set forcereload=true %}
-            {% if page.pagecategory.id==1 %}
-                {% set forcereload=false %}
-            {% endif %}            
-
-            {% set isactive="" %}
-            {% if entity.id is defined and page.id==entity.id %}
-                {% set isactive="class='active'" %}
-            {% endif %}
-            
-            <li id="menupage-{{page.id}}" {{ isactive }}  style="cursor:pointer">
-                <a data-group="{{groupshared.id}}" onClick="showPage({{ page.id }},{{ page.pagecategory.id }},'{{ page.canupdate }}','group','{{forcereload}}','{{groupshared.id}}')">
-                    {% if page.fonticon %}
-                        <i class="{{ page.fonticon }} fa-faw"></i>
-                    {% else %}
-                        <i class="fa fa-users fa-fw"></i>
-                    {% endif %}
-                    &nbsp;{{ groupshared.label }}
-
-                    {% if page.counterread > 0 %}
-                        <span id="badge-{{groupshared.id}}" class="badge">{{page.counterread}}</span>
-                    {% endif %}
-                </a>
+                </a>    
             </li>
-        {% else %}
-            <ul id="pagesshared" class="nav navbar-top-links navbar-left">
-                <li class="dropdown{{submenu}}">
-                    <a data-group="{{groupshared.id}}" href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
-                        <i class="fa fa-users fa-fw"></i>
-                        &nbsp;{{ groupshared.label }}
-                        
-                        {%if submenu is empty %}
-                            <span class="caret"></span>
-                        {% endif %}
-                        {% if groupshared.pagesshared[0].counterread > 0 %}
-                            <span id="badge-{{groupshared.id}}" class="badge">{{groupshared.pagesshared[0].counterread}}</span>
-                        {% endif %}
-                    </a>
-
-                    <ul class="dropdown-menu">
-                        {% for page in groupshared.pagesshared %} 
-                            {% set forcereload=true %}
-                            {% if page.pagecategory.id==1 %}
-                                {% set forcereload=false %}
-                            {% endif %}
-
-                            {% set isactive="" %}
-                            {% if entity.id is defined and page.id==entity.id %}
-                                {% set isactive="class='active'" %}
-                            {% endif %}
-
-                            <li id="menupage-{{page.id}}" {{isactive}} style="cursor:pointer">
-                                <a onClick="showPage({{ page.id }},{{ page.pagecategory.id }},'{{ page.canupdate }}','group','{{forcereload}}','{{groupshared.id}}')">
-                                    {% if page.fonticon %}
-                                        <i class="{{ page.fonticon }} fa-faw"></i>
-                                    {% endif %}
-                                    {{ page.name }}
-                                </a>
-                            </li>
-                        {% endfor %}
-                    </ul>
-                </li>
-            </ul>
-        {% endif %}
-    {% endfor %}
-
-    {% if groupsshared|length > 3 %} 
-                    </ul>
-                </li>
-            </ul>
-    {%endif%}
+        </ul>
+    {%else%}
+        {% set inmenu=true %}
+        {{ include('@CadolesPortal/Page/menugroupe.html.twig') }}
+    {% endif %}
 
     </ul>
 
@@ -172,6 +99,13 @@
         <a id="menuwidgetuser" style='cursor:pointer;display:none' data-toggle='modal' data-target='#selwidgetuser' title='Ajouter un widget'><i class='fa fa-cubes fa-fw'></i></a>
         <a id="menuwidgetgroup" style='cursor:pointer;display:none' data-toggle='modal' data-target='#selwidgetgroup' title='Ajouter un widget'><i class='fa fa-cubes fa-fw'></i></a>
     </div>
+
+
+
+
+
+
+  
 {% endblock %}
 
 {% block pagewrapper %}
@@ -182,6 +116,29 @@
         <iframe src="{{ widonlyoffice_url }}/sso/login" style="display:none"></iframe>
     {% endif %}
 
+    {% set nbgroupregrouped=5 %}
+    {% if groupsshared|length > nbgroupregrouped %} 
+        <div id="selgrouppages" 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">MES GROUPES</h4>
+                    </div>
+
+                    <div class="modal-body">
+                        <a onclick="$('#selgrouppages').modal('hide');" class="btn btn-default" style="margin-bottom:15px">
+                            Annuler
+                        </a>
+
+                        {% set inmenu=false %}
+                        {{ include('@CadolesPortal/Page/menugroupe.html.twig') }}
+                    </div>
+                </div>
+            </div>
+        </div>    
+    {%endif%}
+
     <div id="selwidgetuser" 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">

From 4b038e8c56090156adf305864ae0812f4f6a4f29 Mon Sep 17 00:00:00 2001
From: afornerot <afornerot@cadoles.com>
Date: Mon, 15 Feb 2021 11:38:28 +0100
Subject: [PATCH 2/3] gestion du menu grouppage

---
 .../src/Cadoles/CoreBundle/Resources/public/css/style.css    | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/css/style.css b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/css/style.css
index 594118f9..548810da 100644
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/css/style.css
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/css/style.css
@@ -175,6 +175,11 @@ body {
     border-radius: 6px 0 6px 6px;
 } 
 
+.list-group-item.active, .list-group-item.active:focus, .list-group-item.active:hover {
+    background-color: #cdcdcd;
+    border-color: #cdcdcd;
+}
+
 /*== SIDEBAR ============================================================================================================================================*/
 
 @media (max-width: 767px) {

From c8ad97f4cec727b7875fe9c98b0817f7238a29db Mon Sep 17 00:00:00 2001
From: afornerot <afornerot@cadoles.com>
Date: Mon, 15 Feb 2021 16:58:16 +0100
Subject: [PATCH 3/3] gestion sondednma alone

---
 .../src/Cadoles/CoreBundle/Controller/SondeController.php      | 2 +-
 tmpl/ninegate-template.yml                                     | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/SondeController.php b/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/SondeController.php
index 6918160d..176e34c1 100644
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/SondeController.php
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/SondeController.php
@@ -13,7 +13,7 @@ class SondeController extends Controller
     public function sondeAction()
     {
         // Debug sonde
-        $fgdebug = $this->getParameter("fgdebug");
+        $fgdebug = true;
 
         // Calcul du login
         $user=$this->getUser();
diff --git a/tmpl/ninegate-template.yml b/tmpl/ninegate-template.yml
index bc964709..0bf95e68 100644
--- a/tmpl/ninegate-template.yml
+++ b/tmpl/ninegate-template.yml
@@ -515,6 +515,9 @@ parameters:
 %else if %%getVar("activer_piwik", 'non') == "oui"  
     activate_widsonde: true
     widsonde_url: /piwik/envoleTrackeur.js.php
+%else if %%getVar("activer_sondednma", 'non') == "oui"  
+    activate_widsonde: true
+    widsonde_url: /sondepiwik/envoleTrackeur.js.php    
 %else
     activate_widsonde: false
     widsonde_url: