- adds button to /admin page to download CSV file with grades.

- button to close the test after the grades. - replace (scale_points, scale_min, scale_max) by "scale: [0, 20]" - updates demo.yaml - correct-question.py changed to count the number of correct colors - catch exception during loading test configuration - fix exception handling of sqlalchemy - change default logging to include seconds - update BUGS.md

- adds button to /admin page to download CSV file with grades.
- button to close the test after the grades. - replace (scale_points, scale_min, scale_max) by "scale: [0, 20]" - updates demo.yaml - correct-question.py changed to count the number of correct colors - catch exception during loading test configuration - fix exception handling of sqlalchemy - change default logging to include seconds - update BUGS.md
Miguel Barão
1 parent 094837eb
Showing 12 changed files with 190 additions and 131 deletions Show diff stats
BUGS.md
demo/demo.yaml
demo/questions/correct/correct-question.py
demo/questions/generators/generate-question.py
perguntations/__init__.py
perguntations/app.py
perguntations/main.py
perguntations/serve.py
perguntations/static/js/admin.js
perguntations/templates/admin.html
perguntations/templates/grade.html
perguntations/test.py
@@ -2,8 +2,6 @@
 # BUGS
 - quando scale_max não é 20, as cores das barras continuam a reflectir a escala 0,20
-- servidor ntpd para configurar a data/hora dos portateis dell
-- link na pagina com a nota para voltar ao principio.
 - CRITICAL se answer for `i<n` a revisão de provas mostra apenas i (interpreta `<` como tag?)
 - na pagina grade.html as barras estao normalizadas para os limites scale_min e max do teste actual e nao do realizado.
 - codigo `hello   world` nao esta a preservar o whitespace. O renderer de markdown gera a tag <code> que não preserva whitespace. Necessario adicionar <pre>.
@@ -22,9 +20,11 @@ ou usar push (websockets?)
 # TODO
+- servidor ntpd para configurar a data/hora dos portateis dell
+- autorização dada, mas teste não disponível até que seja dada ordem para começar.
+- alunos com necessidades especiais nao podem ter autosubmit. ter um autosubmit_exceptions: ['123', '456']
 - mostrar unfocus e window area em /admin
 - testar as perguntas todas no início do teste.
-- test: mostrar duração do teste com progressbar no navbar.
 - submissao fazer um post ajax?
 - adicionar opcao para eliminar um teste em curso.
 - enviar resposta de cada pergunta individualmente.
@@ -63,6 +63,9 @@ ou usar push (websockets?)
 # FIXED
+- link na pagina com a nota para voltar ao principio.
+- default logger config mostrar horas com segundos
+- test: mostrar duração do teste com progressbar no navbar.
 - lidar com eventos unfocus.
 - servidor nao esta a lidar com eventos resize.
 - sock.bind(sockaddr)  OSError: [Errno 48] Address already in use
 ---
 # ============================================================================
-# The test reference should be a unique identifier. It is saved in the database
-# so that queries can be done in the terminal like
-#     sqlite3 students.db "select * from tests where ref='demo'"
+# Unique identifier of the test.
+# Database queries can be done in the terminal with
+#     sqlite3 students.db "select * from tests where ref='tutorial'"
 ref: tutorial
-# Database with student credentials and grades of all questions and tests done
-# The database is an sqlite3 file generate with the command initdb
+# Database file that includes student credentials, tests and questions grades.
+# It's a sqlite3 database generated with the command 'initdb'
 database: students.db
-# Directory where the tests including submitted answers and grades are stored.
-# The submitted tests and their corrections can be reviewed later.
+# Directory where the submitted and corrected test are stored for later review.
 answers_dir: ans
 # --- optional settings: -----------------------------------------------------
-# You may wish to refer the course, year or kind of test
+# Title of this test, e.g. course name, year or test number
 # (default: '')
 title: Teste de demonstração (tutorial)
 # Duration in minutes.
 # (0 or undefined means infinite time)
 duration: 2
-autosubmit: true
-# Show points for each question, scale 0-20.
+# Automatic test submission after the timeout 'duration'?
 # (default: false)
+autosubmit: true
+
+# Show points for each question (min and max).
+# (default: true)
 show_points: true
-# scale final grade to the interval [scale_min, scale_max]
-# (default: scale to [0,20])
-scale_max: 20
-scale_min: 0
-scale_points: true
+# scale final grade to an interval, e.g. [0, 20], keeping the relative weight
+# of the points declared in the questions below.
+# (default: no scaling, just use question points)
+scale: [0, 5]
+
+# DEPRECATED: old version, to be removed
+# scale_max: 20
+# scale_min: 0
+# scale_points: true
 # ----------------------------------------------------------------------------
 # Base path applied to the questions files and all the scripts
@@ -50,7 +56,7 @@ files:
 # The order is preserved.
 # There are several ways to define each question (explained below).
 questions:
-  - tut-test
+  - ref: tut-test
   - tut-questions
   - tut-radio
 #!/usr/bin/env python3
+'''
+Demonstação de um script de correcção
+'''
+
 import re
 import sys
-msg1 = '''---
-grade: 1.0
-comments:  Muito bem!
-'''
+s = sys.stdin.read()
-msg0 = '''
-grade: 0.0
-comments: A resposta correcta é "red green blue".
-'''
+ans = set(re.findall(r'[\w]+', s.lower()))  # get words in lowercase
+rgb = set(['red', 'green', 'blue'])     # the correct answer
-s = sys.stdin.read()
+# a nota é o número de cores certas menos o número de erradas
+grade = max(0,
+            len(rgb.intersection(ans)) - len(ans.difference(rgb))) / 3
-answer = set(re.findall(r'[\w]+', s.lower()))  # get words in lowercase
-rgb_colors = set(['red', 'green', 'blue'])     # the correct answer
+if ans == rgb:
+    print('---\n'
+          'grade: 1.0\n'
+          'comments:  Muito bem!')
-if answer == rgb_colors:
-    print(msg1)
 else:
-    print(msg0)
+    print('---\n'
+          f'grade: {grade}\n'
+          'comments: A resposta correcta é "red green blue".')
@@ -18,10 +18,11 @@ print(f&quot;&quot;&quot;---
 type: text
 title: Geradores de perguntas
 text: |
-  Existe a possibilidade da pergunta ser gerada por um programa externo.
-  Este programa deve escrever no `stdout` uma pergunta em formato `yaml` como
-  os anteriores. Pode também receber argumentos para parametrizar a geração da
-  pergunta. Aqui está um exemplo de uma pergunta gerada por um script python:
+  Existe a possibilidade da pergunta ser gerada por um programa externo. Este
+  programa deve escrever no `stdout` uma pergunta em formato `yaml` como nos
+  exemplos anteriores. Pode também receber argumentos para parametrizar a
+  geração da pergunta. Aqui está um exemplo de uma pergunta gerada por um
+  script python:
   ```python
       #!/usr/bin/env python3
@@ -32,7 +32,7 @@ proof of submission and for review.
 '''
 APP_NAME = 'perguntations'
-APP_VERSION = '2020.04.dev5'
+APP_VERSION = '2020.05.dev1'
 APP_DESCRIPTION = __doc__
 __author__ = 'Miguel Barão'
@@ -6,13 +6,15 @@ Main application module
 # python standard libraries
 import asyncio
 from contextlib import contextmanager  # `with` statement in db sessions
+import csv
+import io
 import json
 import logging
 from os import path
-# user installed packages
+# installed packages
 import bcrypt
-from sqlalchemy import create_engine
+from sqlalchemy import create_engine, exc
 from sqlalchemy.orm import sessionmaker
 # this project
@@ -73,9 +75,10 @@ class App():
         try:
             yield session
             session.commit()
-        except Exception:
+        except exc.SQLAlchemyError:
             logger.error('DB rollback!!!')
             session.rollback()
+            raise
         finally:
             session.close()
@@ -85,7 +88,12 @@ class App():
         self.allowed = set([])  # '0' is hardcoded to allowed elsewhere
         logger.info('Loading test configuration "%s".', conf["testfile"])
-        testconf = load_yaml(conf['testfile'])
+        try:
+            testconf = load_yaml(conf['testfile'])
+        except Exception as exc:
+            logger.critical('Error loading test configuration YAML.')
+            raise AppException(exc)
+
         testconf.update(conf)  # command line options override configuration
         # start test factory
@@ -258,7 +266,7 @@ class App():
     # ------------------------------------------------------------------------
     def event_test(self, uid, cmd, value):
-        '''handle browser events the occur during the test'''
+        '''handles browser events the occur during the test'''
         if cmd == 'focus':
             logger.info('Student %s: focus %s', uid, value)
         elif cmd == 'size':
@@ -273,6 +281,21 @@ class App():
     # def get_student_name(self, uid):
     #     return self.online[uid]['student']['name']
+    def get_test_csv(self):
+        '''generates a CSV with the grades of the test'''
+        with self.db_session() as sess:
+            grades = sess.query(Test.student_id, Test.grade,
+                                Test.starttime, Test.finishtime)\
+                         .filter(Test.ref == self.testfactory['ref'])\
+                         .order_by(Test.student_id)\
+                         .all()
+
+        csvstr = io.StringIO()
+        writer = csv.writer(csvstr, delimiter=';', quoting=csv.QUOTE_ALL)
+        writer.writerow(('Número', 'Nota', 'Início', 'Fim'))
+        writer.writerows(grades)
+        return csvstr.getvalue()
+
     def get_student_test(self, uid, default=None):
         '''get test from online student'''
         return self.online[uid].get('test', default)
@@ -320,11 +343,7 @@ class App():
                           .get('start_time', ''),
             'password_defined': pw != '',
             'grades': self.get_student_grades_from_test(
-                uid,
-                self.testfactory['ref']
-                ),
-
-            # 'focus': self.online.get(uid, {}).get('student', {}).get('focus', True), # FIXME
+                uid, self.testfactory['ref'])
             } for uid, name, pw in self.get_all_students()]
     # def get_allowed_students(self):
@@ -363,7 +382,7 @@ class App():
         try:
             with self.db_session() as sess:
                 sess.add(Student(id=uid, name=name, password=''))
-        except Exception:
-            logger.error('Insert failed: student %s already exists.', uid)
+        except exc.SQLAlchemyError:
+            logger.error('Insert failed: student %s already exists?', uid)
         else:
             logger.info('New student inserted: %s, %s', uid, name)
@@ -74,7 +74,7 @@ def get_logger_config(debug=False):
         'formatters': {
             'standard': {
                 'format': '%(asctime)s %(levelname)-8s %(message)s',
-                'datefmt': '%H:%M',
+                'datefmt': '%H:%M:%S',
                 },
             },
         'handlers': {
@@ -42,6 +42,7 @@ class WebApplication(tornado.web.Application):
             (r'/file', FileHandler),
             # (r'/root',      MainHandler), # FIXME
             # (r'/ws',            AdminSocketHandler),
+            (r'/adminwebservice', AdminWebservice),
             (r'/studentwebservice', StudentWebservice),
             (r'/', RootHandler),
         ]
@@ -62,7 +63,10 @@ class WebApplication(tornado.web.Application):
 # ----------------------------------------------------------------------------
 def admin_only(func):
     '''
-    Decorator used to restrict access to the administrator
+    Decorator used to restrict access to the administrator. For example:
+
+        @admin_only()
+        def get(self): ...
     '''
     @functools.wraps(func)
     async def wrapper(self, *args, **kwargs):
@@ -75,14 +79,14 @@ def admin_only(func):
 # ----------------------------------------------------------------------------
 class BaseHandler(tornado.web.RequestHandler):
     '''
-    Base handler. Other handlers will inherit this one.
+    Handlers should inherit this one instead of tornado.web.RequestHandler.
+    It automatically gets the user cookie, which is required to identify the
+    user in most handlers.
     '''
     @property
     def testapp(self):
-        '''
-        simplifies access to the application
-        '''
+        '''simplifies access to the application'''
         return self.application.testapp
     def get_current_user(self):
@@ -155,8 +159,8 @@ class BaseHandler(tornado.web.RequestHandler):
 class StudentWebservice(BaseHandler):
     '''
-    Receive ajax from students in the test:
-        focus, unfocus
+    Receive ajax from students in the test in response from focus, unfocus and
+    resize events.
     '''
     @tornado.web.authenticated
@@ -167,6 +171,25 @@ class StudentWebservice(BaseHandler):
         value = json.loads(self.get_body_argument('value', None))
         self.testapp.event_test(uid, cmd, value)
+
+# ----------------------------------------------------------------------------
+class AdminWebservice(BaseHandler):
+    '''
+    Receive ajax requests from admin
+    '''
+
+    @tornado.web.authenticated
+    @admin_only
+    async def get(self):
+        '''admin webservices that do not change state'''
+        cmd = self.get_query_argument('cmd')
+        if cmd == 'testcsv':
+            self.set_header('Content-Type', 'text/csv')
+            self.set_header('content-Disposition',
+                            'attachment; filename=notas.csv')
+            self.write(self.testapp.get_test_csv())
+            await self.flush()
+
 # ----------------------------------------------------------------------------
 class AdminHandler(BaseHandler):
     '''Handle /admin'''
@@ -14,35 +14,27 @@ jQuery.postJSON = function(url, args) {
 $(document).ready(function() {
     function button_handlers() {
         // button handlers (runs once)
-        $("#allow_all").click(
-            function() {
-                $(":checkbox").prop("checked", true).trigger('change');
-            }
-        );
-        $("#deny_all").click(
-            function() {
-                $(":checkbox").prop("checked", false).trigger('change');
-            }
-        );
-        $("#reset_password").click(
-            function () {
-                $.postJSON("/admin", {
-                    "cmd": "reset_password",
-                    "value": $("#reset_number").val()
-                });
-            }
-        );
-        $("#inserir_novo_aluno").click(
-            function () {
-                $.postJSON("/admin", {
-                    "cmd": "insert_student",
-                    "value": JSON.stringify({
-                        "number": $("#novo_numero").val(),
-                        "name": $("#novo_nome").val()
-                    })
-                });
-            }
-        );
+        $("#allow_all").click(function() {
+            $(":checkbox").prop("checked", true).trigger('change');
+        });
+        $("#deny_all").click(function() {
+            $(":checkbox").prop("checked", false).trigger('change');
+        });
+        $("#reset_password").click(function () {
+            $.postJSON("/admin", {
+                "cmd": "reset_password",
+                "value": $("#reset_number").val()
+            });
+        });
+        $("#inserir_novo_aluno").click(function () {
+            $.postJSON("/admin", {
+                "cmd": "insert_student",
+                "value": JSON.stringify({
+                    "number": $("#novo_numero").val(),
+                    "name": $("#novo_nome").val()
+                })
+            });
+        });
         // authorization checkboxes in the students_table:
         $("tbody", "#students_table").on("change", "input", autorizeStudent);
     }
@@ -68,24 +68,29 @@
 <div class="container-fluid">
   <div class="jumbotron">
-      <h3 id="title"></h3>
-      Ref: <span id="ref"></span><br>
-      Enunciado: <span id="filename"></span><br>
-      Base de dados: <span id="database"></span><br>
-      Testes submetidos: <span id="answers_dir"></span>
+    <h3 id="title"></h3>
+    <p>
+      Referência: <code id="ref">--</code><br>
+      Ficheiro de configuração do teste: <code id="filename">--</code><br>
+      Testes em formato JSON no directório: <code id="answers_dir">--</code><br>
+      Base de dados: <code id="database">--</code><br>
+    </p>
+    <p>
+      <a href="/adminwebservice?cmd=testcsv" class="btn btn-primary">Obter CSV com as notas</a>
+    </p>
   </div> <!-- jumbotron -->
   <table class="table table-sm table-striped" style="width:100%" id="students_table">
-      <thead class="thead thead-light">
-          <tr>
-              <th>#</th>
-              <th>Ok</th>
-              <th>Número</th>
-              <th>Nome</th>
-              <th>Estado</th>
-              <th>Nota</th>
-          </tr>
-      </thead>
+    <thead class="thead thead-light">
+      <tr>
+        <th>#</th>
+        <th>Ok</th>
+        <th>Número</th>
+        <th>Nome</th>
+        <th>Estado</th>
+        <th>Nota</th>
+      </tr>
+    </thead>
   </table>
 </div> <!-- container -->
@@ -43,11 +43,11 @@
     {% if t['state'] == 'FINISHED' %}
       <h1>Resultado:
         <strong>{{ f'{round(t["grade"], 1)}' }}</strong>
-        valores na escala de {{t['scale_min']}} a {{t['scale_max']}}.
+        valores na escala de {{t['scale'][0]}} a {{t['scale'][1]}}.
       </h1>
-      <p>O seu teste foi registado.<br>
-      Pode fechar o browser e desligar o computador.</p>
-      {% if t['grade'] - t['scale_min'] >= 0.75*(t['scale_max'] - t['scale_min']) %}
+      <p>O seu teste foi entregue e está registado.</p>
+      <p><a href="/" class="btn btn-primary btn-lg active" role="button">Clique aqui para sair do teste</a></p>
+      {% 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'] == 'QUIT' %}
@@ -78,19 +78,19 @@
             <td> <!-- progress column -->
               <div class="progress" style="height: 20px;">
                 <div class="progress-bar
-                  {% if g[1] - t['scale_min'] < 0.5*(t['scale_max'] - t['scale_min']) %}
+                  {% if g[1] - t['scale'][0] < 0.5*(t['scale'][1] - t['scale'][0]) %}
                       bg-danger
-                  {% elif g[1]  - t['scale_min'] < 0.75*(t['scale_max'] - t['scale_min']) %}
+                  {% elif g[1]  - t['scale'][0] < 0.75*(t['scale'][1] - t['scale'][0]) %}
                       bg-warning
                   {% else %}
                       bg-success
                   {% end %}
                   "
                   role="progressbar"
-                  aria-valuenow="{{ round(100*(g[1] - t['scale_min'])/(t['scale_max'] - t['scale_min'])) }}"
+                  aria-valuenow="{{ 100*(g[1] - t['scale'][0])/(t['scale'][1] - t['scale'][0]) }}"
                   aria-valuemin="0"
                   aria-valuemax="100"
-                                    style="min-width: 2em; width: {{ round(100*(g[1]-t['scale_min'])/(t['scale_max']-t['scale_min'])) }}%;"
+                                    style="min-width: 2em; width: {{ 100*(g[1]-t['scale'][0])/(t['scale'][1]-t['scale'][0]) }}%;"
                   >
                     {{ str(round(g[1], 1)) }}
@@ -42,10 +42,8 @@ class TestFactory(dict):
         # --- set test defaults and then use given configuration
         super().__init__({  # defaults
             'title': '',
-            'show_points': False,
-            'scale_points': True,
-            'scale_max': 20.0,
-            'scale_min': 0.0,
+            'show_points': True,
+            'scale': None,  # or [0, 20]
             'duration': 0,  # 0=infinite
             'autosubmit': False,
             'debug': False,
@@ -197,11 +195,12 @@ class TestFactory(dict):
     def check_grade_scaling(self):
         '''Just informs the scale limits'''
-        if self['scale_points']:
-            smin, smax = self["scale_min"], self["scale_max"]
-            logger.info('Grades will be scaled to [%g, %g]', smin, smax)
-        else:
-            logger.info('Grades are not being scaled.')
+        if 'scale_points' in self:
+            msg = ('*** DEPRECATION WARNING: *** scale_points, scale_min, '
+                   'scale_max were replaced by "scale: [min, max]".')
+            logger.warning(msg)
+            self['scale'] = [self['scale_min'], self['scale_max']]
+
     # ------------------------------------------------------------------------
     def sanity_checks(self):
@@ -254,25 +253,32 @@ class TestFactory(dict):
             test.append(question)
-        # normalize question points to scale
-        if self['scale_points']:
-            total_points = sum(q['points'] for q in test)
-            if total_points == 0:
-                logger.warning('Can\'t scale, total points in the test is 0!')
-            else:
-                scale = (self['scale_max'] - self['scale_min']) / total_points
+        # setup scale
+        total_points = sum(q['points'] for q in test)
+
+        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:
-                    question['points'] *= scale
+                    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]
         if nerr > 0:
             logger.error('%s errors found!', nerr)
+        # these will be copied to the test instance
         inherit = {'ref', 'title', 'database', 'answers_dir',
                    'questions_dir', 'files',
                    'duration', 'autosubmit',
-                   'scale_min', 'scale_max', 'show_points',
+                   'scale', 'show_points',
                    'show_ref', 'debug', }
-        # NOT INCLUDED: scale_points, testfile, allow_all, review
+        # NOT INCLUDED:  testfile, allow_all, review
         return Test({
             **{'student': student, 'questions': test},
@@ -318,6 +324,7 @@ class Test(dict):
         '''Corrects all the answers of the test and computes the final grade'''
         self['finish_time'] = datetime.now()
         self['state'] = 'FINISHED'
+
         grade = 0.0
         for question in self['questions']:
             await question.correct_async()
@@ -325,8 +332,8 @@ class Test(dict):
             logger.debug('Correcting %30s: %3g%%',
                          question["ref"], question["grade"]*100)
-        # truncate to avoid negative grade and adjust scale
-        self['grade'] = max(0.0, grade) + self['scale_min']
+        # truncate to avoid negative final grade and adjust scale
+        self['grade'] = max(0.0, grade) + self['scale'][0]
         return self['grade']
     # ------------------------------------------------------------------------
1	---	1	---
2	# ============================================================================	2	# ============================================================================
3	-# The test reference should be a unique identifier. It is saved in the database
4	-# so that queries can be done in the terminal like
5	-# sqlite3 students.db "select * from tests where ref='demo'"	3	+# Unique identifier of the test.
		4	+# Database queries can be done in the terminal with
		5	+# sqlite3 students.db "select * from tests where ref='tutorial'"
6	ref: tutorial	6	ref: tutorial
7		7
8	-# Database with student credentials and grades of all questions and tests done
9	-# The database is an sqlite3 file generate with the command initdb	8	+# Database file that includes student credentials, tests and questions grades.
		9	+# It's a sqlite3 database generated with the command 'initdb'
10	database: students.db	10	database: students.db
11		11
12	-# Directory where the tests including submitted answers and grades are stored.
13	-# The submitted tests and their corrections can be reviewed later.	12	+# Directory where the submitted and corrected test are stored for later review.
14	answers_dir: ans	13	answers_dir: ans
15		14
16	# --- optional settings: -----------------------------------------------------	15	# --- optional settings: -----------------------------------------------------
17		16
18	-# You may wish to refer the course, year or kind of test	17	+# Title of this test, e.g. course name, year or test number
19	# (default: '')	18	# (default: '')
20	title: Teste de demonstração (tutorial)	19	title: Teste de demonstração (tutorial)
21		20
22	# Duration in minutes.	21	# Duration in minutes.
23	# (0 or undefined means infinite time)	22	# (0 or undefined means infinite time)
24	duration: 2	23	duration: 2
25	-autosubmit: true
26		24
27	-# Show points for each question, scale 0-20.	25	+# Automatic test submission after the timeout 'duration'?
28	# (default: false)	26	# (default: false)
		27	+autosubmit: true
		28	+
		29	+# Show points for each question (min and max).
		30	+# (default: true)
29	show_points: true	31	show_points: true
30		32
31	-# scale final grade to the interval [scale_min, scale_max]
32	-# (default: scale to [0,20])
33	-scale_max: 20
34	-scale_min: 0
35	-scale_points: true	33	+# scale final grade to an interval, e.g. [0, 20], keeping the relative weight
		34	+# of the points declared in the questions below.
		35	+# (default: no scaling, just use question points)
		36	+scale: [0, 5]
		37	+
		38	+# DEPRECATED: old version, to be removed
		39	+# scale_max: 20
		40	+# scale_min: 0
		41	+# scale_points: true
36		42
37	# ----------------------------------------------------------------------------	43	# ----------------------------------------------------------------------------
38	# Base path applied to the questions files and all the scripts	44	# Base path applied to the questions files and all the scripts
	@@ -50,7 +56,7 @@ files:		@@ -50,7 +56,7 @@ files:
50	# The order is preserved.	56	# The order is preserved.
51	# There are several ways to define each question (explained below).	57	# There are several ways to define each question (explained below).
52	questions:	58	questions:
53	- - tut-test	59	+ - ref: tut-test
54	- tut-questions	60	- tut-questions
55		61
56	- tut-radio	62	- tut-radio
	@@ -32,7 +32,7 @@ proof of submission and for review.		@@ -32,7 +32,7 @@ proof of submission and for review.
32	'''	32	'''
33		33
34	APP_NAME = 'perguntations'	34	APP_NAME = 'perguntations'
35	-APP_VERSION = '2020.04.dev5'	35	+APP_VERSION = '2020.05.dev1'
36	APP_DESCRIPTION = __doc__	36	APP_DESCRIPTION = __doc__
37		37
38	__author__ = 'Miguel Barão'	38	__author__ = 'Miguel Barão'
	@@ -74,7 +74,7 @@ def get_logger_config(debug=False):		@@ -74,7 +74,7 @@ def get_logger_config(debug=False):
74	'formatters': {	74	'formatters': {
75	'standard': {	75	'standard': {
76	'format': '%(asctime)s %(levelname)-8s %(message)s',	76	'format': '%(asctime)s %(levelname)-8s %(message)s',
77	- 'datefmt': '%H:%M',	77	+ 'datefmt': '%H:%M:%S',
78	},	78	},
79	},	79	},
80	'handlers': {	80	'handlers': {
	@@ -14,35 +14,27 @@ jQuery.postJSON = function(url, args) {		@@ -14,35 +14,27 @@ jQuery.postJSON = function(url, args) {
14	$(document).ready(function() {	14	$(document).ready(function() {
15	function button_handlers() {	15	function button_handlers() {
16	// button handlers (runs once)	16	// button handlers (runs once)
17	- $("#allow_all").click(
18	- function() {
19	- $(":checkbox").prop("checked", true).trigger('change');
20	- }
21	- );
22	- $("#deny_all").click(
23	- function() {
24	- $(":checkbox").prop("checked", false).trigger('change');
25	- }
26	- );
27	- $("#reset_password").click(
28	- function () {
29	- $.postJSON("/admin", {
30	- "cmd": "reset_password",
31	- "value": $("#reset_number").val()
32	- });
33	- }
34	- );
35	- $("#inserir_novo_aluno").click(
36	- function () {
37	- $.postJSON("/admin", {
38	- "cmd": "insert_student",
39	- "value": JSON.stringify({
40	- "number": $("#novo_numero").val(),
41	- "name": $("#novo_nome").val()
42	- })
43	- });
44	- }
45	- );	17	+ $("#allow_all").click(function() {
		18	+ $(":checkbox").prop("checked", true).trigger('change');
		19	+ });
		20	+ $("#deny_all").click(function() {
		21	+ $(":checkbox").prop("checked", false).trigger('change');
		22	+ });
		23	+ $("#reset_password").click(function () {
		24	+ $.postJSON("/admin", {
		25	+ "cmd": "reset_password",
		26	+ "value": $("#reset_number").val()
		27	+ });
		28	+ });
		29	+ $("#inserir_novo_aluno").click(function () {
		30	+ $.postJSON("/admin", {
		31	+ "cmd": "insert_student",
		32	+ "value": JSON.stringify({
		33	+ "number": $("#novo_numero").val(),
		34	+ "name": $("#novo_nome").val()
		35	+ })
		36	+ });
		37	+ });
46	// authorization checkboxes in the students_table:	38	// authorization checkboxes in the students_table:
47	$("tbody", "#students_table").on("change", "input", autorizeStudent);	39	$("tbody", "#students_table").on("change", "input", autorizeStudent);
48	}	40	}