Changeset 1557 for WAeUP_SRP/trunk

Timestamp:

15 Mar 2007, 16:00:27 (18 years ago)

Author:

joachim

Message:

display a list of students for the CourseAdviser?
fix for issue #115
M profiles/default/vocabularies/searchable_student_states.xml
M skins/waeup_default/isCourseAdviser.py
M skins/waeup_student/search_students.py
M skins/waeup_student/get_searchable_student_states.py
M skins/waeup_student/students_index.py
M skins/waeup_student/search_students_form.pt

don't delete courses twice
M skins/waeup_student/course_result_delete.py

more detailed error messages for invalid PINs fix for issue #108
M Widgets.py

inform student to contact faculty, if no courses are available
fix for #116
M skins/waeup_student/study_level_view.pt

Location:

WAeUP_SRP/trunk

Files:

• Widgets.py (modified) (1 diff)
• profiles/default/vocabularies/searchable_student_states.xml (modified) (1 diff)
• skins/waeup_default/isCourseAdviser.py (modified) (1 diff)
• skins/waeup_student/course_result_delete.py (modified) (1 diff)
• skins/waeup_student/get_searchable_student_states.py (modified) (1 diff)
• skins/waeup_student/search_students.py (modified) (4 diffs)
• skins/waeup_student/search_students_form.pt (modified) (2 diffs)
• skins/waeup_student/students_index.py (modified) (1 diff)
• skins/waeup_student/study_level_view.pt (modified) (2 diffs)

WAeUP_SRP/trunk/Widgets.py

@@ -719 +719 @@
             err ='You are not a Student. PIN neither checked nor used.'
             s_logger.info('"%s","tried to use Scratchcard", "%s"' % (s_id,pin_str))
+        elif len(b) > 1 and b.find('-') > -1:
+            do = 0
+            err = 'PIN must not contain the "-"'
+            s_logger.info('"%s","Invalid PIN-Number, contains -"' % (s_id))
+        elif n.find('-') > -1:
+            do = 0
+            err = 'PIN must not contain the "-"'
+            s_logger.info('"%s","Invalid PIN-Number, contains -"' % (s_id))
         elif len(n) != 10:
             do = 0

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

@@ -19 +19 @@
  <item key="clearance_requested" msgid="">clearance requested</item>
  <item key="cleared_and_validated" msgid="">cleared and validated</item>
+ <item key="courses_registered" msgid="">courses registered</item>
+ <item key="courses_validated" msgid="">courses validated</item>
  <item key="content_addable" msgid="">content addable</item>
 </object>

WAeUP_SRP/trunk/skins/waeup_default/isCourseAdviser.py

@@ -16 +16 @@
 mtool = context.portal_membership
 roles = mtool.getAuthenticatedMember().getRolesInContext(context)
+return str("CourseAdviser" in roles)
 return "CourseAdviser" in roles
 

WAeUP_SRP/trunk/skins/waeup_student/course_result_delete.py

@@ -18 +18 @@
 ret_url = here.absolute_url()
 
+message = ''
 if ids:
-    here.manage_delObjects(ids)
-    message = 'portal_status_message=psm_item(s)_deleted'
+    real_ids = []
+    for id in ids:
+        if context.hasObject(id):
+            real_ids.append(id)
+    if real_ids:
+        context.manage_delObjects(real_ids)
+        message = 'portal_status_message=psm_item(s)_deleted'
 else:
     message = 'portal_status_message=psm_select_at_least_one_document'

WAeUP_SRP/trunk/skins/waeup_student/get_searchable_student_states.py

@@ -23 +23 @@
     return [item for item in voc.items() if item[0].startswith('clear') or
                                          item[0] in ("all",)]
+elif "CourseAdvisers" in member.getGroups():
+    return [item for item in voc.items() if item[0].startswith('courses') or
+                                         item[0] in ("all",)]
 return voc.items()
 

WAeUP_SRP/trunk/skins/waeup_student/search_students.py

@@ -61 +61 @@
 user_info['faculties'] = []
 co_view = False
+ca_view = False
 faculties =  fget('faculties')
 departments = fget('departments')
-dep_str = fac_str = ''
+certificate_level = fget('certificate_level')
+dep_str = fac_str = certificate_level_str = ''
 if "ClearanceOfficers" in member.getGroups():
     state = "clearance_requested"
@@ -93 +95 @@
         user_info['departments'] = departments
         dep_str = " ".join(departments)
+elif "CourseAdvisers" in member.getGroups():
+    state = "courses_registered"
+    only_review = False
+    ca_view = True
+    if certificate_level:
+        #from Products.zdb import set_trace;set_trace()
+        certificate_level_str = certificate_level
+        certificate_level = certificate_level.split()
+    else:
+        query = In('portal_type',('StudyLevel',)) &\
+                 In('localUsersWithRoles', ("user:%s" % member,))
+        res = evalAdvancedQuery(query)
+        certificate_level = []
+        if res:
+            certificate_level = ['/'.join(f.getPath().split('/')[-2:]) for f in res]
+        user_info['certificate_level'] = certificate_level
+        certificate_level_str = " ".join(certificate_level)
 default = {'search_mode': 'student_id',
         'review_state': state,
@@ -106 +125 @@
                       faculties = fac_str,
                       departments = dep_str,
+                      certificate_level = certificate_level_str,
                       commit = False,
                       )
@@ -200 +220 @@
         end = DateTime().timeTime()
         logger.info('"%s","searchtime","%6.2f"' % (member,end-start))
+elif ca_view:
+    only_review = False
+    with_review = True
+    if with_timer:
+        start = DateTime().timeTime()
+        logger.info('"%s","start 200"' % member)
+    courses = [cl.split('/')[0] for cl in certificate_level]
+    levels = [cl.split('/')[1] for cl in certificate_level]
+    query = In('course',courses) & In('level',levels)
+    res = aq_students(query)
+    if with_timer:
+        end = DateTime().timeTime()
+        logger.info('"%s","searchtime","%6.2f"' % (member,end-start))
+        start = DateTime().timeTime()
+    search_set = [r.id for r in res]
+    if with_timer:
+        end = DateTime().timeTime()
+        logger.info('"%s","searchtime","%6.2f"' % (member,end-start))
 if with_timer:
     logger.info('"%s","start 300"' % member)

WAeUP_SRP/trunk/skins/waeup_student/search_students_form.pt

@@ -35 +35 @@
       </span>
       </strong>
-     
-              
         <h3> Search Student Section</h3><br />
           You are logged in as member <span tal:replace="info/member|nothing" /> 
@@ -45 +43 @@
           <span tal:condition="info/departments|nothing" tal:omit-tag="">
             and <span tal:repeat="department info/departments|nothing" tal:content="department"/></span>.
+          <span tal:condition="info/certificate_level|nothing" tal:omit-tag="">
+            who is CourseAdviser for 
+            <span tal:repeat="cl info/certificate_level" tal:content="cl" />
+          </span>
           <br /><br />
         <span tal:replace="structure rendered" />

WAeUP_SRP/trunk/skins/waeup_student/students_index.py

@@ -23 +23 @@
 students_url = "%s/campus/students" % (context.portal_url())
 
-if "ClearanceOfficers" in member.getGroups():
+if "ClearanceOfficers" in member.getGroups() or\
+   "CourseAdvisers" in member.getGroups():
     return redirect("%s/search_students" % context.portal_url())
 if context.isSectionOfficer():

WAeUP_SRP/trunk/skins/waeup_student/study_level_view.pt

@@ -63 +63 @@
         <h4>Session Courses</h4>
         <br />
-        <table class="contentListing" width="100%" summary="content layout" id="folder_content">      
+      <div class="" tal:condition="not: info/normal">
+        Your faculty has not yet provided the list of courses for your certificate. Please contact your faculty!
+      </div>
+        <table class="contentListing" width="100%" id="folder_content"
+               tal:condition="info/normal">      
           <tr tal:repeat="row info/normal"
               tal:attributes="class python:test(repeat['row'].even(), 'even ajaxtd', 'odd ajaxtd')">
@@ -106 +110 @@
                        />
                 <br /><br />
-                <input type="submit" name="register_courses:method"
+                <input tal:condition="info/normal" 
+                       type="submit" name="register_courses:method"
                        class="context" value="Submit" />
             </td>