Fix missing self. in events.models.__unicode__

[xnet] / xnet / events / models.py

diff --git a/xnet/events/models.py b/xnet/events/models.py
index 04c7d6a..5c77a2e 100644 (file)
--- a/xnet/events/models.py
+++ b/xnet/events/models.py
@@ -1,6 +1,9 @@
 # -*- coding: utf-8 -*-
 from django.db import models
 from django.utils.translation import ugettext_lazy as _
+
+from django_xworkflows import models as xwf_models
+
 import xnet.accounts.models as accounts_models
 
 class Event(models.Model):
@@ -17,20 +20,27 @@ class Event(models.Model):
     )
 
     short = models.SlugField(max_length=40, verbose_name=_(u"nom raccourci"))
+    main_description = models.OneToOneField('events.EventDescription', null=True, blank=True,
+            verbose_name=_(u"description principale"), related_name='+')
+    group = models.ForeignKey(accounts_models.XGroup, verbose_name=_(u"groupe"), related_name='events')
+    creator = models.ForeignKey(accounts_models.Account, verbose_name=_(u"créateur"), related_name='created_events')
     simple = models.BooleanField(verbose_name=_(u"simple"))
 
-    registration_end_date = models.DateTimeField(null=True, blank=True,
+    registration_end = models.DateTimeField(null=True, blank=True,
             verbose_name=_(u"date limite d'inscription"))
     notification_recipient = models.CharField(max_length=10, choices=NOTIFICATION_RECIPIENT_CHOICES,
             verbose_name=_(u"destinataire(s) des notifications"))
     show_registered = models.BooleanField(verbose_name=_(u"montrer les inscriptions aux membres"))
     allow_non_members = models.BooleanField(verbose_name=_(u"autoriser les non-membres"))
     allow_guests = models.BooleanField(verbose_name=_(u"autoriser les invités"))
-    registered_limit = models.PositiveIntegerField(verbose_name=_(u"limites du nombre d'inscrits"))
+    registration_limit = models.IntegerField(verbose_name=_(u"limites du nombre d'inscrits"))
 
     start_date = models.DateTimeField(null=True, blank=True, verbose_name=_(u"date de début"))
     end_date = models.DateTimeField(null=True, blank=True, verbose_name=_(u"date de fin"))
 
+    def __unicode__(self):
+        return self.short
+
     class Meta:
         verbose_name = _(u"événement")
         verbose_name_plural = _(u"événements")
@@ -39,43 +49,60 @@ class Event(models.Model):
 class EventDescription(models.Model):
     name = models.CharField(max_length=100, verbose_name=_(u"nom"))
     description = models.CharField(max_length=1000, verbose_name=_(u"description"))
-    event = models.ForeignKey(Event, verbose_name=_(u"événement parent"), related_name=_(u"+"))
-    registered_limit = models.PositiveIntegerField(verbose_name=_(u"limites du nombre d'inscrits"))
+    event = models.ForeignKey(Event, verbose_name=_(u"événement parent"), related_name='descriptions')
+    registration_limit = models.IntegerField(verbose_name=_(u"limites du nombre d'inscrits"))
     main = models.BooleanField(verbose_name=_(u"principale"))
 
+    def __unicode__(self):
+        return self.name
+
     class Meta:
         verbose_name = _(u"description d'événement")
         verbose_name_plural = _(u"descriptions d'événements")
 
 
-class PaymentOption(models.Model):
+class PriceOption(models.Model):
     name = models.CharField(max_length=100, verbose_name=_(u"nom"))
-    amount = models.FloatField(verbose_name=_(u"montant"))
+    amount = models.IntegerField(verbose_name=_(u"montant (centimes)"))
     event_description = models.ForeignKey(EventDescription, verbose_name=_(u"description associée"),
-            related_name=_(u"+"))
+            related_name='price_options')
+
+    def __unicode__(self):
+        return self.name
 
     class Meta:
         verbose_name = _(u"option de paiement")
         verbose_name_plural = _(u"options de paiement")
 
 
-class Registration(models.Model):
-    STATUS_PENDING = 'pending'
-    STATUS_ACCEPTED = 'accepted'
-    STATUS_CANCELLED = 'cancelled'
-
-    STATUS_CHOICES = (
-        (STATUS_PENDING, _(u"en attente")),
-        (STATUS_ACCEPTED, _(u"accepté")),
-        (STATUS_CANCELLED, _(u"annulé")),
+class RegistrationWorkflow(xwf_models.Workflow):
+    states = (
+        ('pending', u"En attente"),
+        ('accepted', u"Accepté"),
+        ('cancelled', u"Annulé"),
     )
+    transitions = (
+        ('accept', ['pending'], 'accepted'),
+        ('cancel', ['pending', 'accepted'], 'cancelled'),
+    )
+    initial_state = 'pending'
+
+    log_model = ''  # We don't want logs
+
 
+class Registration(models.Model):
     user = models.ForeignKey(accounts_models.Account, verbose_name=_(u"utilisateur enregistré"),
-            related_name=_(u"+"))
-    event = models.ForeignKey(EventDescription, verbose_name=_(u"événement associé"),
-            related_name=_(u"+"))
-    options = models.ForeignKey(PaymentOption, verbose_name=_(u"options associées"),
-            related_name=_(u"+"))
-    status = models.CharField(max_length=10, choices=STATUS_CHOICES, verbose_name=_(u"statut"))
+            related_name='event_registrations')
+    dn_event = models.ForeignKey(EventDescription, verbose_name=_(u"événement associé"),
+            related_name='registrations')
+    option = models.ForeignKey(PriceOption, verbose_name=_(u"options associées"),
+            related_name='registrations')
+    date_registered = models.DateTimeField(verbose_name=_(u"date d'enregistrement"))
+    state = xwf_models.StateField(RegistrationWorkflow, verbose_name=u"état")
 
+    def __unicode__(self):
+        return "%s, %s, %s".format(unicode(self.user), unicode(self.event), unicode(self.option))
 
+    class Meta:
+        verbose_name = _(u"inscription")
+        verbose_name_plural = _(u"inscriptions")