[open-ils-commits] r47 - in servres/trunk/conifer: syrup templates
svn at svn.open-ils.org
svn at svn.open-ils.org
Mon Nov 24 21:50:03 EST 2008
Author: gfawcett
Date: 2008-11-24 21:50:01 -0500 (Mon, 24 Nov 2008)
New Revision: 47
Modified:
servres/trunk/conifer/syrup/admin.py
servres/trunk/conifer/syrup/models.py
servres/trunk/conifer/syrup/views.py
servres/trunk/conifer/templates/course_detail.xhtml
Log:
added primitive Item model. See comments.
In ReservesDirect, an item representation is spread across several
tables. I propose that we try to model an item as a row in a single
table, and include columns for the item metadata as well as its
physical status (if any) and content (if any).
Perhaps it will become clear why RD uses so many tables, and I'll see
the error of my ways. :-) But it seems wise to start with the simplest
data model that might work, and extend from there.
Modified: servres/trunk/conifer/syrup/admin.py
===================================================================
--- servres/trunk/conifer/syrup/admin.py 2008-11-25 02:49:59 UTC (rev 46)
+++ servres/trunk/conifer/syrup/admin.py 2008-11-25 02:50:01 UTC (rev 47)
@@ -22,5 +22,6 @@
# value.__unicode__ = unicode_fn(firstcharfield)
# admin.site.register(value)
-for m in [LibraryUnit, ServiceDesk, Member, Department, Course, Term, UserProfile, NewsItem]:
+for m in [LibraryUnit, ServiceDesk, Member, Department, Course, Term, UserProfile, NewsItem,
+ Item]:
admin.site.register(m)
Modified: servres/trunk/conifer/syrup/models.py
===================================================================
--- servres/trunk/conifer/syrup/models.py 2008-11-25 02:49:59 UTC (rev 46)
+++ servres/trunk/conifer/syrup/models.py 2008-11-25 02:50:01 UTC (rev 47)
@@ -36,11 +36,18 @@
('ADMIN', 'system administrator')))
instructor = m.BooleanField(default=False)
proxy = m.BooleanField(default=False)
- active = m.BooleanField(default=True)
+ # n.b. Django's User has an active flag, maybe we should use that?
+ active = m.BooleanField(default=True)
def __unicode__(self):
return 'UserProfile(%s)' % self.user
+ @classmethod
+ def active_instructors(cls):
+ return cls.objects.filter(instructor=True) \
+ .select_related('user').filter(user__is_active=True) \
+ .order_by('-user__last_name','-user__first_name')
+
#----------------------------------------------------------------------
# LIBRARIES, SERVICE DESKS
@@ -100,6 +107,8 @@
def __unicode__(self):
return self.code or self.title
+ def items(self):
+ return Item.objects.filter(course=self.id)
class Member(m.Model):
course = m.ForeignKey(Course)
@@ -128,6 +137,7 @@
# Items comprise both items-proper, as well as headings. In the
# database, all items are stored as a flat list; the sort_order
+ # dictates the sequencing of items within their parent group.
course = m.ForeignKey(Course)
ITEM_TYPE_CHOICES = (('ITEM', 'Item'),
@@ -137,31 +147,31 @@
sort_order = m.IntegerField(default=0)
# parent must be a heading. could use ForeignKey.limit_choices_to,
# to enforce this in the admin ui.
- parent_heading = m.ForeignKey('Item')
+ parent_heading = m.ForeignKey('Item', blank=True, null=True)
# Metadata
title = m.CharField(max_length=255,db_index=True)
author = m.CharField(max_length=255,db_index=True)
- source = m.CharField(max_length=255,db_index=True)
- volume_title = m.CharField(max_length=255,db_index=True)
- content_notes = m.CharField(max_length=255)
- volume_edition = m.CharField(max_length=255)
- content_notes = m.CharField(max_length=255)
- volume_edition = m.CharField(max_length=255)
- pages_times = m.CharField(max_length=255)
- performer = m.CharField(max_length=255,db_index=True)
- local_control_key = m.CharField(max_length=30)
+ source = m.CharField(max_length=255,db_index=True, blank=True, null=True)
+ volume_title = m.CharField(max_length=255,db_index=True, blank=True, null=True)
+ content_notes = m.CharField(max_length=255, blank=True, null=True)
+ volume_edition = m.CharField(max_length=255, blank=True, null=True)
+ content_notes = m.CharField(max_length=255, blank=True, null=True)
+ volume_edition = m.CharField(max_length=255, blank=True, null=True)
+ pages_times = m.CharField(max_length=255, blank=True, null=True)
+ performer = m.CharField(max_length=255,db_index=True, blank=True, null=True)
+ local_control_key = m.CharField(max_length=30, blank=True, null=True)
creation_date = m.DateField(auto_now=False)
last_modified = m.DateField(auto_now=False)
- url = m.URLField()
+ url = m.URLField(blank=True, null=True)
mime_type = m.CharField(max_length=100,default='text/html')
- isbn = m.CharField(max_length=13,db_index=True)
- issn = m.CharField(max_length=8,db_index=True)
- oclc = m.CharField(max_length=9,db_index=True)
+ isbn = m.CharField(max_length=13,db_index=True, blank=True, null=True)
+ issn = m.CharField(max_length=8,db_index=True, blank=True, null=True)
+ oclc = m.CharField(max_length=9,db_index=True, blank=True, null=True)
- home_library = m.ForeignKey(LibraryUnit)
+ home_library = m.ForeignKey(LibraryUnit, blank=True, null=True)
# shouldn't the icon be derived from the MIME type?
###item_icon = m.CharField(max_length=64, choices=ICON_CHOICES)
@@ -171,8 +181,8 @@
# Physical Item properties
- call_number = m.CharField(max_length=30) # long enough?
- barcode = m.CharField(max_length=30) # long enough?
+ call_number = m.CharField(max_length=30, blank=True, null=True) # long enough?
+ barcode = m.CharField(max_length=30, blank=True, null=True) # long enough?
# # owning_library:is this supposed to be a code?
# owning_library = m.CharField(max_length=15,default='0')
@@ -185,14 +195,14 @@
('INACTIVE', 'InActive')) # no longer on rsrv.
phys_status = m.CharField(max_length=9,
null=True,
- choices=STATUS_CHOICES,
+ choices=STATUS_CHOICE,
default=None) # null if not physical item.
activation_date = m.DateField(auto_now=False)
- expiration_date = m.DateField(auto_now=False)
+ expiration_date = m.DateField(auto_now=False, blank=True, null=True)
# requested_loan_period: why is this a text field?
- requested_loan_period = m.CharField(max_length=255,blank=True,default='')
+ requested_loan_period = m.CharField(max_length=255,blank=True,default='', null=True)
fileobj = m.FileField(upload_to='uploads/%Y/%m/%d', max_length=255,
null=True, default=None)
Modified: servres/trunk/conifer/syrup/views.py
===================================================================
--- servres/trunk/conifer/syrup/views.py 2008-11-25 02:49:59 UTC (rev 46)
+++ servres/trunk/conifer/syrup/views.py 2008-11-25 02:50:01 UTC (rev 47)
@@ -5,6 +5,7 @@
from django.contrib.auth import authenticate, login, logout
import conifer.genshi_support as g
from conifer.syrup import models
+from django.contrib.auth.models import User
#------------------------------------------------------------
@@ -48,8 +49,7 @@
count = int(request.GET.get('count', 5))
action = request.GET.get('action', 'browse')
if action == 'join':
- paginator = Paginator(models.UserProfile.objects.filter(instructor=True).
- select_related('user').filter(user__is_active=True).order_by('-user__last_name','-user__first_name'), count)
+ paginator = Paginator(models.UserProfile.active_instructors(), count)
elif action == 'drop':
paginator = Paginator(models.Course.objects.filter(moderated=False), count)
else:
Modified: servres/trunk/conifer/templates/course_detail.xhtml
===================================================================
--- servres/trunk/conifer/templates/course_detail.xhtml 2008-11-25 02:49:59 UTC (rev 46)
+++ servres/trunk/conifer/templates/course_detail.xhtml 2008-11-25 02:50:01 UTC (rev 47)
@@ -1,17 +1,33 @@
<?python
title = '%s: %s (%s)' % (course.code, course.title, course.term)
+items = course.items()
?>
<html xmlns="http://www.w3.org/1999/xhtml"
xmlns:xi="http://www.w3.org/2001/XInclude"
xmlns:py="http://genshi.edgewall.org/">
-<xi:include href="master.xhtml"/>
-<head>
- <title>${title}</title>
-</head>
-<body>
- <h1>${title}</h1>
- <p>${course.department}</p>
- <h2>Reserve Items</h2>
- (not implemented yet)
-</body>
+ <xi:include href="master.xhtml"/>
+ <head>
+ <title>${title}</title>
+ </head>
+ <body>
+ <h1>${title}</h1>
+ <p>${course.department}</p>
+ <h2>Reserve Items</h2>
+ <p py:if="not items">
+ There are no items associated with this course yet.
+ </p>
+ <div py:if="items">
+ <table class="pagetable">
+ <thead>
+ <tr><th>Title</th><th>Type</th></tr>
+ </thead>
+ <tbody>
+ <tr py:for="item in items">
+ <td><a href="item/${item.id}/">${item.title}</a></td>
+ <td>${item.item_type}</td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ </body>
</html>
More information about the open-ils-commits
mailing list