improving admin dashboard pages for users and scientific programs

ALEXIS-PC\alexis
1 parent 5139a8ed
Showing 5 changed files with 51 additions and 8 deletions Show diff stats
src/core/pyros_django/dashboard/templates/dashboard/user_detail.html
src/core/pyros_django/dashboard/templates/dashboard/users_management.html
src/core/pyros_django/dashboard/templatetags/tags.py
src/core/pyros_django/dashboard/views.py
src/core/pyros_django/scientific_program/templates/scientific_program/scientific_program_detail.html
@@ -2,7 +2,7 @@
 {% block content %}
 {% load tags %}
-
+    <a href="{% url "users" %}" class="btn btn-info" role="button">Return to list of users</a>
     <h1>Name : {{ user.first_name }} {{ user.last_name }}</h1>
     <br> <br>
     <p><strong>Email : </strong> {{user.email }}</p>
@@ -20,8 +20,20 @@
     <p><strong>Put validation beginning : </strong>{{ user.putvalid_beg }}</p>
     <p><strong>Put validation end : </strong>{{ user.putvalid_end }}</p>
     <p><strong>Quota : </strong>{{ user.quota }}</p>
-    <p><strong>Scientific Program : </strong> {% for area in user.scientific_programs.all %}{{ area }} </p>
+    <p><strong>Scientific Program : </strong>  <table class="table table-bordered table-hover table-striped tablesorter" style="font-family: 'Montserra', sans-serif;">
+        <thead>
+            <tr>
+                <th>Name <i class="fa fa-sort"></i></th>
+            </tr>
+        </thead>
+    <tbody>
+     {% for sp in user.scientific_programs.all %}
+     <tr>
+        <td> <a href="{% url "detail_scientific_program" sp.pk %}">{{ sp }}  </a></td>
+    </tr>
     {% endfor %}
+    </tbody>
+    </table></p>
     {% if USER_LEVEL >= 5 %}
         <a href="{% url "user-edit" user.pk %}" class="btn btn-info" role="button">Edit</a>
         {% if not is_last_user  or not user.is_superuser%}
 {% extends "base.html" %} 
-
+{% load tags %}
 {% block title %}
 	PYROS USERS MANAGEMENT
 {% endblock %}
@@ -17,12 +17,37 @@
 <div id="div_users"class="row">
     <h3>Current list of Users </h3>
     <div class="table-responsive">
-        <table
-            class="table table-bordered table-hover table-striped tablesorter" style="font-family: 'Montserra', sans-serif;">
+        <table class="table table-bordered table-hover table-striped tablesorter" style="font-family: 'Montserra', sans-serif;">
+        <thead>
+            <tr>
+                <th>Name <i class="fa fa-sort"></i></th>
+                <th colspan="{{ nb_of_scientific_program }}">Scientific program</th>
+                <th>Laboratory </th>
+                <th>Quota </th>
+            </tr>
+        </thead>
             <tbody>
                 {% for field in instance %}
                     <tr>
                         <td> <a href="{% url "user-detail" field.pk %}"> {{ field.username }} </a></td>     
+
+                            {% for sp in field.scientific_programs.all %}
+                            
+                            {% if forloop.last and forloop.counter < nb_of_scientific_program %}
+                            {% comment "" %}
+                            we need to fill the remaining colspan size
+                            {% endcomment %}
+                                <td colspan="{{ forloop.counter0 | add:negative_nb_scientific_program|abs}}"> 
+                            
+                            {% else %}
+                                <td>
+                            {% endif %} 
+                            <a href="{% url "detail_scientific_program" sp.pk %}"> {{ sp }} </a> </td>
+                            {% endfor %}                        
+                                    
+                        </td>
+                        <td> {{ field.laboratory }} </td>
+                        <td> {{ field.quota}} </td>
                     </tr>
                 {% endfor %}
             </tbody>
@@ -80,4 +80,8 @@ def get_level(name):
     elif name == "USER_LEVEL_SYSADMIN":
         return (7)
     else :
-        return (0)
 \ No newline at end of file
+        return (0)
+
+@register.filter(name='abs')
+def abs_filter(value):
+    return abs(value)
 \ No newline at end of file
@@ -165,7 +165,9 @@ def retrieve_main_icon(request):
 @level_required(6)
 def users(request):
     instance = PyrosUser.objects.order_by("-id")
-    return render(request, 'dashboard/users_management.html', {'instance': instance})                     # return the initial view (the users management's one) 
+    nb_of_scientific_program = ScientificProgram.objects.count()
+    negative_nb_scientific_program = -nb_of_scientific_program
+    return render(request, 'dashboard/users_management.html', {'instance': instance,"nb_of_scientific_program": nb_of_scientific_program,"negative_nb_scientific_program":negative_nb_scientific_program})                     # return the initial view (the users management's one) 
 @login_required
 @level_required(2)
@@ -14,7 +14,7 @@
         </thead>
     <tbody>
     {% for user in scientific_program.pyros_users.all  %}
-        <tr><td>{{ user.username }}</td></tr>    
+        <tr><td><a href=" {% url 'user-detail' user.pk %}" >{{ user.username }} </a> </td></tr>    
     {% endfor %}
     </tbody>
     </table></p>