Changeset 2162

Timestamp:

24 Aug 2007, 20:43:30 (17 years ago)

Author:

Henrik Bettermann

Message:

store date of resubmission

Location:

WAeUP_SRP/trunk

Files:

• profiles/default/layouts/application.xml (modified) (1 diff)
• profiles/default/vocabularies/exam_types.xml (modified) (1 diff)
• skins/waeup_student/apply_pume.py (modified) (2 diffs)

WAeUP_SRP/trunk/profiles/default/layouts/application.xml

@@ -659 +659 @@
   </row>
   <row>
+   <cell name="application_date" ncols="2"/>
+  </row>
+  <row>
    <cell name="status" ncols="2"/>
-  </row>
-  <row>
-   <cell name="application_date" ncols="2"/>
   </row>
   <row>

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

@@ -13 +13 @@
     <item key="tc_ii" msgid="">TC II</item>
     <item key="rsa" msgid="">RSA</item>
-    <item key="nabtec" msgid="">NABTEC</item>
+    <item key="nabtec" msgid="">NABTEB</item>
     <item key="neco" msgid="">NECO</item>
     <item key="ace" msgid="">ACE</item>

WAeUP_SRP/trunk/skins/waeup_student/apply_pume.py

@@ -62 +62 @@
         if not object['passport']:
                 object['passport'] = ''
-        if 'submitted' in object['status']:
+        if object['status'] and 'submitted' in object['status']:
             submitted = True
         if not create and (pin != object['pin'] and not context.isSectionOfficer()):
@@ -137 +137 @@
             logger.info('%s/%s modified and submitted application record' % (member,reg_no))
         elif object['status'] == 'reset':
-            data['status'] = 'resubmitted on %s' % DateTime.DateTime().strftime('%A, %B %d, %Y') 
-            logger.info('%s/%s modified and resubmitted application record' % (member,reg_no)) 
-        object['status'] = data['status']    
+            data['status'] = 'resubmitted on %s' % DateTime.DateTime().strftime('%A, %B %d, %Y')
+            logger.info('%s/%s modified and resubmitted application record' % (member,reg_no))
+        object['status'] = data['status']
         context.applicants_catalog.modifyRecord(**data)
-        
+
         res,psm_dummy,ds = lt.renderLayout(layout_id= 'application',
                                 schema_id= 'application',