X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=influences%2Fmodels.py;h=8478ecc0f728e493f6122797939d9a46300d706b;hb=08b286aa8384a8d748581840407ee17eb7ca1a39;hp=78daa15992304ee33882f4da9922ee38a930f3c7;hpb=682f6cde0a7bb2c822eb9ef69583259454a0d97b;p=matthijs%2Fprojects%2Fxerxes.git

diff --git a/influences/models.py b/influences/models.py
index 78daa15..8478ecc 100644
--- a/influences/models.py
+++ b/influences/models.py
@@ -12,13 +12,20 @@ class Character(models.Model):
         ('N', _('New')),
         ('A', _('Approved')),
     )
+    TYPE_CHOICES = (
+        ('P', _('Player')),
+        ('N', _('NPC')),
+        ('C', _('Contact')),
+    )
     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"))
+    contacts    = models.ManyToManyField('self')
+    type        = models.CharField(max_length=2, choices=TYPE_CHOICES, verbose_name=_("Type"))
 
-    def __str__(self):
+    def __unicode__(self):
         return self.name
 
     def get_absolute_url(self):
@@ -38,16 +45,17 @@ class Influence(models.Model):
     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 Name"))
+    initiator   = models.ForeignKey(Character, verbose_name = _("Initiator"), related_name='initiated_influences')
+    other_contacts = models.CharField(max_length=255, blank = True, verbose_name = _("Other Contacts"))
     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"))
+    todo        = models.TextField(verbose_name = _("Todo"))
+    status      = models.CharField(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):
+    def __unicode__(self):
         return self.summary
 
     def get_absolute_url(self):