From 0a4f779fa43dc39ba24ed6d25f7bf1eecfba8b27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mika=C3=ABl=20Ates?= <mates@entrouvert.com>
Date: Tue, 7 Oct 2014 17:39:22 +0200
Subject: [PATCH] personnes: show inactive accesses and allow to re-active an
 access.

---
 .../personnes/templates/personnes/acces.html  | 40 +++++++++++++++++--
 .../templates/personnes/activate_access.html  |  8 ++++
 .../personnes/disactivate_access.html         |  8 ++++
 calebasse/personnes/urls.py                   |  1 +
 calebasse/personnes/views.py                  | 14 ++++++-
 5 files changed, 66 insertions(+), 5 deletions(-)
 create mode 100644 calebasse/personnes/templates/personnes/activate_access.html
 create mode 100644 calebasse/personnes/templates/personnes/disactivate_access.html

diff --git a/calebasse/personnes/templates/personnes/acces.html b/calebasse/personnes/templates/personnes/acces.html
index 44b2d2c6..ea76c5d8 100644
--- a/calebasse/personnes/templates/personnes/acces.html
+++ b/calebasse/personnes/templates/personnes/acces.html
@@ -6,7 +6,11 @@
 <script type="text/javascript">
     $(function() {
             $('.icon-minus').click(function() {
-                generic_ajaxform_dialog($(this).data('id') + '/delete/', "Supprimer un utilisateur",
+                generic_ajaxform_dialog($(this).data('id') + '/delete/', "Désactiver un utilisateur",
+                    '#ajax-dlg', '500px', 'Oui');
+                });
+            $('.icon-plus').click(function() {
+                generic_ajaxform_dialog($(this).data('id') + '/activate/', "Activer un utilisateur",
                     '#ajax-dlg', '500px', 'Oui');
                 });
             });
@@ -44,6 +48,7 @@
 {% block content %}
 <div class="content">
   {% if active_list %}
+  <h2>Accès actifs</h2>
   <table class="main" id="timetable-table">
     <thead>
     <tr>
@@ -51,7 +56,7 @@
       <th>Courriel</th>
       <th>Fiche Personnel</th>
       <th>Roles</th>
-      <th>Supprimer</th>
+      <th>Désactiver</th>
     </tr>
     </thead>
     <tbody>
@@ -69,9 +74,36 @@
     </tbody>
   </table>
   {% else %}
-  <p>Il n'y a aucun compte actif</p>
+  <p>Il n'y a aucun compte actif.</p>
+  {% endif %}
+  <br/>
+  {% if inactive_list %}
+  <h2>Accès inactifs</h2>
+  <table class="main" id="timetable-table">
+    <thead>
+    <tr>
+      <th>Identifiant</th>
+      <th>Courriel</th>
+      <th>Fiche Personnel</th>
+      <th>Activer</th>
+    </tr>
+    </thead>
+    <tbody>
+   {% for object in inactive_list %}
+     <tr data-pk="{{object.pk}}" id="object-{{ object.pk}}">
+      <td>{{object.username}}</td>
+      <td>{{object.email}}</td>
+      {% with worker=object.userworker.worker %}
+      <td>{% if worker %}<a href="{{ worker.get_absolute_url }}">{{ worker }}</a>{% else %}-{% endif %}</td>
+      {% endwith %}
+      <td><button class="icon-plus" data-id="{{ object.id }}"/></a></td>
+    </tr>
+   {% endfor %}
+    </tbody>
+  </table>
+  {% else %}
+  <p>Il n'y a aucun compte inactif.</p>
   {% endif %}
-
 </div>
 {% endblock %}
 
diff --git a/calebasse/personnes/templates/personnes/activate_access.html b/calebasse/personnes/templates/personnes/activate_access.html
new file mode 100644
index 00000000..d0ea394e
--- /dev/null
+++ b/calebasse/personnes/templates/personnes/activate_access.html
@@ -0,0 +1,8 @@
+{% load widget_tweaks %}
+
+{% if error_message %}
+<p><strong>{{ error_message }}</strong></p>
+{% endif %}
+<form action="{{ request.get_full_path }}" method="post">{% csrf_token %}
+  <p>Êtes-vous sûr de vouloir activer {{ object }} ?</p>
+</form>
diff --git a/calebasse/personnes/templates/personnes/disactivate_access.html b/calebasse/personnes/templates/personnes/disactivate_access.html
new file mode 100644
index 00000000..f280838b
--- /dev/null
+++ b/calebasse/personnes/templates/personnes/disactivate_access.html
@@ -0,0 +1,8 @@
+{% load widget_tweaks %}
+
+{% if error_message %}
+<p><strong>{{ error_message }}</strong></p>
+{% endif %}
+<form action="{{ request.get_full_path }}" method="post">{% csrf_token %}
+  <p>Êtes-vous sûr de vouloir désactiver {{ object }} ?</p>
+</form>
diff --git a/calebasse/personnes/urls.py b/calebasse/personnes/urls.py
index b1aeb2f3..48fe295b 100644
--- a/calebasse/personnes/urls.py
+++ b/calebasse/personnes/urls.py
@@ -7,6 +7,7 @@ user_patterns = patterns('calebasse.personnes.views',
     url(r'^new/$', 'user_new'),
     url(r'^(?P<pk>\d+)/$', 'user_update'),
     url(r'^(?P<pk>\d+)/delete/$', 'user_delete'),
+    url(r'^(?P<pk>\d+)/activate/$', 'user_activate'),
 )
 
 holiday_actions_paterns = patterns('calebasse.personnes.views',
diff --git a/calebasse/personnes/views.py b/calebasse/personnes/views.py
index e8745088..51196eef 100644
--- a/calebasse/personnes/views.py
+++ b/calebasse/personnes/views.py
@@ -56,6 +56,7 @@ class AccessView(cbv.ListView):
     def get_context_data(self, **kwargs):
         ctx = super(AccessView, self).get_context_data(**kwargs)
         ctx['active_list'] = ctx['object_list'].filter(is_active=True)
+        ctx['inactive_list'] = ctx['object_list'].filter(is_active=False)
         return ctx
 
 
@@ -132,7 +133,7 @@ class UserCreateView(cbv.ServiceFormMixin, cbv.CreateView):
 class UserDisactivateView(cbv.DeleteView):
     model = User
     success_url = "../../"
-    template_name = 'calebasse/generic_confirm_delete.html'
+    template_name = 'personnes/disactivate_access.html'
 
     def delete(self, request, *args, **kwargs):
         self.object = self.get_object()
@@ -140,10 +141,21 @@ class UserDisactivateView(cbv.DeleteView):
         self.object.save()
         return HttpResponseRedirect(self.get_success_url())
 
+class UserActivateView(cbv.DeleteView):
+    model = User
+    success_url = "../../"
+    template_name = 'personnes/activate_access.html'
+
+    def delete(self, request, *args, **kwargs):
+        self.object = self.get_object()
+        self.object.is_active = True
+        self.object.save()
+        return HttpResponseRedirect(self.get_success_url())
 
 user_new = super_user_only(UserCreateView.as_view())
 user_update = super_user_only(AccessUpdateView.as_view())
 user_delete = super_user_only(UserDisactivateView.as_view())
+user_activate = super_user_only(UserActivateView.as_view())
 
 
 class WorkerUpdateView(cbv.ServiceViewMixin, cbv.MultiUpdateView):