* Add "Under discussion" status for influences.

[matthijs/projects/xerxes.git] / influences / models.py

diff --git a/influences/models.py b/influences/models.py
index d27e0e0aae73d58e5f452556206b1ecdcaeac1ff..ffc1f66ff2ec2f5a4dc65f30e9c4e9984441bf50 100644 (file)
--- a/influences/models.py
+++ b/influences/models.py
@@ -1,22 +1,48 @@
 from django.db import models
-from ee.base.models import EEObject
+from django.contrib.auth.models import User
+from django.utils.translation import ugettext_lazy as _
 
 # Create your models here.
-class Character(EEObject):
-       name = models.CharField(max_length=255)
+class Character(models.Model):
+       created     = models.DateField(auto_now_add=1, verbose_name = _("Creation time"))
+       modified    = models.DateField(auto_now=1, verbose_name = _("Modification time"))
+       name        = models.CharField(max_length=255, verbose_name = _("Name"))
+       player      = models.ForeignKey(User, verbose_name = _("Player"))
+
        def __str__(self):
                return self.name
 
        class Admin:
                pass
 
-class Influence(EEObject):
-       contact     = models.CharField(max_length=255)
-       character   = models.ForeignKey(Character, edit_inline=models.TABULAR, num_in_admin=3, core=True)
-       description = models.TextField()
+       class Meta:
+               verbose_name = _("Character")
+               verbose_name_plural = _("Characters")
+
+class Influence(models.Model):
+       STATUS_CHOICES = (
+               ('N', 'New'),
+               ('U', 'Under discussion'),
+               ('P', 'Processing'),
+               ('D', 'Done'),
+       )
+       created     = models.DateField(auto_now_add=1, verbose_name = _("Creation time"))
+       modified    = models.DateField(auto_now=1, verbose_name = _("Modification time"))
+       
+       character   = models.ForeignKey(Character, edit_inline=models.TABULAR, num_in_admin=3, core=True, verbose_name = _("Character"))
+       contact     = models.CharField(max_length=255, verbose_name = _("Contact"))
+       description = models.TextField(verbose_name = _("Description"))
+       status      = models.TextField(max_length=1, choices=STATUS_CHOICES, default='N', verbose_name = _("Status"))
+       longterm    = models.BooleanField(default=False, verbose_name = _("Long term"))
 
        def __str__(self):
                return self.description[0:10]
 
        class Admin:
-               pass
+               list_filter=('character', 'status', 'longterm')
+               search_fields=('character', 'description', 'contact')
+
+       class Meta:
+               verbose_name = _("Influence")
+               verbose_name_plural = _("Influences")
+