Commits

Ed Brannin committed 5738f98

I don't even remember what's different. Pushing to clear local space.

Comments (0)

Files changed (6)

+dependencies = dependencies
+c8ecc2d090cd853ad23f91c4f768ddda5391acea dependencies

baptism_records/TODO.md

+Confirmer should not be required.

baptism_records/baptism/admin.py

                                 "sponsor1", "sponsor2",
                                 "baptism_date", "birth_date", "birth_hospital"],
                     'classes': ['family_info']}),
-        ("Church", {'fields': ["baptism_church", "baptizer", "zip_code"],
+        ("Church", {'fields': ["baptism_church", "baptizer", "postal_code"],
                     'classes': ['church_info']}),
         ("Confirmation", {'fields': ["confirmer", "confirmation_date", 
                                     "confirmation_place"],
     list_display = ['full_name', 'last_name', 'baptism_date', 'book', 'page', 'number']
     
 admin.site.register(Minister)
-admin.site.register(ZipCode)
+admin.site.register(PostalCode)
 admin.site.register(Church)
 admin.site.register(Christian, ChristianAdmin)
 admin.site.register(Note)

baptism_records/baptism/models.py

 from django.db import models
 
 class Minister(models.Model):
-    prefix = models.CharField(max_length=10, blank=True)
-    first_name = models.CharField(max_length=40, blank=True)
-    middle_name = models.CharField(max_length=40, blank=True)
-    last_name = models.CharField(max_length=40)
-    suffix = models.CharField(max_length=10, blank=True)
-    notes = models.CharField(max_length=40, blank=True)
+    prefix = models.CharField(max_length=140, blank=True)
+    first_name = models.CharField(max_length=140, blank=True)
+    middle_name = models.CharField(max_length=140, blank=True)
+    last_name = models.CharField(max_length=140)
+    suffix = models.CharField(max_length=140, blank=True)
+    notes = models.CharField(max_length=140, blank=True)
     
     def __unicode__(self):
         answer = u""
         return answer.strip()
     
 
-class ZipCode(models.Model):
-    zip_code = models.CharField(max_length=10)
-    city = models.CharField(max_length=50, blank=True)
-    state = models.CharField(max_length=50, blank=True)
+class PostalCode(models.Model):
+    postal_code = models.CharField(max_length=140)
+    city = models.CharField(max_length=140, blank=True)
+    state = models.CharField(max_length=140, blank=True)
     
     def __unicode__(self):
-        return self.zip_code
+        return self.postal_code
 
 class Church(models.Model):
     id = models.IntegerField(primary_key=True)
-    name = models.CharField(max_length=60)
-    street = models.CharField(max_length=60)
-    city_state_zip = models.CharField(max_length=60)
+    name = models.CharField(max_length=140)
+    street = models.CharField(max_length=140)
+    city_state_postal = models.CharField(max_length=140)
     
     class Meta:
         ordering = ["id"]
     page2 = models.PositiveIntegerField()
     number2 = models.PositiveIntegerField()
     
-    first_name = models.CharField(max_length=50)
-    middle_name = models.CharField(max_length=50)
-    last_name = models.CharField(max_length=50)
+    first_name = models.CharField(max_length=140)
+    middle_name = models.CharField(max_length=140, blank=True)
+    last_name = models.CharField(max_length=140)
     
-    father_name = models.CharField(max_length=50)
-    mother_maiden_name = models.CharField(max_length=50)
+    father_name = models.CharField(max_length=140, blank=True)
+    mother_maiden_name = models.CharField(max_length=140, blank=True)
     
-    sponsor1 = models.CharField(max_length=50)
-    sponsor2 = models.CharField(max_length=50)
+    sponsor1 = models.CharField(max_length=140, blank=True)
+    sponsor2 = models.CharField(max_length=140, blank=True)
     
-    birth_hospital = models.CharField(max_length=50)
-    zip_code = models.ForeignKey(ZipCode)
+    birth_hospital = models.CharField(max_length=140)
+    postal_code = models.ForeignKey(PostalCode)
     # FIXME: Why is priest1 in the original schema?
     
     baptizer = models.ForeignKey(Minister, related_name='baptized')
     baptism_date = models.DateField()
     
     confirmer = models.ForeignKey(Minister, related_name='confirmed', blank=True)
-    confirmation_place = models.CharField(max_length=50, blank=True)
+    confirmation_place = models.CharField(max_length=140, blank=True)
     confirmation_date = models.DateField(blank=True)
     
     
     )
     person = models.ForeignKey(Christian)
     church = models.ForeignKey(Church)
-    note_type = models.CharField(max_length=10, choices=NOTE_TYPES)
+    note_type = models.CharField(max_length=140, choices=NOTE_TYPES)
+http://docs.djangoproject.com/en/dev/topics/forms/
+http://docs.djangoproject.com/en/1.2/
+http://docs.djangoproject.com/en/1.2/ref/contrib/admin/
+http://docs.djangoproject.com/en/dev/ref/models/fields/#model-field-types
+http://docs.djangoproject.com/en/dev/topics/db/models/#meta-options
+http://south.aeracode.org/docs/installation.html#installation
+http://docs.djangoproject.com/en/dev/ref/contrib/admin/
+http://www.kryogenix.org/days/2008/03/28/overriding-a-single-field-in-the-django-admin-using-newforms-admin
+
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.