Changeset 1157

Timestamp:

30 Dec 2006, 15:50:04 (18 years ago)

Author:

Henrik Bettermann

Message:

penalty logic changed

Location:

WAeUP_SRP/trunk/skins/waeup_student

Files:

• getClearanceInfo.py (modified) (2 diffs)
• getStudentInfo.py (modified) (2 diffs)

WAeUP_SRP/trunk/skins/waeup_student/getClearanceInfo.py

@@ -44 +44 @@
     return None
 creation_date = DateTime(res[0].CreationDate)
-info['penalty'] = creation_date.lessThan(DateTime('2006/12/5'))\
-                  and DateTime().greaterThan(DateTime('2006/12/30'))
+info['penalty'] = creation_date.lessThan(DateTime('2006/12/5'))
 info['id'] = student_id
 info['student'] = student
@@ -54 +53 @@
 info['clear_doc'] = student.clearance.getContent()
 info['clear_review_state'] = wf.getInfoFor(student.clearance,'review_state',None)
-if info['clear_review_state'] == "clearance_requested":
+if info['clear_review_state'] in ('clearance_requested', 'cleared_and_validated',):
     info['penalty'] = info['penalty'] and\
-                      info['clear_doc'].entry_date.lessThan(DateTime('2006/12/30'))
+                      info['clear_doc'].entry_date.greaterThan(DateTime('2006/12/30'))
 course = getattr(student,'study_course',None)
 if course:

WAeUP_SRP/trunk/skins/waeup_student/getStudentInfo.py

@@ -23 +23 @@
 logger = logging.getLogger('Student.Info')
 
-from DateTime import DateTime
 
 info = {}
@@ -63 +62 @@
 ##brain = res[-1]
 ##student = brain.getObject()
-
-creation_date = DateTime(student.creation_date)
-info['penalty'] = creation_date.lessThan(DateTime('2006/12/5'))\
-                  and DateTime().greaterThan(DateTime('2006/12/30'))
 
 info['review_state'] = wf.getInfoFor(student,'review_state',None)