Changeset 11668 for main/waeup.kofa/trunk/src

Timestamp:

26 May 2014, 16:27:50 (10 years ago)

Author:

uli

Message:

Deliver images on demand and test this.

Location:

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

Files:

• tests/test_webservices.py (modified) (1 diff)
• webservices.py (modified) (2 diffs)

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

@@ -395 +395 @@
              'fingerprints': {},
              'img': None,
+             'img_name': None,
              })
+
+    def test_get_student_fingerprints_passport(self):
+        # we get a photograph of the student if avail.
+        server = ServerProxy('http://mgr:mgrpw@localhost/app')
+        self.setup_student(self.student)
+        self.create_passport_img(self.student)
+        result = server.get_student_fingerprints(self.student.student_id)
+        self.assertTrue(
+            isinstance(result['img'], xmlrpclib.Binary))
+        self.assertEqual(result['img_name'], 'passport_K1000000.jpg')
 
     def test_get_student_fingerprints_block_unauthorized(self):

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

@@ -17 +17 @@
 ##
 import grok
+import os
 import xmlrpclib
 from zope.component import getUtility, queryUtility
@@ -241 +242 @@
             firstname=student.firstname,
             lastname=student.lastname,
+            fingerprints={},
+            img_name=None,
             img=None,
-            fingerprints={},
             )
         file_store = getUtility(IExtFileStore)
-        for num in [str(x+1) for x in range(10)]:
+        img = file_store.getFileByContext(student, attr='passport.jpg')
+        if img is not None:
+            result.update(
+                img=xmlrpclib.Binary(img.read()),
+                img_name=os.path.basename(img.name))
+
+
+        for num in [str(x + 1) for x in range(10)]:
             fp_file = getUtility(IExtFileStore).getFileByContext(
                 student, attr='%s.fpm' % num)