Ajoute la gestion des adhesions dans la bdd

users/admin.py

@@ -25,7 +25,7 @@ from django.contrib.auth.models import Group
 from django.contrib.auth.admin import UserAdmin as BaseUserAdmin
 from reversion.admin import VersionAdmin
 
-from .models import User, Right, ListRight, Clef, Request
+from .models import User, Right, Adhesion, ListRight, Clef, Request
 from .forms import UserChangeForm, UserCreationForm
 
 
@@ -48,6 +48,9 @@ class RightAdmin(VersionAdmin):
 class ClefAdmin(VersionAdmin):
     list_display = ('proprio', 'nom')
 
+class AdhesionAdmin(VersionAdmin):
+    list_display = ('annee_debut', 'annee_fin')
+
 class ListRightAdmin(VersionAdmin):
     list_display = ('listright',)
 
@@ -82,6 +85,7 @@ admin.site.register(User, UserAdmin)
 admin.site.register(Request, RequestAdmin)
 admin.site.register(ListRight, ListRightAdmin)
 admin.site.register(Right, RightAdmin)
+admin.site.register(Adhesion, AdhesionAdmin)
 admin.site.register(Clef, ClefAdmin)
 # Now register the new UserAdmin...
 admin.site.unregister(User)

users/migrations/0007_adhesion.py

@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.2 on 2017-07-04 22:00
+from __future__ import unicode_literals
+
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('users', '0006_clef_commentaire'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Adhesion',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('annee_debut', models.IntegerField(unique=True)),
+                ('annee_fin', models.IntegerField(unique=True)),
+                ('adherent', models.ManyToManyField(blank=True, null=True, to=settings.AUTH_USER_MODEL)),
+            ],
+        ),
+    ]

users/migrations/0008_auto_20170705_0001.py

@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.2 on 2017-07-04 22:01
+from __future__ import unicode_literals
+
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('users', '0007_adhesion'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='adhesion',
+            name='adherent',
+            field=models.ManyToManyField(blank=True, to=settings.AUTH_USER_MODEL),
+        ),
+    ]

users/models.py

@@ -146,6 +146,10 @@ class User(AbstractBaseUser):
         # Simplest version again
         return True
 
+    @property
+    def is_adherent(self):
+        return self in Adhesion.objects.all().order_by('annee_debut').reverse().first().adherent.all()
+
     def get_admin_right(self):
         admin, created = ListRight.objects.get_or_create(listright="admin")
         return admin 
@@ -213,6 +217,11 @@ class Clef(models.Model):
     proprio = models.ForeignKey('User', on_delete=models.PROTECT, blank=True, null=True)
     commentaire = models.CharField(max_length=255, null=True, blank=True)
 
+class Adhesion(models.Model):
+    annee_debut = models.IntegerField(unique=True)
+    annee_fin = models.IntegerField(unique=True)
+    adherent = models.ManyToManyField('User', blank=True)
+
 class BaseInfoForm(ModelForm):
     def __init__(self, *args, **kwargs):
         super(BaseInfoForm, self).__init__(*args, **kwargs)
@@ -259,6 +268,11 @@ class ClefForm(ModelForm):
         model = Clef
         fields = '__all__'
 
+class AdhesionForm(ModelForm):
+    class Meta:
+        model = Adhesion
+        fields = ['annee_debut', 'annee_fin']
+
 class RightForm(ModelForm):
     def __init__(self, *args, **kwargs):
         super(RightForm, self).__init__(*args, **kwargs)

users/templates/users/aff_adhesion.html

@@ -0,0 +1,46 @@
+{% comment %}
+Re2o est un logiciel d'administration développé initiallement au rezometz. Il
+se veut agnostique au réseau considéré, de manière à être installable en
+quelques clics.
+
+Copyright © 2017  Gabriel Détraz
+Copyright © 2017  Goulven Kermarec
+Copyright © 2017  Augustin Lemesle
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+{% endcomment %}
+
+    <table class="table table-striped">
+        <thead>
+            <tr>
+                <th>Année début</th>
+                <th>Année fin</th>
+                <th></th>
+            </tr>
+        </thead>
+        {% for adhesion in adhesion_list %}
+        <tr>
+            <td>{{ adhesion.annee_debut }}</td>
+	    <td>{{ adhesion.annee_fin }}</td>
+            <td class="text-right">
+                {% if is_bureau %}
+                {% include 'buttons/edit.html' with href='users:edit-adhesion' id=adhesion.id %}
+                {% include 'buttons/suppr.html' with href='users:del-adhesion' id=adhesion.id %}
+                {% endif %}
+                {% include 'buttons/history.html' with href='users:history' name='adhesion' id=adhesion.id %}
+            </td>
+        </tr>
+        {% endfor %}
+    </table>

users/templates/users/aff_users.html

@@ -34,6 +34,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
                 <th>Pseudo</th>
                 <th>Mail</th>
                 <th>Max emprunts</th>
+                <th>Adhérent</th>
                 <th>Profil</th>
             </tr>
         </thead>
@@ -44,7 +45,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
             <td>{{ user.pseudo }}</td>
             <td>{{ user.email }}</td>
             <td>{{ user.maxemprunt }}</td>
-            </td>
+            {% if user.is_adherent %}
+            <td><font color="green">Oui</font></td>
+            {% else %}
+            <td><font color="red">Non</font></td>
+            {% endif %}
             <td><a href="{% url "users:profil" user.id%}" class="btn btn-primary btn-sm" role="button"><i class="glyphicon glyphicon-user"></i></a>
             </td>
         </tr>

users/templates/users/index_adhesion.html

@@ -0,0 +1,39 @@
+{% extends "users/sidebar.html" %}
+{% comment %}
+Re2o est un logiciel d'administration développé initiallement au rezometz. Il
+se veut agnostique au réseau considéré, de manière à être installable en
+quelques clics.
+
+Copyright © 2017  Gabriel Détraz
+Copyright © 2017  Goulven Kermarec
+Copyright © 2017  Augustin Lemesle
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+{% endcomment %}
+
+{% load bootstrap3 %}
+
+{% block title %}Adhesion{% endblock %}
+
+{% block content %}
+  <h2>Liste des adhesion</h2>
+  {% if is_bureau %}
+  <a class="btn btn-primary btn-sm" role="button" href="{% url 'users:add-adhesion'  %}"><i class="glyphicon glyphicon-plus"></i> Ajouter une adhesion</a>
+  {% endif %}
+  {%  include "users/aff_adhesion.html" with  adhesion_list=adhesion_list %}
+  <br />
+  <br />
+  <br />
+{% endblock %}

users/templates/users/profil.html

@@ -103,6 +103,18 @@ with this program; if not, write to the Free Software Foundation, Inc.,
             <th>Dernière connexion</th>
             <td>{{ user.last_login }}</td>
         </tr>
+        <tr>
+            <th>Adherent pour l'année en cours</th>
+            {% if user.is_adherent %}
+            <td><font color="green">Oui</font></td>
+            {% else %}
+            <td><font color="red">Non</font></td>
+            {% endif %}
+            {% if not user.is_adherent and is_bureau %}
+            <th></th>
+            <td><a class="btn btn-primary btn-sm" role="button" href="{% url 'users:adherer' user.id %}"><i class="glyphicon glyphicon-flag"></i> Adhérer</a></td>
+            {% endif %}
+        </tr> 
     </table>
     <h2>Emprunts</h2>
     {% if is_perm or is_bureau %}

users/templates/users/sidebar.html

@@ -33,9 +33,17 @@ with this program; if not, write to the Free Software Foundation, Inc.,
         {% endif %}
         {% if is_perm %}
         <a class="list-group-item list-group-item-info" href="{% url "users:index" %}">
+            <i class="glyphicon glyphicon-list"></i>
+            Utilisateurs dans la base
+        </a>
+        <a class="list-group-item list-group-item-info" href="{% url "users:index-ajour" %}">
             <i class="glyphicon glyphicon-list"></i>
             Adhérents
         </a>
+        <a class="list-group-item list-group-item-info" href="{% url "users:index-adhesion" %}">
+            <i class="glyphicon glyphicon-list"></i>
+            Adhesions
+        </a>
         <a class="list-group-item list-group-item-info" href="{% url "users:index-listright" %}">
             <i class="glyphicon glyphicon-list"></i>
             Droits

users/urls.py

@@ -31,6 +31,7 @@ urlpatterns = [
     url(r'^state/(?P<userid>[0-9]+)$', views.state, name='state'),
     url(r'^password/(?P<userid>[0-9]+)$', views.password, name='password'),
     url(r'^profil/(?P<userid>[0-9]+)$', views.profil, name='profil'),
+    url(r'^adherer/(?P<userid>[0-9]+)$', views.adherer, name='adherer'),
     url(r'^mon_profil/$', views.mon_profil, name='mon-profil'),
     url(r'^add_listright/$', views.add_listright, name='add-listright'),
     url(r'^edit_listright/(?P<listrightid>[0-9]+)$', views.edit_listright, name='edit-listright'),
@@ -41,6 +42,11 @@ urlpatterns = [
     url(r'^del_clef/(?P<clefid>[0-9]+)$', views.del_clef, name='del-clef'),
     url(r'^index_clef/$', views.index_clef, name='index-clef'),
     url(r'^history/(?P<object>clef)/(?P<id>[0-9]+)$', views.history, name='history'),
+    url(r'^add_adhesion/$', views.add_adhesion, name='add-adhesion'),
+    url(r'^edit_adhesion/(?P<adhesionid>[0-9]+)$', views.edit_adhesion, name='edit-adhesion'),
+    url(r'^del_adhesion/(?P<adhesionid>[0-9]+)$', views.del_adhesion, name='del-adhesion'),
+    url(r'^index_adhesion/$', views.index_adhesion, name='index-adhesion'),
+    url(r'^history/(?P<object>adhesion)/(?P<id>[0-9]+)$', views.history, name='history'),
     url(r'^add_right/(?P<userid>[0-9]+)$', views.add_right, name='add-right'),
     url(r'^del_right/$', views.del_right, name='del-right'),
     url(r'^process/(?P<token>[a-z0-9]{32})/$', views.process, name='process'),
@@ -48,6 +54,7 @@ urlpatterns = [
     url(r'^history/(?P<object>user)/(?P<id>[0-9]+)$', views.history, name='history'),
     url(r'^history/(?P<object>listright)/(?P<id>[0-9]+)$', views.history, name='history'),
     url(r'^$', views.index, name='index'),
+    url(r'^index_ajour/$', views.index_ajour, name='index-ajour'),
 ]
 
 

users/views.py

@@ -40,7 +40,7 @@ from django.db import transaction
 from reversion.models import Version
 from reversion import revisions as reversion
 from users.models import User, Request, ListRight, Right, DelListRightForm, NewListRightForm, ListRightForm, RightForm, DelRightForm
-from users.models import InfoForm, BaseInfoForm, StateForm, Clef, ClefForm
+from users.models import InfoForm, BaseInfoForm, StateForm, Clef, ClefForm, Adhesion, AdhesionForm
 from users.forms import PassForm, ResetPasswordForm
 from media.models import Emprunt
 
@@ -308,7 +308,7 @@ def del_clef(request, clefid):
         with transaction.atomic(), reversion.create_revision():
             clef_instance.delete()
             reversion.set_user(request.user)
-            messages.success(request, "La clef a été détruit")
+            messages.success(request, "La clef a été détruite")
         return redirect("/users/index_clef")
     return form({'objet': clef_instance, 'objet_name': 'clef'}, 'users/delete.html', request)
 
@@ -317,6 +317,59 @@ def index_clef(request):
     clef_list = Clef.objects.all().order_by('nom')
     return render(request, 'users/index_clef.html', {'clef_list':clef_list})
 
+
+@login_required
+@permission_required('bureau')
+def add_adhesion(request):
+    adhesion = AdhesionForm(request.POST or None)
+    if adhesion.is_valid():
+        with transaction.atomic(), reversion.create_revision():
+            adhesion.save()
+            reversion.set_user(request.user)
+            reversion.set_comment("Création")
+        messages.success(request, "L'adhesion a été ajouté")
+        return redirect("/users/index_adhesion/")
+    return form({'userform': adhesion}, 'users/user.html', request)
+
+@login_required
+@permission_required('bureau')
+def edit_adhesion(request, adhesionid):
+    try:
+        adhesion_instance = Adhesion.objects.get(pk=adhesionid)
+    except Adhesion.DoesNotExist:
+        messages.error(request, u"Entrée inexistante" )
+        return redirect("/users/index_adhesion/")
+    adhesion = AdhesionForm(request.POST or None, instance=adhesion_instance)
+    if adhesion.is_valid():
+        with transaction.atomic(), reversion.create_revision():
+            adhesion.save()
+            reversion.set_user(request.user)
+            reversion.set_comment("Champs modifié(s) : %s" % ', '.join(field for field in adhesion.changed_data))
+        messages.success(request, "Adhesion modifiée")
+        return redirect("/users/index_adhesion/")
+    return form({'userform': adhesion}, 'users/user.html', request)
+
+@login_required
+@permission_required('bureau')
+def del_adhesion(request, adhesionid):
+    try:
+        adhesion_instance = Adhesion.objects.get(pk=adhesionid)
+    except Adhesion.DoesNotExist:
+        messages.error(request, u"Entrée inexistante" )
+        return redirect("/users/index_adhesion/")
+    if request.method == "POST":
+        with transaction.atomic(), reversion.create_revision():
+            adhesion_instance.delete()
+            reversion.set_user(request.user)
+            messages.success(request, "La adhesion a été détruit")
+        return redirect("/users/index_adhesion")
+    return form({'objet': adhesion_instance, 'objet_name': 'adhesion'}, 'users/delete.html', request)
+
+@login_required
+def index_adhesion(request):
+    adhesion_list = Adhesion.objects.all()
+    return render(request, 'users/index_adhesion.html', {'adhesion_list':adhesion_list})
+
 @login_required
 @permission_required('perm')
 def index(request):
@@ -334,6 +387,23 @@ def index(request):
         users_list = paginator.page(paginator.num_pages)
     return render(request, 'users/index.html', {'users_list': users_list})
 
+@login_required
+@permission_required('perm')
+def index_ajour(request):
+    """ Affiche l'ensemble des users, need droit admin """
+    users_list = Adhesion.objects.all().order_by('annee_debut').reverse().first().adherent.all().order_by('name')
+    paginator = Paginator(users_list, PAGINATION_NUMBER)
+    page = request.GET.get('page')
+    try:
+        users_list = paginator.page(page)
+    except PageNotAnInteger:
+        # If page is not an integer, deliver first page.
+        users_list = paginator.page(1)
+    except EmptyPage:
+        # If page is out of range (e.g. 9999), deliver last page of results.
+        users_list = paginator.page(paginator.num_pages)
+    return render(request, 'users/index.html', {'users_list': users_list})
+
 @login_required
 def history(request, object, id):
     """ Affichage de l'historique : (acl, argument)
@@ -353,6 +423,12 @@ def history(request, object, id):
         except Clef.DoesNotExist:
              messages.error(request, "Utilisateur inexistant")
              return redirect("/users/")
+    elif object == 'adhesion':
+        try:
+             object_instance = Adhesion.objects.get(pk=id)
+        except Adhesion.DoesNotExist:
+             messages.error(request, "Utilisateur inexistant")
+             return redirect("/users/")
     elif object == 'listright':
         try:
              object_instance = ListRight.objects.get(pk=id)
@@ -401,6 +477,24 @@ def profil(request, userid):
         }
     )
 
+@login_required
+@permission_required('bureau')
+def adherer(request, userid):
+    try:
+        users = User.objects.get(pk=userid)
+    except User.DoesNotExist:
+        messages.error(request, "Utilisateur inexistant")
+        return redirect("/users/")
+    adh_annee = Adhesion.objects.all().order_by('annee_debut').reverse().first()
+    with transaction.atomic(), reversion.create_revision():
+        reversion.set_user(request.user)
+        adh_annee.adherent.add(users)
+        adh_annee.save()
+        reversion.set_comment("Adhesion de %s" % users)
+    messages.success(request, "Adhesion effectuee")
+    return redirect("/users/profil/" + userid)
+ 
+
 def reset_password(request):
     userform = ResetPasswordForm(request.POST or None)
     if userform.is_valid():