From c08719dedac5cf565af4adb371edf46be07ee9ad Mon Sep 17 00:00:00 2001 From: afornerot Date: Mon, 21 Oct 2019 10:48:57 +0200 Subject: [PATCH 1/8] =?UTF-8?q?ajout=20description=20=C3=A9v=C3=A8nement?= =?UTF-8?q?=20en=20survol=20de=20l'event=20(fixes=20#22)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/Cadoles/CoreBundle/Command/data/core-init-01.sql | 2 +- .../Resources/views/Pagewidget/viewcalendar.html.twig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Command/data/core-init-01.sql b/src/ninegate-1.0/src/Cadoles/CoreBundle/Command/data/core-init-01.sql index c866b9e7..6d0b91d6 100644 --- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Command/data/core-init-01.sql +++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Command/data/core-init-01.sql @@ -8,7 +8,7 @@ INSERT IGNORE INTO `niveau01` (`id`, `label`, `siren`) VALUES (-100, 'DRAAF', '130007107'); INSERT IGNORE INTO `user` (`id`, `niveau01_id`, `username`, `firstname`, `lastname`, `password`, `email`, `avatar`, `role`,`siren`,`authlevel`) VALUES -(-100, -100, 'admin', 'Administrateur', 'draaf', '{SSHA}d+3hdhVA7sp4QIbp8DlYbcKNekrYbPkG +(-100, -100, 'admin', 'Administrateur', 'draaf', '{SSHA}p8HoeQaUHjlX567Zu5prmDTjQMcKv6zu ', 'admin@ldapbundle.ac-arno.fr', 'admin.jpg', 'ROLE_ADMIN', '130007107', 'simple'); diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewcalendar.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewcalendar.html.twig index 1f6f4977..6a3209b8 100644 --- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewcalendar.html.twig +++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewcalendar.html.twig @@ -68,7 +68,7 @@
{{ libday ~ " " ~ dateeventstart|date("d/m/Y") }}
{% endif %} -
+
{% if not event.allDay %} {{ event.start | date("H:i") }} - {%endif%} From 4f3efd57761015383d3dd4edc24bc29f72c43e0b Mon Sep 17 00:00:00 2001 From: afornerot Date: Mon, 21 Oct 2019 11:46:36 +0200 Subject: [PATCH 2/8] =?UTF-8?q?replacement=20mot=20cl=C3=A9=20#login#=20pa?= =?UTF-8?q?r=20username=20(fixes=20#21)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controller/PagewidgetController.php | 19 +++++++++++-------- .../Resources/views/Bookmark/edit.html.twig | 1 + .../Resources/views/Item/edit.html.twig | 1 + .../Resources/views/Page/updateurl.html.twig | 1 + .../Resources/views/Page/viewurl.html.twig | 8 +++++++- .../views/Pagewidget/viewbookmark.html.twig | 13 ++++++++++--- .../views/Pagewidget/viewcalendar.html.twig | 4 +++- .../views/Pagewidget/viewitem.html.twig | 18 ++++++++++++------ .../Pagewidget/viewitemessential.html.twig | 18 ++++++++++++------ .../views/Pagewidget/viewlink.html.twig | 12 +++++++++--- .../views/Pagewidget/viewslide.html.twig | 12 +++++++++--- .../views/Pagewidget/viewurl.html.twig | 12 +++++++++--- .../Resources/views/Slide/edit.html.twig | 1 + 13 files changed, 86 insertions(+), 34 deletions(-) diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/PagewidgetController.php b/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/PagewidgetController.php index a8550d94..193a8d4e 100644 --- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/PagewidgetController.php +++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Controller/PagewidgetController.php @@ -428,6 +428,7 @@ class PagewidgetController extends Controller // Récupération des paramétres du widget $modedesktop=0; $iditemcategory=null; + $withbookmark=true; $search=false; $menu=false; $menuall=true; @@ -1974,17 +1975,19 @@ class PagewidgetController extends Controller $mygroups=[]; $this->getDoctrine()->getRepository("CadolesPortalBundle:Page")->getPagesUser($user,null,$default,$pagesuser,$pagesadmin,$groupsshared); - foreach($groupsshared as $groupshared) { + if(is_array($groupsshared)) { + foreach($groupsshared as $groupshared) { - $title=$groupshared->getLabel(); - $idpage=$groupshared->pagesshared[0]->getId(); - $icon=null; - if($groupshared->getIcon()) - $icon="/".$groupshared->getIcon()->getLabel(); + $title=$groupshared->getLabel(); + $idpage=$groupshared->pagesshared[0]->getId(); + $icon=null; + if($groupshared->getIcon()) + $icon="/".$groupshared->getIcon()->getLabel(); - array_push($mygroups,["title"=>$title,"icon"=>$icon,"id"=>$idpage]); + array_push($mygroups,["title"=>$title,"icon"=>$icon,"id"=>$idpage]); + } } - + // Render return $this->render($this->labelentity.':viewgroup.html.twig', [ 'entity' => $entity, diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Bookmark/edit.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Bookmark/edit.html.twig index c1d2eb6a..73c977ac 100755 --- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Bookmark/edit.html.twig +++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Bookmark/edit.html.twig @@ -56,6 +56,7 @@
{{ form_row(form.url) }} + le mot clé #login# sera remplacé par le login de l'utilisateur

{{ form_row(form.target) }} {{ form_row(form.color) }} diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Item/edit.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Item/edit.html.twig index 565180e4..b27d69f0 100755 --- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Item/edit.html.twig +++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Item/edit.html.twig @@ -54,6 +54,7 @@
{{ form_row(form.url) }} + le mot clé #login# sera remplacé par le login de l'utilisateur

{{ form_row(form.target) }} {{ form_row(form.itemcategory) }} {{ form_row(form.roles) }} diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Page/updateurl.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Page/updateurl.html.twig index fbf1f0ae..6d92a2cf 100644 --- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Page/updateurl.html.twig +++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Page/updateurl.html.twig @@ -55,6 +55,7 @@ {{ form_row(form.name) }} {{ form_row(form.url) }} + le mot clé #login# sera remplacé par le login de l'utilisateur

{{ form_row(form.roworder) }} {{ form_row(form.maxwidth) }}
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Page/viewurl.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Page/viewurl.html.twig index 3b25ee03..f24dc29e 100644 --- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Page/viewurl.html.twig +++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Page/viewurl.html.twig @@ -5,6 +5,12 @@ #pageiframe { margin: 0px -30px;} {% endblock %} +{% if app.user %} + {% set username = app.user.username %} +{% else %} + {% set username = "" %} +{% endif %} + {% block pagewrapper %} {% if access=="config" %}
@@ -16,7 +22,7 @@ {% endif %}
- +
{% endblock %} diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewbookmark.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewbookmark.html.twig index 1a3ef229..122ef29f 100644 --- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewbookmark.html.twig +++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewbookmark.html.twig @@ -26,6 +26,13 @@ {% set colorbodyfont = "color: #" ~ entity.colorbodyfont %} {% endif %} +{% if app.user %} + {% set username = app.user.username %} +{% else %} + {% set username = "" %} +{% endif %} + +
{% if canupdate or canadd %}
@@ -64,11 +71,11 @@ {% endif %} {% if bookmark.target == 'frame' %} - + {% elseif bookmark.target == "_self" %} - + {% else %} - + {% endif %}
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewcalendar.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewcalendar.html.twig index 6a3209b8..fd35185a 100644 --- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewcalendar.html.twig +++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewcalendar.html.twig @@ -30,7 +30,7 @@ {% if usage=="group" and firstcalendar is defined %} {% set url= path('cadoles_portal_'~access~'_calendar_view',{id:firstcalendar}) %} {% endif %} - + {% endif %}
@@ -80,7 +80,9 @@ {% endfor %} + {% if url is defined %} + {% endif %}
{% endif %}
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewitem.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewitem.html.twig index a4fcb112..b2820fc0 100644 --- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewitem.html.twig +++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewitem.html.twig @@ -27,6 +27,12 @@ {% set colorbodyfont = "color: #" ~ entity.colorbodyfont %} {% endif %} +{% if app.user %} + {% set username = app.user.username %} +{% else %} + {% set username = "" %} +{% endif %} +
{% if canupdate or canadd %}
@@ -100,11 +106,11 @@ {% if bookmark.target == 'frame' %} - + {% elseif bookmark.target == "_self" %} - + {% else %} - + {% endif %}
@@ -209,11 +215,11 @@ {% else %} {% if item.target == 'frame' %} - + {% elseif item.target == "_self" %} - + {% else %} - + {% endif %} {% endif %} diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewitemessential.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewitemessential.html.twig index c5248c9e..7878153e 100644 --- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewitemessential.html.twig +++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewitemessential.html.twig @@ -27,6 +27,12 @@ {% set colorbodyfont = "color: #" ~ entity.colorbodyfont %} {% endif %} +{% if app.user %} + {% set username = app.user.username %} +{% else %} + {% set username = "" %} +{% endif %} +
{% if canupdate or canadd %}
@@ -65,11 +71,11 @@ {% if bookmark.target == 'frame' %} - + {% elseif bookmark.target == "_self" %} - + {% else %} - + {% endif %}
@@ -113,11 +119,11 @@ {% else %} {% if item.target == 'frame' %} - + {% elseif item.target == "_self" %} - + {% else %} - + {% endif %} {% endif %} diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewlink.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewlink.html.twig index 79fef849..7061a582 100644 --- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewlink.html.twig +++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewlink.html.twig @@ -17,6 +17,12 @@ {% if entity.colorheaderfont is null %} {% set stylelink = "color:#" ~ color['fontcolorhover'] %} {% endif %} + +{% if app.user %} + {% set username = app.user.username %} +{% else %} + {% set username = "" %} +{% endif %}
{% if canupdate %} @@ -31,11 +37,11 @@
{% if target == 'frame' %} - + {% elseif target == "_self" %} - + {% else %} - + {% endif %} {% if entity.icon %} diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewslide.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewslide.html.twig index 88dba4fb..f711d9b2 100644 --- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewslide.html.twig +++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewslide.html.twig @@ -17,6 +17,12 @@ {% set stylelink = "color:#" ~ color['fontcolorhover'] ~ ";" %} {% endif %} +{% if app.user %} + {% set username = app.user.username %} +{% else %} + {% set username = "" %} +{% endif %} +
{% if canupdate or canadd %}
@@ -44,11 +50,11 @@ {% if slide.url is not empty %} {% if slide.target == 'frame' %} - + {% elseif slide.target == "_self" %} - + {% else %} - + {% endif %} diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewurl.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewurl.html.twig index b6ee4624..9b838ce9 100644 --- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewurl.html.twig +++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Pagewidget/viewurl.html.twig @@ -11,6 +11,12 @@ {% set stylewidgetbodyframe = constants.mystylewidgetbodyframe(entity) %} {% set stylewidgetbodyimage = constants.mystylewidgetbodyimage(entity) %} +{% if app.user %} + {% set username = app.user.username %} +{% else %} + {% set username = "" %} +{% endif %} +
{% if canupdate %}
@@ -30,10 +36,10 @@ {{ entity.name }}
- +
{% else %} -
+
{% endif %} {% else %}
@@ -46,7 +52,7 @@
- +
{% endif %}
diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Slide/edit.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Slide/edit.html.twig index cb1d266d..815cf9b9 100755 --- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Slide/edit.html.twig +++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Slide/edit.html.twig @@ -59,6 +59,7 @@
{{ form_row(form.roworder) }} {{ form_row(form.url) }} + le mot clé #login# sera remplacé par le login de l'utilisateur

{{ form_row(form.target) }}
From 198ebd14f5a93cd268b34929bd0f28b8cd069d26 Mon Sep 17 00:00:00 2001 From: afornerot Date: Mon, 21 Oct 2019 12:16:18 +0200 Subject: [PATCH 3/8] titre widget responsiv (fixes #20) --- .../CoreBundle/Resources/public/css/style.css | 7 +++++++ .../public/themes/transnum/style.css | 19 +++++++------------ 2 files changed, 14 insertions(+), 12 deletions(-) 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 e9814758..a2a103ae 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 @@ -603,6 +603,7 @@ a.item-heart { position: absolute; margin-left:50px; cursor: pointer; + font-size: 1.5vw; } .widgetheader iframe, @@ -619,6 +620,12 @@ a.item-heart { height:100%; } +@media (max-width: 991px) { + .widgetheader .title { + font-size: 25px; + } +} + /*== FEED ===============================================================================================================================================*/ .cat-list-feed { diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/transnum/style.css b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/transnum/style.css index 78ce34bb..b3a9bf7e 100644 --- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/transnum/style.css +++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/transnum/style.css @@ -1,5 +1,5 @@ .widgetheader .title { - font-size: 25px; + font-size: 1.2vw; } @@ -59,17 +59,6 @@ body.simple { } -/* -.widget-notbordered .widgetheader { - box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24); -} - -.widget-notbordered .widgetbody .list-item, .widget-notbordered .widgetbody .grid-item-content { - box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24); -} -*/ - - .grid .grid-preview { width: 15%; min-width: 138px; @@ -95,3 +84,9 @@ body.simple { border-radius: 10px; margin-bottom: 5px; } + +@media (max-width: 991px) { + .widgetheader .title { + font-size: 25px; + } +} \ No newline at end of file From 7ce296fd2988fb42ec6594b57bd14a8c222ab52a Mon Sep 17 00:00:00 2001 From: afornerot Date: Mon, 21 Oct 2019 14:09:24 +0200 Subject: [PATCH 4/8] gestion visible et ajout colonne telephone (fixes #15 #16) --- .../Controller/ConfigController.php | 3 + .../CoreBundle/Controller/UserController.php | 177 ++++++++++-------- .../Resources/views/User/list.html.twig | 1 + 3 files changed, 108 insertions(+), 73 deletions(-) diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/ConfigController.php b/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/ConfigController.php index 2f1b7ab1..c0ee499c 100755 --- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/ConfigController.php +++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/ConfigController.php @@ -317,6 +317,9 @@ class ConfigController extends Controller $fields["role"]["perm"]=1; $fields["role"]["label"]="Rôles"; + + $fields["telephonenumber"]["perm"]=1; + $fields["telephonenumber"]["label"]="Téléphone"; } else { $fields=json_decode($fields, true); diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/UserController.php b/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/UserController.php index 03b3265b..55353335 100644 --- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/UserController.php +++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/UserController.php @@ -65,71 +65,92 @@ class UserController extends Controller $draw= $request->query->get('draw'); $order= $request->query->get('order'); $viewniveau02=$this->getParameter('viewniveau02'); + $fields=$this->getDefaultDatauser(); + $fgusevisible=!($fields["visible"]["perm"]==0); // Nombre total d'enregistrement - if($this->isGranted('ROLE_ADMIN')||$access=="user") - $total = $em->createQueryBuilder()->select('COUNT(user)')->from($this->labelentity,'user')->getQuery()->getSingleScalarResult(); - elseif($this->isGranted('ROLE_MODO')) { - $usermodo=$this->get('security.token_storage')->getToken()->getUser()->getId(); - $total = $em->createQueryBuilder() - ->select('COUNT(user)') - ->from($this->labelentity,'user') - ->from("CadolesCoreBundle:UserModo",'usermodo') - ->where("usermodo.niveau01 = user.niveau01") - ->andWhere("usermodo.user = :userid") - ->setParameter("userid", $usermodo) - ->getQuery()->getSingleScalarResult(); + if($access=="config") { + if($this->isGranted('ROLE_ADMIN')) { + $total = $em->createQueryBuilder()->select('COUNT(user)')->from($this->labelentity,'user')->getQuery()->getSingleScalarResult(); + } + elseif($this->isGranted('ROLE_MODO')) { + $usermodo=$this->get('security.token_storage')->getToken()->getUser()->getId(); + $total = $em->createQueryBuilder() + ->select('COUNT(user)') + ->from($this->labelentity,'user') + ->from("CadolesCoreBundle:UserModo",'usermodo') + ->where("usermodo.niveau01 = user.niveau01") + ->andWhere("usermodo.user = :userid") + ->setParameter("userid", $usermodo) + ->getQuery()->getSingleScalarResult(); + } + } + else { + if($fgusevisible) { + $total = $em->createQueryBuilder()->select('COUNT(user)')->from($this->labelentity,'user')->where('user.visible=true')->getQuery()->getSingleScalarResult(); + } + else { + $total = $em->createQueryBuilder()->select('COUNT(user)')->from($this->labelentity,'user')->getQuery()->getSingleScalarResult(); + } } - elseif($this->isGranted('ROLE_ANIM')||$this->isGranted('ROLE_USER')) { - $niveau01=$this->get('security.token_storage')->getToken()->getUser()->getNiveau01(); - $total = $em->createQueryBuilder() - ->select('COUNT(user)') - ->from($this->labelentity,'user') - ->where("user.niveau01 = :niveau01") - ->setParameter("niveau01", $niveau01) - ->getQuery()->getSingleScalarResult(); - } // Nombre d'enregistrement filtré if($search["value"]=="") $totalf = $total; else { - if($this->isGranted('ROLE_ADMIN')||$access=="user") - $totalf= $em->createQueryBuilder() - ->select('COUNT(user)') - ->from('CadolesCoreBundle:User','user') - ->from('CadolesCoreBundle:Niveau01', 'niveau01') - ->where('user.niveau01=niveau01.id') - ->andWhere('user.username LIKE :value OR user.firstname LIKE :value OR user.lastname LIKE :value OR user.email LIKE :value OR user.role LIKE :value OR niveau01.label LIKE :value') - ->setParameter("value", "%".$search["value"]."%") - ->getQuery() - ->getSingleScalarResult(); - elseif($this->isGranted('ROLE_MODO')) - $totalf= $em->createQueryBuilder() - ->select('COUNT(user)') - ->from('CadolesCoreBundle:User','user') - ->from('CadolesCoreBundle:Niveau01', 'niveau01') - ->from('CadolesCoreBundle:UserModo', 'usermodo') - ->where('user.niveau01=niveau01.id') - ->andWhere('user.username LIKE :value OR user.firstname LIKE :value OR user.lastname LIKE :value OR user.email LIKE :value OR user.role LIKE :value OR niveau01.label LIKE :value') - ->andwhere("usermodo.niveau01 = user.niveau01") - ->andWhere("usermodo.user = :userid") - ->setParameter("userid", $usermodo) - ->setParameter("value", "%".$search["value"]."%") - ->getQuery() - ->getSingleScalarResult(); - elseif($this->isGranted('ROLE_ANIM')||$this->isGranted('ROLE_USER')) - $totalf= $em->createQueryBuilder() - ->select('COUNT(user)') - ->from('CadolesCoreBundle:User','user') - ->from('CadolesCoreBundle:Niveau01', 'niveau01') - ->where('user.niveau01=niveau01.id') - ->andWhere('user.username LIKE :value OR user.firstname LIKE :value OR user.lastname LIKE :value OR user.email LIKE :value OR user.role LIKE :value OR niveau01.label LIKE :value') - ->andWhere("user.niveau01 = :niveau01") - ->setParameter("niveau01", $niveau01) - ->setParameter("value", "%".$search["value"]."%") - ->getQuery() - ->getSingleScalarResult(); + if($access=="config") { + if($this->isGranted('ROLE_ADMIN')) { + $totalf= $em->createQueryBuilder() + ->select('COUNT(user)') + ->from('CadolesCoreBundle:User','user') + ->from('CadolesCoreBundle:Niveau01', 'niveau01') + ->where('user.niveau01=niveau01.id') + ->andWhere('user.username LIKE :value OR user.firstname LIKE :value OR user.lastname LIKE :value OR user.email LIKE :value OR user.role LIKE :value OR niveau01.label LIKE :value') + ->setParameter("value", "%".$search["value"]."%") + ->getQuery() + ->getSingleScalarResult(); + } + elseif($this->isGranted('ROLE_MODO')) { + $totalf= $em->createQueryBuilder() + ->select('COUNT(user)') + ->from('CadolesCoreBundle:User','user') + ->from('CadolesCoreBundle:Niveau01', 'niveau01') + ->from('CadolesCoreBundle:UserModo', 'usermodo') + ->where('user.niveau01=niveau01.id') + ->andWhere('user.username LIKE :value OR user.firstname LIKE :value OR user.lastname LIKE :value OR user.email LIKE :value OR user.role LIKE :value OR niveau01.label LIKE :value') + ->andwhere("usermodo.niveau01 = user.niveau01") + ->andWhere("usermodo.user = :userid") + ->setParameter("userid", $usermodo) + ->setParameter("value", "%".$search["value"]."%") + ->getQuery() + ->getSingleScalarResult(); + } + } + else { + if($fgusevisible) { + $totalf= $em->createQueryBuilder() + ->select('COUNT(user)') + ->from('CadolesCoreBundle:User','user') + ->from('CadolesCoreBundle:Niveau01', 'niveau01') + ->where('user.niveau01=niveau01.id') + ->andWhere('user.visible=true') + ->andWhere('user.username LIKE :value OR user.firstname LIKE :value OR user.lastname LIKE :value OR user.email LIKE :value OR user.role LIKE :value OR niveau01.label LIKE :value') + ->setParameter("value", "%".$search["value"]."%") + ->getQuery() + ->getSingleScalarResult(); + } + else { + $totalf= $em->createQueryBuilder() + ->select('COUNT(user)') + ->from('CadolesCoreBundle:User','user') + ->from('CadolesCoreBundle:Niveau01', 'niveau01') + ->where('user.niveau01=niveau01.id') + ->andWhere('user.username LIKE :value OR user.firstname LIKE :value OR user.lastname LIKE :value OR user.email LIKE :value OR user.role LIKE :value OR niveau01.label LIKE :value') + ->setParameter("value", "%".$search["value"]."%") + ->getQuery() + ->getSingleScalarResult(); + } + } } // Construction du tableau de retour @@ -142,23 +163,24 @@ class UserController extends Controller // Parcours des Enregistrement $qb = $em->createQueryBuilder(); - if($this->isGranted('ROLE_ADMIN')||$access=="user") { + if($access=="config") { + if($this->isGranted('ROLE_ADMIN')) { + $qb->select('user')->from($this->labelentity,'user')->from('CadolesCoreBundle:Niveau01','niveau01'); + $qb->where('user.niveau01=niveau01.id'); + } + elseif($this->isGranted('ROLE_MODO')) { + $qb->select('user')->from($this->labelentity,'user')->from('CadolesCoreBundle:Niveau01','niveau01')->from('CadolesCoreBundle:UserModo', 'usermodo'); + $qb->where('user.niveau01=niveau01.id') + ->andwhere("usermodo.niveau01 = user.niveau01") + ->andWhere("usermodo.user = :userid") + ->setParameter("userid", $usermodo); + } + } + else { $qb->select('user')->from($this->labelentity,'user')->from('CadolesCoreBundle:Niveau01','niveau01'); $qb->where('user.niveau01=niveau01.id'); + if($fgusevisible) $qb->andWhere('user.visible=true'); } - elseif($this->isGranted('ROLE_MODO')) { - $qb->select('user')->from($this->labelentity,'user')->from('CadolesCoreBundle:Niveau01','niveau01')->from('CadolesCoreBundle:UserModo', 'usermodo'); - $qb->where('user.niveau01=niveau01.id') - ->andwhere("usermodo.niveau01 = user.niveau01") - ->andWhere("usermodo.user = :userid") - ->setParameter("userid", $usermodo); - } - elseif($this->isGranted('ROLE_ANIM')||$this->isGranted('ROLE_USER')) { - $qb->select('user')->from($this->labelentity,'user')->from('CadolesCoreBundle:Niveau01','niveau01'); - $qb->where('user.niveau01=niveau01.id') - ->andwhere("user.niveau01 = :niveau01") - ->setParameter("niveau01", $niveau01); - } if($search["value"]!="") { $qb ->andWhere('user.username LIKE :value OR user.firstname LIKE :value OR user.lastname LIKE :value OR user.email LIKE :value OR user.role LIKE :value OR niveau01.label LIKE :value') @@ -184,10 +206,14 @@ class UserController extends Controller break; case 6 : + $qb->orderBy('user.telephonenumber',$order[0]["dir"]); + break; + + case 7 : $qb->orderBy('niveau01.label',$order[0]["dir"]); break; - case 9 : + case 10 : $qb->orderBy('user.role',$order[0]["dir"]); break; } @@ -211,10 +237,14 @@ class UserController extends Controller break; case 5 : + $qb->orderBy('user.telephonenumber',$order[0]["dir"]); + break; + + case 6 : $qb->orderBy('niveau01.label',$order[0]["dir"]); break; - case 7 : + case 8 : $qb->orderBy('user.role',$order[0]["dir"]); break; } @@ -245,6 +275,7 @@ class UserController extends Controller array_push($tmp,$data->getLastname()); array_push($tmp,$data->getFirstname()); array_push($tmp,"".$data->getEmail().""); + array_push($tmp,$data->getTelephonenumber()); array_push($tmp,$data->getNiveau01()->getLabel()); if($viewniveau02) array_push($tmp,($data->getNiveau02()!==null?$data->getNiveau02()->getLabel():"")); array_push($tmp,$groups); diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/User/list.html.twig b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/User/list.html.twig index 731b9d9b..8e1498c9 100644 --- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/User/list.html.twig +++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/User/list.html.twig @@ -32,6 +32,7 @@ Nom Prénom Email + Téléphone {{ labelniveau01 }} {% if viewniveau02 %} {{ labelniveau02 }} From 52ad21060b30cb25c5b85b83cd69cfcd0c2b85bf Mon Sep 17 00:00:00 2001 From: afornerot Date: Mon, 21 Oct 2019 17:08:46 +0200 Subject: [PATCH 5/8] ajustement onboarding + affiche fiche utilisateur sur clique avatar --- .../CoreBundle/Command/data/core-init-01.sql | 2 +- .../CoreBundle/Controller/CoreController.php | 4 +- .../CoreBundle/Controller/GroupController.php | 6 +-- .../CoreBundle/Controller/UserController.php | 12 +++++- .../CoreBundle/Resources/config/routing.yml | 4 ++ .../Resources/public/themes/transnum/local.js | 42 ++++++++++++------- .../Resources/views/Group/list.html.twig | 2 +- .../Resources/views/Group/users.html.twig | 2 +- .../Resources/views/Include/footer.html.twig | 11 +++++ .../views/Pagewidget/viewalert.html.twig | 2 +- .../Pagewidget/viewappexternal.html.twig | 2 +- .../views/Pagewidget/viewblog.html.twig | 2 +- .../views/Pagewidget/viewbookmark.html.twig | 2 +- .../views/Pagewidget/viewcalendar.html.twig | 2 +- .../views/Pagewidget/viewchat.html.twig | 2 +- .../views/Pagewidget/viewfile.html.twig | 2 +- .../views/Pagewidget/viewflux.html.twig | 2 +- .../views/Pagewidget/viewframe.html.twig | 2 +- .../views/Pagewidget/viewgalery.html.twig | 2 +- .../views/Pagewidget/viewgroup.html.twig | 2 +- .../Pagewidget/viewgroupmessage.html.twig | 4 +- .../views/Pagewidget/viewinfo.html.twig | 6 +-- .../views/Pagewidget/viewitem.html.twig | 2 +- .../Pagewidget/viewitemessential.html.twig | 2 +- .../views/Pagewidget/viewlink.html.twig | 2 +- .../views/Pagewidget/viewseparator.html.twig | 2 +- .../views/Pagewidget/viewslide.html.twig | 2 +- .../views/Pagewidget/viewurl.html.twig | 2 +- .../Resources/views/Chat/client.html.twig | 6 +-- 29 files changed, 86 insertions(+), 49 deletions(-) diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Command/data/core-init-01.sql b/src/ninegate-1.0/src/Cadoles/CoreBundle/Command/data/core-init-01.sql index 6d0b91d6..b14c05b0 100644 --- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Command/data/core-init-01.sql +++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Command/data/core-init-01.sql @@ -8,7 +8,7 @@ INSERT IGNORE INTO `niveau01` (`id`, `label`, `siren`) VALUES (-100, 'DRAAF', '130007107'); INSERT IGNORE INTO `user` (`id`, `niveau01_id`, `username`, `firstname`, `lastname`, `password`, `email`, `avatar`, `role`,`siren`,`authlevel`) VALUES -(-100, -100, 'admin', 'Administrateur', 'draaf', '{SSHA}p8HoeQaUHjlX567Zu5prmDTjQMcKv6zu +(-100, -100, 'admin', 'Administrateur', 'draaf', '{SSHA}wVosXEVYfrthFQKc0AqqOtZZXDWT3re1 ', 'admin@ldapbundle.ac-arno.fr', 'admin.jpg', 'ROLE_ADMIN', '130007107', 'simple'); diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/CoreController.php b/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/CoreController.php index d2c6755a..6609b157 100644 --- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/CoreController.php +++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/CoreController.php @@ -76,6 +76,7 @@ class CoreController extends Controller foreach($fields as $key => $field) { // Si champs obligatoire if($field["perm"]==2) { + dump($key); switch($key) { case "firstname": if($user->getFirstname()=="") $toprofil=true; break; case "visible": if($user->getVisible()=="") $toprofil=true; break; @@ -93,12 +94,13 @@ class CoreController extends Controller case "birthcountry": if($user->getBirthcountry()=="") $toprofil=true; break; case "birthplace": if($user->getBirthplace()=="") $toprofil=true; break; } + dump($toprofil); } } } if($toprofil) { - return $this->redirect($this->generateUrl('cadoles_core_profil',array("info"=>"Merci de compléter votre profil"))); + return $this->redirect($this->generateUrl('cadoles_core_user',array("info"=>"Merci de compléter votre profil"))); } } diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/GroupController.php b/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/GroupController.php index 6359fd22..4a60d0b9 100644 --- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/GroupController.php +++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/GroupController.php @@ -188,7 +188,7 @@ class GroupController extends Controller $userinfo=""; if($data->getOwner()) { - $userinfo.="getOwner()->getAvatar()."' class='avatar' style='margin:0px 5px 0px 0px;display:inline-block;'>"; + $userinfo.="getOwner()->getAvatar()."' class='avatar' style='margin:0px 5px 0px 0px;display:inline-block;'>"; $userinfo.=$data->getOwner()->getUsername(); } @@ -331,7 +331,7 @@ class GroupController extends Controller $fgmanager=""; // Avatar - $avatar="getAvatar()."' style='width:30px;background-color:#337ab7;margin:auto;display:block;'>"; + $avatar="getAvatar()."' style='width:30px;background-color:#337ab7;margin:auto;display:block;cursor:pointer;'>"; array_push($output["data"],array("DT_RowId"=>"user".$data->getId(),$action,$avatar,$data->getUsername(),$data->getEmail(),$fgmanager)); } @@ -463,7 +463,7 @@ class GroupController extends Controller $action.=""; // Avatar - $avatar="getAvatar()."' style='width:30px;background-color:#337ab7;margin:auto;display:block;'>"; + $avatar="getAvatar()."' style='width:30px;background-color:#337ab7;margin:auto;display:block;cursor:pointer'>"; // Flag manager $fgmanager=""; diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/UserController.php b/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/UserController.php index 55353335..c76d3647 100644 --- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/UserController.php +++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/UserController.php @@ -270,7 +270,7 @@ class UserController extends Controller $tmp=array(); if($access=="config") array_push($tmp,$action); - array_push($tmp,"getAvatar()."' class='avatar' style='margin:auto;display:block;'>"); + array_push($tmp,"getAvatar()."' class='avatar' style='margin:auto;display:block;'>"); array_push($tmp,$data->getUsername()); array_push($tmp,$data->getLastname()); array_push($tmp,$data->getFirstname()); @@ -735,7 +735,17 @@ class UserController extends Controller return $this->updateAction($user->getId(),"user",$request); } + public function viewAction($id, Request $request) + { + $user=$this->getData($id); + return $this->render('CadolesCoreBundle:User:view.html.twig', [ + 'useheader' => false, + 'usemenu' => false, + 'usesidebar' => false, + "user" => $user + ]); + } public function importuserAction(Request $request) { if($this->GetParameter("masteridentity")!="SQL") diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/config/routing.yml b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/config/routing.yml index b63b1f09..b6fc83ec 100644 --- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/config/routing.yml +++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/config/routing.yml @@ -265,6 +265,10 @@ cadoles_core_user_users: path: /user/users defaults: { _controller: CadolesCoreBundle:User:list, access: user } +cadoles_core_user_view: + path: /user/view/{id} + defaults: { _controller: CadolesCoreBundle:User:view } + #== Niveau01 ============================================================================================================= cadoles_core_config_niveau01: diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/transnum/local.js b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/transnum/local.js index 46cf9921..abb65545 100644 --- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/transnum/local.js +++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/transnum/local.js @@ -3,24 +3,34 @@ // Instance the tour function MyTour() { + var template="

"; var tour = new Tour({ + name: "tour", + template: template, steps: [ - { - element: "#logo", - title: "Transnum", - content: "Bienvenue sur le portail TRANSNUM" - }, - { - element: "#menu-profil", - title: "Votre Profil", - content: "Vous pouvez modifier les informations vous concernant à cet emplacement" - }, - { - element: "#menu-annuaire", - title: "Annuaire", - content: "Vous pouvez recherche un utilisateur parmis l'annuaire du portail" - } - ]}); + { + element: "#logo", + title: "Transnum", + content: "Bienvenue sur le portail TRANSNUM" + }, + { + element: "#menu-profil", + title: "Votre Profil", + content: "Vous pouvez modifier les informations vous concernant à cet emplacement" + }, + { + element: "#menu-annuaire", + title: "Annuaire", + content: "Vous pouvez recherche un utilisateur parmis l'annuaire du portail" + }, + { + element: $("iframe").first().contents().find(".widget-itemessential").find(".widgetheader"), + title: "Bureau", + content: "Vos items essentiels, vous pouvez via le bouton + ajouter des items à votre bureau", + container: $("iframe").first().contents().find("body") + } + ] + }); // Initialize the tour tour.init(); diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Group/list.html.twig b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Group/list.html.twig index 41cc1222..1704bbfc 100644 --- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Group/list.html.twig +++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Group/list.html.twig @@ -72,5 +72,5 @@ }); } }); - }); + }); {% endblock %} diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Group/users.html.twig b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Group/users.html.twig index 0a45f67a..544a4e29 100644 --- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Group/users.html.twig +++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Group/users.html.twig @@ -148,5 +148,5 @@ "user": id, } }); - } + } {% endblock %} diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Include/footer.html.twig b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Include/footer.html.twig index 5502f568..fc0c5214 100644 --- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Include/footer.html.twig +++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Include/footer.html.twig @@ -91,6 +91,17 @@ {% endif %}