Changeset 1446

Timestamp:

19 Feb 2007, 22:14:47 (18 years ago)

Author:

Henrik Bettermann

Message:

make book_reserved_bed work

Location:

WAeUP_SRP/trunk

Files:

• profiles/default/vocabularies/verdicts.xml (modified) (1 diff)
• skins/waeup_accommodation/book_reserved_bed.py (modified) (5 diffs)
• skins/waeup_accommodation/reservedRoomsVoc.py (modified) (2 diffs)
• skins/waeup_student/getVerdict.py (modified) (1 diff)
• skins/waeup_student/search_students.py (modified) (1 diff)

WAeUP_SRP/trunk/profiles/default/vocabularies/verdicts.xml

@@ -8 +8 @@
  <item key="A" msgid="">successful student</item>
  <item key="B" msgid="">student with carryover courses</item>
- <item key="C" msgid="">student for probation</item>
+ <item key="C" msgid="">student on probation</item>
  <item key="C" msgid="">student on probation/transfer</item>
  <item key="D" msgid="">student who is to withdraw from the faculty</item>

WAeUP_SRP/trunk/skins/waeup_accommodation/book_reserved_bed.py

@@ -72 +72 @@
             break
         if not bed_brain.bed_type.endswith("reserved"):
-            psm = "Not a reserved bed %s" % bid
+            psm = "Not a reserved bed: %s" % bid
             break
         if bed_brain.student and not change:
@@ -85 +85 @@
             break
         if not bed_brain.bed_type.endswith("reserved"):
-            psm = "Not a reserved bed %s" % bid
+            psm = "Not a reserved bed: %s" % bid
             break
         if not bed_brain.student:
@@ -91 +91 @@
             break
     break
-        
+
 if psm != '':
     return context.book_reserved_bed_form(rendered = rendered,
@@ -103 +103 @@
     for bed in already:
         acco_cat.modifyRecord(bed=bed.bed,student='')
-        
+
 students = context.portal_url.getPortalObject().campus.students
 student_obj = getattr(students,sid)
@@ -118 +118 @@
     if acco_id in student_obj.objectIds():
         acco_doc = getattr(student_obj, acco_id).getContent()
-        acco_doc.edit(mapping={'bed': bid + "(removed)"})
-    logger.info('"%s","released reserved bed %s for","%s"' % (member,bid,sid))
-    psm = "Bed %s released for %s" % (sid,student.name)
-    
+        acco_doc.edit(mapping={'bed':bid + " (reservation cancelled by %s!)" % member})
+    logger.info('"%s","cancelled reservation %s by","%s"' % (member,bid,sid))
+    psm = "%s removed from %s" % (student.name,bid)
+
 mode = 'view'
 return context.book_reserved_bed_form(rendered = "",

WAeUP_SRP/trunk/skins/waeup_accommodation/reservedRoomsVoc.py

@@ -1 @@
-##parameters=key=None 
+##parameters=key=None
 # $Id$
 """
@@ -6 +6 @@
 """
 doc = context.getContent()
-voc = [("_".join((r.split('/')[0],r.split('/')[1])),r) 
-                      for r in doc.reserved_rooms.split(',') if r]
+voc = [("_".join((r.split('/')[0],r.split('/')[1])),r)
+                      for r in doc.reserved_rooms.replace(' ','').split(',') if r]
 #from Products.zdb import set_trace;set_trace()
 if not key:

WAeUP_SRP/trunk/skins/waeup_student/getVerdict.py

@@ -10 +10 @@
 # $Id$
 
-verdicts = {'SUCCESSFUL STUDENT': ('successful',True),
-            'STUDENT WITH CARRYOVER COURSES': ('carryover',True),
-            'STUDENT ON PROBATION': ('probation',False),
-            'WITHDRAWAL STUDENT': ('withdrawal',False),
+verdicts = {'SUCCESSFUL STUDENT': ('A',True),
+            'STUDENT WITH CARRYOVER COURSES': ('B',True),
+            'STUDENT ON PROBATION': ('C',False),
+            'WITHDRAWAL STUDENT': ('D',False),
             'FIRST CLASS HONOURS': ('first_class',False),
             'SECOND CLASS HONOURS (UPPER DIVISION)': ('second_class_upper',False),

WAeUP_SRP/trunk/skins/waeup_student/search_students.py

@@ -228 +228 @@
     for item in items:
         stcat = context.students_catalog
-        record = stcat(id = item)[0]
+        record = stcat(id = item)
+        if record:
+            record = record[0]
+        else:
+            return item+' not found in students_catalog'
         info = {}
         for field in stcat.schema() + stcat.indexes():