Changeset 2766 for WAeUP_SRP/base/skins

Timestamp:

26 Nov 2007, 19:18:09 (17 years ago)

Author:

joachim

Message:

M skins/waeup_student/create_level.py
use course_results for carry_overs

M skins/waeup_pins/pins_view.pt
M skins/waeup_pins/search_pins.py
sort batches in select-box

M Widgets.py
M WAeUPTables.py
M WAeUPTool.py
mass_(create,edit)_courseresults edits verdict in level.

M profiles/default/layouts/application_cest.xml
M profiles/default/applicants_catalog.xml
new meta_data field "serial", index must be added manually

Location:

WAeUP_SRP/base/skins

Files:

• waeup_pins/pins_view.pt (modified) (1 diff)
• waeup_pins/search_pins.py (modified) (1 diff)
• waeup_student/create_level.py (modified) (4 diffs)

WAeUP_SRP/base/skins/waeup_pins/pins_view.pt

@@ -62 +62 @@
                 >
           <option value="--">Goto Batch ...</option>
-          <option tal:repeat="batch context/objectIds"
+          <option tal:repeat="batch info/batches"
                   tal:attributes="value batch"
                   tal:content="batch">

WAeUP_SRP/base/skins/waeup_pins/search_pins.py

@@ -109 +109 @@
     view = context.batch_view
 elif context.portal_type == "ScratchCardBatchesFolder":
+    batches = context.objectIds()
+    batches.sort()
+    info['batches'] = batches
     view = context.pins_view
 if psm == '':

WAeUP_SRP/base/skins/waeup_student/create_level.py

@@ -39 +39 @@
 lt = context.portal_layouts
 wt = context.waeup_tool
-student = context.students_catalog(id=student_id)[0]
+student = context.students_catalog.getRecordByKey(student_id)
 cert_id = student.course
 current_level = student.level
@@ -51 +51 @@
 
 if context.hasObject(current_level):
-    level = getattr(context,"%s" % current_level)
+    #level = getattr(context,"%s" % current_level)
+    return response.redirect("%s/%s" % (context.absolute_url(),current_level))
 else:
     context.invokeFactory('StudentStudyLevel',"%s" % current_level)
@@ -65 +66 @@
     results = context.results_import(matric_no = student.matric_no)
 l = []
-
 
 # fetch carry_over courses from results_import
@@ -110 +110 @@
         records.append(d)
 # fetch carry_over courses from the course_results catalog
-# else
+else:
+    res = context.aq_results(Eq('student_id',student_id),
+                             sortSpecs=('level_id',))
+    last_level_id = res[-1].level_id
+    for result in res:
+        course_id = result.code
+        if course_id in l or result.level_id != last_level_id: 
+            continue
+        query = Eq('code',course_id)
+        c_res = aq_courses(query)
+        if not c_res:
+            #logger.info('%s", course %s not found in courses_catalog' % (student.id,result.CosCode))
+            continue
+        course_cat_entry = c_res[0]
+        passmark = getattr(course_cat_entry,'passmark',None)
+        try:
+            score = int(result.score)
+        except:
+            # logger.info('%s, course %s has invalid score %s"' % (student.id,
+            #                                                     course_id,
+            #                                                     result.Score))
+            continue
+        if int(c_res[0].passmark) <= score:
+            continue
+        l += course_id,
+        d = context.getCourseInfo(course_id)
+        d['course_id'] = course_id
+        d['carry_over'] = True
+        d['code'] = course_id
+        d['student_id'] = student_id
+        d['level_id'] = level_id
+        d['session_id'] = session_id
+        records.append(d)
 
 # fetch session courses from the certificate