Merge branch 'master' of git.illyse.org:coin

coin/billing/templates/billing/facture.tex

@@ -0,0 +1,31 @@
+\documentclass{facture}
+\usepackage{lipsum}
+\setmainfont[Mapping=tex-text]{Palatino}
+\datelimite{30}
+\dest{{{member.first_name}} {{member.last_name}}\\
+{{member.address}}\\
+{{member.postal_code}} {member.city}} 
+}
+\fact{{{member.first_name}} {{member.last_name}}}
+{{member.address}}\\
+{{member.postal_code}} {{member.city}} 
+}
+\nomemet{Illyse - chez Jean-François Mourgues}
+\adresseemet{225 route de Genas\\
+69100 Villeurbanne\\
+contact@illyse.org \\
+}
+
+\numero{invoice.number}
+\type{Facture}
+\pied{Payable à l’ordre de Illyse}
+\begin{document}
+\entete
+
+\begin{facture}
+{% for detail in InvoiceDetail }
+\ligne{detail.label}[detail.quantity]{detail.amount}[][detail.tax]
+{% endfor %}
+\end{facture}
+
+\end{document}

coin/members/templates/members/contact.html

@@ -0,0 +1,8 @@
+{% extends "base.html" %}
+
+{% block content %}
+<div class="row">
+    <h2>Contact / Support</h2>
+    <div class="panel">contact [at] illyse  [point] org</div>
+</div>
+{% endblock %}

coin/members/templates/members/infos.html

@@ -8,16 +8,17 @@
         <div class="large-6 columns">
             <div class="panel">
                 <h3>Me joindre</h3>
-                <span class="label">Prénom - Nom</span>&nbsp;<strong>John Doe</strong><br/>
-                <span class="label">Adresse</span>&nbsp;55, rue des canards - 69000 LYON<br/>
-                <span class="label">Email</span>&nbsp;coin [at] illyse [point] org<br/>
-                <span class="label">Téléphone</span>&nbsp;01 01 01 01 01<br/>
+                <span class="label">Prénom - Nom</span>&nbsp;<strong>{{member.first_name}} {{member.last_name}}</strong><br/>
+                <span class="label">Adresse</span>&nbsp;{{member.address}} - {{member.postal_code}} {{member.city}}<br/>
+                <span class="label">Email</span>&nbsp;{{member.email}}<br/>
+                <span class="label">Téléphone fixe</span>&nbsp;{{member.home_phone_number}}<br/>
+                <span class="label">Téléphone mobile</span>&nbsp;{{member.mobile_phone_number}}<br/>
             </div>
         </div>
 
         <div class="large-6 columns">
             <div class="panel">
-                <h3>Je suis membre d'illyse</h3>
+                <h3>Je suis membre d'Illyse</h3>
                 <p>et ma cotisation est : <span class="label success">à jour !</span></p>
             </div>
             <div class="panel">

coin/members/views.py

@@ -9,6 +9,16 @@ from coin.members.models import Member
 def index(request):
     return render_to_response('members/index.html')
 
+def infos(request, member_id):
+    member = get_object_or_404(Member, pk=member_id)
+    return render('members/infos.html', {'member':member})
+
+def abos(request, member_id):
+    return render_to_response('members/abo.html')
+
+def contact(request):
+    return render_to_response('members/contact.html')
+
 def change_password(request, member_id):
     member = get_object_or_404(Member, pk=member_id)
     if request.POST['password']:

coin/resources/migrations/0002_auto__del_field_ippool_description__add_field_ippool_default_subnetsiz.py

@@ -0,0 +1,89 @@
+# -*- coding: utf-8 -*-
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        # Deleting field 'IPPool.description'
+        db.delete_column(u'resources_ippool', 'description')
+
+        # Adding field 'IPPool.default_subnetsize'
+        db.add_column(u'resources_ippool', 'default_subnetsize',
+                      self.gf('django.db.models.fields.PositiveSmallIntegerField')(default=56),
+                      keep_default=False)
+
+
+    def backwards(self, orm):
+        # Adding field 'IPPool.description'
+        db.add_column(u'resources_ippool', 'description',
+                      self.gf('django.db.models.fields.TextField')(default='', blank=True),
+                      keep_default=False)
+
+        # Deleting field 'IPPool.default_subnetsize'
+        db.delete_column(u'resources_ippool', 'default_subnetsize')
+
+
+    models = {
+        u'members.member': {
+            'Meta': {'object_name': 'Member'},
+            'address': ('django.db.models.fields.TextField', [], {}),
+            'city': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
+            'country': ('django.db.models.fields.CharField', [], {'default': "'France'", 'max_length': '200'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '254'}),
+            'entry_date': ('django.db.models.fields.DateField', [], {'default': 'datetime.date.today'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
+            'home_phone_number': ('django.db.models.fields.CharField', [], {'max_length': '25', 'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
+            'ldap_cn': ('django.db.models.fields.CharField', [], {'max_length': '200', 'blank': 'True'}),
+            'mobile_phone_number': ('django.db.models.fields.CharField', [], {'max_length': '25', 'blank': 'True'}),
+            'organization_name': ('django.db.models.fields.CharField', [], {'max_length': '200', 'blank': 'True'}),
+            'postal_code': ('django.db.models.fields.CharField', [], {'max_length': '15'}),
+            'resign_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+            'status': ('django.db.models.fields.CharField', [], {'default': "'non_adherent'", 'max_length': '50'}),
+            'type': ('django.db.models.fields.CharField', [], {'default': "'personne_physique'", 'max_length': '20'})
+        },
+        u'offers.offer': {
+            'Meta': {'object_name': 'Offer'},
+            'billing_period': ('django.db.models.fields.IntegerField', [], {'default': '1'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'initial_fees': ('django.db.models.fields.DecimalField', [], {'max_digits': '5', 'decimal_places': '2'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'period_fees': ('django.db.models.fields.DecimalField', [], {'max_digits': '5', 'decimal_places': '2'}),
+            'service': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['offers.Service']"})
+        },
+        u'offers.offersubscription': {
+            'Meta': {'object_name': 'OfferSubscription'},
+            'commitment': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'member': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['members.Member']"}),
+            'offer': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['offers.Offer']"}),
+            'resign_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+            'subscription_date': ('django.db.models.fields.DateField', [], {'default': 'datetime.date.today'})
+        },
+        u'offers.service': {
+            'Meta': {'object_name': 'Service'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'})
+        },
+        u'resources.ippool': {
+            'Meta': {'object_name': 'IPPool'},
+            'default_subnetsize': ('django.db.models.fields.PositiveSmallIntegerField', [], {}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'inet': ('netfields.fields.CidrAddressField', [], {'max_length': '43'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'})
+        },
+        u'resources.ipsubnet': {
+            'Meta': {'object_name': 'IPSubnet'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'inet': ('netfields.fields.CidrAddressField', [], {'max_length': '43', 'blank': 'True'}),
+            'ip_pool': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['resources.IPPool']"}),
+            'offer_subscription': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'ip_subnet'", 'to': u"orm['offers.OfferSubscription']"})
+        }
+    }
+
+    complete_apps = ['resources']

coin/resources/models.py

@@ -1,27 +1,63 @@
 # -*- coding: utf-8 -*-
 from django.db import models
+from django.core.exceptions import ValidationError
+from django.core.validators import MaxValueValidator
 from netfields import CidrAddressField, NetManager
-
+from netaddr import IPNetwork, IPSet
 
 class IPPool(models.Model):
     """Pool of IP addresses (either v4 or v6)."""
     name = models.CharField(max_length=255, blank=False, null=False,
                             verbose_name='Name of the IP pool')
-    description = models.TextField(blank=True, null=False,
-                                   verbose_name='Description of the IP pool')
+    default_subnetsize = models.PositiveSmallIntegerField(blank=False,
+                                                          verbose_name='Default subnet size to allocate to subscribers in this pool',
+                                                          validators=[MaxValueValidator(64)])
     inet = CidrAddressField()
     objects = NetManager()
 
+    def clean(self):
+        if self.inet.version == 4:
+            if not self.inet.prefixlen <= self.default_subnetsize <= 32:
+                raise ValidationError('Invalid default subnet size')
+        elif self.inet.version == 6:
+            if not self.inet.prefixlen <= self.default_subnetsize <= 64:
+                raise ValidationError('Invalid default subnet size')
+        else:
+            pass
+
     def __unicode__(self):
         return self.name
 
 
 class IPSubnet(models.Model):
-    inet = CidrAddressField()
+    inet = CidrAddressField(blank=True, verbose_name="Leave empty for automatic allocation")
     objects = NetManager()
     ip_pool = models.ForeignKey(IPPool)
     offer_subscription = models.ForeignKey('offers.OfferSubscription',
                                            related_name='ip_subnet')
 
+    def clean(self):
+        if not self.inet:
+            # Automatically allocate a free subnet
+            pool = IPSet([self.ip_pool.inet])
+            used = IPSet((s.inet for s in self.ip_pool.ipsubnet_set.all()))
+            free = pool.difference(used)
+            # Generator for efficiency (we don't build the whole list)
+            available = (p for p in free.iter_cidrs() if p.prefixlen <= self.ip_pool.default_subnetsize)
+            # TODO: for IPv4, get rid of the network and broadcast
+            # addresses? Not really needed nowadays, and we usually don't
+            # have a real subnet in practice (i.e. Ethernet segment), but
+            # many /32.
+            try:
+                first_free = available.next()
+            except StopIteration:
+                raise ValidationError('Unable to allocate an IP subnet in the specified pool: not enough space left.')
+            self.inet = first_free.subnet(SUBNET_SIZE, 1).next()
+        else:
+            # TODO:
+            # Check that we are included in the IP pool.
+            # Check that we don't conflict with existing subnets
+            pass
+
     def __unicode__(self):
         return str(self.inet)

coin/templates/base.html

@@ -28,10 +28,10 @@
     <nav id="sidebox" class="hide-for-small">
      <h3 id="nav">Navigation</h3>
      <ul class="side-nav">
-         <li class="active"><a href="index.html">Tableau de bord</a></li>
-         <li><a href="infos.html">Mes informations personnelles</a></li>
-         <li><a href="abo.html">Mes abonnements</a></li>
-         <li><a href="contact.html">Contact / Support</a></li>
+         <li {% if request.get_full_path = "/members/" %}class="active"{% endif %}><a href="index.html">Tableau de bord</a></li>
+         <li {% if request.get_full_path = "/members/info/" %}class="active"{% endif %} ><a href="infos.html">Mes informations personnelles</a></li>
+         <li {% if request.get_full_path = "/members/abo/" %}class="active"{% endif %}><a href="abo.html">Mes abonnements</a></li>
+         <li {% if request.get_full_path = "/members/contact/" %}class="active"{% endif %}><a href="contact.html">Contact / Support</a></li>
      </ul>
      </nav>
      {% endblock %}