Changeset 3863 for WAeUP_SRP/trunk

Timestamp:

20 Jan 2009, 08:22:52 (16 years ago)

Author:

Henrik Bettermann

Message:

getPaymentsFolderInfo.py: resolve #600
getAccommodationInfo.py: implement disable switch
WAeUPImport.py: export student password

Location:

WAeUP_SRP/trunk

Files:

• WAeUPImport.py (modified) (4 diffs)
• skins/waeup_accommodation/getAccommodationInfo.py (modified) (3 diffs)
• skins/waeup_epayment/getPaymentsFolderInfo.py (modified) (1 diff)

WAeUP_SRP/trunk/WAeUPImport.py

@@ -885 +885 @@
         #           }
 
-        sub_types = ['StudentApplication','StudentClearance','StudentPersonal']
+        sub_types = ['StudentApplication','StudentClearance','StudentPersonal','StudentStudyCourse']
         non_image_keys = {}
         for i in sub_types:
@@ -912 +912 @@
                     #headline = ','.join(fields).replace('level','current_level')
                     headline = ','.join(fields)
+                    headline = headline + ',password'
                     open(export_file,"a").write(headline +'\n')
                 format = '"%(' + ')s","%('.join(fields) + ')s"'
+                format = format + ',"%(password)s"'
                 res = self.students_catalog(id = student_id)
                 student = res[0]
@@ -926 +928 @@
                     for f in toexport[k]:
                         d[f] = getattr(object_doc,f,'')
+                if hasattr(stdir, student_id):
+                    d['password'] = self.waeup_tool.getCredential(student_id)
+                    stdir.deleteEntry(student_id)
+                self.waeup_tool.removePictureFolder(student_id)       
                 line.append(format % d)
                 open(export_file,"a").write('\n'.join(line) +'\n')
@@ -934 +940 @@
                 msg = "Student object not found"
                 break
-            if hasattr(stdir, student_id):
-                stdir.deleteEntry(student_id)
-            self.waeup_tool.removePictureFolder(student_id)            
+     
             break
         return student_id,msg,mapping     

WAeUP_SRP/trunk/skins/waeup_accommodation/getAccommodationInfo.py

@@ -15 +15 @@
 logger = logging.getLogger('Skins.getAccommodationInfo')
 import DateTime
+
+booking_disabled = False
 
 request = context.REQUEST
@@ -121 +123 @@
     info['acco_review_state'] = wf.getInfoFor(acco,'review_state',None)
     info['maintenance_paid'] = info['acco_review_state'] == "maintenance_fee_paid"
+elif booking_disabled:
+    info['booking_allowed'] = False
 
 d = {}
@@ -147 +151 @@
 info['student_status'] = student_status
 return info
-

WAeUP_SRP/trunk/skins/waeup_epayment/getPaymentsFolderInfo.py

@@ -73 +73 @@
 info['prod_id'] = '61'
 
+gown_records = aq_payments(Eq('student_id',student_id)  & Eq('category','gown'))
 try:
     level = int(student_record.level)
     end_level = int(student_record.end_level)
-    if level >= end_level:
+    if level >= end_level and not gown_records:
         info['gown'] = True
 except: