Merge branch '1.11.x' of github.com:chamilo/chamilo-lms into 1.11.x

plugin/studentfollowup/my_students.php

@@ -57,10 +57,26 @@ if (!empty($userList) || api_is_platform_admin()) {
     ;
 
     if (!empty($keyword)) {
-        $qb
-            ->andWhere('u.firstname LIKE :keyword OR u.lastname LIKE :keyword OR u.username LIKE :keyword')
-            ->setParameter('keyword', "%$keyword%")
-        ;
+        $keyword = explode(' ', $keyword);
+        if (is_array($keyword)) {
+            foreach ($keyword as $key) {
+                $key = trim($key);
+                //$key = api_replace_dangerous_char($key);
+                if (empty($key)) {
+                    continue;
+                }
+                $qb
+                    ->andWhere('u.firstname LIKE :keyword OR u.lastname LIKE :keyword OR u.username LIKE :keyword')
+                    ->setParameter('keyword', "%$key%")
+                ;
+            }
+        } else {
+            $qb
+                ->andWhere('u.firstname LIKE :keyword OR u.lastname LIKE :keyword OR u.username LIKE :keyword')
+                ->setParameter('keyword', "%$keyword%")
+            ;
+        }
+
     }
 
     $query = $qb->getQuery();
@@ -99,9 +115,10 @@ $form->addButtonSearch(get_lang('Search'));
 $tpl = new Template($plugin->get_lang('plugin_title'));
 $tpl->assign('users', $items);
 $tpl->assign('form', $form->returnForm());
-
 $url = api_get_path(WEB_PLUGIN_PATH).'studentfollowup/posts.php?';
 $tpl->assign('post_url', $url);
+$url = api_get_path(WEB_CODE_PATH).'mySpace/myStudents.php?';
+$tpl->assign('my_students_url', $url);
 $tpl->assign('pagination', $pagination);
 $tpl->assign('care_title', $plugin->get_lang('CareDetailView'));
 $content = $tpl->fetch('/'.$plugin->get_name().'/view/my_students.html.twig');

plugin/studentfollowup/view/my_students.html.twig

@@ -10,9 +10,12 @@
         <tr>
             <td>{{ user.user.completeNameWithUsername }}</td>
             <td>
+                <a href="{{ my_students_url }}&student={{ user.user.id }}">
+                    <img src="{{ '2rightarrow.png'|icon() }}">
+                </a>
                 <a href="{{ post_url }}&student_id={{ user.user.id }}">
-                <img src="{{ '2rightarrow.png'|icon() }}">
-            </a>
+                    <img src="{{ 'blog.png'|icon() }}">
+                </a>
             </td>
         </tr>
     {% endfor %}

plugin/studentfollowup/view/post.html.twig

@@ -6,7 +6,6 @@
             <div class="col-md-8">
                 <h2>{{ post.title }}</h2>
                 <p>{{ post.content }}</p>
-
                 {% if type == 'simple' %}
                     {% set countElements = post.hasParent  + post.children.count %}
                     {% if countElements %}
@@ -19,7 +18,6 @@
                         </a>
                     {% endif %}
                 {% endif %}
-
                 {#{% if type == 'all' %}#}
                     {#{% if related_posts %}#}
                         {#<h3>Related</h3>#}
@@ -33,7 +31,6 @@
                     {#{% endif %}#}
                 {#{% endif %}#}
             </div>
-
             <div class="col-md-4">
                 <p>{{ post.createdAt |date('d/m/Y') }}</p>
                 <p>{{ post.insertUser.completeName }}</p>