Changeset 1536 for WAeUP_SRP/trunk

Timestamp:

10 Mar 2007, 18:52:25 (18 years ago)

Author:

Henrik Bettermann

Message:

ticket 98

Location:

WAeUP_SRP/trunk/skins

Files:

• waeup_accommodation/release_bed.py (modified) (1 diff)
• waeup_student/getRetStudentStatistics.py (modified) (1 diff)

WAeUP_SRP/trunk/skins/waeup_accommodation/release_bed.py

@@ -44 +44 @@
     acco_cat.modifyRecord(bed=allocated_bed.bed,student='')
     acco_doc = context.getContent()
-    acco_doc.edit(mapping={'bed':"-- cancelled by %s --" % member})
+    acco_doc.edit(mapping={'bed':"-- cancelled by section officer --"})
+    logger.info('"%s", "released bed of", "%s"' % (member_id,student_id))
     redirect("%s" % (context.absolute_url()))
 

WAeUP_SRP/trunk/skins/waeup_student/getRetStudentStatistics.py

@@ -42 +42 @@
     dep['id'] = fid
     fquery = Eq('faculty',fid)
-    fac_res = aq_students(fquery)
-    fac_ids = [r.id for r in fac_res]
-    total = float(len(fac_res))
+    stud_res = aq_students(fquery)
+    stud_ids = [r.id for r in stud_res]
+    total = float(len(stud_res))
 
     if total == 0:
         continue
 
-    ret = len([s for s in fac_ids if s in ret_ids])
+    ret = len([s for s in stud_ids if s in ret_ids])
     dep['returned'] = ret
     sum += ret