X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=influences%2Fmodels.py;h=aefa83c802b882bda63d09b0234c771450bbc35c;hb=3875c317e81ce85be062e8b29d7dac7c8568e2ab;hp=d5db8a39b5cfc598f65df9d1f7e939f9aa54fc38;hpb=d4a0f8d42a45478fd9e3d8e3e3078033a8a5410c;p=matthijs%2Fprojects%2Fxerxes.git

diff --git a/influences/models.py b/influences/models.py
index d5db8a3..aefa83c 100644
--- a/influences/models.py
+++ b/influences/models.py
@@ -1,25 +1,52 @@
 from django.db import models
+from django.contrib.auth.models import User
+from django.utils.translation import ugettext_lazy as _
 
 # Create your models here.
 class Character(models.Model):
-	created     = models.DateField(auto_now_add=1)
-	modified    = models.DateField(auto_now=1)
-	name = models.CharField(max_length=255)
-	def __str__(self):
-		return self.name
+    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"))
 
-	class Admin:
-		pass
+    def __str__(self):
+        return self.name
+
+    class Admin:
+        pass
+
+    class Meta:
+        verbose_name = _("Character")
+        verbose_name_plural = _("Characters")
 
 class Influence(models.Model):
-	created     = models.DateField(auto_now_add=1)
-	modified    = models.DateField(auto_now=1)
-	contact     = models.CharField(max_length=255)
-	character   = models.ForeignKey(Character, edit_inline=models.TABULAR, num_in_admin=3, core=True)
-	description = models.TextField()
+    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, verbose_name = _("Character"))
+    contact     = models.CharField(max_length=255, verbose_name = _("Contact"))
+    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.summary
+
+    class Admin:
+        list_filter=('character', 'status', 'longterm')
+        search_fields=('character', 'description', 'contact')
+        list_display=('character', 'contact', 'summary', 'longterm', 'status') 
 
-	def __str__(self):
-		return self.description[0:10]
+    class Meta:
+        verbose_name = _("Influence")
+        verbose_name_plural = _("Influences")
 
-	class Admin:
-		pass