Changeset 3967

Timestamp:

19 Feb 2009, 10:54:25 (16 years ago)

Author:

Henrik Bettermann

Message:

session, level, and mode widgets must not allow empty strings
So far, the mode vocabulary has only been changed for FUT Minna. Should be changed for other portals too.

Location:

WAeUP_SRP/trunk

Files:

• Widgets.py (modified) (2 diffs)
• profiles/futminna/vocabularies/entry_modes.xml (modified) (1 diff)
• skins/waeup_epayment/purgeSFPayments.py (modified) (2 diffs)

WAeUP_SRP/trunk/Widgets.py

@@ -351 +351 @@
     def _getSessions(self):
         current_year = DateTime().year()
-        d = {'': ''}
+        #d = {'': ''}
+        d = {}
         for y in range(current_year - 10,current_year + 1):
             d['%s' % str(y)[-2:]] = '%4d/%4d' % (y,y+1)
@@ -424 +425 @@
 
     def _getLevels(self):
-        d = {'':'','000':'Pre-Studies'}
+        #d = {'':'','000':'Pre-Studies'}
+        d = {'000':'Pre-Studies'}
         for y in range(100,800,100):
             d['%s' % str(y)] = 'Year %1d (%3d Level)' % (y/100,y)

WAeUP_SRP/trunk/profiles/futminna/vocabularies/entry_modes.xml

@@ -6 +6 @@
  <property name="description"></property>
  <property name="acl_write_roles">Manager</property>
- <item key="" msgid=""></item>
  <item key="ume_ft" msgid="">UME Full Time</item>
  <item key="de_ft" msgid="">Direct Entry Full Time</item>

WAeUP_SRP/trunk/skins/waeup_epayment/purgeSFPayments.py

@@ -30 +30 @@
 paid_status = ('school_fee_paid','courses_registered','courses_validated')
 students = context.students_catalog(review_state = paid_status)
+student_total = len(students)
 counter = 0
 counter_unpaid = 0
 commit_after = 100
 records_to_del = []
+student_count = 0
 for student in students:
+    student_count += 1
     to_del = []
     student_id = student.id
@@ -49 +52 @@
         if getattr(payments_folder,pid,False):
             to_del += pid,
-            logger.info('object deleted: %s, %s' % (payment.student_id, pid))
+            logger.info('object deleted: %s (%d of %d), %s' % (payment.student_id, student_count, student_total, pid))
         else:
             logger.info('no object: %s, %s' % (payment.student_id, pid))