diff --git a/BUGS.md b/BUGS.md index a0dbccc..2b9e22a 100644 --- a/BUGS.md +++ b/BUGS.md @@ -1,6 +1,8 @@ # BUGS +- total do teste aparece negativo. +- espaco no final das tabelas. - qual a diferenca entre md_to_html e md_to_html_review, parece desnecessario haver dois. - servir imagens das perguntas - como alterar configuracao para mostrar logs de debug? diff --git a/questions.py b/questions.py index 669f676..f8736f7 100644 --- a/questions.py +++ b/questions.py @@ -70,6 +70,7 @@ class Question(dict): self.set_defaults({ 'title': '', 'answer': None, + 'comments': '', 'files': {}, }) @@ -78,7 +79,6 @@ class Question(dict): def correct(self): self['grade'] = 0.0 - self['comments'] = '' return 0.0 def set_defaults(self, d): @@ -87,7 +87,7 @@ class Question(dict): self.setdefault(k, v) -# =========================================================================== +# ========================================================================== class QuestionRadio(Question): '''An instance of QuestionRadio will always have the keys: type (str) diff --git a/static/css/test.css b/static/css/test.css index 756ab52..81877d3 100644 --- a/static/css/test.css +++ b/static/css/test.css @@ -15,7 +15,7 @@ body { } .card { - margin-top: 70px; + margin-top: 5em; } @@ -26,7 +26,8 @@ textarea { /* make markdown tables beautiful */ table { border-collapse: collapse; - margin-left: 50px; + margin: 1em; + margin-left: 5em; } thead, tbody, td, th { padding: 5px; diff --git a/templates/grade.html b/templates/grade.html index 19f112d..f50ed4a 100644 --- a/templates/grade.html +++ b/templates/grade.html @@ -13,7 +13,7 @@ - + - +

Resultado

{% if t['state'] == 'FINISHED' %}

{{t['grade']}} valores na escala de 0 a 20.

+ {% if t['grade'] >= 15 %} + + {% end %} {% elif t['state'] == 'QUIT' %}

Foi registada a sua desistência da prova.

diff --git a/templates/review-question.html b/templates/review-question.html index d34f87d..b2efbbc 100644 --- a/templates/review-question.html +++ b/templates/review-question.html @@ -1,63 +1,90 @@ {% autoescape %} + {% block question %} -
- -
- {{ q['number'] }}. {{ q['title'] }} -
- Classificar  - {% if q['answer'] is not None %} - - {% else %} - - {% end %} -
-
- -
-

- {{ md(q['text'], q) }} -

- - {% block answer %}{% end %} - - {% if t['show_points'] %} -

- - (Cotação: {{ round(q['points'], 2) }}) - -

- {% end %} -
- - {% if t['state'] == 'FINISHED' %} -
- {% if q['grade'] > 0.99 %} -

- - {{ round(q['grade'] * q['points'], 2) }} - pontos
- {{ q['comments'] }} + {% if q['answer'] is not None %} + +

+
+ {{ q['number'] }}. {{ q['title'] }} +
+ Classificar  + +
+
+ +
+

+ {{ md(q['text'], q) }}

- {% elif q['grade'] > 0.49 %} -

- - {{ round(q['grade'] * q['points'], 2) }} - pontos
- {{ q['comments'] }} + + {% block answer %}{% end %} + +

+ + (Cotação: {{ round(q['points'], 2) }}) +

- {% else %} -

- - {{ round(q['grade'] * q['points'], 2) }} - pontos
- {{ q['comments'] }} +

+ +
+ {% if q['grade'] > 0.99 %} +

+ + {{ round(q['grade'] * q['points'], 2) }} + pontos
+ {{ q['comments'] }} +

+ {% elif q['grade'] > 0.49 %} +

+ + {{ round(q['grade'] * q['points'], 2) }} + pontos
+ {{ q['comments'] }} +

+ {% else %} +

+ + {{ round(q['grade'] * q['points'], 2) }} + pontos
+ {{ q['comments'] }} +

+ {% end %} +
+
+ + {% else %} + +
+
+ {{ q['number'] }}. {{ q['title'] }} +
+ Classificar  + +
+
+ +
+

+ {{ md(q['text'], q) }}

- {% end %} -
- {% end %} + {% block answer %}{% end %} -
-{% end %} \ No newline at end of file +

+ + (Cotação: {{ round(q['points'], 2) }}) + +

+
+ +
+

+ + {{ round(q['grade'] * q['points'], 2) }} pontos
+ {{ q['comments'] }} +

+
+
+ {% end %} +{% end %} \ No newline at end of file diff --git a/test.py b/test.py index 66e694d..8452ea6 100644 --- a/test.py +++ b/test.py @@ -234,7 +234,7 @@ class Test(dict): self['state'] = 'FINISHED' grade = sum(q.correct()*q['points'] for q in self['questions']) - self['grade'] = round(grade, 1) + self['grade'] = max(0, round(grade, 1)) # truncate FIXME scale? logger.info(f'Student {self["student"]["number"]}: correction gave {self["grade"]} points.') return self['grade'] -- libgit2 0.21.2