Merge remote-tracking branch 'origin/dev' into dev

Miguel Barão
2 parents 81d72682 d0fcee91
Showing 2 changed files with 5 additions and 5 deletions Show diff stats
demo/demo.yaml
perguntations/templates/grade.html
@@ -35,7 +35,7 @@ autosubmit: false
 # shown to the student. If false, the test is saved but not corrected.
 # No grade is shown to the student.
 # (default: true)
-autocorrect: false
+autocorrect: true
  
 # Show points for each question (min and max).
 # (default: true)
@@ -40,14 +40,14 @@
 <!-- ================================================================== -->
 <div class="container">
   <div class="jumbotron">
-    {% if t['state'] == 'FINISHED' %}
+    {% if t['state'] == 'CORRECTED' %}
+      {% if t['grade'] - t['scale'][0] >= 0.75*(t['scale'][1] - t['scale'][0]) %}
+        <i class="fas fa-thumbs-up fa-5x text-success" aria-hidden="true"></i>
+      {% end %}
       <h3>Resultado:
         <strong>{{ f'{round(t["grade"], 3)}' }}</strong>
         valores na escala [{{t['scale'][0]}},{{t['scale'][1]}}].
       </h3>
-      {% if t['grade'] - t['scale'][0] >= 0.75*(t['scale'][1] - t['scale'][0]) %}
-        <i class="fas fa-thumbs-up fa-5x text-success" aria-hidden="true"></i>
-      {% end %}
     {% elif t['state'] == 'SUBMITTED' %}
       <h3>A prova foi submetida com sucesso. Vai ser corrigida mais tarde.</h3>
     {% elif t['state'] == 'QUIT' %}
...	...	@@ -35,7 +35,7 @@ autosubmit: false
35	35	# shown to the student. If false, the test is saved but not corrected.
36	36	# No grade is shown to the student.
37	37	# (default: true)
38		-autocorrect: false
	38	+autocorrect: true
39	39
40	40	# Show points for each question (min and max).
41	41	# (default: true)
...	...
...	...	@@ -40,14 +40,14 @@
40	40	<!-- ================================================================== -->
41	41	<div class="container">
42	42	<div class="jumbotron">
43		- {% if t['state'] == 'FINISHED' %}
	43	+ {% if t['state'] == 'CORRECTED' %}
	44	+ {% if t['grade'] - t['scale'][0] >= 0.75*(t['scale'][1] - t['scale'][0]) %}
	45	+ <i class="fas fa-thumbs-up fa-5x text-success" aria-hidden="true"></i>
	46	+ {% end %}
44	47	<h3>Resultado:
45	48	<strong>{{ f'{round(t["grade"], 3)}' }}</strong>
46	49	valores na escala [{{t['scale'][0]}},{{t['scale'][1]}}].
47	50	</h3>
48		- {% if t['grade'] - t['scale'][0] >= 0.75*(t['scale'][1] - t['scale'][0]) %}
49		- <i class="fas fa-thumbs-up fa-5x text-success" aria-hidden="true"></i>
50		- {% end %}
51	51	{% elif t['state'] == 'SUBMITTED' %}
52	52	<h3>A prova foi submetida com sucesso. Vai ser corrigida mais tarde.</h3>
53	53	{% elif t['state'] == 'QUIT' %}
...	...