Changeset 765 for WAeUP_SRP/trunk

Timestamp:

27 Oct 2006, 11:34:06 (18 years ago)

Author:

joachim

Message:

pume import addopted
searchStudents-results now sorted by student_id

Location:

WAeUP_SRP/trunk

Files:

• Students.py (modified) (2 diffs)
• __init__.py (modified) (1 diff)
• profiles/default/workflows.xml (modified) (1 diff)
• skins/waeup_student/searchStudents.py (modified) (2 diffs)
• skins/waeup_student/student_index.py (modified) (1 diff)

WAeUP_SRP/trunk/Students.py

@@ -243 +243 @@
                  'days': "Days",
                  'response': "Responce",
-                 'right': "Right",
                  'wrong': "Wrong",
                  'pume_eng_score': "EngScore",
@@ -338 +337 @@
                          )
             for f in dp_fields:
-                da[f] = jamb.get(csv_d[f])
-            pume = student.application
-            pume.getContent().edit(mapping=da)
+                dp[f] = jamb.get(csv_d[f])
+            pume = student.pume
+            pume.getContent().edit(mapping=dp)
             wftool.doActionFor(pume,'close',dest_container=app)
             pume.manage_setLocalRoles(sid, ['Owner',])

WAeUP_SRP/trunk/__init__.py

@@ -50 +50 @@
          "StudentPersonal",
          "StudentStudyLevel",
-         #"StudentSemester",
          #"Semester",
          "StudentCourseResult",

WAeUP_SRP/trunk/profiles/default/workflows.xml

@@ -74 +74 @@
    <bound-workflow workflow_id="waeup_student_subobject_wf"/>
   </type>
+  <type type_id="StudentPume">
+   <bound-workflow workflow_id="waeup_student_subobject_wf"/>
+  </type>
   <type type_id="StudentStudyCourse">
    <bound-workflow workflow_id="waeup_student_subobject_wf"/>

WAeUP_SRP/trunk/skins/waeup_student/searchStudents.py

@@ -17 +17 @@
 except:
     evalAdvancedQuery = None
+
+def cmp_id(a,b):
+    if a.getId() > b.getId():
+        return 1
+    return -1
 
 request = context.REQUEST
@@ -147 +152 @@
     items.append(a)
 students = []
+items.sort(cmp_id)
 if items:
     for item in items:

WAeUP_SRP/trunk/skins/waeup_student/student_index.py

@@ -34 +34 @@
     elif state == 'application_pin_entered':
         return redirect("%s/passport_entry_view" % student.absolute_url())
+    elif context.portal_type == 'StudentStudyLevel':
+        return context.study_level_student_view()
     return redirect("%s/student_view" % student.absolute_url())