Changeset 14443 for main/waeup.kofa

Timestamp:

23 Jan 2017, 15:58:02 (8 years ago)

Author:

Henrik Bettermann

Message:

Get set of selected students also from list of matric numbers.

Location:

main/waeup.kofa/trunk

Files:

• CHANGES.txt (modified) (1 diff)
• src/waeup/kofa/students/browser_templates/exportselected.pt (modified) (1 diff)
• src/waeup/kofa/students/export.py (modified) (1 diff)
• src/waeup/kofa/students/tests/test_export.py (modified) (2 diffs)

main/waeup.kofa/trunk/CHANGES.txt

@@ -4 +4 @@
 1.4.2.dev0 (unreleased)
 =======================
+
+* Get set of selected students also from list of matric numbers.
+
+* Confine Level Reports and Session Results Presentations to certificates.
 
 * Show report number (job_id) on report pdf slips.

main/waeup.kofa/trunk/src/waeup/kofa/students/browser_templates/exportselected.pt

@@ -1 +1 @@
 <p i18n:translate="">
   Here you can export student data for a small subset of students by entering
-  a list of student ids. The ids must be separated by whitespaces or commas.
+  a list of student ids or matric numbers.
+  The values must be separated by whitespaces or commas.
   You can also copy and paste parts of Excel or Calc columns.
 </p>

main/waeup.kofa/trunk/src/waeup/kofa/students/export.py

@@ -223 +223 @@
         for id in selected:
             student = students_container.get(id, None)
-            if student:
-                students.append(student)
+            if student is None:
+                # try matric number
+                result = list(StudentsQuery(matric_number=id).query())
+                if result:
+                    student = result[0]
+                else:
+                    continue
+            students.append(student)
         return students
 

main/waeup.kofa/trunk/src/waeup/kofa/students/tests/test_export.py

@@ -422 +422 @@
         return
 
-    def test_export_selected(self):
+    def test_export_selected_student_id(self):
         # we can export a filtered set of students (filtered by session/level)
         self.setup_student(self.student)
@@ -430 +430 @@
         exporter.export_selected(
             self.app, self.outfile, selected=['A111111'])
+        result = open(self.outfile, 'rb').read()
+        self.assertEqual(
+            result,
+            'certificate,current_level,current_session,current_verdict,'
+            'entry_mode,entry_session,previous_verdict,student_id\r\n'
+
+            'CERT1,200,2012,0,ug_ft,2010,0,A111111\r\n'
+            )
+        return
+
+    def test_export_selected_matric_number(self):
+        # we can export a filtered set of students (filtered by session/level)
+        self.setup_student(self.student)
+        self.app['students'].addStudent(self.student)
+        notify(grok.ObjectModifiedEvent(self.student))
+        exporter = StudentStudyCourseExporter()
+        exporter.export_selected(
+            self.app, self.outfile, selected=['234'])
         result = open(self.outfile, 'rb').read()
         self.assertEqual(