Changeset 1117 for WAeUP_SRP/trunk/skins

Timestamp:

21 Dec 2006, 16:19:39 (18 years ago)

Author:

joachim

Message:

reserve accommodation now respects special cases, change_bed moves wrong assigned students to the right bed.

Location:

WAeUP_SRP/trunk/skins

Files:

• waeup_accommodation/change_bed.py (modified) (2 diffs)
• waeup_student/getAccommodationInfo.py (modified) (2 diffs)

WAeUP_SRP/trunk/skins/waeup_accommodation/change_bed.py

@@ -38 +38 @@
                                                   r.bed_type,
                                                   info['student_status']))
-    to_modify.append((r.bed,r.student,info['student_status']))
-    
-for former_bed, student, status in to_modify:
+    to_modify.append((r.bed,r.student,info['student_status'],info['acco_doc']))
+for former_bed, student, status,acco_doc in to_modify:
     beds.modifyRecord(bed=former_bed,student='')
     code,bed = beds.searchAndReserveBed(student,status)
     if code > 0:
+        #from Products.zdb import set_trace; set_trace()
         d = {}
         d['bed'] = bed
@@ -50 +50 @@
         d['acco_maint_code'] = acco_info.get('maintenance_code')
         d['acco_maint_fee'] = acco_info.get('maintenance_fee')
-        info['acco_doc'].edit(mapping=d)
-        list.append("Student %s new bed %s assigned code = %s" % (r.student,
+        acco_doc.edit(mapping=d)
+        list.append("Student %s new bed %s assigned code = %s" % (student,
                                                               bed,
                                                               code))

WAeUP_SRP/trunk/skins/waeup_student/getAccommodationInfo.py

@@ -50 +50 @@
                         'BARTTHR',
                         )
-
+pti_certificates = ('BENGIEP',
+                    'BENGGCPP',
+                    'BENGEEP',
+                    'BENGGEP',
+                    'BENGPEP',
+                    'BENGMEP',
+                    )
 s_brain = res[0]
 students_object = context.portal_url.getPortalObject().campus.students
@@ -71 +77 @@
 if s_brain.course in ekehuan_certificates:
     bt += "_ekenhuan"
+elif s_brain.course in pti_certificates:
+    bt += "_pti"
+    
 d['bt'] = bt
 #from Products.zdb import set_trace