Changeset 2161 for WAeUP_SRP/trunk

Timestamp:

24 Aug 2007, 14:23:50 (17 years ago)

Author:

Henrik Bettermann

Message:

resubmit and reset status added

Location:

WAeUP_SRP/trunk/skins/waeup_student

Files:

• apply_pume.py (modified) (4 diffs)
• apply_pume_manage.py (modified) (1 diff)
• apply_pume_manage_form.pt (modified) (1 diff)

WAeUP_SRP/trunk/skins/waeup_student/apply_pume.py

@@ -62 +62 @@
         if not object['passport']:
                 object['passport'] = ''
-        if object['status'] == "submitted":
+        if 'submitted' in object['status']:
             submitted = True
         if not create and (pin != object['pin'] and not context.isSectionOfficer()):
@@ -133 +133 @@
         psm = "You successfully applied for PUME!"
         data['application_date'] = current
-        data['status'] = "submitted"
+        if object['status'] == 'edited':
+            data['status'] = "submitted"
+            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']    
         context.applicants_catalog.modifyRecord(**data)
-        logger.info('%s/%s modified and submitted application record' % (member,reg_no))
+        
         res,psm_dummy,ds = lt.renderLayout(layout_id= 'application',
                                 schema_id= 'application',
@@ -182 +188 @@
         logger.info('%s/%s modified application record' % (member,reg_no))
 
-elif manage:        
+elif manage:
     if submitted:
         mode = "view"
@@ -201 +207 @@
 
 
-try:   
+try:
     passport_uploaded = bool(data['passport'])
 except:

WAeUP_SRP/trunk/skins/waeup_student/apply_pume_manage.py

@@ -54 +54 @@
     data['reg_no'] = reg_no
     psm = "You successfully reset the record! The applicant will be able to edit and resubmit the data."
-    data['status'] = "edited"
+    data['status'] = "reset"
     context.applicants_catalog.modifyRecord(**data)
     logger.info('%s reset application record of %s' % (member,reg_no))

WAeUP_SRP/trunk/skins/waeup_student/apply_pume_manage_form.pt

@@ -51 +51 @@
                    name="reset"
                    value="Reset" 
-                   tal:condition="python: ds['status'] == 'submitted'"
+                   tal:condition="python: 'submitted' in ds['status']"
                    />
             <br /><br />