Merge branch 'master' into dev

Miguel Barão
2 parents e02a02ef d8f5228d
Showing 6 changed files with 25 additions and 20 deletions Show diff stats
demo/questions/questions-tutorial.yaml
perguntations/main.py
perguntations/serve.py
perguntations/templates/review-question-text.html
perguntations/templates/review-question.html
perguntations/templates/review.html
@@ -288,6 +288,8 @@
     * `lower` e `upper` convertem respectivamente para minúsculas e maiúsculas.
   transform: ['trim', 'lower']
   correct: ['azul']
+  solution: |
+    O céu é `azul`, pelo menos durante o dia e se estiver bom tempo...
 # ---------------------------------------------------------------------------
 - type: text-regex
@@ -329,6 +331,8 @@
     situações.
   correct: '(VERDE|[Vv]erde)'
+  solution: |
+    Deveria ter escrito `VERDE` ou `Verde` ou `verde`.
 # ---------------------------------------------------------------------------
 - type: numeric-interval
@@ -31,7 +31,7 @@ def parse_cmdline_arguments():
         'have to be previously configured. Please read the documentation '
         'included with this software before running the server.')
     parser.add_argument('testfile',
-                        type=str, nargs='?',
+                        type=str,
                         help='tests in YAML format')
     parser.add_argument('--allow-all',
                         action='store_true',
@@ -492,7 +492,6 @@ class ReviewHandler(BaseHandler):
             logging.error('JSON error in "%s": %s', fname, exc)
             raise tornado.web.HTTPError(404)  # Not Found
-        print(test['show_ref'])
         self.render('review.html', t=test, md=md_to_html,
                 templ=self._templates)
@@ -5,7 +5,7 @@
 <div class="card bg-light">
   <div class="card-body">
-    <pre>{{ q['answer'] if q['answer'] is not None else '' }}</pre>
+    <pre>{{ escape(q['answer']) if q['answer'] is not None else '' }}</pre>
   </div>
 </div>
@@ -37,31 +37,31 @@
           <p class="text-success">
             <i class="far fa-thumbs-up fa-3x" aria-hidden="true"></i>
             {{ round(q['grade'] * q['points'], 2) }}
-            pontos<br>
-            {{ q['comments'] }}
+            pontos
           </p>
+          <p class="text-success">{{ q['comments'] }}</p>
         {% elif q['grade'] > 0.49 %}
           <p class="text-warning">
             <i class="fas fa-exclamation-triangle fa-3x" aria-hidden="true"></i>
             {{ round(q['grade'] * q['points'], 2) }}
-            pontos<br>
-            {{ q['comments'] }}
-            {% if 'solution' in q %}
-              <hr>
-              {{ md('**Solução:** \n\n' + q['solution']) }}
-            {% end %}
+            pontos
           </p>
+          <p class="text-warning">{{ q['comments'] }}</p>
+          {% if q.get('solution', '') %}
+            <hr>
+            {{ md('**Solução:** \n\n' + q['solution']) }}
+          {% end %}
         {% else %}
           <p class="text-danger">
             <i class="far fa-thumbs-down fa-3x" aria-hidden="true"></i>
             {{ round(q['grade'] * q['points'], 2) }}
-            pontos<br>
-            {{ q['comments'] }}
-            {% if 'solution' in q %}
-              <hr>
-              {{ md('**Solução:** \n\n' + q['solution']) }}
-            {% end %}
+            pontos
           </p>
+          <p class="text-danger">{{ q['comments'] }}</p>
+          {% if q.get('solution', '') %}
+            <hr>
+            {{ md('**Solução:** \n\n' + q['solution']) }}
+          {% end %}
         {% end %}
         {% if t['show_ref'] %}
@@ -84,7 +84,7 @@
         </div>
       </h5> <!-- card-header -->
-      <div class="card-body text-secondary">
+      <div class="card-body text-secondary bg-light">
         <p id="text">
           {{ md(q['text']) }}
         </p>
@@ -102,7 +102,7 @@
           <i class="fas fa-ban fa-3x" aria-hidden="true"></i>
           {{ round(q['grade'] * q['points'], 2) }} pontos<br>
           {{ q['comments'] }}
-          {% if 'solution' in q %}
+          {% if q.get('solution', '') %}
             <hr>
             {{ md('**Solução:** \n\n' + q['solution']) }}
           {% end %}
@@ -75,7 +75,9 @@
     <h5>
       <div class="row">
         <label for="duracao" class="col-sm-2">Duração (minutos):</label>
-        <div class="col-sm-10" id="duracao">{{ t.get('duration', chr(8734)) }}</div>
+        <div class="col-sm-10" id="duracao">
+          {{ t.get('duration', 0) if t.get('duration', 0) > 0 else '+'+chr(8734) }}
+        </div>
       </div>
     </h5>
	@@ -31,7 +31,7 @@ def parse_cmdline_arguments():		@@ -31,7 +31,7 @@ def parse_cmdline_arguments():
31	'have to be previously configured. Please read the documentation '	31	'have to be previously configured. Please read the documentation '
32	'included with this software before running the server.')	32	'included with this software before running the server.')
33	parser.add_argument('testfile',	33	parser.add_argument('testfile',
34	- type=str, nargs='?',	34	+ type=str,
35	help='tests in YAML format')	35	help='tests in YAML format')
36	parser.add_argument('--allow-all',	36	parser.add_argument('--allow-all',
37	action='store_true',	37	action='store_true',
	@@ -492,7 +492,6 @@ class ReviewHandler(BaseHandler):		@@ -492,7 +492,6 @@ class ReviewHandler(BaseHandler):
492	logging.error('JSON error in "%s": %s', fname, exc)	492	logging.error('JSON error in "%s": %s', fname, exc)
493	raise tornado.web.HTTPError(404) # Not Found	493	raise tornado.web.HTTPError(404) # Not Found
494		494
495	- print(test['show_ref'])
496	self.render('review.html', t=test, md=md_to_html,	495	self.render('review.html', t=test, md=md_to_html,
497	templ=self._templates)	496	templ=self._templates)
498		497
	@@ -5,7 +5,7 @@		@@ -5,7 +5,7 @@
5		5
6	<div class="card bg-light">	6	<div class="card bg-light">
7	<div class="card-body">	7	<div class="card-body">
8	- <pre>{{ q['answer'] if q['answer'] is not None else '' }}</pre>	8	+ <pre>{{ escape(q['answer']) if q['answer'] is not None else '' }}</pre>
9	</div>	9	</div>
10	</div>	10	</div>
11		11