Browse Source

Adding user list and a action bar.

Julio Montoya 11 years ago
parent
commit
6c8a883685

+ 6 - 0
main/template/minedu/admin/director/branches/add_user.tpl

@@ -1,5 +1,11 @@
 {% extends app.template_style ~ "/layout/layout_1_col.tpl" %}
 {% block content %}
+    <div class="actions">
+        <a href="{{ url('branch_director.controller:indexAction') }}">
+            <i class="icon-circle-arrow-left icon-2x"></i>
+        </a>
+    </div>
+    <h2>{{ 'AddUsers' | trans }}</h2>
     <form action="{{ url('branch_director.controller:addUsersAction', {'juryId' : juryId, 'branchId':branchId}) }}" method = "post" {{ form_enctype(form) }}>
     {{ form_widget(form) }}
     </form>

+ 1 - 0
main/template/minedu/admin/director/branches/list.tpl

@@ -1,4 +1,5 @@
 {% extends app.template_style ~ "/layout/layout_1_col.tpl" %}
 {% block content %}
+    <h2>{{ 'Branches'  | get_lang }}</h2>
     {{ tree }}
 {% endblock %}

+ 32 - 0
main/template/minedu/admin/director/branches/list_users.tpl

@@ -0,0 +1,32 @@
+{% extends app.template_style ~ "/layout/layout_1_col.tpl" %}
+{% block content %}
+    <div class="actions">
+        <a href="{{ url('branch_director.controller:indexAction') }}">
+            <i class="icon-circle-arrow-left icon-2x"></i>
+        </a>
+    </div>
+
+    <h2>{{ 'Jury' | trans }} {{ jury.name }}</h2>
+    <h3>{{ 'Members' | trans }}</h3>
+    <table class="data_table">
+        <tr>
+            <th>{{ 'Username' | trans }}</th>
+            <th>{{ 'Firstname' | trans }}</th>
+            <th>{{ 'Lastname' | trans }}</th>
+        </tr>
+    {% for user in users %}
+        <tr>
+            <td>
+                {{ user.user.username }}
+            </td>
+            <td>
+                {{ user.user.firstname }}
+            </td>
+            <td>
+                {{ user.user.lastname }}
+            </td>
+        </tr>
+    {% endfor %}
+    </table>
+
+{% endblock %}

+ 0 - 2
main/template/minedu/admin/director/branches/read.tpl

@@ -16,6 +16,4 @@
     <form action="{{ url(links.update_link, {id : item.id}) }}" method = "post" {{ form_enctype(form) }}>
         {{ form_widget(form) }}
     </form>
-
-
 {% endblock %}

+ 1 - 1
main/template/minedu/admin/director/role_index.tpl

@@ -4,7 +4,7 @@
         <ul>
             <li>
                 <a href="{{ url('branch_director.controller:indexAction') }}">
-                    Branches
+                    {{ 'Branches'  | get_lang }}
                 </a>
             </li>
         </ul>

+ 19 - 7
src/ChamiloLMS/Controller/Admin/Director/BranchDirectorController.php

@@ -60,12 +60,8 @@ class BranchDirectorController extends CommonController
 
                     $juryList  .= $jury->getName() . ' '.$addUserLink.$viewUsers.'<br />';
                 }
-
-
                 return $row['branchName'].' <br />'.$juryList;
             }
-            //'representationField' => 'slug',
-            //'html' => true
         );
 
         // @todo add director filters
@@ -107,7 +103,6 @@ class BranchDirectorController extends CommonController
         $request = $this->getRequest();
 
         $template->assign('links', $this->generateLinks());
-        $repo = $this->getRepository();
 
         $item = $this->getEntity($id);
         $template->assign('item', $item);
@@ -149,6 +144,7 @@ class BranchDirectorController extends CommonController
 
             $jury = $this->getManager()->getRepository('Entity\Jury')->find($juryId);
 
+            // Creating user
             $factory = $this->get('security.encoder_factory');
             $encoder = $factory->getEncoder($user);
             $pass = $encoder->encodePassword($user->getPassword(), $user->getSalt());
@@ -174,8 +170,12 @@ class BranchDirectorController extends CommonController
             $em->persist($juryMember);
             $em->flush();
             $this->get('session')->getFlashBag()->add('success', "User saved");
-            //return $this->redirect($url);
 
+            $url = $this->generateUrl(
+                'branch_director.controller:listUsersAction',
+                array('juryId' => $juryId, 'branchId' => $branchId)
+            );
+            return $this->redirect($url);
         }
 
         $template->assign('form', $form->createView());
@@ -190,9 +190,21 @@ class BranchDirectorController extends CommonController
     * @Route("branches/{branchId}/jury/{juryId}/list-user")
     * @Method({"GET"})
     */
-    public function listUsersAction()
+    public function listUsersAction($juryId)
     {
+        $template = $this->get('template');
+        $criteria = array(
+            'juryId' => $juryId
+        );
+        $users = $this->getManager()->getRepository('Entity\JuryMembers')->findBy($criteria);
+
+        $jury = $this->getManager()->getRepository('Entity\Jury')->find($juryId);
 
+
+        $template->assign('users', $users);
+        $template->assign('jury', $jury);
+        $response = $template->render_template($this->getTemplatePath().'list_users.tpl');
+        return new Response($response, 200, array());
     }
 
     protected function getControllerAlias()