+
diff --git a/perguntations/test.py b/perguntations/test.py
index 3f53e31..8c1c1da 100644
--- a/perguntations/test.py
+++ b/perguntations/test.py
@@ -111,9 +111,9 @@ class TestFactory(dict):
# check if all the questions can be correctly generated
try:
self.question_factory[question['ref']].generate()
- except Exception:
+ except Exception as exc:
msg = f'Failed to generate "{question["ref"]}"'
- raise TestFactoryException(msg)
+ raise TestFactoryException(msg) from exc
else:
logger.info('%4d. "%s" Ok.', counter, question["ref"])
counter += 1
@@ -152,9 +152,9 @@ class TestFactory(dict):
try:
with open(testfile, 'w') as file:
file.write('You can safely remove this file.')
- except OSError:
+ except OSError as exc:
msg = f'Cannot write answers to directory "{self["answers_dir"]}"'
- raise TestFactoryException(msg)
+ raise TestFactoryException(msg) from exc
def check_questions_directory(self):
'''Check if questions directory is missing or not accessible.'''
@@ -223,16 +223,16 @@ class TestFactory(dict):
self.check_grade_scaling()
# ------------------------------------------------------------------------
- async def generate(self, student):
+ async def generate(self): #, student):
'''
Given a dictionary with a student dict {'name':'john', 'number': 123}
returns instance of Test() for that particular student
'''
# make list of questions
- test = []
- qnum = 1 # track question number
- nerr = 0 # count errors generating questions
+ questions = []
+ qnum = 1 # track question number
+ nerr = 0 # count errors during questions generation
for qlist in self['questions']:
# choose one question variant
@@ -255,28 +255,28 @@ class TestFactory(dict):
question['number'] = qnum # counter for non informative panels
qnum += 1
- test.append(question)
+ questions.append(question)
# setup scale
- total_points = sum(q['points'] for q in test)
+ total_points = sum(q['points'] for q in questions)
if total_points > 0:
# normalize question points to scale
if self['scale'] is not None:
scale_min, scale_max = self['scale']
- for question in test:
+ for question in questions:
question['points'] *= (scale_max - scale_min) / total_points
else:
self['scale'] = [0, total_points]
else:
logger.warning('Total points is **ZERO**.')
if self['scale'] is None:
- self['scale'] = [0, 20]
+ self['scale'] = [0, 20] # default
if nerr > 0:
logger.error('%s errors found!', nerr)
- # these will be copied to the test instance
+ # copy these from the test configuratoin to each test instance
inherit = {'ref', 'title', 'database', 'answers_dir',
'questions_dir', 'files',
'duration', 'autosubmit',
@@ -284,9 +284,7 @@ class TestFactory(dict):
'show_ref', 'debug', }
# NOT INCLUDED: testfile, allow_all, review
- return Test({
- **{'student': student, 'questions': test},
- **{k:self[k] for k in inherit}})
+ return Test({'questions': questions, **{k:self[k] for k in inherit}})
# ------------------------------------------------------------------------
def __repr__(self):
@@ -301,8 +299,15 @@ class Test(dict):
'''
# ------------------------------------------------------------------------
- def __init__(self, d):
- super().__init__(d)
+ # def __init__(self, d):
+ # super().__init__(d)
+
+ # ------------------------------------------------------------------------
+ def start(self, student):
+ '''
+ Write student id in the test and register start time
+ '''
+ self['student'] = student
self['start_time'] = datetime.now()
self['finish_time'] = None
self['state'] = 'ACTIVE'
@@ -346,5 +351,12 @@ class Test(dict):
self['finish_time'] = datetime.now()
self['state'] = 'QUIT'
self['grade'] = 0.0
- logger.info('Student %s: gave up.', self["student"]["number"])
+ # logger.info('Student %s: gave up.', self["student"]["number"])
return self['grade']
+
+ # ------------------------------------------------------------------------
+ def __str__(self):
+ return ('Test:\n'
+ f' student: {self.get("student", "--")}\n'
+ f' start_time: {self.get("start_time", "--")}\n'
+ f' questions: {", ".join(q["ref"] for q in self["questions"])}\n')
--
libgit2 0.21.2