X-Git-Url: http://gitweb.fperrin.net/?p=djsite.git;a=blobdiff_plain;f=quotes%2Fmodels.py;h=7539152451509845f8e984c31bbd16c2dd4ddb69;hp=53afcbe246a20f61e2c1c03767de029739540fca;hb=5c563ff1701456a2ca7108a301e4e48457475daa;hpb=0b5eb1c3de4b96a048f784ab7c210462f26ac8da

diff --git a/quotes/models.py b/quotes/models.py
index 53afcbe..7539152 100644
--- a/quotes/models.py
+++ b/quotes/models.py
@@ -1,30 +1,76 @@
 from django.db import models
+from localmodels import HTMLField, TagField
 
 # Create your models here.
-
 class Author(models.Model):
-    name = models.CharField(max_length=100)
-    notes = models.TextField(blank=True, help_text= \
-                             "Notes for the author; may be left blank. Will \
-                              not be HTML-escaped.")
+    name = models.CharField(max_length=100,
+                            help_text="Name of the author")
+    notes = HTMLField(blank=True, help_text= \
+                      "Notes about the author; may be left blank. Will \
+                      not be HTML-escaped.",)
+    pvt_notes = HTMLField(blank=True, help_text= \
+                          "Notes about the author; not displayed on \
+                          the public interface",)
+    tags = TagField()
+
+    birth_date = models.DateField(blank=True, null=True,
+                                  help_text="Date of birth")
+    death_date = models.DateField(blank=True, null=True,
+                                  help_text="Date of death (leave blank \
+                                  if still alive!)")
 
-    def __unicode__(self):
+    def __str__(self):
         return self.name
 
-class Tag(models.Model):
-    tag = models.CharField(max_length=100)
+# class DatePrecision(models.CharField):
+#     DAY = "D"
+#     MONTH = "M"
+#     YEAR = "Y"
+#     DECADE = "X"
+#     CENTURY = "C"
+#     UNKNOWN = "?"
+#     PRECISION_CHOICES = [
+#         (DAY, "Day"),
+#         (MONTH, "Month"),
+#         (YEAR, "Year"),
+#         (DECADE, "Decade"),
+#         (CENTURY, "Century"),
+#         (UNKNOWN, "Unknown"),
+#     ]
+#     def __init__(self, **kwargs):
+#         models.CharField(max_length=1, choices=self.PRECISION_CHOICES,
+#                          default=self.DAY, **kwargs)
 
-    def __unicode__(self):
-        return self.tag
+class Work(models.Model):
+    name = models.CharField(max_length=100,
+                            help_text="Name of the context for the quote \
+                            (title of the work or speech it appears in)")
+    author = models.ForeignKey(Author)
+    date = models.DateField(blank=True, null=True,
+                            help_text="Date of the quote")
+    tags = TagField()
 
-    class Meta:
-        ordering = ("tag", )
+    notes = HTMLField(blank=True, help_text= \
+                      "Notes about the work; may be left blank. Will \
+                      not be HTML-escaped. XXX: offer a WYSIWYG editor")
+    pvt_notes = HTMLField(blank=True, help_text= \
+                          "Notes about the work; not displayed on \
+                          the public interface")
+
+    def __str__(self):
+        return "%s: %s (%s)" % (self.author.name, self.name, self.date)
 
 class Quote(models.Model):
-    text = models.TextField()
-    author = models.ForeignKey(Author)
-    tags = models.ManyToManyField(Tag, blank=True)
+    text = HTMLField()
+    tags = TagField()
+    work = models.ForeignKey(Work)
 
-    def __unicode__(self):
-        return self.author.name + ": " + self.text
+    notes = HTMLField(blank=True, help_text= \
+                      "Notes about the quote; may be left blank. Will \
+                      not be HTML-escaped. XXX: offer a WYSIWYG editor")
+    pvt_notes = HTMLField(blank=True, help_text= \
+                          "Notes about the quote; not displayed on \
+                          the public interface")
 
+    def __str__(self):
+        return self.work.author.name + ": " + self.text