Merge branch 'master' into dev

Miguel Barão
2 parents d1877854 ebcff086
Showing 2 changed files with 13 additions and 7 deletions Show diff stats
perguntations/app.py
perguntations/serve.py
@@ -224,8 +224,8 @@ class App():
         '''
         Corrects test
-        ans is a dictionary {question_index: answer, ...}
-        for example:  {0:'hello', 1:[1,2]}
+        ans is a dictionary {question_index: answer, ...} with the answers for
+        the complete test. For example:  {0:'hello', 1:[1,2]}
         '''
         test = self.online[uid]['test']
@@ -7,15 +7,16 @@ Uses the tornadoweb framework.
 # python standard library
-from os import path
-import sys
 import base64
-import uuid
+import functools
+import json
 import logging.config
 import mimetypes
+from os import path
 import signal
-import functools
-import json
+import sys
+from timeit import default_timer as timer
+import uuid
 # user installed libraries
 import tornado.ioloop
@@ -421,6 +422,7 @@ class TestHandler(BaseHandler):
         builds dictionary ans={0: 'answer0', 1:, 'answer1', ...}
         unanswered questions not included.
         '''
+        timeit_start = timer()  # performance timer
         uid = self.current_user
         test = self.testapp.get_student_test(uid)
@@ -447,6 +449,10 @@ class TestHandler(BaseHandler):
         # show final grade and grades of other tests in the database
         allgrades = self.testapp.get_student_grades_from_all_tests(uid)
+
+        timeit_finish = timer()
+        logging.info('  correction took %fs', timeit_finish-timeit_start)
+
         self.render('grade.html', t=test, allgrades=allgrades)