- /admin review includes student identification.

- Fixed bug where textarea was being initialized with answer from previous submission from another student. - Fixed get CSV with grades. - Fixed many regressions from the upgrade to bootstrap 5.1. - Changed menu in /admin. - Removed dependency from fontawesome (but added bootstrap-icons). - Removed jquery where not needed.

- /admin review includes student identification.
- Fixed bug where textarea was being initialized with answer from previous submission from another student. - Fixed get CSV with grades. - Fixed many regressions from the upgrade to bootstrap 5.1. - Changed menu in /admin. - Removed dependency from fontawesome (but added bootstrap-icons). - Removed jquery where not needed.
Miguel Barão
1 parent 71adb971
Showing 12 changed files with 143 additions and 180 deletions Show diff stats
BUGS.md
package.json
perguntations/app.py
perguntations/questions.py
perguntations/templates/admin.html
perguntations/templates/grade.html
perguntations/templates/review-question-checkbox.html
perguntations/templates/review-question-radio.html
perguntations/templates/review-question.html
perguntations/templates/review.html
perguntations/templates/test.html
perguntations/testfactory.py
@@ -2,21 +2,22 @@
 ## BUGS
-- review por nome e numero no cabecalho jumbotron
-- talvez a base de dados devesse ter como chave do teste um id que fosse único
-  desse teste particular (não um auto counter, nem ref do teste)
 - em caso de timeout na submissão (e.g. JOBE ou script nao responde) a correcção
   não termina e o teste não é guardado.
-- reload do teste recomeça a contagem no inicio do tempo.
+- modo --review nao implementado em testfactory.py
+- talvez a base de dados devesse ter como chave do teste um id que fosse único
+  desse teste particular (não um auto counter, nem ref do teste)
 - em admin, quando scale_max não é 20, as cores das barras continuam a reflectir
   a escala 0,20. a tabela teste na DB não tem a escala desse teste.
+- a revisao do teste não mostra as imagens que nao estejam ja em cache.
+- reload do teste recomeça a contagem no inicio do tempo.
 - mensagems de erro do assembler aparecem na mesma linha na correcao e nao
-  fazerm rendering do `$t`, ver se servidor faz parse do markdown dessas
+  fazem rendering do `$t`, ver se servidor faz parse do markdown dessas
   mensagens.
-- a revisao do teste não mostra as imagens que nao estejam ja em cache.
 ## TODO
+- pagina de login semelhante ao aprendizations
 - QuestionTextArea falta reportar nos comments os vários erros que podem ocorrer
   (timeout, etc)
 - pergunta com varias partes.
@@ -62,6 +63,12 @@
 - se ocorrer um erro na correcçao avisar aluno para contactar o professor.
 - abrir o teste numa janela maximizada e que nao permite que o aluno a
   redimensione/mova? modo kiosk?
-- detectar scroll e enviar posição para servidor (analise de scroll para detectar copianço?)
+- detectar scroll e enviar posição para servidor (analise de scroll para
+  detectar copianço?)
 - criar perguntas de outros tipos, e.g. associação, ordenação.
-- stress tests. use https://locust.io
+- stress tests. use [locust](https://locust.io)
+
+## FIXED
+
+- textarea vem inicializado com a resposta de outros alunos!!!
+- App has no attribute get_grades_csv
@@ -2,7 +2,6 @@
     "description": "Javascript libraries required to run the server",
     "email": "mjsb@uevora.pt",
     "dependencies": {
-        "@fortawesome/fontawesome-free": "^5.15.3",
         "bootstrap": "^5.1.0",
         "bootstrap-icons": "^1.7.2",
         "codemirror": "^5.61.1",
@@ -372,7 +372,7 @@ class App():
                 }
     # ------------------------------------------------------------------------
-    def get_test_csv(self):
+    def get_grades_csv(self):
         '''generates a CSV with the grades of the test currently running'''
         test_ref = self._testfactory['ref']
         with Session(self._engine, future=True) as session:
@@ -604,16 +604,14 @@ def question_from(qdict: QDict) -&gt; Question:
     try:
         qclass = types[qdict['type']]
     except KeyError:
-        logger.error('Invalid type "%s" in "%s"',
-                     qdict['type'], qdict['ref'])
+        logger.error('Invalid type "%s" in "%s"', qdict['type'], qdict['ref'])
         raise
     # Create an instance of Question() of appropriate type
     try:
-        qinstance = qclass(QDict(qdict))
+        qinstance = qclass(qdict.copy())
     except QuestionException:
-        logger.error('Error generating "%s" in %s/%s',
-                     qdict['ref'], qdict['path'], qdict['filename'])
+        logger.error('Generating "%s" in %s', qdict['ref'], qdict['filename'])
         raise
     return qinstance
@@ -625,11 +623,10 @@ class QFactory():
     QFactory is a class that can generate question instances, e.g. by shuffling
     options, running a script to generate the question, etc.
-    To generate an instance of a question we use the method generate().
+    To generate an instance of a question we use the method gen_async().
     It returns a question instance of the correct class.
-    There is also an asynchronous version called gen_async(). This version is
-    synchronous for all question types (radio, checkbox, etc) except for
-    generator types which run asynchronously.
+    The method is async but it only awaits on generator questions. The others
+    are run until completion.
     Example:
@@ -640,16 +637,13 @@ class QFactory():
           'options': ['a', 'b']
           })
-      # generate synchronously
-      question = qfactory.generate()
-
       # generate asynchronously
       question = await qfactory.gen_async()
       # answer one question and correct it
-      question['answer'] = 42          # set answer
-      question.correct()               # correct answer
-      grade = question['grade']        # get grade
+      question.set_answer(42)           # set answer
+      question.correct()                # correct answer
+      grade = question['grade']         # get grade
     '''
     def __init__(self, qdict: QDict = QDict({})) -> None:
@@ -21,8 +21,6 @@
     <!-- Scripts -->
     <script src="/static/jquery/jquery.min.js"></script>
-    <!-- <script defer src="/static/popper.js/popper.min.js"></script> -->
-    <!-- <script defer src="/static/fontawesome-free/js/all.min.js"></script> -->
     <script defer src="/static/bootstrap/js/bootstrap.bundle.min.js"></script>
     <script defer src="/static/datatables/js/jquery.dataTables.min.js"></script>
     <script defer src="/static/underscore/underscore-min.js"></script>
@@ -40,27 +38,34 @@
         <span class="navbar-toggler-icon"></span>
       </button>
       <div class="collapse navbar-collapse" id="navbarNavDropdown">
-        <!-- left -->
-        <span class="navbar-text mr-auto"></span>
-
         <!-- center -->
-        <span class="navbar-text mr-auto"><span id="clock"> --:-- </span></span>
+        <span class="navbar-text mx-auto" id="clock"> --:-- </span>
         <!-- right -->
         <ul class="navbar-nav">
           <li class="nav-item dropdown">
+            <a class="nav-link dropdown-toggle" href="#" id="navbarDropdownNotas" role="button" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              Notas
+            </a>
+            <ul class="dropdown-menu dropdown-menu-end" aria-labelledby="navbarDropdownNotas">
+              <li><a class="dropdown-item" href="/adminwebservice?cmd=testcsv">Obter CSV notas finais...</a></li>
+              <li><a class="dropdown-item" href="/adminwebservice?cmd=questionscsv">Obter CSV detalhado...</a></li>
+            </ul>
+          </li>
+          <li class="nav-item dropdown">
             <a class="nav-link dropdown-toggle" href="#" id="navbarDropdownAluno" role="button" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-              Acções
+              Alunos
             </a>
-            <ul class="dropdown-menu dropdown-menu-right" aria-labelledby="navbarDropdownAluno">
+            <ul class="dropdown-menu dropdown-menu-end" aria-labelledby="navbarDropdownAluno">
               <li><a class="dropdown-item" href="#" id="novo_aluno" data-bs-toggle="modal" data-bs-target="#novo_aluno_modal">Novo aluno...</a></li>
               <li><a class="dropdown-item" href="#" id="reset_password_menu" data-bs-toggle="modal" data-bs-target="#reset_password_modal">Limpar password...</a></li>
               <li><a class="dropdown-item" href="#" id="allow_all">Autorizar todos</a></li>
               <li><a class="dropdown-item" href="#" id="deny_all">Desautorizar todos</a></li>
-              <li><hr class="dropdown-divider"></hr></li>
-              <li><a class="dropdown-item" href="/logout">Sair</a></li>
             </ul>
           </li>
+          <li class="nav-item">
+            <a class="nav-link" href="/logout">Sair</a>
+          </li>
         </ul>
       </div>
     </div>
@@ -71,28 +76,25 @@
     <div class="bg-light p-3">
       <h3 id="title"></h3>
       <ul>
-        <li>Referência: <code id="ref">--</code><br></li>
-        <li>Ficheiro de configuração: <code id="filename">--</code><br></li>
-        <li>Directório com os testes entregues: <code id="answers_dir">--</code><br></li>
-        <li>Base de dados: <code id="database">--</code><br></li>
+        <li>Referência: <code id="ref">--</code></li>
+        <li>Ficheiro de configuração: <code id="filename">--</code></li>
+        <li>Directório com os testes entregues: <code id="answers_dir">--</code></li>
+        <li>Base de dados: <code id="database">--</code></li>
       </ul>
-      <p>
-        <a href="/adminwebservice?cmd=testcsv" class="btn btn-primary">Obter CSV das notas</a>
-        <a href="/adminwebservice?cmd=questionscsv" class="btn btn-primary">Obter CSV detalhado</a>
-      </p>
     </div>
     <br>
-    <table class="table table-sm table-striped" style="width:100%" id="students_table">
-      <thead class="thead thead-light">
+    <table class="table table-borderless table-striped" id="students_table">
+      <thead>
         <tr>
-          <th>#</th>
-          <th>Autoriz.</th>
-          <th>Número</th>
-          <th>Nome</th>
-          <th>Estado</th>
-          <th>Nota</th>
+          <th scope="col">#</th>
+          <th scope="col">Autoriz.</th>
+          <th scope="col">Número</th>
+          <th scope="col">Nome</th>
+          <th scope="col">Estado</th>
+          <th scope="col">Nota</th>
         </tr>
       </thead>
+      <tbody> </tbody>
     </table>
   </div> <!-- container -->
-<!DOCTYPE html>
+<!doctype html>
 <html lang="pt-PT">
 <head>
-  <title>Teste</title>
+  <title>Prova de avaliação</title>
   <meta charset="utf-8">
   <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
   <link rel="icon" href="/static/favicon.ico">
@@ -35,9 +35,7 @@
   <div class="container">
     <div class="bg-light p-3">
       {% if t['state'] == 'CORRECTED' %}
-        <h1>
-          Resultado: <strong>{{ f'{round(t["grade"], 3)}' }}</strong> valores
-        </h1>
+        <h1>Resultado: <strong>{{ f'{round(t["grade"], 3)}' }}</strong> valores</h1>
       {% elif t['state'] == 'SUBMITTED' %}
         <h3>A prova foi submetida com sucesso. Vai ser corrigida mais tarde.</h3>
       {% elif t['state'] == 'QUIT' %}
@@ -10,45 +10,35 @@
       {% if q['answer'] is not None and str(n) in q['answer'] %}
         <div class="p-2">
           <i class="bi bi-check-square"></i>
-          <!-- <i class="far fa-check-square" aria-hidden="true"></i> -->
         </div>
         <div class="p-2">
           {{ md(opt) }}
         </div>
-        <div class="ml-auto p-2">
-          {% if q['correct'][n] > 0 %}
-            <div class="text-right text-success">
-              <i class="bi bi-check-lg"></i>
-              <!-- <i class="fas fa-check" aria-hidden="true"></i> -->
-            </div>
-          {% else %}
-            <div class="text-right text-danger">
-              <i class="bi bi-x-lg"></i>
-              <!-- <i class="fas fa-times" aria-hidden="true"></i> -->
-            </div>
-          {% end %}
+        <div class="ms-auto p-2">
+          <div class="text-end">
+            {% if q['correct'][n] > 0 %}
+                <i class="bi bi-check-lg text-success"></i>
+            {% else %}
+                <i class="bi bi-x-lg text-danger"></i>
+            {% end %}
+          </div>
         </div>
       {% else %}
         <div class="p-2">
           <i class="bi bi-square"></i>
-          <!-- <i class="far fa-square" aria-hidden="true"></i> -->
         </div>
         <div class="p-2">
             {{ md(opt) }}
         </div>
-        <div class="ml-auto p-2">
-          {% if q['correct'][n] > 0 %}
-            <div class="text-right text-danger">
-              <i class="bi bi-x-lg"></i>
-              <!-- <i class="fas fa-times" aria-hidden="true"></i> -->
-            </div>
-          {% else %}
-            <div class="text-right text-success">
-              <i class="bi bi-check-lg"></i>
-              <!-- <i class="fas fa-check" aria-hidden="true"></i> -->
-            </div>
-          {% end %}
+        <div class="ms-auto p-2">
+          <div class="text-end">
+            {% if q['correct'][n] > 0 %}
+              <i class="bi bi-x-lg text-danger"></i>
+            {% else %}
+              <i class="bi bi-check-lg text-success"></i>
+            {% end %}
+          </div>
         </div>
       {% end %}
       </div>
@@ -10,39 +10,28 @@
             {% if q['answer'] is not None and str(n)==q['answer'] %}
                 <div class="p-2">
                     <i class="bi bi-record-circle"></i>
-                    <!-- <i class="fas fa-dot-circle" aria-hidden="true"></i> -->
                 </div>
                 <div class="p-2">
                     {{ md(opt) }}
                 </div>
-                <div class="ml-auto p-2">
+                <div class="ms-auto p-2">
                     {% if q['correct'][n] > 0 %}
-                        <div class="text-right text-success">
-                            <i class="bi bi-check-lg"></i>
-                            <!-- <i class="fas fa-check" aria-hidden="true"></i> -->
-                        </div>
+                      <i class="bi bi-check-lg text-success"></i>
                     {% else %}
-                        <div class="text-right text-danger">
-                            <i class="bi bi-x-lg"></i>
-                            <!-- <i class="fas fa-times" aria-hidden="true"></i> -->
-                        </div>
+                      <i class="bi bi-x-lg text-danger"></i>
                     {% end %}
                 </div>
             {% else %}
                 <div class="p-2">
                     <i class="bi bi-circle"></i>
-                    <!-- <i class="far fa-circle" aria-hidden="true"></i> -->
                 </div>
                 <div class="p-2">
                     {{ md(opt) }}
                 </div>
-                <div class="ml-auto p-2">
+                <div class="ms-auto p-2">
                     {% if q['correct'][n] > 0 %}
-                        <div class="text-right text-info">
-                            <i class="bi bi-arrow-left"></i>
-                            <!-- <i class="fas fa-dot-circle" aria-hidden="true"></i> -->
-                        </div>
+                        <i class="bi bi-arrow-left text-info"></i>
                     {% end %}
                 </div>
             {% end %}
@@ -6,10 +6,9 @@
     <div class="card border-dark mb-3">
       <h5 class="card-header text-white bg-dark">
         {{ q['number'] }}.  {{ q['title'] }}
-        <div class="float-right">
-          <small>Classificar&nbsp;</small>
-          <i class="bi bi-check-square"></i>
-          <!-- <i class="far fa-check-square" aria-hidden="true"></i> -->
+        <div class="float-end">
+          <small>Classificada&nbsp;</small>
+          <i class="bi bi-toggle2-on"></i>
         </div>
       </h5> <!-- card-header -->
@@ -38,14 +37,12 @@
           {% if q['grade'] > 0.999 %}
             <h1 class="text-success"><i class="bi bi-hand-thumbs-up"></i></h1>
             <p class="text-success">
-              <!-- <i class="far fa-thumbs-up fa-3x" aria-hidden="true"></i> -->
               {{ round(q['grade'] * q['points'], 2) }} pontos
             </p>
             <p class="text-success">{{ md(q['comments']) }}</p>
           {% elif q['grade'] >= 0.5 %}
             <h1 class="text-warning"><i class="bi bi-exclamation-triangle"></i></h1>
             <p class="text-warning">
-              <!-- <i class="fas fa-exclamation-triangle fa-3x" aria-hidden="true"></i> -->
               {{ round(q['grade'] * q['points'], 2) }} pontos
             </p>
             <p class="text-warning">{{ md(q['comments']) }}</p>
@@ -56,7 +53,6 @@
           {% else %}
           <h1 class="text-danger"><i class="bi bi-hand-thumbs-down"></i></h1>
             <p class="text-danger">
-              <!-- <i class="far fa-thumbs-down fa-3x" aria-hidden="true"></i> -->
               {{ round(q['grade'] * q['points'], 2) }} pontos
             </p>
             <p class="text-danger">{{ md(q['comments']) }}</p>
@@ -80,10 +76,9 @@
     <div class="card border-secondary mb-3">
       <h5 class="card-header text-white bg-secondary">
         {{ q['number'] }}.  {{ q['title'] }}
-        <div class="float-right">
-          <small>Classificar&nbsp;</small>
-          <i class="bi bi-square"></i>
-          <!-- <i class="far fa-square" aria-hidden="true"></i> -->
+        <div class="float-end">
+          <small>Não classificada</small>
+          <i class="bi bi-toggle2-off"></i>
         </div>
       </h5> <!-- card-header -->
@@ -102,16 +97,10 @@
       </div> <!-- card-body -->
       <div class="card-footer">
-          <h1 class="text-secondary"><i class="bi bi-dash-circle"></i></h1>
-          <p class="text-secondary">
-          Não respondeu
-          <!-- <i class="fas fa-ban fa-3x" aria-hidden="true"></i> -->
-          {{ md(q['comments']) }}
-          {% if q['solution'] %}
-            <hr>
-            {{ md('**Solução:** \n\n' + q['solution']) }}
-          {% end %}
-        </p>
+        {{ md(q['comments']) }}
+        {% if q['solution'] %}
+          {{ md('**Solução:** \n\n' + q['solution']) }}
+        {% end %}
         {% if debug %}
           <hr>
@@ -22,14 +22,12 @@
 <!-- Styles -->
   <link rel="stylesheet" type="text/css" href="/static/bootstrap/css/bootstrap.min.css">
+  <link rel="stylesheet" type="text/css" href="/static/bootstrap-icons/font/bootstrap-icons.css">
   <link rel="stylesheet" type="text/css" href="/static/css/github.css">  <!-- syntax highlight -->
   <link rel="stylesheet" type="text/css" href="/static/css/test.css">
-  <link rel="stylesheet" type="text/css" href="/static/bootstrap-icons/font/bootstrap-icons.css">
 <!-- Scripts -->
   <script src="/static/jquery/jquery.min.js"></script>
-  <!-- <script defer src="/static/popper.js/popper.min.js"></script> -->
-  <!-- <script defer src="/static/fontawesome-free/js/all.min.js"></script> -->
   <script defer src="/static/bootstrap/js/bootstrap.bundle.min.js"></script>
 </head>
 <!-- ===================================================================== -->
@@ -58,10 +56,8 @@
       <ul class="nav navbar-nav">
           <li class="nav-item">
             <span class="navbar-text">
-              <!-- <i class="fas fa-user" aria-hidden="true"></i> -->
               <span id="name">{{ escape(name) }}</span>
               (<span id="number">{{ escape(uid) }}</span>)
-              <!-- <span class="caret"></span> -->
             </span>
           </li>
       </ul>
@@ -73,46 +69,47 @@
 <div class="container">
   <div class="bg-light p-3">
     <h1 class="display-5">{{ t['title'] }}</h1>
-    <h5>
-      <div class="row">
-        <label for="duracao" class="col-sm-2">Duração:</label>
-        <div class="col-sm-10" id="duracao">
-          {{ str(t.get('duration', 0)) + ' minutos' if t.get('duration', 0) > 0 else '+'+chr(8734) }}
-        </div>
-      </div>
-    </h5>
     <hr>
-
-    <h5>
-      <div class="row">
-        <label for="inicio" class="col-sm-2">Início:</label>
-        <div class="col-sm-10" id="inicio">{{t['start_time'][:19]}}</div>
+    <div class="row">
+      <label for="nome" class="col-sm-2">Nome:</label>
+      <div class="col-sm-9" id="nome">{{ escape(name) }}</div>
+    </div>
+    <div class="row">
+      <label for="numero" class="col-sm-2">Número:</label>
+      <div class="col-sm-9" id="numero">{{ escape(uid) }}</div>
+    </div>
+    <div class="row">
+      <label for="duracao" class="col-sm-2">Duração:</label>
+      <div class="col-sm-10" id="duracao">
+        {{ str(t.get('duration', 0)) + ' minutos' if t.get('duration', 0) > 0 else '+'+chr(8734) }}
       </div>
-      <div class="row">
-        <label for="fim" class="col-sm-2">Fim:</label>
-        <div class="col-sm-10" id="fim">{{t['finish_time'][:19]}}</div>
+    </div>
+    <div class="row">
+      <label for="inicio" class="col-sm-2">Início:</label>
+      <div class="col-sm-10" id="inicio">{{t['start_time'][:19]}}</div>
+    </div>
+    <div class="row">
+      <label for="fim" class="col-sm-2">Fim:</label>
+      <div class="col-sm-10" id="fim">{{t['finish_time'][:19]}}</div>
+    </div>
+    <div class="row">
+      <label for="nota" class="col-sm-2">Nota:</label>
+      <div class="col-sm-10" id="nota">
+        {% if t['state'] == 'CORRECTED' %}
+          <strong>{{ round(t['grade'], 2) }}</strong> valores
+        {% elif t['state'] == 'SUBMITTED' %}
+          (não corrigido)
+        {% elif t['state'] == 'QUIT' %}
+          (DESISTIU)
+        {% end %}
       </div>
-    </h5>
-    <h3>
+    </div>
+    {% if t['comment'] != '' %}
       <div class="row">
-        <label for="nota" class="col-sm-2">Nota:</label>
-        <div class="col-sm-10" id="nota">
-          {% if t['state'] == 'CORRECTED' %}
-            <span class="badge badge-primary">{{ round(t['grade'], 2) }}</span> valores
-          {% elif t['state'] == 'SUBMITTED' %}
-            (não corrigido)
-          {% elif t['state'] == 'QUIT' %}
-            (DESISTIU)
-          {% end %}
-        </div>
+        <label for="comentario" class="col-sm-2">Comentário:</label>
+        <div class="col-sm-10" id="comentario">{{ t['comment'] }}</div>
       </div>
-      {% if t['comment'] != '' %}
-        <div class="row">
-          <label for="comentario" class="col-sm-2">Comentário:</label>
-          <div class="col-sm-10" id="comentario">{{ t['comment'] }}</div>
-        </div>
-      {% end %}
-    </h3>
+    {% end %}
   </div>
   {% for i, q in enumerate(t['questions']) %}
-<!DOCTYPE html>
+<!doctype html>
 <html lang="pt-PT">
 <head>
-  <title>Teste</title>
-  <meta charset="UTF-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+  <title>Prova de avalliação</title>
+  <meta charset="utf-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
   <link rel="icon" href="/static/favicon.ico">
+<!-- Styles -->
+  <link rel="stylesheet" type="text/css" href="/static/bootstrap/css/bootstrap.min.css">
+  <link rel="stylesheet" type="text/css" href="/static/codemirror/lib/codemirror.css">
+  <link rel="stylesheet" type="text/css" href="/static/codemirror/theme/darcula.css">
+  <link rel="stylesheet" type="text/css" href="/static/css/github.css">  <!-- syntax highlight -->
+  <link rel="stylesheet" type="text/css" href="/static/css/test.css">
+
 <!-- MathJax3 -->
   <script>
   MathJax = {
@@ -21,21 +28,12 @@
 <!-- Scripts -->
   <script src="/static/jquery/jquery.min.js"></script>
-  <!-- <script defer src="/static/popper.js/popper.min.js"></script> -->
-  <!-- <script defer src="/static/fontawesome-free/js/all.min.js"></script> -->
   <script defer src="/static/bootstrap/js/bootstrap.bundle.min.js"></script>
   <script defer src="/static/underscore/underscore-min.js"></script>
   <script src="/static/codemirror/lib/codemirror.js"></script>
   <script src="/static/codemirror/addon/selection/active-line.js"></script>
   <script src="/static/codemirror/addon/edit/matchbrackets.js"></script>
-<!-- Styles -->
-  <link rel="stylesheet" type="text/css" href="/static/bootstrap/css/bootstrap.min.css">
-  <link rel="stylesheet" type="text/css" href="/static/codemirror/lib/codemirror.css">
-  <link rel="stylesheet" type="text/css" href="/static/codemirror/theme/darcula.css">
-  <link rel="stylesheet" type="text/css" href="/static/css/github.css">  <!-- syntax highlight -->
-  <link rel="stylesheet" type="text/css" href="/static/css/test.css">
-
 <!-- My scripts -->
   <script defer src="/static/js/question_disabler.js"></script>
   <script defer src="/static/js/prevent_enter_submit.js"></script>
@@ -73,10 +71,8 @@
       <ul class="nav navbar-nav">
         <li class="nav-item">
           <span class="navbar-text">
-            <!-- <i class="fas fa-user" aria-hidden="true"></i> -->
             <span id="name">{{ escape(name) }}</span>
             (<span id="number">{{ escape(uid) }}</span>)
-            <!-- <span class="caret"></span> -->
           </span>
         </li>
       </ul>
@@ -136,17 +132,19 @@
         <h4 class="modal-title">Deseja submeter o teste?</h4>
       </div>
       <div class="modal-body">
-        O teste será enviado para classificação e já não poderá voltar atrás.
-        Antes de submeter, verifique se respondeu a todas as questões.
-        Desactive as perguntas que não pretende classificar para evitar
-        penalizações.
+        <ul>
+          <li> O teste será enviado para classificação e já não poderá voltar atrás.</li>
+          <li> Antes de submeter, verifique se respondeu a todas as questões.</li>
+          <li> Para evitar penalizações, esconda as perguntas que não
+            respondeu desactivando a checkbox "classificar".</li>
+        </ul>
       </div>
       <div class="modal-footer">
         <button form="test" type="submit" class="btn btn-success btn-lg">
           Sim, submeter...
         </button>
         <button type="button" class="btn btn-danger btn-lg" data-bs-dismiss="modal">
-          Oops, NÃO!!!
+          Ainda NÃO!!!
         </button>
       </div>
     </div>
@@ -157,7 +155,6 @@
   $("textarea").each(function(i, ta) {
     CodeMirror.fromTextArea(ta, {
       lineNumbers: true,
-      // theme: "darcula",
       viewportMargin: Infinity,
       matchBrackets: true,
       styleActiveLine: true,
@@ -270,6 +270,7 @@ class TestFactory(dict):
             if question['type'] == 'textarea':
                 _runtests_textarea(qref, question)
+
     # ------------------------------------------------------------------------
     async def generate(self):
         '''
	@@ -372,7 +372,7 @@ class App():		@@ -372,7 +372,7 @@ class App():
372	}	372	}
373		373
374	# ------------------------------------------------------------------------	374	# ------------------------------------------------------------------------
375	- def get_test_csv(self):	375	+ def get_grades_csv(self):
376	'''generates a CSV with the grades of the test currently running'''	376	'''generates a CSV with the grades of the test currently running'''
377	test_ref = self._testfactory['ref']	377	test_ref = self._testfactory['ref']
378	with Session(self._engine, future=True) as session:	378	with Session(self._engine, future=True) as session:
	@@ -270,6 +270,7 @@ class TestFactory(dict):		@@ -270,6 +270,7 @@ class TestFactory(dict):
270		270
271	if question['type'] == 'textarea':	271	if question['type'] == 'textarea':
272	_runtests_textarea(qref, question)	272	_runtests_textarea(qref, question)
		273	+
273	# ------------------------------------------------------------------------	274	# ------------------------------------------------------------------------
274	async def generate(self):	275	async def generate(self):
275	'''	276	'''