X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=influences%2Fmodels.py;h=9587aff22f9338f2011b62dff66b702e766873e0;hb=426cb2ff0508dfecbff4b5b55e752449df9c31d0;hp=846410f5cd2caf57daf2d7335fd58590cfb1896c;hpb=17c4e95680e7d491c808fa06d1bad45dd743ccce;p=matthijs%2Fprojects%2Fxerxes.git

diff --git a/influences/models.py b/influences/models.py
index 846410f..9587aff 100644
--- a/influences/models.py
+++ b/influences/models.py
@@ -4,9 +4,14 @@ from django.utils.translation import ugettext_lazy as _
 
 # Create your models here.
 class Character(models.Model):
+    STATUS_CHOICES = (
+        ('N', _('New')),
+        ('A', _('Approved')),
+    )
     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"))
+    status      = models.CharField(max_length=2, choices=STATUS_CHOICES, default='N', verbose_name = _("Status"))
     player      = models.ForeignKey(User, verbose_name = _("Player"))
 
     def __str__(self):
@@ -21,28 +26,33 @@ class Character(models.Model):
 
 class Influence(models.Model):
     STATUS_CHOICES = (
-        ('N', 'New'),
-        ('U', 'Under discussion'),
-        ('P', 'Processing'),
-        ('D', 'Done'),
+        ('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"))
+    character   = models.ForeignKey(Character, verbose_name = _("Character"))
+    contact     = models.CharField(max_length=255, verbose_name = _("Contact Name"))
+    summary     = models.CharField(max_length=255, verbose_name = _("Summary"))
     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"))
 
+    result      = models.TextField(blank=True,verbose_name = _("Result"))
+
     def __str__(self):
-        return self.description[0:10]
+        return self.summary
 
     class Admin:
         list_filter=('character', 'status', 'longterm')
         search_fields=('character', 'description', 'contact')
+        list_display=('character', 'contact', 'summary', 'longterm', 'status') 
 
     class Meta:
         verbose_name = _("Influence")
         verbose_name_plural = _("Influences")
 
+# vim: set sts=4 sw=4 expandtab: