Changeset 1032 for WAeUP_SRP/trunk/skins

Timestamp:

12 Dec 2006, 10:00:51 (18 years ago)

Author:

Henrik Bettermann

Message:

logging messages modified
Study Course always listed
date labels chsnged

Location:

WAeUP_SRP/trunk/skins/waeup_student

Files:

• clearance_edit.py (modified) (2 diffs)
• getStudentInfo.py (modified) (1 diff)
• start_clearance.py (modified) (2 diffs)

WAeUP_SRP/trunk/skins/waeup_student/clearance_edit.py

@@ -49 +49 @@
 args = {}
 action = "/external_clearance_edit_form"
+if context.isStudent():
+    action = "/clearance_edit_form"
+
 if is_valid:
     if cpsdocument_edit_button:
         psm = "Content changed!"
-        if context.isStudent():
-           action = "/clearance_edit_form"
         if clear_doc.clr_ac_pin == "":
             res = context.portal_pins(student=member_id)
@@ -75 +76 @@
             logger.info('"%s","repeatedly requested clearance"' % (student_id))
             psm = "You have already requested clearance!"
-            if context.isStudent():
-               action = "/clearance_edit_form"
         else:
             psm = "You must tick the acknowledgement check box before submission!"
-            if context.isStudent():
-               action = "/clearance_edit_form"
     elif clear_and_validate_button and info['review_state'] == "clearance_requested":
         logger.info('"%s","cleared","%s"' % (member_id,student_id ))

WAeUP_SRP/trunk/skins/waeup_student/getStudentInfo.py

@@ -144 +144 @@
         row['s_edit_link'] = "%s/%s" % (soo.absolute_url(),se_link)
     row['review_state'] = so.review_state
-    row['display'] = so.review_state in ('opened','closed',)
+    row['display'] = so.review_state in ('opened','closed',) or so.portal_type == 'StudentStudyCourse'
     items.append(row)
 info['items'] = items

WAeUP_SRP/trunk/skins/waeup_student/start_clearance.py

@@ -42 +42 @@
 error = False
 if session.get("clicked",None):
-    psm = 'Please wait a moment, until "Clearance started" turns green, then click on the green link'
+    psm = 'Please wait a moment until "Clearance started" turns green, then click on the green link!'
     error = True
+    logger.info('"%s","repeatedly pressed the clearance button"' % (info['id']))
 elif app_doc.passport is None:
     psm = "You must upload your passport picture before you can start the registration process!"
     error = True
+    logger.info('"%s", "tried to start clerance without passport picture"' % (info['id']))
 elif review_state == "clearance_pin_entered":
-    psm = "You have already entered a clearance pin"
+    psm = "You have already entered a clearance pin!"
     error = True
+    logger.info('"%s", "tried to start clearance though already started"' % (info['id']))
 elif psm == 'invalid':
     psm = "Please correct your input!"
     error = True
+    logger.info('"%s","entered wrong clearance pin"' % (info['id']))
 if error:
     return context.clearance_pin_form(rendered = res,
@@ -62 +66 @@
 session.set("clicked","clicked")
 pin = str(ds.get('clr_ac_pin'))
-logger.info('"%s", "entered clearance pin", "%s"' % (info['id'],pin))
+logger.info('"%s", "started clearance with pin", "%s"' % (info['id'],pin))
 wf.doActionFor(info['student'],'enter_clearance_pin')
 wf.doActionFor(info['clear'],'open')