From: artunit Date: Wed, 19 Nov 2008 22:12:41 +0000 (+0000) Subject: git-svn-id: svn://svn.open-ils.org/ILS-Contrib/servres/trunk@27 6d9bc8c9-1ec2-4278... X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=4b9d9a59ac0bfcf28d729bd4ad5aaf8f0f667fc0;p=syrup%2Fmasslnc.git git-svn-id: svn://svn.open-ils.org/ILS-Contrib/servres/trunk@27 6d9bc8c9-1ec2-4278-b937-99fde70a366f --- diff --git a/conifer/syrup/admin.py b/conifer/syrup/admin.py index d9d46da..9fbf7bd 100644 --- a/conifer/syrup/admin.py +++ b/conifer/syrup/admin.py @@ -22,5 +22,5 @@ from conifer.syrup.models import * # value.__unicode__ = unicode_fn(firstcharfield) # admin.site.register(value) -for m in [Member, Course, Term, UserProfile, NewsItem]: +for m in [LibraryUnit, ServiceDesk, Member, Department, Course, Term, UserProfile, NewsItem]: admin.site.register(m) diff --git a/conifer/syrup/models.py b/conifer/syrup/models.py index d012543..88d7c61 100644 --- a/conifer/syrup/models.py +++ b/conifer/syrup/models.py @@ -39,6 +39,27 @@ class UserProfile(m.Model): return 'UserProfile(%s)' % self.user #---------------------------------------------------------------------- +# LIBRARIES, SERVICE DESKS + +class LibraryUnit(m.Model): + name = m.CharField(max_length=100) + nickname = m.CharField(max_length=15,blank=True,default='') + url = m.URLField() + contact_email = m.EmailField() + + def __unicode__(self): + return self.name + +class ServiceDesk(m.Model): + library = m.ForeignKey(LibraryUnit) + abbreviation = m.CharField(max_length=8,db_index=True) + name = m.TextField(db_index=True) + active = m.BooleanField(default=True) + + def __unicode__(self): + return self.name + +#---------------------------------------------------------------------- # TERMS, COURSES, MEMBERSHIP class Term(m.Model): @@ -50,6 +71,13 @@ class Term(m.Model): def __unicode__(self): return self.code or self.name +class Department(m.Model): + abbreviation = m.CharField(max_length=8,db_index=True) + name = m.TextField(db_index=True) + active = m.BooleanField(default=True) + + def __unicode__(self): + return self.name class Course(m.Model): """An offering of a course."""