Changeset 5163

Timestamp:

21 Apr 2010, 04:38:00 (15 years ago)

Author:

Henrik Bettermann

Message:

some code cleaning

Location:

WAeUP_SRP/trunk/skins

Files:

• waeup_student/add_course_result.py (modified) (1 diff)
• waeup_student/create_level.py (modified) (5 diffs)
• waeup_student/deactivate_students.py (modified) (1 diff)
• waeup_student/getClearanceInfo.py (modified) (1 diff)
• waeup_student/getIdCardInfo.py (modified) (1 diff)
• waeup_student/getStudyCourseInfo.py (modified) (2 diffs)
• waeup_student/list_students.py (deleted)
• waeup_student/payment_export.py (deleted)
• waeup_student/refresh_level.py (modified) (1 diff)
• waeup_utilities/list_students.py (added)
• waeup_utilities/payment_export.py (added)

WAeUP_SRP/trunk/skins/waeup_student/add_course_result.py

@@ -25 +25 @@
 course_cat = context.courses_catalog
 from Products.AdvancedQuery import Eq, Between, Le,In
-try:
-    aq_portal = context.portal_catalog.evalAdvancedQuery
-except:
-    aq_portal = context.portal_catalog_real.evalAdvancedQuery
 course_id = request.get('course_id')
 mtool = context.portal_membership

WAeUP_SRP/trunk/skins/waeup_student/create_level.py

@@ -25 +25 @@
 redirect = response.redirect
 logger = logging.getLogger('Skins.create_level')
-# mtool = context.portal_membership
-# member = mtool.getAuthenticatedMember()
-# member_id = str(member)
-# requested_id = context.getStudentId()
-# #set_trace()
-# create_level =  request.form.get('create_level',None)
-# if not create_level or not requested_id or\
-#    (not context.isStaff() and member_id != requested_id):
-#     logger.info('%s tried to access %s' % (member_id,requested_id))
-#     return redirect("%s/srp_anonymous_view" % context.portal_url())
-# student_id = context.getStudentId()
 info = context.waeup_tool.getAccessInfo(context)
 student_id = info['student_id']
@@ -41 +30 @@
     return None
 
-#lt = context.portal_layouts
-#wt = context.waeup_tool
 student = context.students_catalog.getRecordByKey(student_id)
 cert_id = student.course
@@ -55 +42 @@
 
 if context.hasObject(current_level):
-    #level = getattr(context,"%s" % current_level)
     return response.redirect("%s/%s" % (context.absolute_url(),current_level))
 else:
@@ -62 +48 @@
     context.portal_workflow.doActionFor(level,'open')
     level.getContent().edit(mapping={'session': current_session})
-    #context.portal_workflow.doActionFor(level,'close_for_edit')
 level_id = level.getId()
 session_id = context.getLevelSession(level.getContent(),student_id,level_id)
@@ -71 +56 @@
 l = []
 
-#level_nr,dummy = divmod(int(current_level),100)
-# fetch session courses from the certificate
 res = context.portal_catalog(portal_type="Certificate", id = cert_id)
 if res:
     cert = res[0]
     path = cert.getPath()
-    #academics_level = 100 * level_nr
     if int(current_level) > 0:
         academics_level = 100 * (int(current_level)/100)

WAeUP_SRP/trunk/skins/waeup_student/deactivate_students.py

@@ -21 +21 @@
 logger = logging.getLogger('Skins.deactivate_students')
 from Products.AdvancedQuery import Eq, Between, Le,In
-#aq_portal = context.portal_catalog_real.evalAdvancedQuery
 aq_students = context.students_catalog.evalAdvancedQuery
 students_folder = context.portal_url.getPortalObject().campus.students

WAeUP_SRP/trunk/skins/waeup_student/getClearanceInfo.py

@@ -77 +77 @@
 #     info['penalty'] = info['penalty'] and\
 #                       info['clear_doc'].entry_date.greaterThan(DateTime('2006/12/30'))
-# course = getattr(student,'study_course',None)
-# if course:
-#     cert_id = course.getContent().study_course
-#     res = context.portal_catalog(portal_type = "Certificate", id = cert_id)
-#     ci = {}
-#     if len(res) > 0:
-#         info['course'] = course
-#         brain = res[0]
-#         ci['study_course'] = brain.getId
-#         ci['title'] = brain.Title
-#         pl = brain.getPath().split('/')
-#         ci['faculty'] = pl[-4]
-#         ci['department'] = pl[-3]
-#         info['course_doc'] = ci
-#     else:
-#         info['course'] = None
 return info

WAeUP_SRP/trunk/skins/waeup_student/getIdCardInfo.py

@@ -58 +58 @@
     info['personal'] = personal_doc
 
-#cert_id = sbrain.course
-#res = context.portal_catalog(portal_type = "Certificate", id = cert_id)
-#if res:
-#    brain = res[0]
-#    info['sc_title'] = brain.Title
 
 info['passport_url'] = context.portal_url() + '/viewimage/' + student_id + '/passport_' + student_id + '.jpg'

WAeUP_SRP/trunk/skins/waeup_student/getStudyCourseInfo.py

@@ -52 +52 @@
 info['student'] = student_record
 cert_id = student_record.course
-# logger.info("before search")
-# starttime = DateTime.DateTime().timeTime()
-# res = context.portal_catalog_real.evalAdvancedQuery(Eq('id', cert_id)) # &
-#                                                    Eq('portal_type', "Certificate"))
-# logger.info("searchtime %f" % (DateTime.DateTime().timeTime() - starttime))
-# if True:
-#     #info['cert_id'] = cert_id
-#     # brain = res[0]
-#     # ci['title'] = brain.Title
-#     # pl = brain.getPath().split('/')
-#     # ci['faculty'] = pl[-4]
-#     # ci['department'] = pl[-3]
-#     ci['study_course'] = student_record.course
-#     ci['faculty'] = student_record.faculty
-#     ci['department'] = student_record.department
-#     info['course_doc'] = ci
-# else:
-#     info['cert_id'] = 'N/A'
-#     ci['study_course'] = 'N/A'
-#     ci['title'] = 'N/A'
-#     ci['faculty'] = 'N/A'
-#     ci['department'] = 'N/A'
-#     info['course_doc'] = ci
 ci = {}
 ci['study_course'] = student_record.course
@@ -106 +83 @@
 review_state = wftool.getInfoFor(context,'review_state',None)
 student_review_state = student_record.review_state
-#if review_state != 'content_addable' and student_review_state == 'school_fee_paid': #and context.isStudent():
-#    wftool.doActionFor(context,'close_for_edit')
 
 has_paid = student_review_state == 'school_fee_paid'

WAeUP_SRP/trunk/skins/waeup_student/refresh_level.py

@@ -8 +8 @@
 # $Id$
 """
-process the Application Form
-return html renderer + psm
 """
 request = context.REQUEST