Add member method to know if membership fee is ok or not

Improve member informations page

coin/members/membershipfee_filter.py

@@ -20,8 +20,8 @@ class MembershipFeeFilter(SimpleListFilter):
         in the right sidebar.
         """
         return (
-            ('ok', 'À jour de cotisation'),
-            ('retard', 'En retard'),
+            ('paidup', 'À jour de cotisation'),
+            ('late', 'En retard'),
         )
 
     def queryset(self, request, queryset):
@@ -30,11 +30,11 @@ class MembershipFeeFilter(SimpleListFilter):
         provided in the query string and retrievable via
         `self.value()`.
         """
-        if self.value() == 'ok':
+        if self.value() == 'paidup':
             return queryset.filter(
                 membership_fees__start_date__lte=datetime.date.today,
                 membership_fees__end_date__gte=datetime.date.today)
-        if self.value() == 'retard':
+        if self.value() == 'late':
             return queryset.exclude(
                 membership_fees__start_date__lte=datetime.date.today,
                 membership_fees__end_date__gte=datetime.date.today)

coin/members/models.py

@@ -80,6 +80,17 @@ class Member(CoinLdapSyncModel):
         except:
             return None
 
+    def is_paid_up(self):
+        """
+        True si le membre est à jour de cotisation. False sinon
+        """
+        print self.end_date_of_membership()
+        if (self.end_date_of_membership()
+            and self.end_date_of_membership() >= datetime.date.today()):
+                return True
+        else:
+            return False
+
     def change_password(self, new_password):
         ldap_user = LdapUser.objects.get(pk=self.ldap_cn)
         ldap_user.password = new_password

coin/members/templates/members/infos.html

@@ -17,18 +17,28 @@
         <div class="large-6 columns">
             <div class="panel">
                 <h3>Je suis membre d'Illyse</h3>
-                <p>et ma cotisation est : <span class="label success">à jour !</span></p>
+                <p>et ma cotisation est :
+                    {% if member.is_paid_up %}
+                        <span class="label success">à jour !</span>
+                    {% else %}
+                        <span class="label alert">non à jour !</span>
+                    {% endif %}
+                </p>
+                <p>Date de fin de cotisation : {{ member.end_date_of_membership }}</p>
             </div>
-            <div class="panel">
+            <!--<div class="panel">
                 <h3>Infos additionnelles</h3>
                 <span class="label">Clé ssh</span> coin.pub
-            </div>
+            </div>-->
         </div>
 
     </div>
     <div class="row">
-        <a href="#" class="button">Modifier mes informations</a>
-        <a href="#" class="button">Mettre à jour ma cotisation</a>
+        <p>Pour modifier vos informations personnelles et vos coordonnées, veuillez en faire la demande par email à <a href="mailto:bureau@illyse.org">bureau@illyse.org</a></p>
+    </div>
+    <div class="row">
+        <!--<a href="#" class="button">Modifier mes informations</a>-->
+        <a href="https://www.illyse.org/documents/22" target="_blank" class="button">Mettre à jour ma cotisation</a>
     </div>
 </div>
 

coin/templates/base.html

@@ -17,7 +17,7 @@
 
   <div class="large-12 columns inner-wrap">
    <header class="row">
-       <h1><a href="index.html">COIN est un Outil pour un Internet Neutre</a></h1>
+       <h1><a href="{% url 'home' %}">COIN est un Outil pour un Internet Neutre</a></h1>
    </header>
     <p class="show-for-small">
         <a class="left-off-canvas-toggle button">Menu</a>