.env.example

@@ -1,21 +1,10 @@
 SERVER_NAME= # URL where this will be hosted.
-FLASK_DEBUG=False
 
 TZ=Europe/London # Time Zone
 
-## App Configuration
+## Flask Configuration
 SECRET_KEY= # Long, secure, secret string.
 DATA=./data/
-DATABASE_TYPE=SQLite # SQLite or MySQL, defaults to SQLite
-DATABASE_HOST= # Required if MySQL. Must match name of Docker service, or provide host if database is on an external server. Defaults to localhost.
-DATABASE_PORT= # Required if MySQL. Defaults to 3306
-
-## MySQL Database Configuration (Required if configured to MySQL Database.)
-# Note that if using the Docker service, these configuration values will also be used when creating the database in the mysql container.
-MYSQL_RANDOM_ROOT_PASSWORD=True
-MYSQL_DATABASE= # Required if MySQL.
-MYSQL_USER= # Required if MySQL
-MYSQL_PASSWORD= # Required if MySQL. Create secure password string. Note '@' character cannot be used.
 
 ## Flask Mail Configuration
 MAIL_SERVER=postfix # Must match name of the Docker service

.gitignore

@@ -153,13 +153,3 @@ database/data/
 
 # Ignore Data Dir
 **/data/*
-
-# Ignore Logs Dir
-logs/*
-
-# Ignore Certbot Dir
-certbot/*
-
-# Ignore src dir (exception for robots.txt)
-src/html/*
-src/html/robots.txt

README.md

@@ -10,7 +10,7 @@ The exam client is made with accessibility in mind, and has been designed to be
 
 ## Set Up and Installation
 
-The app is designed to be hosted on a server.
+The clien is designed to work on a server.
 
 ### Pre-Requisites
 
@@ -29,11 +29,12 @@ To set up the server, consult some of the comprehensive guides on various hostin
 Here is a [good starting point on setting up a server](https://www.digitalocean.com/community/tutorials/initial-server-setup-with-ubuntu-22-04).
 
 To install Docker and Docker Compose, consult the respective documentation:
+  - [Install on Ubuntu](https://docs.docker.com/engine/install/ubuntu/) or [Install on Debian](https://docs.docker.com/engine/install/debian/)
+  - Docker Compose should be installed as part of that.
 
-- [Install on Ubuntu](https://docs.docker.com/engine/install/ubuntu/) or [Install on Debian](https://docs.docker.com/engine/install/debian/)
+```
-- Docker Compose should be installed as part of that.
+At the time of writing, there has been an upgrade to Docker and Docker Compose, meaning the syntax below might be different between versions.
-
+```
-> At the time of writing, there has been an upgrade to Docker and Docker Compose, meaning the syntax below might be different between versions.
 
 Check if Git is installed on your server using the `git --version` command.
 If it isn't installed, install it.
@@ -57,16 +58,6 @@ Once in the destination folder, clone all the relevant files you will need for t
 
 (Remember to include the trailing dot at the end, as that indicates to Git to download the files in the current directory.)
 
-#### Choose What Database Engine You Will Use
-
-This app is designed to use an SQLite database by default.
-You can set it up to use a MySQL database by configuring the environment variables accordingly.
-If your database is being hosted remotely, make sure the MySQL database has the proper authentication for the user from a remote server.
-Alternatively, you can also use the second `docker-compose-mysql.yml` file which provides a MySQL database as part of the cluster.
-To use the second `docker-compose-mysql.yml` file, use the following command at the last step of the installation:
-
-```sudo docker compose -f docker-compose-mysql.yml up```
-
 #### Populate Environment Variables
 
 Configuration values for the app are stored in the environment variables file.
@@ -81,13 +72,13 @@ Also make sure that the various entries for usernames and passwords match.
 
 There are some values in the following four files you will need to configure to reflect the domain you are installing this app.
 
-```sh
+```
 # .env
 
 SERVER_NAME= # URL where this will be hosted.
 ```
 
-```sh
+```
 # install-script.sh
 
 domains=(example.org www.example.org)
@@ -96,7 +87,7 @@ email="" # Adding a valid address is strongly recommended
 
 Substitute the domain name `domain_name` in the two file paths in the following file:
 
-```sh
+```
 # nginx/ssl.conf
 
 ssl_certificate /etc/letsencrypt/live/domain_name/fullchain.pem;
@@ -104,9 +95,9 @@ ssl_certificate_key /etc/letsencrypt/live/domain_name/privkey.pem;
 ...
 ```
 
-And **six** locations in the following file, two for the regular version of the domain and four for the www version (remember to keep the www. prefix where present):
+And **six** locations in the following file, two for the regular version of the domain and two for the www version:
 
-```nginx
+```
 # nginx/conf.d/ref-test-app.conf
 
 server {
@@ -149,9 +140,9 @@ This will be set up automatically.
 However, there is a specific chicken-and-egg problem as the web server, Nginx, won't run without certificates, Certbot, the certificate generator, won't run without the web server.
 So to solve this, there is an automation script we can run that will set up a dummy certificate and then issue the appropriate certificates for us.
 
-```sh
+```
-chmod +x install-script.sh
+$ chmod +x install-script.sh
-sudo ./install-script.sh
+$ sudo ./install-script.sh
 ```
 
 This will take a long time to run the first time because it will try and generate a fairly sizeable cypher.

REFERENCES.md

@@ -6,6 +6,11 @@
 
 - [Docker Compose Reference](https://docs.docker.com/compose/compose-file/compose-file-v3/)
 
+### MongoDB/PyMongo
+
+- [MongoDB Shell Commands](https://docs.mongodb.com/manual/reference/)
+- [PyMongo Driver](https://pymongo.readthedocs.io/en/stable/)
+
 ## Source Code
 
 - [MongoDB Docker Image entrypoint shell script](https://github.com/docker-library/mongo/blob/master/5.0/docker-entrypoint.sh) (Context: Tried to replicate the command to create a new user in the original entrypoint script in the custom initialisation script in this app.)
@@ -18,6 +23,15 @@
 - [Tables](https://www.blog.pythonlibrary.org/2017/12/14/flask-101-adding-editing-and-displaying-data/)
 - [Tables, but interactive](https://blog.miguelgrinberg.com/post/beautiful-interactive-tables-for-your-flask-templates)
 
+## Stack Exchange/Overflow
+
+### MongoDB
+
+- [Creating MongoDB Database on Container Start](https://stackoverflow.com/questions/42912755/how-to-create-a-db-for-mongodb-container-on-start-up)
+- [Passing Environment Variables to Docker Container Entrypoint](https://stackoverflow.com/questions/64606674/how-can-i-pass-environment-variables-to-mongo-docker-entrypoint-initdb-d)
+- [Integrating Flask-Login with MongoDB](https://stackoverflow.com/questions/54992412/flask-login-usermixin-class-with-a-mongodb) (**This does not work with the app as is, and is possibly something that needs more research and development in the future**)
+- [Setting up a Postfix email notification system](https://medium.com/@vietgoeswest/a-simple-outbound-email-service-for-your-app-in-15-minutes-cc4da70a2af7)
+
 ## YouTube Tutorials
 
 ### General Flask Introduction
@@ -58,7 +72,7 @@ A much simpler and more rudimentary introduction to Flask and MongoDB.
 - [Build a User Login System with `flask-login`, `flask-wtforms`, `flask-bootstrap`, and `flask-sqlalchemy`](https://www.youtube.com/watch?v=8aTnmsDMldY)
 
 A much more robust method that uses the various Flask modules to make a more powerful framework.
-Uses SQL.
+Uses SQL rather than MongoDB.
 
 ### Flask techniques
 
@@ -66,4 +80,4 @@ Uses SQL.
 
 ### Flask handling file uploads
 
-- [Handling File Uploads](https://blog.miguelgrinberg.com/post/handling-file-uploads-with-flask)
+- [Handlin File Uploads](https://blog.miguelgrinberg.com/post/handling-file-uploads-with-flask)

certbot/.gitignore

@@ -0,0 +1,2 @@
+*
+!.gitignore

docker-compose-mysql.yml

@@ -1,90 +0,0 @@
-version: '3.9'
-
-volumes:
-  app:
-  mysql:
-
-services:
-  nginx:
-    container_name: reftest_server
-    image: nginx:alpine
-    volumes:
-      - ./certbot:/etc/letsencrypt:ro
-      - ./nginx:/etc/nginx
-      - ./src/html/certbot:/usr/share/nginx/html/certbot:ro
-      - ./src/html/robots.txt:/usr/share/nginx/html/robots.txt:ro
-      - ./ref-test/app/root:/usr/share/nginx/html/root:ro
-      - ./ref-test/app/admin/static:/usr/share/nginx/html/admin/static:ro
-      - ./ref-test/app/editor/static:/usr/share/nginx/html/editor/static:ro
-      - ./ref-test/app/quiz/static:/usr/share/nginx/html/quiz/static:ro
-      - ./ref-test/app/view/static:/usr/share/nginx/html/view/static:ro
-    ports:
-      - 80:80
-      - 443:443
-    restart: unless-stopped
-    networks:
-      - frontend
-    depends_on:
-      - app
-    command: "/bin/sh -c 'while :; do sleep 6h & wait $${!}; nginx -s reload; done & nginx -g \"daemon off;\"'"
-  
-  app:
-    container_name: reftest_app
-    image: reftest
-    build: ./ref-test
-    env_file:
-      - ./.env
-    ports:
-      - 5000
-    volumes:
-      - app:/ref-test/data
-      - ./logs:/ref-test/data/logs
-    restart: unless-stopped
-    networks:
-      - frontend
-      - backend
-    depends_on:
-      postfix:
-      mysql:
-        condition: service_healthy
-
-  postfix:
-    container_name: reftest_postfix
-    image: catatnight/postfix:latest
-    restart: unless-stopped
-    env_file:
-      - ./.env
-    ports:
-      - 25
-    networks:
-      - backend
-  
-  certbot:
-    container_name: reftest_certbot
-    image: certbot/certbot
-    volumes:
-      - ./certbot:/etc/letsencrypt
-      - ./src/html/certbot:/var/www/html
-    entrypoint: "/bin/sh -c 'trap exit TERM; while :; do certbot renew; sleep 12h & wait $${!}; done;'"
-  
-  mysql:
-    container_name: reftest_db
-    image: mysql:8.0
-    env_file:
-      - ./.env
-    volumes:
-      - mysql:/var/lib/mysql
-    ports:
-      - 3306
-    networks:
-      - backend
-    healthcheck:
-      test: ["CMD", "mysqladmin" ,"ping", "-h", "localhost"]
-      timeout: 10s
-      retries: 10
-
-networks:
-  frontend:
-    external: false
-  backend:
-    external: false

docker-compose.yml

@@ -1,7 +1,7 @@
 version: '3.9'
 
 volumes:
-  app:
+  data:
 
 services:
   nginx:
@@ -10,14 +10,11 @@ services:
     volumes:
       - ./certbot:/etc/letsencrypt:ro
       - ./nginx:/etc/nginx
-      - ./src/html/certbot:/usr/share/nginx/html/certbot:ro
+      - ./src/html:/usr/share/nginx/html/
-      - ./src/html/robots.txt:/usr/share/nginx/html/robots.txt:ro
+      - ./ref-test/app/editor/static:/usr/share/nginx/html/admin/editor/static
-      - ./ref-test/app/root:/usr/share/nginx/html/root:ro
+      - ./ref-test/app/admin/static:/usr/share/nginx/html/admin/static
-      - ./ref-test/app/admin/static:/usr/share/nginx/html/admin/static:ro
+      - ./ref-test/app/quiz/static:/usr/share/nginx/html/quiz/static
-      - ./ref-test/app/editor/static:/usr/share/nginx/html/editor/static:ro
+      - ./ref-test/app/root:/usr/share/nginx/html/root
-      - ./ref-test/app/quiz/static:/usr/share/nginx/html/quiz/static:ro
-      - ./ref-test/app/view/static:/usr/share/nginx/html/view/static:ro
-      - ./ref-test/app/analysis/static:/usr/share/nginx/html/analysis/static:ro
     ports:
       - 80:80
       - 443:443
@@ -37,8 +34,7 @@ services:
     ports:
       - 5000
     volumes:
-      - app:/ref-test/data
+      - data:/ref-test/data
-      - ./logs:/ref-test/data/logs
     restart: unless-stopped
     networks:
       - frontend
@@ -62,7 +58,7 @@ services:
     image: certbot/certbot
     volumes:
       - ./certbot:/etc/letsencrypt
-      - ./src/html/certbot:/var/www/html
+      - ./src/html:/var/www/html
     entrypoint: "/bin/sh -c 'trap exit TERM; while :; do certbot renew; sleep 12h & wait $${!}; done;'"
   
 networks:

nginx/certbot-challenge.conf

@@ -1,6 +1,6 @@
 # Certbot Renewal
 location ^~ /.well-known/acme-challenge/ {
-    root /usr/share/nginx/html/certbot;
+    root /usr/share/nginx/html;
     allow all;
     default_type "text/plain";
 }

nginx/conf.d/ref-test-app.conf

@@ -15,16 +15,10 @@ server {
     listen 443 ssl http2 default_server;
     listen [::]:443 ssl http2 default_server;
 
-    # SSL configuration
+	# SSL configuration
     include	/etc/nginx/ssl.conf;
     include	/etc/nginx/certbot-challenge.conf;
 
-    # Define locations for static files to be served by Nginx
-    location ^~ /root/ {
-        include  /etc/nginx/mime.types;
-        alias /usr/share/nginx/html/root/;
-    }
-
     location ^~ /quiz/static/  {
         include  /etc/nginx/mime.types;
         alias /usr/share/nginx/html/quiz/static/;
@@ -37,20 +31,9 @@ server {
 
     location ^~ /admin/editor/static/  {
         include  /etc/nginx/mime.types;
-        alias /usr/share/nginx/html/editor/static/;
+        alias /usr/share/nginx/html/admin/editor/static/;
     }
 
-    location ^~ /admin/view/static/  {
-        include  /etc/nginx/mime.types;
-        alias /usr/share/nginx/html/view/static/;
-    }
-
-    location ^~ /admin/analysis/static/  {
-        include  /etc/nginx/mime.types;
-        alias /usr/share/nginx/html/analysis/static/;
-    }
-
-    # Proxy to the main app for all other requests
     location / {
         include /etc/nginx/conf.d/proxy_headers.conf;
         proxy_pass http://reftest;

ref-test/.dockerignore

@@ -1,3 +1,2 @@
 env/
 __pycache__/
-data/

ref-test/Dockerfile

@@ -4,5 +4,5 @@ ENV DATA=$DATA
 WORKDIR /ref-test
 COPY . .
 RUN pip install --upgrade pip && pip install -r requirements.txt
-RUN chmod +x install.py reset.py && ./install.py
+RUN chmod +x install.py && ./install.py
 CMD [ "gunicorn", "-b", "0.0.0.0:5000", "-w", "5", "wsgi:app" ]

ref-test/app/__init__.py

@@ -1,10 +1,9 @@
 from .config import Production as Config
-from .models import *
+from .models import User
 from .extensions import bootstrap, csrf, db, login_manager, mail
-from .tools.logs import write
 
 from flask import flash, Flask, render_template, request
-from flask.helpers import abort, url_for
+from flask.helpers import url_for
 from flask.json import jsonify
 from flask_wtf.csrf import CSRFError
 from werkzeug.middleware.proxy_fix import ProxyFix
@@ -25,16 +24,13 @@ def create_app():
     login_manager.login_view = 'admin._login'
     @login_manager.user_loader
     def _load_user(id):
-        try: return User.query.filter_by(id=id).first()
+        return User.query.filter_by(id=id).first()
-        except Exception as exception:
-            write('system.log', f'Database error when loading user fo login manager: {exception}')
-            return abort(500)
 
     @app.before_request
     def _check_cookie_consent():
         if request.cookies.get('cookie_consent'):
             return
-        if any([ request.path.startswith(x) for x in [ '/admin/static/', '/root/', '/quiz/static', '/cookies/', '/admin/editor/static', '/admin/view/static' ] ]):
+        if any([ request.path.startswith(x) for x in [ '/admin/static/', '/root/', '/quiz/static', '/cookies/', '/admin/editor/static' ] ]):
             return
         flash(f'<strong>Cookie Consent</strong>: This web site only stores minimal, functional cookies. It does not store any tracking information. By using this site, you consent to this use of cookies. For more information, see our <a href="{url_for("views._privacy")}">privacy policy</a>.', 'cookie_alert')
 
@@ -50,21 +46,11 @@ def create_app():
     from .quiz.views import quiz
     from .views import views
     from .editor.views import editor
-    from .view.views import view
-    from .analysis.views import analysis
 
     app.register_blueprint(admin, url_prefix='/admin')
     app.register_blueprint(api, url_prefix='/api')
     app.register_blueprint(views)
     app.register_blueprint(quiz)
     app.register_blueprint(editor, url_prefix='/admin/editor')
-    app.register_blueprint(view, url_prefix='/admin/view')
-    app.register_blueprint(analysis, url_prefix='/admin/analysis')
-
-    """Create Database Tables before First Request"""
-    @app.before_first_request
-    def _create_database_tables():
-        with app.app_context():
-            db.create_all()
     
     return app

ref-test/app/admin/static/js/script.js

@@ -1,25 +1,25 @@
 // Menu Highlight Scripts
-const menuItems = document.getElementsByClassName('nav-link')
+const menuItems = document.getElementsByClassName('nav-link');
 for(let i = 0; i < menuItems.length; i++) {
     if(menuItems[i].pathname == window.location.pathname) {
-        menuItems[i].classList.add('active')
+        menuItems[i].classList.add('active');
     }
 }
-const dropdownItems = document.getElementsByClassName('dropdown-item')
+const dropdownItems = document.getElementsByClassName('dropdown-item');
 for(let i = 0; i< dropdownItems.length; i++) {
     if(dropdownItems[i].pathname == window.location.pathname) {
-        dropdownItems[i].classList.add('active')
+        dropdownItems[i].classList.add('active');
-        $( "#" + dropdownItems[i].id ).closest( '.dropdown' ).find('.dropdown-toggle').addClass('active')
+        $( "#" + dropdownItems[i].id ).closest( '.dropdown' ).find('.dropdown-toggle').addClass('active');
     }
 }
 
 // General Post Method Form Processing Script
 $('form.form-post').submit(function(event) {
     
-    var $form = $(this)
+    var $form = $(this);
-    var data = $form.serialize()
+    var data = $form.serialize();
-    var url = $(this).prop('action')
+    var url = $(this).prop('action');
-    var rel_success = $(this).data('rel-success')
+    var rel_success = $(this).data('rel-success');
 
     $.ajax({
         url: url,
@@ -28,25 +28,25 @@ $('form.form-post').submit(function(event) {
         dataType: 'json',
         success: function(response) {
             if (response.redirect_to) {
-                window.location.href = response.redirect_to
+                window.location.href = response.redirect_to;
             }
             else {
-                window.location.href = rel_success
+                window.location.href = rel_success;
             }
         },
         error: function(response) {
-            error_response(response)
+            error_response(response);
         }
-    })
+    });
 
-    event.preventDefault()
+    event.preventDefault();
-})
+});
 
 // Form Upload Questions - Special case, needs to handle files.
 $('form[name=form-upload-questions]').submit(function(event) {
     
-    var $form = $(this)
+    var $form = $(this);
-    var data = new FormData($form[0])
+    var data = new FormData($form[0]);
     var file = $('input[name=data_file]')[0].files[0]
     data.append('file', file)
 
@@ -57,21 +57,21 @@ $('form[name=form-upload-questions]').submit(function(event) {
         processData: false,
         contentType: false,
         success: function(response) {
-            window.location.reload()
+            window.location.reload();
         },
         error: function(response) {
-            error_response(response)
+            error_response(response);
         }
-    })
+    });
 
-    event.preventDefault()
+    event.preventDefault();
-})
+});
 
 // Edit and Delete Test Button Handlers
 $('.test-action').click(function(event) {
     
-    let id = $(this).data('id')
+    let id = $(this).data('id');
-    let action = $(this).data('action')
+    let action = $(this).data('action');
 
     if (action == 'delete' || action == 'start' || action == 'end') {
         $.ajax({
@@ -80,38 +80,25 @@ $('.test-action').click(function(event) {
             data: JSON.stringify({'id': id, 'action': action}),
             contentType: 'application/json',
             success: function(response) {
-                window.location.href = '/admin/tests/'
+                window.location.href = '/admin/tests/';
             },
             error: function(response){
-                error_response(response)
+                error_response(response);
             },
-        })
+        });
     } else if (action == 'edit') {
         window.location.href = `/admin/test/${id}/`
-    } else if (action == 'analyse') {
-        $.ajax({
-            url: `/admin/analysis/`,
-            type: 'POST',
-            data: JSON.stringify({'id': id, 'class': 'test'}),
-            contentType: 'application/json',
-            success: function(response) {
-                window.location.href = response
-            },
-            error: function(response){
-                error_response(response)
-            },
-        })
     }
 
-    event.preventDefault()
+    event.preventDefault();
-})
+});
 
 // Edit Dataset Button Handlers
 $('.edit-question-dataset').click(function(event) {
     
-    var id = $(this).data('id')
+    var id = $(this).data('id');
-    var action = $(this).data('action')
+    var action = $(this).data('action');
-    var disabled = $(this).hasClass('disabled')
+    var disabled = $(this).hasClass('disabled');
 
     if ( !disabled ) {
         if (action == 'delete') {
@@ -124,40 +111,25 @@ $('.edit-question-dataset').click(function(event) {
                 }),
                 contentType: 'application/json',
                 success: function(response) {
-                    window.location.reload()
+                    window.location.reload();
                 },
                 error: function(response){
-                    error_response(response)
+                    error_response(response);
                 },
-            })
+            });
         } else if (action == 'edit') {
             window.location.href = `/admin/editor/${id}/`
-        } else if (action == 'view') {
-            window.location.href = `/admin/view/${id}`
         } else if (action == 'download') {
             window.location.href = `/admin/settings/questions/download/${id}/`
-        } else if (action == 'analyse') {
-            $.ajax({
-                url: `/admin/analysis/`,
-                type: 'POST',
-                data: JSON.stringify({'id': id, 'class': 'dataset'}),
-                contentType: 'application/json',
-                success: function(response) {
-                    window.location.href = response
-                },
-                error: function(response){
-                    error_response(response)
-                },
-            })
         }
-    }
+    };
-    event.preventDefault()
+    event.preventDefault();
-})
+});
 
 function error_response(response) {
 
-    const $alert = $("#alert-box")
+    const $alert = $("#alert-box");
-    $alert.html('')
+    $alert.html('');
 
     if (typeof response.responseJSON.error === 'string' || response.responseJSON.error instanceof String) {
         $alert.html(`
@@ -166,18 +138,18 @@ function error_response(response) {
             ${response.responseJSON.error}
             <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
         </div>
-        `)
+        `);
     } else if (response.responseJSON.error instanceof Array) {
         var output = ''
-        for (let i = 0; i < response.responseJSON.error.length; i ++) {
+        for (var i = 0; i < response.responseJSON.error.length; i ++) {
             output += `
             <div class="alert alert-danger alert-dismissible fade show" role="alert">
                 <i class="bi bi-exclamation-triangle-fill" title="Danger"></i>
                 ${response.responseJSON.error[i]}
                 <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
             </div>
-            `
+            `;
-            $alert.html(output)
+            $alert.html(output);
         }
     }
 
@@ -195,20 +167,20 @@ $('#dismiss-cookie-alert').click(function(event){
         },
         dataType: 'json',
         success: function(response){
-            console.log(response)
+            console.log(response);
         },
         error: function(response){
-            console.log(response)
+            console.log(response);
         }
     })
 
-    event.preventDefault()
+    event.preventDefault();
 })
 
 // Script for Result Actions
 $('.result-action-buttons').click(function(event){
 
-    var id = $(this).data('id')
+    var id = $(this).data('id');
 
     if ($(this).data('result-action') == 'generate') {
         $.ajax({
@@ -218,13 +190,13 @@ $('.result-action-buttons').click(function(event){
             contentType: 'application/json',
             dataType: 'html',
             success: function(response) {
-                var display_window = window.open()
+                var display_window = window.open();
-                display_window.document.write(response)
+                display_window.document.write(response);
             },
             error: function(response){
-                error_response(response)
+                error_response(response);
             },
-        })
+        });
     } else {
         var action = $(this).data('result-action')
         $.ajax({
@@ -234,23 +206,23 @@ $('.result-action-buttons').click(function(event){
             contentType: 'application/json',
             success: function(response) {
                 if (action == 'delete') {
-                    window.location.href = '/admin/results/'
+                    window.location.href = '/admin/results/';
-                } else window.location.reload()
+                } else window.location.reload();
             },
             error: function(response){
-                error_response(response)
+                error_response(response);
             },
-        })
+        });
     }
 
-    event.preventDefault()
+    event.preventDefault();
-})
+});
 
 // Script for Deleting Time Adjustment
 $('.adjustment-delete').click(function(event){
 
-    var user_code = $(this).data('user_code')
+    var user_code = $(this).data('user_code');
-    var location = window.location.href
+    var location = window.location.href;
     location = location.replace('#', '')
 
     $.ajax({
@@ -259,19 +231,12 @@ $('.adjustment-delete').click(function(event){
         data: JSON.stringify({'user_code': user_code}),
         contentType: 'application/json',
         success: function(response) {
-            window.location.reload()
+            window.location.reload();
         },
         error: function(response){
-            error_response(response)
+            error_response(response);
         },
-    })
+    });
     
-    event.preventDefault()
+    event.preventDefault();
-})
+});
-
-// Detailed Results view questions
-$('.view-full-questions').click(function(event) {
-    var dataset = $(this).data('dataset')
-    window.open(`/admin/view/${dataset}`, '_blank')
-    event.preventDefault()
-})

ref-test/app/admin/templates/admin/components/certificate.html

@@ -50,7 +50,7 @@
                         <div class="d-flex w-100 justify-content-between">
                             <h5 class="mb-1">Start Time</h5>
                         </div>
-                        {{ entry.start_time.strftime('%d %b %Y %H:%M:%S') if entry.start_time else None }}
+                        {{ entry.start_time.strftime('%d %b %Y %H:%M:%S') }}
                     </li>
                     <li class="list-group-item list-group-item-action">
                         <div class="d-flex w-100 justify-content-between">
@@ -59,7 +59,7 @@
                                 <span class="badge bg-danger">Late</span>
                             {% endif %}
                         </div>
-                        {{ entry.end_time.strftime('%d %b %Y %H:%M:%S') if entry.end_time else None }}
+                        {{ entry.end_time.strftime('%d %b %Y %H:%M:%S') }}
                     </li>       
                     <li class="list-group-item list-group-item-action">
                         <div class="d-flex w-100 justify-content-between">

ref-test/app/admin/templates/admin/components/footer.html

@@ -1,2 +1,2 @@
-<p>This web app was developed and is maintained by Vivek Santayana. The source code for the web app, excluding any data pertaining to the questions in the quiz, is freely available at <a href="https://git.vsnt.uk/viveksantayana/ska-referee-test">Vivek&rsquo;s personal GIT repository</a> under an MIT License.</p>
+<p>This web app was developed by Vivek Santayana. The source code for the web app, excluding any data pertaining to the questions in the quiz, is freely available at <a href="https://git.vsnt.uk/viveksantayana/ska-referee-test">Vivek&rsquo;s personal GIT repository</a> under an MIT License.</p>
 <p>All questions in the test are &copy; The Scottish Korfball Association {{ now.year }}. All rights are reserved.</p>

ref-test/app/admin/templates/admin/components/navbar.html

@@ -1,6 +1,6 @@
 <nav class="navbar fixed-top navbar-expand-md navbar-dark bg-dark">
     <div class="container">
-        <a href="{{ url_for('admin._home') }}" class="navbar-brand mb-0 h1">RefTest | Admin</a>
+        <a href="{{ url_for('admin._home') }}" class="navbar-brand mb-0 h1">RefTest (Beta) | Admin</a>
         <button
             class="navbar-toggler"
             type="button"
@@ -20,28 +20,8 @@
                     </li>
                 {% endif %}
                 {% if current_user.is_authenticated %}
-                    <li class="nav-item dropdown" id="nav-results">
+                    <li class="nav-item" id="nav-results">
-                        <a
+                        <a href="{{ url_for('admin._view_entries') }}" id="link-results" class="nav-link">View Results</a>
-                            class="nav-link dropdown-toggle"
-                            id="dropdown-results"
-                            role="button"
-                            href="{{ url_for('admin._view_entries') }}"
-                            data-bs-toggle="dropdown"
-                            aria-expanded="false"
-                        >
-                            Results
-                        </a>
-                        <ul
-                            class="dropdown-menu"
-                            aria-labelledby="dropdown-results"
-                        >
-                            <li>
-                                <a href="{{ url_for('admin._view_entries', filter='active') }}" id="link-results" class="dropdown-item">View Results</a>
-                            </li>
-                            <li>
-                                <a href="{{ url_for('analysis._analysis') }}" id="link-analysis" class="dropdown-item">Analysis</a>
-                            </li>
-                        </ul>
                     </li>
                     <li class="nav-item dropdown" id="nav-tests">
                         <a
@@ -56,7 +36,7 @@
                         </a>
                         <ul
                             class="dropdown-menu"
-                            aria-labelledby="dropdown-tests"
+                            aria-labelledby="dropdown-settings"
                         >
                             <li>
                                 <a href="{{ url_for('admin._tests', filter='active') }}" id="link-active" class="dropdown-item">Active</a>
@@ -78,7 +58,7 @@
                     <li class="nav-item dropdown" id="nav-settings">
                         <a
                             class="nav-link dropdown-toggle"
-                            id="dropdown-settings"
+                            id="dropdown-account"
                             role="button"
                             href="{{ url_for('admin._settings') }}"
                             data-bs-toggle="dropdown"
@@ -97,13 +77,10 @@
                                 <a href="{{ url_for('admin._users') }}" id="link-users" class="dropdown-item">Users</a>
                             </li>
                             <li>
-                                <a href="{{ url_for('admin._questions') }}" id="link-questions" class="dropdown-item">Manage Questions</a>
+                                <a href="{{ url_for('admin._questions') }}" id="link-questions" class="dropdown-item">Question Datasets</a>
                             </li>
                             <li>
-                                <a href="{{ url_for('view._view') }}" id="link-editor" class="dropdown-item">View Questions</a>
+                                <a href="{{ url_for('editor._editor') }}" id="link-editor" class="dropdown-item">Question Editor</a>
-                            </li>
-                            <li>
-                                <a href="{{ url_for('editor._editor') }}" id="link-editor" class="dropdown-item">Edit Questions</a>
                             </li>
                         </ul>
                     </li>

ref-test/app/admin/templates/admin/index.html

@@ -28,7 +28,7 @@
                                                     <a href="{{ url_for('admin._view_test', id=test.id) }}">{{ test.get_code() }}</a>
                                                 </td>
                                                 <td>
-                                                    {{ test.end_date.strftime('%d %b %Y') if test.end_date else None }}
+                                                    {{ test.end_date.strftime('%d %b %Y') }}
                                                 </td>
                                             </tr>
                                         {% endfor %}
@@ -72,14 +72,10 @@
                                                     <a href="{{ url_for('admin._view_entry', id=result.id) }}">{{ result.get_surname() }}, {{ result.get_first_name() }}</a>
                                                 </td>
                                                 <td>
-                                                    {{ result.end_time.strftime('%d %b %Y %H:%M') if result.end_time else None }}
+                                                    {{ result.end_time.strftime('%d %b %Y %H:%M') }}
                                                 </td>
                                                 <td>
-                                                    {% if result.result %}
+                                                    {{ (100*result.result['score']/result.result['max'])|round|int }}&percnt; ({{ result.result.grade }})
-                                                        {{ (100*result.result['score']/result.result['max'])|round|int }}&percnt; ({{ result.result.grade }})
-                                                    {% else %}
-                                                        Incomplete
-                                                    {% endif %}
                                                 </td>
                                             </tr>
                                         {% endfor %}
@@ -121,7 +117,7 @@
                                                         <a href="{{ url_for('admin._view_test', id=test.id) }}">{{ test.get_code() }}</a>
                                                     </td>
                                                     <td>
-                                                        {{ test.end_date.strftime('%d %b %Y') if test.end_date else None }}
+                                                        {{ test.end_date.strftime('%d %b %Y') }}
                                                     </td>
                                                 </tr>
                                             {% endfor %}
@@ -142,7 +138,7 @@
                 <div class="card m-3">
                     <div class="card-body">
                         <h5 class="card-title">Help</h5>
-                        <p class="card-text">This web app was developed and is maintained by Vivek Santayana. If there are any issues with the app, any bugs you need to report, or any features you would like to request, please feel free to <a href="https://git.vsnt.uk/viveksantayana/ska-referee-test/issues">open an issue at the Git Repository</a>.</p>
+                        <p class="card-text">This web app was developed by Vivek Santayana. If there are any issues with the app, any bugs you need to report, or any features you would like to request, please feel free to <a href="https://git.vsnt.uk/viveksantayana/ska-referee-test/issues">open an issue at the Git Repository</a>.</p>
                         <a href="https://git.vsnt.uk/viveksantayana/ska-referee-test/issues" class="btn btn-primary">Open an Issue</a>
                     </div>
                   </div>

ref-test/app/admin/templates/admin/result-detail.html

@@ -49,7 +49,7 @@
                             <div class="d-flex w-100 justify-content-between">
                                 <h5 class="mb-1">Start Time</h5>
                             </div>
-                            {{ entry.start_time.strftime('%d %b %Y %H:%M:%S') if entry.start_time else None }}
+                            {{ entry.start_time.strftime('%d %b %Y %H:%M:%S') }}
                         </li>
                     {% endif %}
                     <li class="list-group-item list-group-item-action">
@@ -108,13 +108,13 @@
                                             {% for tag, scores in entry.result.tags.items() %}
                                                 <tr>
                                                     <td>
-                                                        {{ tag|safe }}
+                                                        {{ tag }}
                                                     </td>
                                                     <td>
                                                         {{ scores.scored }}
                                                     </td>
                                                     <td>
-                                                        {{ scores.max }}
+                                                        {{scores.max}}
                                                     </td>
                                                 </tr>
                                             {% endfor %}
@@ -131,7 +131,6 @@
                             </h2>
                         <div id="by-question-breakdown" class="accordion-collapse collapse" aria-labelledby="by-question" data-bs-parent="#results-breakdown">
                             <div class="accordion-body">
-                                <a class="view-full-questions" data-dataset="{{ entry.test.dataset.id }}">View Questions</a>
                                 <table class="table table-striped">
                                         <thead>
                                             <tr>
@@ -147,7 +146,7 @@
                                             {% for question, answer in entry.answers.items() %}
                                                 <tr>
                                                     <td>
-                                                        {{ question|int + 1 }}
+                                                        {{ question }}
                                                     </td>
                                                     <td>
                                                         {{ answers[question|int][answer|int] }}

ref-test/app/admin/templates/admin/results.html

@@ -54,7 +54,7 @@
                         </td>
                         <td>
                             {% if entry.end_time %}
-                                {{ entry.end_time.strftime('%Y-%m-%d %H:%M') }}
+                                {{ entry.end_time.strftime('%d %b %Y') }}
                             {% endif %}
                         </td>
                         <td>

ref-test/app/admin/templates/admin/settings/questions.html

@@ -43,7 +43,7 @@
                             {{ element.get_name() }}
                         </td>
                         <td>
-                            {{ element.date.strftime('%Y-%m-%d %H:%M') }}
+                            {{ element.date.strftime('%d %b %Y %H:%M') }}
                         </td>
                         <td>
                             {{ element.creator.get_username() }}
@@ -52,51 +52,33 @@
                             {{ element.tests|length }}
                         </td>
                         <td class="row-actions">
-                            <a
-                                href="javascript:void(0)"
-                                class="btn btn-success edit-question-dataset {% if not element.entries %} disabled {% endif %}"
-                                data-id="{{ element.id }}"
-                                data-action="analyse"
-                                title="Analyse Answers"
-                            >
-                                <i class="bi bi-search button-icon"></i>
-                            </a>
                             <a
                                 href="javascript:void(0)"
                                 class="btn btn-primary edit-question-dataset"
                                 data-id="{{ element.id }}"
                                 data-action="download"
-                                title="Download Questions"
+                                title="Download Dataset"
                             >
                                 <i class="bi bi-cloud-arrow-down-fill button-icon"></i>
-                            </a>
+                            </button>
-                            <a
-                                href="javascript:void(0)"
-                                class="btn btn-primary edit-question-dataset"
-                                data-id="{{ element.id }}"
-                                data-action="view"
-                                title="View Questions"
-                            >
-                                <i class="bi bi-file-earmark-text-fill button-icon"></i>
-                            </a>
                             <a
                                 href="javascript:void(0)"
                                 class="btn btn-primary edit-question-dataset"
                                 data-id="{{ element.id }}"
                                 data-action="edit"
-                                title="Edit Questions"
+                                title="Edit Dataset"
                             >
-                                <i class="bi bi-pencil-fill button-icon"></i>
+                                <i class="bi bi-file-earmark-text-fill button-icon"></i>
-                            </a>
+                            </button>
                             <a
                                 href="javascript:void(0)"
                                 class="btn btn-danger edit-question-dataset {% if element.default %}disabled{% endif %}"
                                 data-id="{{ element.id }}"
                                 data-action="delete"
-                                title="Delete Questions"
+                                title="Delete Dataset"
                             >
                                 <i class="bi bi-file-earmark-excel-fill button-icon"></i>
-                            </a>
+                            </button>
                         </td>
                     </tr>
                 {% endfor %}

ref-test/app/admin/templates/admin/test.html

@@ -19,7 +19,7 @@
                         <div class="d-flex w-100 justify-content-between">
                             <h5 class="mb-1">Dataset</h5>
                         </div>
-                        <a href="{{ url_for('view._view_console', id=test.dataset.id) }}">{{ test.dataset.get_name() }}</a>
+                        {{ test.dataset.date.strftime('%Y%m%d%H%M%S') }}
                     </li>
                     <li class="list-group-item list-group-item-action">
                         <div class="d-flex w-100 justify-content-between">
@@ -32,13 +32,13 @@
                         <div class="d-flex w-100 justify-content-between">
                             <h5 class="mb-1">Start Date</h5>
                         </div>
-                        {{ test.start_date.strftime('%d %b %Y %H:%M') if test.start_date else None }}
+                        {{ test.start_date.strftime('%d %b %Y %H:%M') }}
                     </li>
                     <li class="list-group-item list-group-item-action">
                         <div class="d-flex w-100 justify-content-between">
                             <h5 class="mb-1">Expiry Date</h5>
                         </div>
-                        {{ test.end_date.strftime('%d %b %Y %H:%M') if test.end_date else None }}
+                        {{ test.end_date.strftime('%d %b %Y %H:%M') }}
                     </li>
                     <li class="list-group-item list-group-item-action">
                         <div class="d-flex w-100 justify-content-between">
@@ -71,7 +71,7 @@
                                                 {% for entry in test.entries %}
                                                     <tr>
                                                         <td>
-                                                            <a href="{{ url_for('admin._view_entry', id=entry.id) }}" >Entry {{ loop.index }}</a>
+                                                            <a href="{{ url_for('admin._view_entry', id=entry) }}" >Entry {{ loop.index }}</a>
                                                         </td>
                                                     </tr>
                                                 {% endfor %}
@@ -162,7 +162,7 @@
                     {% include "admin/components/client-alerts.html" %}
                 </div>
                 <div class="container justify-content-center">
-                    <div class="my-3 row">
+                    <div class="row">
                         {% if test.start_date <= now %}
                             <a href="#" class="btn btn-warning test-action {% if test.end_date < now %}disabled{% endif %}" data-action="end" data-id="{{ test.id }}">
                                 <i class="bi bi-hourglass-bottom button-icon"></i>
@@ -174,16 +174,6 @@
                                 Start Exam
                             </a>
                         {% endif %}
-                        <a
-                            href="#"
-                            class="btn btn-success test-analyse test-action {% if not test.entries %} disabled {% endif %}"
-                            data-id="{{test.id}}"
-                            title="Analyse Exam"
-                            data-action="analyse"
-                        >
-                            <i class="bi bi-search button-icon"></i>
-                            Analyse Exam
-                        </a>
                         <a href="#" class="btn btn-danger test-action" data-action="delete" data-id="{{ test.id }}">
                             <i class="bi bi-file-earmark-excel-fill button-icon"></i>
                             Delete Exam

ref-test/app/admin/templates/admin/tests.html

@@ -33,13 +33,13 @@
                 {% for test in tests %}
                     <tr class="table-row">
                         <td>
-                            {{ test.start_date.strftime('%Y-%m-%d %H:%M') }}
+                            {{ test.start_date.strftime('%d %b %y %H:%M') }}
                         </td>
                         <td>
                             {{ test.get_code() }}
                         </td>
                         <td>
-                            {{ test.end_date.strftime('%Y-%m-%d %H:%M') }}
+                            {{ test.end_date.strftime('%d %b %Y %H:%M') }}
                         </td>
                         <td>
                             {% if test.time_limit == None -%}
@@ -58,15 +58,6 @@
                             {{ test.entries|length }}
                         </td>
                         <td class="row-actions">
-                            <a
-                                href="#"
-                                class="btn btn-success test-analyse test-action {% if not test.entries %} disabled {% endif %}"
-                                data-id="{{test.id}}"
-                                title="Analyse Exam"
-                                data-action="analyse"
-                            >
-                                <i class="bi bi-search button-icon"></i>
-                            </a>
                             <a
                                 href="#"
                                 class="btn btn-primary test-action"

ref-test/app/admin/views.py

@@ -1,16 +1,15 @@
 from ..forms.admin import AddTimeAdjustment, CreateTest, CreateUser, DeleteUser, Login, Register, ResetPassword, UpdatePassword, UpdateUser, UploadData
 from ..models import Dataset, Entry, Test, User
 from ..tools.auth import disable_if_logged_in, require_account_creation
-from ..tools.data import check_dataset_exists, check_is_json, validate_json
 from ..tools.forms import get_dataset_choices, get_time_options, send_errors_to_client
-from ..tools.logs import write
+from ..tools.data import check_is_json, validate_json
 from ..tools.test import  answer_options, get_correct_answers
 
-from flask import abort, Blueprint, jsonify, render_template, request, send_file, session
+from flask import abort, Blueprint, jsonify, render_template, redirect, request, send_file, session
-from flask.helpers import abort, flash, redirect, url_for
+from flask.helpers import flash, url_for
 from flask_login import current_user, login_required
 
-from datetime import date, datetime, MINYEAR, timedelta
+from datetime import date, datetime, timedelta
 from json import loads
 from os import path
 import secrets
@@ -27,29 +26,21 @@ admin = Blueprint(
 @admin.route('/dashboard/')
 @login_required
 def _home():
-    try:
+    tests = Test.query.all()
-        tests = Test.query.all()
+    results = Entry.query.all()
-        results = Entry.query.all()
-    except Exception as exception:
-        write('system.log', f'Database error when processing request \'{request.url}\': {exception}')
-        return abort(500)
     current_tests = [ test for test in tests if test.end_date >= datetime.now() and test.start_date.date() <= date.today() ]
-    current_tests.sort(key= lambda x: x.end_date or datetime(MINYEAR,1,1), reverse=True)
+    current_tests.sort(key= lambda x: x.end_date, reverse=True)
     upcoming_tests = [ test for test in tests if test.start_date.date() > datetime.now().date()]
-    upcoming_tests.sort(key= lambda x: x.start_date or datetime(MINYEAR,1,1))
+    upcoming_tests.sort(key= lambda x: x.start_date)
     recent_results = [result for result in results if not result.status == 'started' ]
-    recent_results.sort(key= lambda x: x.end_time or datetime(MINYEAR,1,1), reverse=True)
+    recent_results.sort(key= lambda x: x.end_time, reverse=True)
     return render_template('/admin/index.html', current_tests = current_tests, upcomimg_tests = upcoming_tests, recent_results = recent_results)
 
 @admin.route('/settings/')
 @login_required
 def _settings():
-    try:
+    users = User.query.all()
-        users = User.query.all()
+    datasets = Dataset.query.all()
-        datasets = Dataset.query.all()
-    except Exception as exception:
-        write('system.log', f'Database error when processing request \'{request.url}\': {exception}')
-        return abort(500)
     return render_template('/admin/settings/index.html', users=users, datasets=datasets)
 
 @admin.route('/login/', methods=['GET','POST'])
@@ -59,10 +50,7 @@ def _login():
     form = Login()
     if request.method == 'POST':
         if form.validate_on_submit():
-            try: users = User.query.all()
+            users = User.query.all()
-            except Exception as exception:
-                write('system.log', f'Database error when processing request \'{request.url}\': {exception}')
-                return abort(500)
             user = None
             for _user in users:
                 if _user.get_username() == request.form.get('username').lower():
@@ -111,10 +99,7 @@ def _reset():
     if request.method == 'POST':
         if form.validate_on_submit():
             user = None
-            try: users = User.query.all()
+            users = User.query.all()
-            except Exception as exception:
-                write('system.log', f'Database error when processing request \'{request.url}\': {exception}')
-                return abort(500)
             for _user in users:
                 if _user.get_username() == request.form.get('username'):
                     user = _user
@@ -126,10 +111,7 @@ def _reset():
     
     token = request.args.get('token')
     if token:
-        try: user = User.query.filter_by(reset_token=token).first()
+        user = User.query.filter_by(reset_token=token).first()
-        except Exception as exception:
-            write('system.log', f'Database error when processing request \'{request.url}\': {exception}')
-            return abort(500)
         if not user: return redirect(url_for('admin._reset'))
         verification_token = user.verification_token
         user.clear_reset_tokens()
@@ -146,10 +128,7 @@ def _update_password():
     form = UpdatePassword()
     if form.validate_on_submit():
         user = session.pop('user')
-        try: user = User.query.filter_by(id=user).first()
+        user = User.query.filter_by(id=user).first()
-        except Exception as exception:
-            write('system.log', f'Database error when processing request \'{request.url}\': {exception}')
-            return abort(500)
         user.update(password=request.form.get('password'))
         session['remembered_username'] = user.get_username()
         flash('Your password has been reset.', 'success')
@@ -160,10 +139,7 @@ def _update_password():
 @login_required
 def _users():
     form = CreateUser()
-    try: users = User.query.all()
+    users = User.query.all()
-    except Exception as exception:
-        write('system.log', f'Database error when processing request \'{request.url}\': {exception}')
-        return abort(500)
     if request.method == 'POST':
         if form.validate_on_submit():
             password = request.form.get('password')
@@ -180,10 +156,7 @@ def _users():
 @admin.route('/settings/users/delete/<string:id>', methods=['GET', 'POST'])
 @login_required
 def _delete_user(id:str):
-    try: user = User.query.filter_by(id=id).first()
+    user = User.query.filter_by(id=id).first()
-    except Exception as exception:
-        write('system.log', f'Database error when processing request \'{request.url}\': {exception}')
-        return abort(500)
     form = DeleteUser()
     if request.method == 'POST': 
         if not user: return jsonify({'error': 'User does not exist.'}), 400
@@ -207,15 +180,12 @@ def _delete_user(id:str):
 @admin.route('/settings/users/update/<string:id>', methods=['GET', 'POST'])
 @login_required
 def _update_user(id:str):
-    try: user = User.query.filter_by(id=id).first()
+    user = User.query.filter_by(id=id).first()
-    except Exception as exception:
-        write('system.log', f'Database error when processing request \'{request.url}\': {exception}')
-        return abort(500)
     form = UpdateUser()
     if request.method == 'POST': 
         if not user: return jsonify({'error': 'User does not exist.'}), 400
         if form.validate_on_submit():
-            if not current_user.verify_password(request.form.get('confirm_password')): return jsonify({'error': 'Invalid password for your account.'}), 401
+            if not user.verify_password(request.form.get('confirm_password')): return jsonify({'error': 'Invalid password for your account.'}), 401
             success, message = user.update(
                 password = request.form.get('password'),
                 email = request.form.get('email'),
@@ -251,10 +221,8 @@ def _questions():
             if success: return jsonify({'success': message}), 200
             return jsonify({'error': message}), 400
         return send_errors_to_client(form=form)
-    try: data = Dataset.query.all()
+
-    except Exception as exception:
+    data = Dataset.query.all()
-        write('system.log', f'Database error when processing request \'{request.url}\': {exception}')
-        return abort(500)
     return render_template('/admin/settings/questions.html', form=form, data=data)
 
 @admin.route('/settings/questions/delete/', methods=['POST'])
@@ -263,10 +231,7 @@ def _edit_questions():
     id = request.get_json()['id']
     action = request.get_json()['action']
     if not action == 'delete': return jsonify({'error': 'Invalid action.'}), 400
-    try: dataset = Dataset.query.filter_by(id=id).first()
+    dataset = Dataset.query.filter_by(id=id).first()
-    except Exception as exception:
-        write('system.log', f'Database error when processing request \'{request.url}\': {exception}')
-        return abort(500)
     if action == 'delete': success, message = dataset.delete()
     if success: return jsonify({'success': message}), 200
     return jsonify({'error': message}), 400
@@ -274,26 +239,23 @@ def _edit_questions():
 @admin.route('/settings/questions/download/<string:id>/')
 @login_required
 def _download(id:str):
-    try: dataset = Dataset.query.filter_by(id=id).first()
+    dataset = Dataset.query.filter_by(id=id).first()
-    except Exception as exception:
-        write('system.log', f'Database error when processing request \'{request.url}\': {exception}')
-        return abort(500)
     if not dataset: return abort(404)
     data_path = path.abspath(dataset.get_file())
-    return send_file(data_path, as_attachment=True, download_name=f'{dataset.get_name()}.json')
+    return send_file(data_path, as_attachment=True, attachment_filename=f'{dataset.get_name()}.json')
 
 @admin.route('/tests/<string:filter>/', methods=['GET'])
 @admin.route('/tests/', methods=['GET'])
 @login_required
-@check_dataset_exists
 def _tests(filter:str=None):
+    datasets = Dataset.query.all()
     tests = None
-    try: _tests = Test.query.all()
+    _tests = Test.query.all()
-    except Exception as exception:
-        write('system.log', f'Database error when processing request \'{request.url}\': {exception}')
-        return abort(500)
     form = None
     now = datetime.now()
+    if not datasets:
+        flash('There are no available question datasets. Please upload a question dataset in order to set up an exam.', 'error')
+        return redirect(url_for('admin._questions'))
     if filter not in ['create','active','scheduled','expired','all']: return redirect(url_for('admin._tests', filter='active'))
     if filter == 'create':
         form = CreateTest()
@@ -308,7 +270,7 @@ def _tests(filter:str=None):
     if filter in [None, '', 'active']:
         tests = [ test for test in _tests if test.end_date >= now and test.start_date <= now ]
         display_title = 'Active Exams'
-        error_none = 'There are no exams that are currently active. You can create one using the Create Exam form.'
+        error_none = 'There are no exams that are currently active. You can create one using the Creat Exam form.'
     if filter == 'expired':
         tests = [ test for test in _tests if test.end_date < now ]
         display_title = 'Expired Exams'
@@ -337,10 +299,7 @@ def _create_test():
         new_test.end_date = datetime.strptime(new_test.end_date, '%Y-%m-%dT%H:%M')
         new_test.time_limit = None if request.form.get('time_limit') == 'none' else int(request.form.get('time_limit'))
         dataset = request.form.get('dataset')
-        try: new_test.dataset = Dataset.query.filter_by(id=dataset).first()
+        new_test.dataset = Dataset.query.filter_by(id=dataset).first()
-        except Exception as exception:
-            write('system.log', f'Database error when processing request \'{request.url}\': {exception}')
-            return abort(500)
         success, message = new_test.create()
         if success:
             flash(message=message, category='success')
@@ -354,10 +313,7 @@ def _edit_test():
     id = request.get_json()['id']
     action = request.get_json()['action']
     if action not in ['start', 'delete', 'end']: return jsonify({'error': 'Invalid action.'}), 400
-    try: test = Test.query.filter_by(id=id).first()
+    test = Test.query.filter_by(id=id).first()
-    except Exception as exception:
-        write('system.log', f'Database error when processing request \'{request.url}\': {exception}')
-        return abort(500)
     if not test: return jsonify({'error': 'Could not find the corresponding test to delete.'}), 404
     if action == 'delete': success, message = test.delete()
     if action == 'start': success, message = test.start()
@@ -371,10 +327,7 @@ def _edit_test():
 @login_required
 def _view_test(id:str=None):    
     form = AddTimeAdjustment()
-    try: test = Test.query.filter_by(id=id).first()
+    test = Test.query.filter_by(id=id).first()
-    except Exception as exception:
-        write('system.log', f'Database error when processing request \'{request.url}\': {exception}')
-        return abort(500)
     if request.method == 'POST':
         if not test: return jsonify({'error': 'Invalid test ID.'}), 404
         if form.validate_on_submit():
@@ -391,10 +344,7 @@ def _view_test(id:str=None):
 @admin.route('/test/<string:id>/delete-adjustment/', methods=['POST'])
 @login_required
 def _delete_adjustment(id:str=None):
-    try: test = Test.query.filter_by(id=id).first()
+    test = Test.query.filter_by(id=id).first()
-    except Exception as exception:
-        write('system.log', f'Database error when processing request \'{request.url}\': {exception}')
-        return abort(500)
     if not test: return jsonify({'error': 'Invalid test ID.'}), 404
     user_code = request.get_json()['user_code'].lower()
     success, message = test.remove_adjustment(user_code)
@@ -404,19 +354,13 @@ def _delete_adjustment(id:str=None):
 @admin.route('/results/')
 @login_required
 def _view_entries():
-    try: entries = Entry.query.all()
+    entries = Entry.query.all()
-    except Exception as exception:
-        write('system.log', f'Database error when processing request \'{request.url}\': {exception}')
-        return abort(500)
     return render_template('/admin/results.html', entries = entries)
 
 @admin.route('/results/<string:id>/', methods = ['GET', 'POST'])
 @login_required
 def _view_entry(id:str=None):
-    try: entry = Entry.query.filter_by(id=id).first()
+    entry = Entry.query.filter_by(id=id).first()
-    except Exception as exception:
-        write('system.log', f'Database error when processing request \'{request.url}\': {exception}')
-        return abort(500)
     if request.method == 'POST':
         if not entry: return jsonify({'error': 'Invalid entry ID.'}), 404
         action = request.get_json()['action']
@@ -434,7 +378,10 @@ def _view_entry(id:str=None):
         flash('Invalid entry ID.', 'error')
         return redirect(url_for('admin._view_entries'))
     test = entry.test
-    data = test.dataset.get_data()
+    dataset = test.dataset
+    dataset_path = dataset.get_file()
+    with open(dataset_path, 'r') as _dataset:
+        data = loads(_dataset.read())
     correct = get_correct_answers(dataset=data)
     answers = answer_options(dataset=data)
     return render_template('/admin/result-detail.html', entry = entry, correct = correct, answers = answers)
@@ -444,9 +391,6 @@ def _view_entry(id:str=None):
 def _generate_certificate():
     from ..extensions import db
     id = request.get_json()['id']
-    try: entry = Entry.query.filter_by(id=id).first()
+    entry = Entry.query.filter_by(id=id).first()
-    except Exception as exception:
-        write('system.log', f'Database error when processing request \'{request.url}\': {exception}')
-        return abort(500)
     if not entry: return jsonify({'error': 'Invalid entry ID.'}), 404
     return render_template('/admin/components/certificate.html', entry = entry)

ref-test/app/analysis/static/css/analysis.css

@@ -1,8 +0,0 @@
-#alert-box {
-    margin: 30px auto;
-    max-width: 460px;
-}
-
-.cell-percentage::after {
-    content: '%';
-}

ref-test/app/analysis/static/css/style.css

@@ -1,260 +0,0 @@
-body {
-    padding: 80px 0;
-}
-
-.site-footer {
-    background-color: lightgray;
-    font-size: small;
-}
-
-.site-footer p {
-    margin: 0;
-}
-
-.form-container {
-    display: -ms-flexbox;
-    display: flex;
-    -ms-flex-align: center;
-    align-items: center;
-    padding-top: 40px;
-    padding-bottom: 40px;
-}
-
-.form-display {
-    width: 100%;
-    max-width: 420px;
-    padding: 15px;
-    margin: auto;
-}
-
-.form-heading {
-    margin-bottom: 2rem;
-}
-
-.form-label-group {
-    position: relative;
-    margin-bottom: 2rem;
-}
-
-.form-label-group input,
-.form-label-group label {
-    padding: var(--input-padding-y) var(--input-padding-x);
-    font-size: 16pt;
-}
-
-.form-label-group label {
-    position: absolute;
-    top: 0;
-    left: 0;
-    display: block;
-    width: 100%;
-    margin-bottom: 0; /* Override default `<label>` margin */
-    line-height: 1.5;
-    color: #495057;
-    cursor: text; /* Match the input under the label */
-    border: 1px solid transparent;
-    border-radius: .25rem;
-    transition: all .1s ease-in-out;
-    z-index: -1;
-}
-
-.form-label-group input {
-    background-color: transparent;
-    border: none;
-    border-radius: 0%;
-    border-bottom: 2px solid #585858;
-}
-
-.form-label-group input:active, .form-label-group input:focus {
-    background-color: transparent;
-}
-
-.form-label-group input::-webkit-input-placeholder {
-    color: transparent;
-}
-  
-.form-label-group input:-ms-input-placeholder {
-    color: transparent;
-}
-  
-.form-label-group input::-ms-input-placeholder {
-    color: transparent;
-}
-  
-.form-label-group input::-moz-placeholder {
-    color: transparent;
-}
-  
-.form-label-group input::placeholder {
-    color: transparent;
-}
-  
-.form-label-group input:not(:placeholder-shown) {
-    padding-top: calc(var(--input-padding-y) + var(--input-padding-y) * (2 / 3));
-    padding-bottom: calc(var(--input-padding-y) / 3);
-}
-  
-.form-label-group input:not(:placeholder-shown) ~ label {
-    padding-top: calc(var(--input-padding-y) / 3);
-    padding-bottom: calc(var(--input-padding-y) / 3);
-    font-size: 12px;
-    color: #777;
-}
-
-.form-check {
-    margin-bottom: 2rem;
-}
-
-.checkbox input {
-    transform: scale(1.5);
-    margin-right: 1rem;
-}
-
-.signin-forgot-password {
-    font-size: 14pt;
-}
-
-.form-submission-button {
-    margin-bottom: 2rem;
-}
-
-.form-submission-button button, .form-submission-button a {
-    margin: 1rem;
-    vertical-align: middle;
-}
-
-.form-submission-button button span, .form-submission-button button svg, .form-submission-button a span, .form-submission-button a svg {
-    margin: 0 2px;
-}
-
-table.dataTable {
-    border-collapse: collapse;
-    width: 100%;
-}
-
-.table-row {
-    vertical-align: middle;
-}
-
-.row-actions {
-    text-align: center;
-    white-space: nowrap;
-}
-
-.dataTables_wrapper .dt-buttons {
-    left: 50%;
-    transform: translateX(-50%);
-    float:none;  
-    text-align:center;
-}
-
-.row-actions button, .row-actions a {
-    margin: 0px 5px;
-}
-
-#cookie-alert {
-    padding-right: 16px;
-}
-
-#dismiss-cookie-alert {
-    margin-top: 16px;
-    width: fit-content;
-}
-
-.alert-db-empty {
-    width: 100%;
-    max-width: 720px;
-    font-size: 14pt;
-    margin: 20px auto;
-}
-
-.form-date-input, .form-select-input {
-    position: relative;
-    margin: 2rem 0;
-}
-
-.form-date-input input,
-.form-date-input label, .form-select-input select, .form-select-input label {
-    padding: var(--input-padding-y) var(--input-padding-x);
-    font-size: 16pt;
-    width: 100%;
-    background-color: transparent;
-    border: none;
-    border-bottom: 2px solid #585858;
-}
-
-.datepicker::-webkit-calendar-picker-indicator {    
-    border: 1px;
-    border-color: gray;
-    border-radius: 10%;
-}
-
-.form-date-input label, .form-select-input label {
-    /* position: absolute; */
-    /* top: 0;
-    left: 0; */
-    display: block;
-    width: 100%;
-    margin-bottom: 0; /* Override default `<label>` margin */
-    line-height: 1.5;
-    color: #495057;
-    cursor: text; /* Match the input under the label */
-    border: 1px solid transparent;
-    border-radius: .25rem;
-    transition: all .1s ease-in-out;
-    z-index: -1;
-}
-
-.button-icon {
-    font-size: 20px;
-}
-
-.form-upload {
-    margin: 2rem 0;
-    font-size: 14pt;
-}
-
-.result-action-buttons, .test-action {
-    margin: 5px auto;
-    width: fit-content;
-}
-
-.accordion-item {
-    background-color: unset;
-}
-
-/* Change Autocomplete styles in Chrome*/
-input:-webkit-autofill,
-input:-webkit-autofill:hover, 
-input:-webkit-autofill:focus,
-textarea:-webkit-autofill,
-textarea:-webkit-autofill:hover,
-textarea:-webkit-autofill:focus,
-select:-webkit-autofill,
-select:-webkit-autofill:hover,
-select:-webkit-autofill:focus {
-  transition: background-color 5000s ease-in-out 0s;
-}
-
-/* Fallback for Edge
--------------------------------------------------- */
-@supports (-ms-ime-align: auto) {
-    .form-label-group label {
-      display: none;
-    }
-    .form-label-group input::-ms-input-placeholder {
-      color: #777;
-    }
-}
-  
-  /* Fallback for IE
-  -------------------------------------------------- */
-@media all and (-ms-high-contrast: none), (-ms-high-contrast: active) {
-    .form-label-group label {
-        display: none;
-    }
-    .form-label-group input:-ms-input-placeholder {
-        color: #777;
-    }
-}
-  

ref-test/app/analysis/static/js/analysis.js

@@ -1,27 +0,0 @@
-// Analyse Button Listener
-$('.button-analyse').click(function(event) {
-
-    let buttonClass = $(this).data('class')
-    let id = null
-
-    if (buttonClass == 'test' ) {
-        id = $('#select-test').children('option:selected').val()
-    } else if (buttonClass == 'dataset' ) {
-        id = $('#select-dataset').children('option:selected').val()
-    }
-
-    $.ajax({
-        url: `/admin/analysis/`,
-        type: 'POST',
-        data: JSON.stringify({'id': id, 'class': buttonClass}),
-        contentType: 'application/json',
-        success: function(response) {
-            window.location.href = response
-        },
-        error: function(response){
-            error_response(response)
-        },
-    })
-
-    event.preventDefault()
-})

ref-test/app/analysis/static/js/script.js

@@ -1,115 +0,0 @@
-// Menu Highlight Scripts
-const menuItems = document.getElementsByClassName('nav-link')
-for(let i = 0; i < menuItems.length; i++) {
-    if(menuItems[i].pathname == window.location.pathname) {
-        menuItems[i].classList.add('active')
-    }
-}
-const dropdownItems = document.getElementsByClassName('dropdown-item')
-for(let i = 0; i< dropdownItems.length; i++) {
-    if(dropdownItems[i].pathname == window.location.pathname) {
-        dropdownItems[i].classList.add('active')
-        $( "#" + dropdownItems[i].id ).closest( '.dropdown' ).find('.dropdown-toggle').addClass('active')
-    }
-}
-
-// General Post Method Form Processing Script
-$('form.form-post').submit(function(event) {
-    
-    var $form = $(this)
-    var data = $form.serialize()
-    var url = $(this).prop('action')
-    var rel_success = $(this).data('rel-success')
-
-    $.ajax({
-        url: url,
-        type: 'POST',
-        data: data,
-        dataType: 'json',
-        success: function(response) {
-            if (response.redirect_to) {
-                window.location.href = response.redirect_to
-            }
-            else {
-                window.location.href = rel_success
-            }
-        },
-        error: function(response) {
-            error_response(response)
-        }
-    })
-
-    event.preventDefault()
-})
-
-function error_response(response) {
-
-    const $alert = $("#alert-box")
-    $alert.html('')
-
-    if (typeof response.responseJSON.error === 'string' || response.responseJSON.error instanceof String) {
-        $alert.html(`
-        <div class="alert alert-danger alert-dismissible fade show" role="alert">
-            <i class="bi bi-exclamation-triangle-fill" title="Danger"></i>
-            ${response.responseJSON.error}
-            <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
-        </div>
-        `)
-    } else if (response.responseJSON.error instanceof Array) {
-        var output = ''
-        for (let i = 0; i < response.responseJSON.error.length; i ++) {
-            output += `
-            <div class="alert alert-danger alert-dismissible fade show" role="alert">
-                <i class="bi bi-exclamation-triangle-fill" title="Danger"></i>
-                ${response.responseJSON.error[i]}
-                <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
-            </div>
-            `
-            $alert.html(output)
-        }
-    }
-
-    $alert.focus()
-}
-
-// Dismiss Cookie Alert
-$('#dismiss-cookie-alert').click(function(event){
-
-    $.ajax({
-        url: '/cookies/',
-        type: 'POST',
-        data: {
-            time: Date.now()
-        },
-        dataType: 'json',
-        success: function(response){
-            console.log(response)
-        },
-        error: function(response){
-            console.log(response)
-        }
-    })
-
-    event.preventDefault()
-})
-
-// Create New Dataset
-$('.create-new-dataset').click(function(event){
-    $.ajax({
-        url: '/api/editor/new/',
-        type: 'POST',
-        data: {
-            time: Date.now()
-        },
-        dataType: 'json',
-        success: function(response){
-            if (response.redirect_to) {
-                window.location.href = response.redirect_to
-            }
-        },
-        error: function(response){
-            console.log(response)
-        }
-    })
-    event.preventDefault()
-})

ref-test/app/analysis/templates/analysis/analysis.html

@@ -1,198 +0,0 @@
-{% extends "analysis/components/datatable.html" %}
-
-{% block style %}
-<link 
-    rel="stylesheet"
-    href="{{ url_for('.static', filename='css/analysis.css') }}"
-/>
-{% endblock %}
-
-{% block content %}
-    <h1>Analysis by {{ type[0]|upper }}{{ type[1:] }}</h1>
-    <div class="container">
-        <p class="lead">
-            The analysis section displays statistics for all test results as well as answers to individual questions.
-            Analysis reports can be generated per exam or per question dataset to identify common mistakes or patterns in answers.
-        </p>
-        <div class="input-group mb-3">
-            <span class="input-group-text">
-                {% if type == 'exam' %}
-                    Exam Code
-                {% elif type == 'dataset' %}
-                    Dataset Name
-                {% endif %}
-            </span>
-            <span class="form-control">
-                {{ subject }}
-            </span>
-        </div>
-        <div class="input-group mb-3">
-            <span class="input-group-text">Total Entries</span>
-            <span class="form-control">
-                {{ analysis.entries }}
-            </span>
-        </div>
-        <div class="input-group mb-3">
-            <span class="input-group-text">Passed</span>
-            <span class="form-control">
-                {{ analysis.grades.merit + analysis.grades.pass }} ({{ ((analysis.grades.merit + analysis.grades.pass)*100/analysis.entries)|round(2) }} &percnt;)
-            </span>
-        </div>
-        <div class="mb-3">
-            <span class="badge rounded-pill progress-bar-striped bg-success">Merit: {{ analysis.grades.merit }}</span> <span class="badge rounded-pill bg-primary progress-bar-striped">Pass: {{ analysis.grades.pass }}</span> <span class="badge rounded-pill progress-bar-striped bg-danger">Fail: {{ analysis.grades.fail }}</span>
-            <div class="my-1 progress">
-                <div class="progress-bar progress-bar-striped bg-success" role="progressbar" style="width: {{ (analysis.grades.merit*100/analysis.entries)|round(2) }}%" aria-valuenow="{{ analysis.grades.merit }}" aria-valuemin="0" aria-valuemax="{{ analysis.entries }}">{{ (analysis.grades.merit*100/analysis.entries)|round(2) }} &percnt;</div>
-                <div class="progress-bar progress-bar-striped" role="progressbar" style="width: {{ (analysis.grades.pass*100/analysis.entries)|round(2) }}%" aria-valuenow="{{ analysis.grades.pass }}" aria-valuemin="0" aria-valuemax="{{ analysis.entries }}">{{ (analysis.grades.pass*100/analysis.entries)|round(2) }} &percnt;</div>
-                <div class="progress-bar progress-bar-striped bg-danger" role="progressbar" style="width: {{ (analysis.grades.fail*100/analysis.entries)|round(2) }}%" aria-valuenow="{{ analysis.grades.fail }}" aria-valuemin="0" aria-valuemax="{{ analysis.entries }}">{{ (analysis.grades.fail*100/analysis.entries)|round(2) }} &percnt;</div>
-            </div>
-        </div>
-        <div class="input-group mb-3">
-            <span class="input-group-text">Mean Score</span>
-            <span class="form-control">
-                {{ analysis.scores.mean|round(2) }} &percnt;
-            </span>
-        </div>
-        <div class="input-group mb-3">
-            <span class="input-group-text">Standard Deviation</span>
-            <span class="form-control">
-                {% if analysis.scores.stdev %}
-                    {{ analysis.scores.stdev|round(2) }}
-                {% else %}
-                    {{ None }}
-                {% endif %}
-            </span>
-        </div>
-        <div class="input-group mb-3">
-            <span class="input-group-text">Median Score</span>
-            <span class="form-control">
-                {{ analysis.scores.median|round(2) }} &percnt;
-            </span>
-        </div>
-        {% if type == 'exam' %}
-            <div class="input-group mb-3">
-                <span class="input-group-text">Dataset Name</span>
-                <span class="form-control">
-                    {{ dataset.get_name() }}
-                </span>
-            </div>
-        {% endif %}
-    </div>
-    <div class="container">
-        <table id="analysis-table" class="table table-striped" style="width:100%">
-            <thead>
-                <th data-priority="1">
-                    Question
-                </th>
-                <th data-priority="1">
-                    Percent Correct
-                </th>
-                <th data-priority="2">
-                    Answers
-                </th>
-                <th data-priority="3">
-                    Tags
-                </th>
-            </thead>
-            <tbody>
-                {% for question in questions %}
-                    <tr class="table-row">
-                        <td>
-                            {{ question.q_no + 1 }}
-                        </td>
-                        <td class="cell-percentage">
-                            {{ ((analysis.answers[question.q_no][question.correct] or 0)*100/(analysis.answers[question.q_no].values())|sum())|round(2) }}
-                        </td>
-                        <td>
-                            <table style="width:100%">
-                                {% for option in question.options %}
-                                    <tr>
-                                        <td style="width:50%">
-                                            {{ option[1] }}
-                                        </td>
-                                        <td>
-                                            {% if question.correct == option[0] %}
-                                                <div class="progress">
-                                                    <div class="progress-bar bg-success progress-bar-striped" role="progressbar" style="width: {{ (analysis.answers[question.q_no][option[0]] or 0)*100/(analysis.answers[question.q_no].values())|sum() }}%;" aria-valuenow="{{ (analysis.answers[question.q_no][option[0]] or 0)*100/(analysis.answers[question.q_no].values())|sum() }}" aria-valuemin="0" aria-valuemax="100">{{ ((analysis.answers[question.q_no][option[0]] or 0)*100/(analysis.answers[question.q_no].values())|sum())|round(2) }}%</div>
-                                                </div>
-                                            {% else %}
-                                                <div class="progress">
-                                                    <div class="progress-bar bg-danger progress-bar-striped" role="progressbar" style="width: {{ (analysis.answers[question.q_no][option[0]] or 0)*100/(analysis.answers[question.q_no].values())|sum() }}%;" aria-valuenow="{{ (analysis.answers[question.q_no][option[0]] or 0)*100/(analysis.answers[question.q_no].values())|sum() }}" aria-valuemin="0" aria-valuemax="100">{{ ((analysis.answers[question.q_no][option[0]] or 0)*100/(analysis.answers[question.q_no].values())|sum())|round(2) }}%</div>
-                                                </div>
-                                            {% endif %}
-                                        </td>
-                                    </tr>
-                                {% endfor %}
-                            </table>
-                        </td>
-                        <td>
-                            <ul>
-                                {% for tag in question.tags %}
-                                    <li>{{ tag|safe }}</li>
-                                {% endfor %}
-                            </ul>
-                        </td>
-                    </tr>
-                {% endfor %}
-            </tbody>
-        </table>
-    </div>
-{% endblock %}
-
-{% block script %}
-<script>
-    const target = "{{ url_for('api._editor') }}"
-    const id = "{{ dataset.id }}"
-</script>
-<script
-    type="text/javascript"
-    src="{{ url_for('.static', filename='js/analysis.js') }}"
-></script>
-{% endblock %}
-
-{% block custom_data_script %}
-    <script>
-        console.log($('#analysis-table'))
-        $(document).ready(function() {
-            $('#analysis-table').DataTable({
-                'searching': true,
-                'columnDefs': [
-                    {'sortable': true, 'targets': [0,1]},
-                    {'sortable': false, 'targets': [2,3]},
-                    {'searchable': true, 'targets': [0,2,3]}
-                ],
-                'order': [[0, 'asc'], [1, 'desc']],
-                'buttons': [
-                    {
-                        extend: 'print',
-                        exportOptions: {
-                            columns: [0, 1, 2, 3]
-                        }
-                    },
-                    {
-                        extend: 'excel',
-                        exportOptions: {
-                            columns: [0, 1, 2, 3]
-                        }
-                    },
-                    {
-                        extend: 'pdf',
-                        exportOptions: {
-                            columns: [0, 1, 2, 3]
-                        }
-                    }
-                ],
-                'responsive': 'true',
-                'colReorder': 'true',
-                'fixedHeader': 'true',
-                'searchBuilder': {
-                    depthLimit: 2,
-                    columns: [2, 3],
-                },
-                dom: 'BQlfrtip'
-            });
-            // $('.buttons-pdf').html('<span class="glyphicon glyphicon-file" data-toggle="tooltip" title="Export To Excel"/>') -->
-        } );
-        $('#analysis-table').show();
-        $(window).trigger('resize');
-    </script>
-{% endblock %}

ref-test/app/analysis/templates/analysis/components/base.html

@@ -1,92 +0,0 @@
-<!DOCTYPE html>
-<html>
-    <head>
-        <meta charset="utf8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1" />
-        <link
-            href="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/css/bootstrap.min.css"
-            rel="stylesheet"
-            integrity="sha384-1BmE4kWBq78iYhFldvKuhfTAU6auU8tT94WrHftjDbrCEXSU1oBoqyl2QvZ6jIW3"
-            crossorigin="anonymous">
-        <link
-            rel="stylesheet"
-            href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.7.1/font/bootstrap-icons.css">
-        <link 
-            rel="stylesheet"
-            href="{{ url_for('.static', filename='css/style.css') }}"
-        />
-        <link 
-            rel="stylesheet"
-            href="{{ url_for('.static', filename='css/view.css') }}"
-        />
-        {% block style %}
-        {% endblock %}
-        <title>{% block title %} SKA Referee Test | Admin Console {% endblock %}</title>
-        {% include "analysis/components/og-meta.html" %}
-    </head>
-    <body class="bg-light">
-
-        {% block navbar %}
-            {% include "analysis/components/navbar.html" %}
-        {% endblock %}
-
-        <div class="container">
-            {% block top_alerts %}
-                {% include "analysis/components/server-alerts.html" %}
-            {% endblock %}
-            {% block content %}{% endblock %}
-        </div>
-
-        <footer class="container site-footer mt-5">
-            {% block footer %}
-                {% include "analysis/components/footer.html" %}
-            {% endblock %}
-        </footer>
-
-        <!-- JQuery, Popper, and Bootstrap js dependencies -->
-        <script
-            src="https://code.jquery.com/jquery-3.6.0.min.js"
-            integrity="sha256-/xUj+3OJU5yExlq6GSYGSHk7tPXikynS7ogEvDej/m4="
-            crossorigin="anonymous">
-        </script>
-        <script>
-            window.jQuery || document.write(`<script src="{{ url_for('.static', filename='js/jquery-3.6.0.min.js') }}"><\/script>`)
-        </script>
-        <script
-            src="https://cdn.jsdelivr.net/npm/@popperjs/core@2.10.2/dist/umd/popper.min.js"
-            integrity="sha384-7+zCNj/IqJ95wo16oMtfsKbZ9ccEh31eOz1HGyDuCQ6wgnyJNSYdrPa03rtR1zdB"
-            crossorigin="anonymous">
-        </script>
-        <script
-            src="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/js/bootstrap.min.js"
-            integrity="sha384-QJHtvGhmr9XOIpI6YVutG+2QOK9T+ZnN4kzFN1RtK3zEFEIsxhlmWl5/YESvpZ13"
-            crossorigin="anonymous"
-        ></script>
-        <!-- Custom js -->
-        <script type="text/javascript">
-            var csrf_token = "{{ csrf_token() }}";
-        
-            $.ajaxSetup({
-                beforeSend: function(xhr, settings) {
-                    if (!/^(GET|HEAD|OPTIONS|TRACE)$/i.test(settings.type) && !this.crossDomain) {
-                        xhr.setRequestHeader("X-CSRFToken", csrf_token);
-                    }
-                }
-            });
-        </script>
-        <script
-            type="text/javascript"
-            src="{{ url_for('.static', filename='js/script.js') }}"
-        ></script>
-        <script
-            type="text/javascript"
-            src="{{ url_for('.static', filename='js/analysis.js') }}"
-        ></script>
-        {% block script %}
-        {% endblock %}
-        {% block datatable_scripts %}
-        {% endblock %}
-        {% block custom_data_script %}
-        {% endblock %}
-    </body>
-</html>

ref-test/app/analysis/templates/analysis/components/client-alerts.html

@@ -1 +0,0 @@
-<div id="alert-box" tabindex="-1"></div>

ref-test/app/analysis/templates/analysis/components/datatable.html

@@ -1,28 +0,0 @@
-{% extends "analysis/components/base.html" %}
-{% block datatable_css %}
-    <link rel="stylesheet" type="text/css" href="https://cdn.datatables.net/1.11.3/css/dataTables.bootstrap5.min.css"/>
-    <link rel="stylesheet" type="text/css" href="https://cdn.datatables.net/buttons/2.0.1/css/buttons.bootstrap5.min.css"/>
-    <link rel="stylesheet" type="text/css" href="https://cdn.datatables.net/colreorder/1.5.5/css/colReorder.bootstrap5.min.css"/>
-    <link rel="stylesheet" type="text/css" href="https://cdn.datatables.net/fixedheader/3.2.0/css/fixedHeader.bootstrap5.min.css"/>
-    <link rel="stylesheet" type="text/css" href="https://cdn.datatables.net/keytable/2.6.4/css/keyTable.bootstrap5.min.css"/>
-    <link rel="stylesheet" type="text/css" href="https://cdn.datatables.net/responsive/2.2.9/css/responsive.bootstrap5.min.css"/>
-    <link rel="stylesheet" type="text/css" href="https://cdn.datatables.net/searchbuilder/1.3.0/css/searchBuilder.dataTables.min.css"/>
-{% endblock %}
-{% block datatable_scripts %}
-<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/jszip/2.5.0/jszip.min.js"></script>
-<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.36/pdfmake.min.js"></script>
-<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.36/vfs_fonts.js"></script>
-<script type="text/javascript" src="https://cdn.datatables.net/1.11.3/js/jquery.dataTables.min.js"></script>
-<script type="text/javascript" src="https://cdn.datatables.net/1.11.3/js/dataTables.bootstrap5.min.js"></script>
-<script type="text/javascript" src="https://cdn.datatables.net/buttons/2.0.1/js/dataTables.buttons.min.js"></script>
-<script type="text/javascript" src="https://cdn.datatables.net/buttons/2.0.1/js/buttons.bootstrap5.min.js"></script>
-<script type="text/javascript" src="https://cdn.datatables.net/buttons/2.0.1/js/buttons.colVis.min.js"></script>
-<script type="text/javascript" src="https://cdn.datatables.net/buttons/2.0.1/js/buttons.html5.min.js"></script>
-<script type="text/javascript" src="https://cdn.datatables.net/buttons/2.0.1/js/buttons.print.min.js"></script>
-<script type="text/javascript" src="https://cdn.datatables.net/colreorder/1.5.5/js/dataTables.colReorder.min.js"></script>
-<script type="text/javascript" src="https://cdn.datatables.net/fixedheader/3.2.0/js/dataTables.fixedHeader.min.js"></script>
-<script type="text/javascript" src="https://cdn.datatables.net/keytable/2.6.4/js/dataTables.keyTable.min.js"></script>
-<script type="text/javascript" src="https://cdn.datatables.net/responsive/2.2.9/js/dataTables.responsive.min.js"></script>
-<script type="text/javascript" src="https://cdn.datatables.net/responsive/2.2.9/js/responsive.bootstrap5.js"></script>
-<script type="text/javascript" src="https://cdn.datatables.net/searchbuilder/1.3.0/js/dataTables.searchBuilder.min.js"></script>
-{% endblock %}

ref-test/app/analysis/templates/analysis/components/footer.html

@@ -1,2 +0,0 @@
-<p>This web app was developed and is maintained by Vivek Santayana. The source code for the web app, excluding any data pertaining to the questions in the quiz, is freely available at <a href="https://git.vsnt.uk/viveksantayana/ska-referee-test">Vivek&rsquo;s personal GIT repository</a> under an MIT License.</p>
-<p>All questions in the test are &copy; The Scottish Korfball Association {{ now.year }}. All rights are reserved.</p>

ref-test/app/analysis/templates/analysis/components/input-forms.html

@@ -1,4 +0,0 @@
-{% extends "analysis/components/base.html" %}
-{% import "bootstrap/wtf.html" as wtf %}
-{% block top_alerts %}
-{% endblock %}

ref-test/app/analysis/templates/analysis/components/navbar.html

@@ -1,137 +0,0 @@
-<nav class="navbar fixed-top navbar-expand-md navbar-dark bg-dark">
-    <div class="container">
-        <a href="{{ url_for('admin._home') }}" class="navbar-brand mb-0 h1">RefTest | Admin</a>
-        <button
-            class="navbar-toggler"
-            type="button"
-            data-bs-toggle="collapse"
-            data-bs-target="#navbar"
-            aria-controls="navbar"
-            aria-expanded="false"
-            aria-label="Toggle Navigation"
-        >
-            <span class="navbar-toggler-icon"></span>
-        </button>
-        <div class="collapse navbar-collapse justify-content-end" id="navbar">
-            <ul class="navbar-nav">
-                {% if not current_user.is_authenticated %}
-                    <li class="nav-item" id="nav-login">
-                        <a href="{{ url_for('admin._login') }}" id="link-login" class="nav-link">Log In</a>
-                    </li>
-                {% endif %}
-                {% if current_user.is_authenticated %}
-                    <li class="nav-item dropdown" id="nav-results">
-                        <a
-                            class="nav-link dropdown-toggle"
-                            id="dropdown-results"
-                            role="button"
-                            href="{{ url_for('admin._view_entries') }}"
-                            data-bs-toggle="dropdown"
-                            aria-expanded="false"
-                        >
-                            Results
-                        </a>
-                        <ul
-                            class="dropdown-menu"
-                            aria-labelledby="dropdown-results"
-                        >
-                            <li>
-                                <a href="{{ url_for('admin._view_entries', filter='active') }}" id="link-results" class="dropdown-item">View Results</a>
-                            </li>
-                            <li>
-                                <a href="{{ url_for('analysis._analysis') }}" id="link-analysis" class="dropdown-item">Analysis</a>
-                            </li>
-                        </ul>
-                    </li>
-                    <li class="nav-item dropdown" id="nav-tests">
-                        <a
-                            class="nav-link dropdown-toggle"
-                            id="dropdown-tests"
-                            role="button"
-                            href="{{ url_for('admin._tests') }}"
-                            data-bs-toggle="dropdown"
-                            aria-expanded="false"
-                        >
-                            Exams
-                        </a>
-                        <ul
-                            class="dropdown-menu"
-                            aria-labelledby="dropdown-tests"
-                        >
-                            <li>
-                                <a href="{{ url_for('admin._tests', filter='active') }}" id="link-active" class="dropdown-item">Active</a>
-                            </li>
-                            <li>
-                                <a href="{{ url_for('admin._tests', filter='scheduled') }}" id="link-scheduled" class="dropdown-item">Scheduled</a>
-                            </li>
-                            <li>
-                                <a href="{{ url_for('admin._tests', filter='expired') }}" id="link-expired" class="dropdown-item">Expired</a>
-                            </li>
-                            <li>
-                                <a href="{{ url_for('admin._tests', filter='all') }}" id="link-all" class="dropdown-item">All</a>
-                            </li>
-                            <li>
-                                <a href="{{ url_for('admin._tests', filter='create') }}" id="link-create" class="dropdown-item">Create</a>
-                            </li>
-                        </ul>
-                    </li>
-                    <li class="nav-item dropdown" id="nav-settings">
-                        <a
-                            class="nav-link dropdown-toggle"
-                            id="dropdown-settings"
-                            role="button"
-                            href="{{ url_for('admin._settings') }}"
-                            data-bs-toggle="dropdown"
-                            aria-expanded="false"
-                        >
-                            Settings
-                        </a>
-                        <ul
-                            class="dropdown-menu"
-                            aria-labelledby="dropdown-settings"
-                        >
-                            <li>
-                                <a href="{{ url_for('admin._settings') }}" id="link-settings" class="dropdown-item">View Settings</a>
-                            </li>
-                            <li>
-                                <a href="{{ url_for('admin._users') }}" id="link-users" class="dropdown-item">Users</a>
-                            </li>
-                            <li>
-                                <a href="{{ url_for('admin._questions') }}" id="link-questions" class="dropdown-item">Manage Questions</a>
-                            </li>
-                            <li>
-                                <a href="{{ url_for('view._view') }}" id="link-editor" class="dropdown-item">View Questions</a>
-                            </li>
-                            <li>
-                                <a href="{{ url_for('editor._editor') }}" id="link-editor" class="dropdown-item">Edit Questions</a>
-                            </li>
-                        </ul>
-                    </li>
-                    <li class="nav-item dropdown" id="nav-account">
-                        <a
-                            class="nav-link dropdown-toggle"
-                            id="dropdown-account"
-                            role="button"
-                            href="{{ url_for('admin._update_user', id=current_user.id) }}"
-                            data-bs-toggle="dropdown"
-                            aria-expanded="false"
-                        >
-                            Account
-                        </a>
-                        <ul
-                            class="dropdown-menu"
-                            aria-labelledby="dropdown-account"
-                        >
-                            <li>
-                                <a href="{{ url_for('admin._update_user', id=current_user.id) }}" id="link-account" class="dropdown-item">Account Settings</a>
-                            </li>
-                            <li>
-                                <a href="{{ url_for('admin._logout') }}" id="link-logout" class="dropdown-item">Log Out</a>
-                            </li>
-                        </ul>
-                    </li>
-                {% endif %}
-            </ul>
-        </div>
-    </div>
-</nav>

ref-test/app/analysis/templates/analysis/components/og-meta.html

@@ -1,18 +0,0 @@
-<meta name="description" content="A web app for taking the Scottish Korfball Association Refereeing Theory Exam on-line." />
-<meta property="og:locale" content="en_UK" />
-<meta property="og:type" content="website" />
-<meta property="og:description" content="A web app for taking the Scottish Korfball Association Refereeing Theory Exam on-line." />
-<meta property="og:url" content="{{ url_for(request.endpoint, _external = True, **(request.view_args or {})) }}" />
-<meta property="og:site_name" content="Scottish Korfball Association Referee Theory Exam" />
-<meta property="og:image" content="{{ url_for('.static', filename='favicon.png', _external = True) }}" />
-<meta property="og:image:alt" content="Logo of the SKA Refereeing Exam App" />
-<meta property="og:image:width" content="512" />
-<meta property="og:image:height" content="512" />
-<meta name="twitter:card" content="summary" />
-<meta name="twitter:description" content="A web app for taking the Scottish Korfball Association Refereeing Theory Exam on-line." />
-<meta name="twitter:image" content="{{ url_for('.static', filename='favicon.png', _external = True) }}" />
-<meta name="twitter:image:alt" content="Logo of the SKA Refereeing Exam App" />
-<meta name="twitter:creator" content="@viveksantayana" />
-<meta name="twitter:site" content="@viveksantayana" />
-<meta name="theme-color" content="#343a40" />
-<link rel="shortcut icon" href="{{ url_for('.static', filename='favicon.ico') }}">

ref-test/app/analysis/templates/analysis/components/secondary-navs/tests.html

@@ -1,23 +0,0 @@
-<div class="navbar navbar-expand-sm navbar-light bg-light">
-    <div class="container-fluid">
-    <div class="expand navbar-expand justify-content-center" id="navbar_secondary">
-        <ul class="nav nav-pills">
-            <li class="nav-item">
-                <a class="nav-link" href="{{ url_for('admin._tests', filter='active') }}">Active</a>
-            </li>
-            <li class="nav-item">
-                <a class="nav-link" href="{{ url_for('admin._tests', filter='scheduled') }}">Scheduled</a>
-            </li>
-            <li class="nav-item">
-                <a class="nav-link" href="{{ url_for('admin._tests', filter='expired') }}">Expired</a>
-            </li>
-            <li class="nav-item">
-                <a class="nav-link" href="{{ url_for('admin._tests', filter='all') }}">All</a>
-            </li>
-            <li class="nav-item">
-                <a class="nav-link" href="{{ url_for('admin._tests', filter='create') }}">Create</a>
-            </li>
-        </ul>
-    </div>
-    </div>
-</div>

ref-test/app/analysis/templates/analysis/components/server-alerts.html

@@ -1,43 +0,0 @@
-{% with messages = get_flashed_messages(with_categories=true) %}
-    {% if messages %}
-        {% set cookie_flash_flag = namespace(value=False) %}
-        {% for category, message in messages %}
-            {% if category == "error" %}
-                <div class="alert alert-danger alert-dismissible fade show" role="alert">
-                    <i class="bi bi-exclamation-triangle-fill" title="Error" aria-title="Error"></i>
-                    {{ message|safe }}
-                    <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
-                </div>
-            {% elif category == "success" %}
-                <div class="alert alert-success alert-dismissible fade show" role="alert">
-                    <i class="bi bi-check2-circle" title="Success" aria-title="Success"></i>
-                    {{ message|safe }}
-                    <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
-                </div>
-            {% elif category == "warning" %}
-                <div class="alert alert-warning alert-dismissible fade show" role="alert">
-                    <i class="bi bi-info-circle-fill" aria-title="Warning" title="Warning"></i>
-                    {{ message|safe }}
-                    <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
-                </div>
-            {% elif category == "cookie_alert" %}
-                {% if not cookie_flash_flag.value %}
-                    <div class="alert alert-primary alert-dismissible fade show" id="cookie-alert" role="alert">
-                        <i class="bi bi-info-circle-fill" title="Cookie Alert" aria-title="Cookie Alert"></i>
-                        {{ message|safe }}
-                        <div class="d-flex justify-content-center w-100">
-                            <button type="button" id="dismiss-cookie-alert" class="btn btn-success" data-bs-dismiss="alert" aria-label="Close">Accept</button>
-                        </div>
-                    </div>
-                    {% set cookie_flash_flag.value = True %}
-                {% endif %}
-            {% else %}
-                <div class="alert alert-primary alert-dismissible fade show" role="alert">
-                    <i class="bi bi-info-circle-fill" title="Alert"></i>
-                    {{ message|safe }}
-                    <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
-                </div>
-            {% endif %}
-        {% endfor %}
-    {% endif %}
-{% endwith %}

ref-test/app/analysis/templates/analysis/index.html

@@ -1,54 +0,0 @@
-{% extends "analysis/components/input-forms.html" %}
-
-{% block content %}
-    <h1>Analysis</h1>
-    <div class="container">
-        <div class="row">
-            <div class="col-sm">
-                <div class="card m-3">
-                    <div class="card-body">
-                        <h5 class="card-title">Exams</h5>
-                        <div class="card-text">
-                            <div class="form-select-input">
-                                <select name="select-test" id="select-test">
-                                    {% for test in tests %}
-                                        <option value="{{ test.id }}">{{ test.get_code() }}</option>
-                                    {% endfor %}
-                                </select>
-                            </div>
-                            <div class="my-3">
-                                <a href="{{ url_for('analysis._test') }}" class="btn btn-primary button-analyse" data-class="test">
-                                    <i class="bi bi-search button-icon"></i>
-                                    Analyse
-                                </a>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-            <div class="col-sm">
-                <div class="card m-3">
-                    <div class="card-body">
-                        <h5 class="card-title">Datasets</h5>
-                        <div class="card-text">
-                            <div class="form-select-input">
-                                <select name="select-dataset" id="select-dataset">
-                                    {% for dataset in datasets %}
-                                        <option value="{{ dataset.id }}">{{ dataset.get_name() }}</option>
-                                    {% endfor %}
-                                </select>
-                            </div>
-                            <div class="my-3">
-                                <a href="{{ url_for('analysis._dataset') }}" class="btn btn-primary button-analyse" data-class="dataset">
-                                    <i class="bi bi-search button-icon"></i>
-                                    Analyse
-                                </a>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-    {% include "analysis/components/client-alerts.html" %}
-{% endblock %}

ref-test/app/analysis/views.py

@@ -1,85 +0,0 @@
-from ..models import Dataset, Test
-from ..tools.data import analyse, check_dataset_exists, check_test_exists
-from ..tools.logs import write
-from ..tools.data import parse_questions
-
-from flask import Blueprint, render_template, request, jsonify
-from flask.helpers import abort, flash, redirect, url_for
-from flask_login import login_required
-
-analysis = Blueprint(
-    name='analysis',
-    import_name=__name__,
-    template_folder='templates',
-    static_folder='static'
-)
-
-@analysis.route('/', methods=['GET','POST'])
-@login_required
-@check_dataset_exists
-@check_test_exists
-def _analysis():
-    try:
-        _tests = Test.query.all()
-        _datasets = Dataset.query.all()
-    except Exception as exception:
-        write('system.log', f'Database error when processing request \'{request.url}\': {exception}')
-        return abort(500)
-    tests = [ test for test in _tests if test.entries ]
-    datasets = [ dataset for dataset in _datasets if dataset.entries ]
-    if request.method == 'POST':
-        selection = request.get_json()
-        if selection['class'] == 'test':
-            try:
-                test = Test.query.filter_by(id=selection['id']).first()
-            except Exception as exception:
-                write('system.log', f'Database error when processing request \'{request.url}\': {exception}')
-                return abort(500)
-            if not test: return jsonify({'error': 'Invalid entry ID.'}), 404
-            return url_for('analysis._test', id=selection['id']), 200
-        if selection['class'] == 'dataset':
-            try:
-                dataset = Dataset.query.filter_by(id=selection['id']).first()
-            except Exception as exception:
-                write('system.log', f'Database error when processing request \'{request.url}\': {exception}')
-                return abort(500)
-            if not dataset: return jsonify({'error': 'Invalid entry ID.'}), 404
-            return url_for('analysis._dataset', id=selection['id']), 200
-        return jsonify({'error': 'Invalid entry ID.'}), 404
-    return render_template('/analysis/index.html', tests=tests, datasets=datasets)
-
-@analysis.route('/test/<string:id>')
-@analysis.route('/test/')
-@login_required
-@check_test_exists
-def _test(id:str=None):
-    if id in [None, '']:
-        flash(message='Please select a valid exam.', category='error')
-        return redirect(url_for('analysis._analysis'))
-    try:
-        test = Test.query.filter_by(id=id).first()
-    except Exception as exception:
-        write('system.log', f'Database error when processing request \'{request.url}\': {exception}')
-        return abort(500)
-    if not test:
-        flash('Invalid exam.', 'error')
-        return redirect(url_for('analysis._analysis'))
-    return render_template('/analysis/analysis.html', analysis=analyse(test), subject=test.get_code(), type='exam', dataset=test.dataset, questions=parse_questions(test.dataset.get_data()))
-
-@analysis.route('/dataset/<string:id>')
-@analysis.route('/dataset/')
-@login_required
-@check_dataset_exists
-def _dataset(id:str=None):
-    if id in [None, '']:
-        flash(message='Please select a valid dataset.', category='error')
-        return redirect(url_for('analysis._analysis'))
-    try:
-        dataset = Dataset.query.filter_by(id=id).first()
-    except Exception as exception:
-        write('system.log', f'Database error when processing request \'{request.url}\': {exception}')
-        return abort(500)
-    if not dataset:
-        flash('Invalid dataset.', 'error')
-        return redirect(url_for('analysis._analysis'))
-    return render_template('/analysis/analysis.html', analysis=analyse(dataset), subject=dataset.get_name(), type='dataset', dataset=dataset, questions=parse_questions(dataset.get_data()))

ref-test/app/api/views.py

@@ -1,10 +1,8 @@
 from ..models import Dataset, Entry, User
 from ..tools.data import validate_json
-from ..tools.logs import write
 from ..tools.test import evaluate_answers, generate_questions
 
-from flask import Blueprint, jsonify, request
+from flask import Blueprint, flash, jsonify, request, url_for
-from flask.helpers import abort, flash, url_for
 from flask_login import login_required
 
 from datetime import datetime, timedelta
@@ -18,10 +16,7 @@ api = Blueprint(
 @api.route('/questions/', methods=['POST'])
 def _fetch_questions():
     id = request.get_json()['id']
-    try: entry = Entry.query.filter_by(id=id).first()
+    entry = Entry.query.filter_by(id=id).first()
-    except Exception as exception:
-        write('system.log', f'Database error when processing request \'{request.url}\': {exception}')
-        return abort(500)
     if not entry: return jsonify({'error': 'Invalid entry ID.'}), 400
     test = entry.test
     user_code = entry.user_code
@@ -55,10 +50,7 @@ def _fetch_questions():
 def _submit_quiz():
     id = request.get_json()['id']
     answers = request.get_json()['answers']
-    try: entry = Entry.query.filter_by(id=id).first()
+    entry = Entry.query.filter_by(id=id).first()
-    except Exception as exception:
-        write('system.log', f'Database error when processing request \'{request.url}\': {exception}')
-        return abort(500)
     if not entry: return jsonify({'error': 'Unrecognised Entry.'}), 400
     test = entry.test
     dataset = test.dataset
@@ -79,10 +71,7 @@ def _submit_quiz():
 def _editor(id:str=None):
     request_data = request.get_json()
     id = request_data['id']
-    try: dataset = Dataset.query.filter_by(id=id).first()
+    dataset = Dataset.query.filter_by(id=id).first()
-    except Exception as exception:
-        write('system.log', f'Database error when processing request \'{request.url}\': {exception}')
-        return abort(500)
     if not dataset: return jsonify({'error': 'Invalid request. Dataset not found.'}), 404
     data_path = dataset.get_file()
     if request_data['action'] == 'fetch':
@@ -91,13 +80,10 @@ def _editor(id:str=None):
         return jsonify({'success': 'Successfully downloaded dataset', 'data': data}), 200
     default = request_data['default']
     creator = request_data['creator']
-    try: user = User.query.filter_by(id=creator).first()
-    except Exception as exception:
-        write('system.log', f'Database error when processing request \'{request.url}\': {exception}')
-        return abort(500)
     name = request_data['name']
     data = request_data['data']
     if not validate_json(data): return jsonify({'error': 'The data you submitted was invalid.'}), 400
+    user = User.query.filter_by(id=creator).first()
     dataset.set_name(name)
     dataset.creator = user
     success, message = dataset.update(data=data, default=default)

ref-test/app/config.py

@@ -4,7 +4,6 @@ from dotenv import load_dotenv
 load_dotenv('../.env')
 
 class Config(object):
-    """Basic App Configuration"""
     APP_HOST = '0.0.0.0'
     DATA = './data/'
     DEBUG = False
@@ -12,9 +11,9 @@ class Config(object):
     SECRET_KEY = os.getenv('SECRET_KEY')
     SERVER_NAME = os.getenv('SERVER_NAME')
     SESSION_COOKIE_SECURE = True
-    WTF_CSRF_TIME_LIMIT = None
+    SQLALCHEMY_DATABASE_URI = f'sqlite:///{Path(os.path.abspath(f"{DATA}/database.db"))}'
+    SQLALCHEMY_TRACK_MODIFICATIONS = False
 
-    """Email Engine Configuration"""
     MAIL_SERVER = os.getenv('MAIL_SERVER')
     MAIL_PORT = int(os.getenv('MAIL_PORT') or 25)
     MAIL_USE_TLS = False
@@ -27,19 +26,6 @@ class Config(object):
     MAIL_SUPPRESS_SEND = False
     MAIL_ASCII_ATTACHMENTS = bool(os.getenv('MAIL_ASCII_ATTACHMENTS') or True)
 
-    """Database Driver Configuration"""
-    DATABASE_TYPE = os.getenv('DATABASE_TYPE') or 'SQLite'
-    SQLALCHEMY_TRACK_MODIFICATIONS = False
-
-    if DATABASE_TYPE.lower() == 'mysql' and os.getenv('MYSQL_DATABASE') and os.getenv('MYSQL_USER') and os.getenv('MYSQL_PASSWORD'):
-        DATABASE_HOST = os.getenv('DATABASE_HOST') or 'localhost'
-        DATABASE_PORT = int(os.getenv('DATABASE_PORT') or 3306)
-        MYSQL_DATABASE = os.getenv('MYSQL_DATABASE')
-        MYSQL_USER = os.getenv('MYSQL_USER')
-        MYSQL_PASSWORD = os.getenv('MYSQL_PASSWORD')
-        SQLALCHEMY_DATABASE_URI = f'mysql+pymysql://{MYSQL_USER}:{MYSQL_PASSWORD}@{DATABASE_HOST}:{DATABASE_PORT}/{MYSQL_DATABASE}'
-    else: SQLALCHEMY_DATABASE_URI = f'sqlite:///{Path(os.path.abspath(f"{DATA}/db.sqlite"))}'
-
 class Production(Config):
     pass
 

ref-test/app/editor/static/css/editor.css

@@ -71,7 +71,7 @@
     margin: 30pt auto;
 }
 
-.info-panel, .viewer-panel {
+.info-panel {
     display: none;
 }
 
@@ -85,19 +85,3 @@
     margin: 30px auto;
     max-width: 460px;
 }
-
-.block {
-    border: 2px solid black;
-    border-radius: 10px;
-    margin: 10px;
-    padding: 5px;
-}
-
-.question-body, .question-block {
-    padding: 0px 2em;
-}
-
-blockquote {
-    padding: 0px 2em;
-    font-style: italic;
-}

ref-test/app/editor/static/js/editor.js

@@ -5,69 +5,24 @@ const id = $root.data('id')
 
 const $control_panel = $('.control-panel')
 const $info_panel = $('.info-panel')
-const $viewer_panel = $('.viewer-panel')
 const $editor_panel = $('.editor-panel')
 
-var toggle_info = false
-var toggle_viewer = false
-
 var element_index = 0
 
 // Initialise Sortable and trigger renumbering on end of drag
 Sortable.create($root.get(0), {handle: '.move-handle', onEnd: function(evt) {renumber_blocks()}})
 
-// Info and Viewer Button Listener
+// Info Button Listener
 $control_panel.find('button').click(function(event){
-    var action = $(this).data('action');
+    if ($info_panel.is(":hidden")) {
-
+        $editor_panel.hide()
-    if (action == 'info') {
+        $info_panel.fadeIn()
-        if ($info_panel.is(":hidden")) {
+        $(this).addClass('active')
-            if ($viewer_panel.is(":visible")) {
+    } else {
-                toggle_viewer = true
+        $info_panel.hide()
-                $viewer_panel.hide()
+        $editor_panel.fadeIn()
-            }
+        $(this).removeClass('active')
-            $editor_panel.hide()
-            $info_panel.fadeIn()
-            $(window).scrollTop(0)
-            toggle_info = false
-            $(this).addClass('active')
-        } else {
-            $info_panel.hide()
-            if (toggle_viewer) {
-                render_viewer()
-                $(window).scrollTop(0)
-                toggle_viewer = false
-            } else {
-                $editor_panel.fadeIn()
-                $(window).scrollTop(0)
-            }
-            $(this).removeClass('active')
-        }
-    } else if (action == 'view') {
-        if ($viewer_panel.is(":hidden")) {
-            if ($info_panel.is(':visible')) {
-                toggle_info = true
-                $info_panel.hide()
-            }
-            $editor_panel.hide()
-            render_viewer()
-            $(window).scrollTop(0)
-            toggle_viewer = false
-            $(this).addClass('active')
-        } else {
-            $viewer_panel.hide()
-            if (toggle_info) {
-                $info_panel.fadeIn()
-                $(window).scrollTop(0)
-                toggle_info = false
-            } else {
-                $editor_panel.fadeIn()
-                $(window).scrollTop(0)
-            }
-            $(this).removeClass('active')
-        }
     }
-    
     event.preventDefault()
 })
 
@@ -542,101 +497,3 @@ $(window).on('load', function() {
         }
     })
 })
-
-// Viewer Render Function
-function render_viewer() {
-    $viewer_panel.fadeIn()
-    $viewer_panel.empty()
-    var heading = document.createElement('h3')
-    heading.innerText = 'View Questions'
-    $viewer_panel.append(heading)
-    var data = parse_input()
-    var block
-    var obj
-    for (let i = 0; i < data.length; i++) {
-        block = data[i]
-        obj = document.createElement('div')
-        obj.classList = 'block'
-        if (block['type'] == 'question') {
-            text = document.createElement('p')
-            text.innerHTML = `<strong>Question ${block['q_no'] + 1}.</strong> ${block['text']}`
-            obj.append(text)
-            question_body = document.createElement('div')
-            question_body.className ='question-body'
-            type = document.createElement('p')
-            type.innerHTML = `<strong>Question Type:</strong> ${block['q_type']}`
-            question_body.append(type)
-            options = document.createElement('p')
-            options.innerHTML = '<strong>Options:</strong>'
-            option_list = document.createElement('ul')
-            for (let _i = 0; _i < block['options'].length; _i++) {
-                option = document.createElement('li')
-                option.innerHTML = block['options'][_i]
-                if (block['correct'] == _i) {
-                    option.innerHTML += ' <span class="badge rounded-pill bg-success">Correct</span>'
-                }
-                option_list.append(option)
-            }
-            options.append(option_list)
-            question_body.append(options)
-            tags = document.createElement('p')
-            tags.innerHTML = `<strong>Tags:</strong>`
-            tag_list = document.createElement('ul')
-            for (let _i = 0; _i < block['tags'].length; _i++) {
-                tag = document.createElement('li')
-                tag.innerHTML = block['tags'][_i]
-                tag_list.append(tag)
-            }
-            tags.append(tag_list)
-            question_body.append(tags)
-            obj.append(question_body)
-        } else if (block['type'] == 'block') {
-            meta = document.createElement('p')
-            meta.innerHTML = `<strong>Block ${i+1}.</strong> ${block['questions'].length} questions.`
-            obj.append(meta)
-            header = document.createElement('blockquote')
-            header.innerText = block['question_header']
-            obj.append(header)
-            var block_question = document.createElement('div')
-            var question
-            block_question.className = 'question-block'
-            for (let _i = 0; _i < block['questions'].length; _i++) {
-                question = block['questions'][_i]
-                text = document.createElement('p')
-                text.innerHTML = `<strong>Question ${question['q_no'] + 1}.</strong> ${question['text']}`
-                block_question.append(text)
-                question_body = document.createElement('div')
-                question_body.className ='question-body'
-                type = document.createElement('p')
-                type.innerHTML = `<strong>Question Type:</strong> ${question['q_type']}`
-                question_body.append(type)
-                options = document.createElement('p')
-                options.innerHTML = '<strong>Options:</strong>'
-                option_list = document.createElement('ul')
-                for (let __i = 0; __i < question['options'].length; __i++) {
-                    option = document.createElement('li')
-                    option.innerHTML = question['options'][__i]
-                    if (question['correct'] == __i) {
-                        option.innerHTML += ' <span class="badge rounded-pill bg-success">Correct</span>'
-                    }
-                    option_list.append(option)
-                }
-                options.append(option_list)
-                question_body.append(options)
-                tags = document.createElement('p')
-                tags.innerHTML = `<strong>Tags:</strong>`
-                tag_list = document.createElement('ul')
-                for (let __i = 0; __i < question['tags'].length; __i++) {
-                    tag = document.createElement('li')
-                    tag.innerHTML = question['tags'][__i]
-                    tag_list.append(tag)
-                }
-                tags.append(tag_list)
-                question_body.append(tags)
-                block_question.append(question_body)
-                obj.append(block_question)
-            }
-        }
-        $viewer_panel.append(obj)
-    }
-}

ref-test/app/editor/static/js/script.js

@@ -57,7 +57,7 @@ function error_response(response) {
         `);
     } else if (response.responseJSON.error instanceof Array) {
         var output = ''
-        for (let i = 0; i < response.responseJSON.error.length; i ++) {
+        for (var i = 0; i < response.responseJSON.error.length; i ++) {
             output += `
             <div class="alert alert-danger alert-dismissible fade show" role="alert">
                 <i class="bi bi-exclamation-triangle-fill" title="Danger"></i>

ref-test/app/editor/templates/editor/components/footer.html

@@ -1,2 +1,2 @@
-<p>This web app was developed and is maintained by Vivek Santayana. The source code for the web app, excluding any data pertaining to the questions in the quiz, is freely available at <a href="https://git.vsnt.uk/viveksantayana/ska-referee-test">Vivek&rsquo;s personal GIT repository</a> under an MIT License.</p>
+<p>This web app was developed by Vivek Santayana. The source code for the web app, excluding any data pertaining to the questions in the quiz, is freely available at <a href="https://git.vsnt.uk/viveksantayana/ska-referee-test">Vivek&rsquo;s personal GIT repository</a> under an MIT License.</p>
 <p>All questions in the test are &copy; The Scottish Korfball Association {{ now.year }}. All rights are reserved.</p>

ref-test/app/editor/templates/editor/components/navbar.html

@@ -1,6 +1,6 @@
 <nav class="navbar fixed-top navbar-expand-md navbar-dark bg-dark">
     <div class="container">
-        <a href="{{ url_for('admin._home') }}" class="navbar-brand mb-0 h1">RefTest | Admin</a>
+        <a href="{{ url_for('admin._home') }}" class="navbar-brand mb-0 h1">RefTest (Beta) | Admin</a>
         <button
             class="navbar-toggler"
             type="button"
@@ -20,28 +20,8 @@
                     </li>
                 {% endif %}
                 {% if current_user.is_authenticated %}
-                    <li class="nav-item dropdown" id="nav-results">
+                    <li class="nav-item" id="nav-results">
-                        <a
+                        <a href="{{ url_for('admin._view_entries') }}" id="link-results" class="nav-link">View Results</a>
-                            class="nav-link dropdown-toggle"
-                            id="dropdown-results"
-                            role="button"
-                            href="{{ url_for('admin._view_entries') }}"
-                            data-bs-toggle="dropdown"
-                            aria-expanded="false"
-                        >
-                            Results
-                        </a>
-                        <ul
-                            class="dropdown-menu"
-                            aria-labelledby="dropdown-results"
-                        >
-                            <li>
-                                <a href="{{ url_for('admin._view_entries', filter='active') }}" id="link-results" class="dropdown-item">View Results</a>
-                            </li>
-                            <li>
-                                <a href="{{ url_for('analysis._analysis') }}" id="link-analysis" class="dropdown-item">Analysis</a>
-                            </li>
-                        </ul>
                     </li>
                     <li class="nav-item dropdown" id="nav-tests">
                         <a
@@ -56,7 +36,7 @@
                         </a>
                         <ul
                             class="dropdown-menu"
-                            aria-labelledby="dropdown-tests"
+                            aria-labelledby="dropdown-settings"
                         >
                             <li>
                                 <a href="{{ url_for('admin._tests', filter='active') }}" id="link-active" class="dropdown-item">Active</a>
@@ -78,7 +58,7 @@
                     <li class="nav-item dropdown" id="nav-settings">
                         <a
                             class="nav-link dropdown-toggle"
-                            id="dropdown-settings"
+                            id="dropdown-account"
                             role="button"
                             href="{{ url_for('admin._settings') }}"
                             data-bs-toggle="dropdown"
@@ -97,13 +77,10 @@
                                 <a href="{{ url_for('admin._users') }}" id="link-users" class="dropdown-item">Users</a>
                             </li>
                             <li>
-                                <a href="{{ url_for('admin._questions') }}" id="link-questions" class="dropdown-item">Manage Questions</a>
+                                <a href="{{ url_for('admin._questions') }}" id="link-questions" class="dropdown-item">Question Datasets</a>
                             </li>
                             <li>
-                                <a href="{{ url_for('view._view') }}" id="link-editor" class="dropdown-item">View Questions</a>
+                                <a href="{{ url_for('editor._editor') }}" id="link-editor" class="dropdown-item">Question Editor</a>
-                            </li>
-                            <li>
-                                <a href="{{ url_for('editor._editor') }}" id="link-editor" class="dropdown-item">Edit Questions</a>
                             </li>
                         </ul>
                     </li>

ref-test/app/editor/templates/editor/console.html

@@ -11,12 +11,11 @@
     <h1>Editor</h1>
     <div class="container">
         <p class="lead">
-            Use this console to edit the questions in this dataset. For more information on using the editor console, click on the the blue Information button. To preview the questions in the current dataset, click on the green View Questions button.
+            Use this console to edit the questions in this dataset. For more information on using the editor console, click on the the blue information button.
         </p>
     </div>
     <div class="container control-panel">
-        <button class="btn btn-primary" aria-title="Information" title="Information" data-action="info"><i class="bi bi-info-circle-fill"></i></button>
+        <button class="btn btn-primary" aria-title="Infrmation" title="Information"><i class="bi bi-info-circle-fill"></i></button>
-        <button class="btn btn-success" aria-title="View Questions" title="View Questions" data-action="view"><i class="bi bi-book-fill"></i></button>
     </div>
     <div class="container info-panel">
         <h3>
@@ -78,11 +77,9 @@
             In order to show how many questions are remaining inside a block, e.g. to say &lsquo;the next n questions are about a specific scenario&rsquo;, use the placeholder <code>&lt;block_remaining_questions&gt;</code>.
         </p>
     </div>
-    <div class="container viewer-panel">
-    </div>
     <div class="container editor-panel">
         <h3>
-            Edit Questions
+            Edit Dataset
         </h3>
         <div class="container dataset-metadata">
             <div class="input-group mb-3">
@@ -101,7 +98,7 @@
                 <span class="input-group-text">Last Updated</span>
                 <span class="form-control">
                     {{ dataset.date.strftime('%d %b %Y %H:%M') }}
-                </span>
+                </select>
             </div>
             <div class="input-group mb-3">
                 <span class="input-group-text">

ref-test/app/editor/templates/editor/index.html

@@ -4,7 +4,7 @@
     <div class="form-container">
         <form name="form-editor" class="form-display form-post" action="{{ url_for(request.endpoint, **request.view_args) }}" data-rel-success="{{ url_for(request.endpoint, **request.view_args) }}">
             {% include "admin/components/server-alerts.html" %}
-            <h2 class="form">Edit Questions</h2>
+            <h2 class="form">Dataset Editor</h2>
             {{ form.hidden_tag() }}
             <div class="form-select-input">
                 {{ form.dataset(placeholder="Select Question Dataset") }}

ref-test/app/editor/views.py

@@ -1,11 +1,9 @@
 from ..forms.admin import EditDataset
 from ..models import Dataset, User
-from ..tools.data import check_dataset_exists
 from ..tools.forms import get_dataset_choices, send_errors_to_client
-from ..tools.logs import write
 
-from flask import Blueprint, jsonify, render_template
+from flask import Blueprint, flash, jsonify, redirect, render_template, request
-from flask.helpers import abort, flash, redirect, request, url_for
+from flask.helpers import url_for
 from flask_login import login_required
 
 editor = Blueprint(
@@ -29,16 +27,11 @@ def _editor():
     return render_template('/editor/index.html', form=form)
 
 @editor.route('/<string:id>/')
-@check_dataset_exists
 @login_required
 def _editor_console(id:str=None):
-    try:
+    dataset = Dataset.query.filter_by(id=id).first()
-        dataset = Dataset.query.filter_by(id=id).first()
+    datasets = Dataset.query.count()
-        datasets = Dataset.query.count()
+    users = User.query.all()
-        users = User.query.all()
-    except Exception as exception:
-        write('system.log', f'Database error when processing request \'{request.url}\': {exception}')
-        return abort(500)
     if not dataset:
         flash('Invalid dataset ID.', 'error')
         return redirect(url_for('admin._questions'))

ref-test/app/forms/admin.py

@@ -8,44 +8,44 @@ from wtforms.validators import InputRequired, Email, EqualTo, Length, Optional
 
 class Login(FlaskForm):
     username = StringField('Username', validators=[InputRequired(), Length(min=4, max=15)])
-    password = PasswordField('Password', validators=[InputRequired(), Length(min=6, max=20, message='The password must be between 6 and 20 characters long.')])
+    password = PasswordField('Password', validators=[InputRequired(), Length(min=6, max=30, message='The password must be between 6 and 20 characters long.')])
     remember = BooleanField('Remember Log In', render_kw={'checked': True})
 
 class Register(FlaskForm):
     username = StringField('Username', validators=[InputRequired(), Length(min=4, max=15)])
     email = StringField('Email Address', validators=[InputRequired(), Email(message='You must enter a valid email address.'), Length(max=50)])
-    password = PasswordField('Password', validators=[InputRequired(), Length(min=6, max=20, message='The password must be between 6 and 20 characters long.')])
+    password = PasswordField('Password', validators=[InputRequired(), Length(min=6, max=30, message='The password must be between 6 and 20 characters long.')])
-    password_reenter = PasswordField('Re-Enter Password', validators=[InputRequired(), Length(min=6, max=20, message='The password must be between 6 and 20 characters long.'), EqualTo('password', message='Passwords do not match.')])
+    password_reenter = PasswordField('Re-Enter Password', validators=[InputRequired(), Length(min=6, max=30, message='The password must be between 6 and 20 characters long.'), EqualTo('password', message='Passwords do not match.')])
 
 class ResetPassword(FlaskForm):
     username = StringField('Username', validators=[InputRequired(), Length(min=4, max=15)])
     email = StringField('Email Address', validators=[InputRequired(), Email(message='You must enter a valid email address.'), Length(max=50)])
 
 class UpdatePassword(FlaskForm):
-    password = PasswordField('Password', validators=[InputRequired(), Length(min=6, max=20, message='The password must be between 6 and 20 characters long.')])
+    password = PasswordField('Password', validators=[InputRequired(), Length(min=6, max=30, message='The password must be between 6 and 20 characters long.')])
-    password_reenter = PasswordField('Re-Enter Password', validators=[InputRequired(), Length(min=6, max=20, message='The password must be between 6 and 20 characters long.'), EqualTo('password', message='Passwords do not match.')])
+    password_reenter = PasswordField('Re-Enter Password', validators=[InputRequired(), Length(min=6, max=30, message='The password must be between 6 and 20 characters long.'), EqualTo('password', message='Passwords do not match.')])
 
 class CreateUser(FlaskForm):
     username = StringField('Username', validators=[InputRequired(), Length(min=4, max=15)])
     email = StringField('Email Address', validators=[InputRequired(), Email(message='You must enter a valid email address.'), Length(max=50)])
-    password = PasswordField('Password (Optional)', validators=[Optional(),Length(min=6, max=20, message='The password must be between 6 and 20 characters long.')])
+    password = PasswordField('Password (Optional)', validators=[Optional(),Length(min=6, max=30, message='The password must be between 6 and 20 characters long.')])
     notify = BooleanField('Notify accout creation by email', render_kw={'checked': True})
 
 class DeleteUser(FlaskForm):
-    password = PasswordField('Confirm Your Password', validators=[InputRequired(), Length(min=6, max=20, message='The password must be between 6 and 20 characters long.')])
+    password = PasswordField('Confirm Your Password', validators=[InputRequired(), Length(min=6, max=30, message='The password must be between 6 and 20 characters long.')])
     notify = BooleanField('Notify deletion by email', render_kw={'checked': True})
 
 class UpdateUser(FlaskForm):
-    confirm_password = PasswordField('Confirm Your Password', validators=[InputRequired(), Length(min=6, max=20, message='The password must be between 6 and 20 characters long.')])
+    confirm_password = PasswordField('Confirm Your Password', validators=[InputRequired(), Length(min=6, max=30, message='The password must be between 6 and 20 characters long.')])
     email = StringField('Email Address', validators=[Optional(), Email(message='You must enter a valid email address.'), Length(max=50)])
-    password = PasswordField('Change Password', validators=[Optional(),Length(min=6, max=20, message='The password must be between 6 and 20 characters long.')])
+    password = PasswordField('Change Password', validators=[Optional(),Length(min=6, max=30, message='The password must be between 6 and 20 characters long.')])
     password_reenter = PasswordField('Re-Enter New Password', validators=[EqualTo('password', message='Passwords do not match.')])
     notify = BooleanField('Notify changes by email', render_kw={'checked': True})
 
 class UpdateAccount(FlaskForm):
-    confirm_password = PasswordField('Current Password', validators=[InputRequired(), Length(min=6, max=20, message='The password must be between 6 and 20 characters long.')])
+    confirm_password = PasswordField('Current Password', validators=[InputRequired(), Length(min=6, max=30, message='The password must be between 6 and 20 characters long.')])
     email = StringField('Email Address', validators=[Optional(), Email(message='You must enter a valid email address.'), Length(max=50)])
-    password = PasswordField('Change Password', validators=[Optional(),Length(min=6, max=20, message='The password must be between 6 and 20 characters long.')])
+    password = PasswordField('Change Password', validators=[Optional(),Length(min=6, max=30, message='The password must be between 6 and 20 characters long.')])
     password_reenter = PasswordField('Re-Enter New Password', validators=[EqualTo('password', message='Passwords do not match.')])
 
 class CreateTest(FlaskForm):

ref-test/app/models/dataset.py

@@ -2,22 +2,22 @@ from ..extensions import db
 from ..tools.encryption import decrypt, encrypt
 from ..tools.logs import write
 
+from flask import flash
 from flask import current_app as app
-from flask.helpers import flash
 from flask_login import current_user
 from werkzeug.utils import secure_filename
 
 from datetime import datetime
-from json import dump, loads
+from json import dump
 from os import path, remove
 from pathlib import Path
 from uuid import uuid4
 
 class Dataset(db.Model):
-    id = db.Column(db.String(36), index=True, primary_key=True)
+
+    id = db.Column(db.String(36), primary_key=True)
     name = db.Column(db.String(128), nullable=False)
     tests = db.relationship('Test', backref='dataset')
-    entries = db.relationship('Entry', backref='dataset')
     creator_id = db.Column(db.String(36), db.ForeignKey('user.id'))
     date = db.Column(db.DateTime, nullable=False)
     default = db.Column(db.Boolean, default=False, nullable=True)
@@ -42,17 +42,10 @@ class Dataset(db.Model):
     def get_name(self): return decrypt(self.name)
 
     def make_default(self):
-        try:
+        for dataset in Dataset.query.all():
-            for dataset in Dataset.query.all(): dataset.default = False
+            dataset.default = False
-        except Exception as exception:
-            write('system.log', f'Database error when setting default dataset {self.id}: {exception}')
-            return False, f'Database error {exception}.'
         self.default = True
-        try: db.session.commit()
+        db.session.commit()
-        except Exception as exception:
-            db.session.rollback()
-            write('system.log', f'Database error when setting default dataset {self.id}: {exception}')
-            return False, f'Database error {exception}.'
         write('system.log', f'Dataset {self.id} set as default by {current_user.get_username()}.')
         flash(message='Dataset set as default.', category='success')
         return True, f'Dataset set as default.'
@@ -62,26 +55,17 @@ class Dataset(db.Model):
             message = 'Cannot delete the default dataset.'
             flash(message, 'error')
             return False, message
-        try:
+        if Dataset.query.count() == 1:
-            if Dataset.query.count() == 1:
+            message = 'Cannot delete the only dataset.'
-                message = 'Cannot delete the only dataset.'
+            flash(message, 'error')
-                flash(message, 'error')
+            return False, message
-                return False, message
-        except Exception as exception:
-            write('system.log', f'Database error when setting default dataset {self.id}: {exception}')
-            return False, f'Database error {exception}.'
         write('system.log', f'Dataset {self.id} deleted by {current_user.get_username()}.')
         filename = secure_filename('.'.join([self.id,'json']))
         data = Path(app.config.get('DATA'))
         file_path = path.join(data, 'questions', filename)
-        try:
-            db.session.delete(self)
-            db.session.commit()
-        except Exception as exception:
-            db.session.rollback()
-            write('system.log', f'Database error when trying to delete dataset {self.id}: {exception}')
-            return False, f'Database error: {exception}'
         remove(file_path)
+        db.session.delete(self)
+        db.session.commit()
         return True, 'Dataset deleted.'
     
     def create(self, data:list, default:bool=False):
@@ -94,13 +78,8 @@ class Dataset(db.Model):
         self.creator = current_user
         if default: self.make_default()
         write('system.log', f'New dataset {self.get_name()} added by {current_user.get_username()}.')
-        try:
+        db.session.add(self)
-            db.session.add(self)
+        db.session.commit()
-            db.session.commit()
-        except Exception as exception:
-            db.session.rollback()
-            write('system.log', f'Database error when trying to crreate dataset {self.id}: {exception}')
-            return False, f'Database error: {exception}'
         return True, 'Dataset created.'
 
     def check_file(self):
@@ -116,12 +95,6 @@ class Dataset(db.Model):
         file_path = path.join(data, 'questions', filename)
         return file_path
     
-    def get_data(self):
-        dataset_path = self.get_file()
-        with open(dataset_path, 'r') as _dataset:
-            data = loads(_dataset.read())
-        return data
-
     def update(self, data:list=None, default:bool=False):
         self.date = datetime.now()
         if default: self.make_default()
@@ -130,11 +103,6 @@ class Dataset(db.Model):
             dump(data, file, indent=2)
         write('system.log', f'Dataset {self.id} edited by {current_user.get_username()}.')
         flash(f'Dataset {self.get_name()} successfully edited.', 'success')
-        try:
+        db.session.add(self)
-            db.session.add(self)
+        db.session.commit()
-            db.session.commit()
-        except Exception as exception:
-            db.session.rollback()
-            write('system.log', f'Database error when trying to update dataset {self.id}: {exception}')
-            return False, f'Database error: {exception}'
         return True, 'Dataset successfully edited.'

ref-test/app/models/entry.py

@@ -1,31 +1,30 @@
 from ..extensions import db, mail
+from ..tools.forms import JsonEncodedDict
 from ..tools.encryption import decrypt, encrypt
 from ..tools.logs import write
 from .test import Test
-from .dataset import Dataset
 
 from flask_login import current_user
 from flask_mail import Message
-from sqlalchemy_json import MutableJson
 
 from datetime import datetime, timedelta
 from uuid import uuid4
 
 class Entry(db.Model):
-    id = db.Column(db.String(36), index=True, primary_key=True)
+
+    id = db.Column(db.String(36), primary_key=True)
     first_name = db.Column(db.String(128), nullable=False)
     surname = db.Column(db.String(128), nullable=False)
     email = db.Column(db.String(128), nullable=False)
     club = db.Column(db.String(128), nullable=True)
     test_id = db.Column(db.String(36), db.ForeignKey('test.id'))
-    dataset_id = db.Column(db.String(36), db.ForeignKey('dataset.id'))
     user_code = db.Column(db.String(6), nullable=True)
-    start_time = db.Column(db.DateTime, index=True, nullable=True)
+    start_time = db.Column(db.DateTime, nullable=True)
-    end_time = db.Column(db.DateTime, index=True, nullable=True)
+    end_time = db.Column(db.DateTime, nullable=True)
     status = db.Column(db.String(16), nullable=True)
     valid = db.Column(db.Boolean, default=True, nullable=True)
-    answers = db.Column(MutableJson, nullable=True)
+    answers = db.Column(JsonEncodedDict, nullable=True)
-    result = db.Column(MutableJson, nullable=True)
+    result = db.Column(JsonEncodedDict, nullable=True)
     
     def __repr__(self):
         return f'<New entry by {self.first_name} {self.surname}> was added with <id {self.id}>.'
@@ -70,31 +69,23 @@ class Entry(db.Model):
 
     def ready(self):
         self.generate_id()
-        try:
+        db.session.add(self)
-            db.session.add(self)
+        db.session.commit()
-            db.session.commit()
+        write('tests.log', f'New test ready for {self.get_first_name()} {self.get_surname()}.')
-        except Exception as exception:
-            db.session.rollback()
-            write('system.log', f'Database error when preparing new entry for {self.get_surname()}, {self.get_first_name()}: {exception}')
-            return False, f'Database error: {exception}'
-        write('tests.log', f'New test ready for {self.get_surname()}, {self.get_first_name()} with id {self.id}.')
         return True, f'Test ready.'
 
     def start(self):
         self.start_time = datetime.now()
         self.status = 'started'
-        try: db.session.commit()
+        write('tests.log', f'Test started by {self.get_first_name()} {self.get_surname()}.')
-        except Exception as exception:
+        db.session.commit()
-            db.session.rollback()
-            write('system.log', f'Database error when starting test for {self.get_surname()}, {self.get_first_name()}: {exception}')
-            return False, f'Database error: {exception}'
-        write('tests.log', f'Test started by {self.get_surname()}, {self.get_first_name()} with id {self.id}.')
         return True, f'New test started with id {self.id}.'
 
     def complete(self, answers:dict=None, result:dict=None):
         self.end_time = datetime.now()
         self.answers = answers
         self.result = result
+        write('tests.log', f'Test completed by {self.get_first_name()} {self.get_surname()}.')
         delta = timedelta(minutes=int(0 if self.test.time_limit is None else self.test.time_limit)+1)
         if not self.test.time_limit or self.end_time <= self.start_time + delta:
             self.status = 'completed'
@@ -102,12 +93,7 @@ class Entry(db.Model):
         else:
             self.status = 'late'
             self.valid = False
-        try: db.session.commit()
+        db.session.commit()
-        except Exception as exception:
-            db.session.rollback()
-            write('system.log', f'Database error when submitting entry for {self.get_surname()}, {self.get_first_name()}: {exception}')
-            return False, f'Database error: {exception}'
-        write('tests.log', f'Test completed by {self.get_surname()}, {self.get_first_name()} with id {self.id}.')
         return True, f'Test entry completed for id {self.id}.'
 
     def validate(self):
@@ -115,24 +101,15 @@ class Entry(db.Model):
         if self.status == 'started': return False, 'The entry is still pending.'
         self.valid = True
         self.status = 'completed'
-        try: db.session.commit()
+        db.session.commit()
-        except Exception as exception:
-            db.session.rollback()
-            write('system.log', f'Database error when validating entry {self.id}: {exception}')
-            return False, f'Database error: {exception}'
         write('system.log', f'The entry {self.id} has been validated by {current_user.get_username()}.')
         return True, f'The entry {self.id} has been validated.'
 
     def delete(self):
         id = self.id
         name = f'{self.get_first_name()} {self.get_surname()}'
-        try:
+        db.session.delete(self)
-            db.session.delete(self)
+        db.session.commit()
-            db.session.commit()
-        except Exception as exception:
-            db.session.rollback()
-            write('system.log', f'Database error when deleting entry {id}: {exception}')
-            return False, f'Database error: {exception}'
         write('system.log', f'The entry {id} by {name} has been deleted by {current_user.get_username()}.')
         return True, 'Entry deleted.'
     
@@ -197,5 +174,4 @@ class Entry(db.Model):
             <p>Best wishes, <br/> SKA Refereeing</p>
             """
         )
-        try: mail.send(email)
+        mail.send(email)
-        except Exception as exception: write('system.log', f'SMTP Error when trying to notify results to {self.get_surname()}, {self.get_first_name()} with error: {exception}')

ref-test/app/models/test.py

@@ -1,22 +1,23 @@
 from ..extensions import db
+from ..tools.forms import JsonEncodedDict
 from ..tools.logs import write
 
 from flask_login import current_user
-from sqlalchemy_json import MutableJson
 
 from datetime import date, datetime
 import secrets
 from uuid import uuid4
 
 class Test(db.Model):
-    id = db.Column(db.String(36), index=True, primary_key=True)
+    
-    code = db.Column(db.String(36), index=True, nullable=False)
+    id = db.Column(db.String(36), primary_key=True)
-    start_date = db.Column(db.DateTime, index=True, nullable=True)
+    code = db.Column(db.String(36), nullable=False)
+    start_date = db.Column(db.DateTime, nullable=True)
     end_date = db.Column(db.DateTime, nullable=True)
     time_limit = db.Column(db.Integer, nullable=True)
     creator_id = db.Column(db.String(36), db.ForeignKey('user.id'))
     dataset_id = db.Column(db.String(36), db.ForeignKey('dataset.id'))
-    adjustments = db.Column(MutableJson, nullable=True)
+    adjustments = db.Column(JsonEncodedDict, nullable=True)
     entries = db.relationship('Entry', backref='test')
 
     def __repr__(self):
@@ -51,24 +52,16 @@ class Test(db.Model):
             errors.append('The expiry date cannot be before the start date.')
         if errors:
             return False, errors
-        try:
+        db.session.add(self)
-            db.session.add(self)
+        db.session.commit()
-            db.session.commit()
-        except Exception as exception:
-            db.session.rollback()
-            write('system.log', f'Database error when creating test {self.get_code()}: {exception}')
-            return False, f'Database error: {exception}'
         write('system.log', f'Test with code {self.get_code()} created by {current_user.get_username()}.')
         return True, f'Test with code {self.get_code()} has been created.'
     
     def delete(self):
+        code = self.code
         if self.entries: return False, f'Cannot delete a test with submitted entries.'
         db.session.delete(self)
-        try: db.session.commit()
+        db.session.commit()
-        except Exception as exception:
-            db.session.rollback()
-            write('system.log', f'Database error when deleting test {self.get_code()}: {exception}')
-            return False, f'Database error: {exception}'
         write('system.log', f'Test with code {self.get_code()} has been deleted by {current_user.get_username()}.')
         return True, f'Test with code {self.get_code()} has been deleted.'
     
@@ -76,11 +69,7 @@ class Test(db.Model):
         now = datetime.now()
         if self.start_date.date() > now.date():
             self.start_date = now
-            try: db.session.commit()
+            db.session.commit()
-            except Exception as exception:
-                db.session.rollback()
-                write('system.log', f'Database error when launching test {self.get_code()}: {exception}')
-                return False, f'Database error: {exception}'
             write('system.log', f'Test with code {self.get_code()} has been started by {current_user.get_username()}.')
             return True,  f'Test with code {self.get_code()} has been started.'
         return False, f'Test with code {self.get_code()} has already started.'
@@ -89,11 +78,7 @@ class Test(db.Model):
         now = datetime.now()
         if self.end_date >= now:
             self.end_date = now
-            try: db.session.commit()
+            db.session.commit()
-            except Exception as exception:
-                db.session.rollback()
-                write('system.log', f'Database error when closing test {self.get_code()}: {exception}')
-                return False, f'Database error: {exception}'
             write('system.log', f'Test with code {self.get_code()} ended by {current_user.get_username()}.')
             return True, f'Test with code {self.get_code()} has been ended.'
         return False, f'Test with code {self.get_code()} has already ended.'
@@ -103,11 +88,7 @@ class Test(db.Model):
         code = secrets.token_hex(3).lower()
         adjustments[code] = time
         self.adjustments = adjustments
-        try: db.session.commit()
+        db.session.commit()
-        except Exception as exception:
-            db.session.rollback()
-            write('system.log', f'Database error when adding adjustment to test {self.get_code()}: {exception}')
-            return False, f'Database error: {exception}'
         write('system.log', f'Time adjustment for {time} minutes with code {code} added to test {self.get_code()} by {current_user.get_username()}.')
         return True, f'Time adjustment for {time} minutes added to test {self.get_code()}. This can be accessed using the user code {code.upper()}.'
 
@@ -115,11 +96,7 @@ class Test(db.Model):
         if not self.adjustments: return False, f'There are no adjustments configured for test {self.get_code()}.'
         self.adjustments.pop(code)
         if not self.adjustments: self.adjustments = None
-        try: db.session.commit()
+        db.session.commit()
-        except Exception as exception:
-            db.session.rollback()
-            write('system.log', f'Database error when deleting adjustment from test {self.get_code()}: {exception}')
-            return False, f'Database error: {exception}'
         write('system.log', f'Time adjustment for with code {code} has been removed from test {self.get_code()} by {current_user.get_username()}.')
         return True, f'Time adjustment for with code {code} has been removed from test {self.get_code()}.'
 
@@ -128,10 +105,6 @@ class Test(db.Model):
         if start_date: self.start_date = start_date
         if end_date: self.end_date = end_date
         if time_limit is not None: self.time_limit = time_limit
-        try: db.session.commit()
+        db.session.commit()
-        except Exception as exception:
-            db.session.rollback()
-            write('system.log', f'Database error when updating test {self.get_code()}: {exception}')
-            return False, f'Database error: {exception}'
         write('system.log', f'Test with code {self.get_code()} has been updated by user {current_user.get_username()}.')
         return True, f'Test with code {self.get_code()} has been updated by.'

ref-test/app/models/user.py

@@ -2,8 +2,8 @@ from ..extensions import db, mail
 from ..tools.encryption import decrypt, encrypt
 from ..tools.logs import write
 
-from flask import jsonify, session
+from flask import flash, jsonify, session
-from flask.helpers import flash, url_for
+from flask.helpers import url_for
 from flask_login import current_user, login_user, logout_user, UserMixin
 from flask_mail import Message
 from werkzeug.security import check_password_hash, generate_password_hash
@@ -11,11 +11,11 @@ from werkzeug.security import check_password_hash, generate_password_hash
 import secrets
 from uuid import uuid4
 class User(UserMixin, db.Model):
-    id = db.Column(db.String(36), index=True, primary_key=True)
+    id = db.Column(db.String(36), primary_key=True)
     username = db.Column(db.String(128), nullable=False)
     password = db.Column(db.String(128), nullable=False)
     email = db.Column(db.String(128), nullable=False)
-    reset_token = db.Column(db.String(20), index=True, nullable=True)
+    reset_token = db.Column(db.String(20), nullable=True)
     verification_token = db.Column(db.String(20), nullable=True)
     tests = db.relationship('Test', backref='creator')
     datasets = db.relationship('Dataset', backref='creator')
@@ -55,21 +55,13 @@ class User(UserMixin, db.Model):
 
     def register(self, notify:bool=False, password:str=None):
         self.generate_id()
-        try: users = User.query.all()
+        users = User.query.all()
-        except Exception as exception:
-            write('system.log', f'Database error when setting default dataset {self.id}: {exception}')
-            return False, f'Database error {exception}.'
         for user in users:
             if user.get_username() == self.get_username(): return False, f'Username {self.get_username()} already in use.'
             if user.get_email() == self.get_email(): return False, f'Email address {self.get_email()} already in use.'
         self.set_password(password=password)
-        try:
+        db.session.add(self)
-            db.session.add(self)
+        db.session.commit()
-            db.session.commit()
-        except Exception as exception:
-            db.session.rollback()
-            write('system.log', f'Database error when registering user {self.get_username()}: {exception}')
-            return False, f'Database error: {exception}'
         write('users.log', f'User \'{self.get_username()}\' was created with id \'{self.id}\'.')
         if notify:
             email = Message(
@@ -98,8 +90,7 @@ class User(UserMixin, db.Model):
                 <p>SKA Refereeing</p>
                 """
             )
-            try: mail.send(email)
+            mail.send(email)
-            except Exception as exception: write('system.log', f'SMTP Error while trying to notify new user account creation to {self.get_username()} with error: {exception}')
         return True, f'User {self.get_username()} was created successfully.'
 
     def login(self, remember:bool=False):
@@ -118,6 +109,7 @@ class User(UserMixin, db.Model):
         self.set_password(new_password)
         self.reset_token = secrets.token_urlsafe(16)
         self.verification_token = secrets.token_urlsafe(16)
+        db.session.commit()
         email = Message(
             subject='RefTest | Password Reset',
             recipients=[self.get_email()],
@@ -150,36 +142,22 @@ class User(UserMixin, db.Model):
             <p>SKA Refereeing</p>
             """
         )
-        try: mail.send(email)
+        mail.send(email)
-        except Exception as exception:
+        print('Password', new_password)
-            write('system.log', f'SMTP Error while trying to reset password for {self.get_username()} with error: {exception}')
+        print('Reset Token', self.reset_token)
-            db.session.rollback()
+        print('Verification Token', self.verification_token)
-            return jsonify({'error': f'SMTP Error: {exception}'}), 500
+        print('Reset Link', f'{url_for("admin._reset", token=self.reset_token, verification=self.verification_token, _external=True)}')
-        try: db.session.commit()
-        except Exception as exception:
-            db.session.rollback()
-            write('system.log', f'Database error when resetting password for user {self.get_username()}: {exception}')
-            return False, f'Database error: {exception}'
         return jsonify({'success': 'Your password reset link has been generated.'}), 200
 
     def clear_reset_tokens(self):
         self.reset_token = self.verification_token = None
-        try: db.session.commit()
+        db.session.commit()
-        except Exception as exception:
-            db.session.rollback()
-            write('system.log', f'Database error when resetting clearing reset tokens for user {self.get_username()}: {exception}')
-            return False, f'Database error: {exception}'
     
     def delete(self, notify:bool=False):
         username = self.get_username()
         email_address = self.get_email()
-        try:
+        db.session.delete(self)
-            db.session.delete(self)
+        db.session.commit()
-            db.session.commit()
-        except Exception as exception:
-            db.session.rollback()
-            write('system.log', f'Database error when deleting user {self.get_username()}: {exception}')
-            return False, f'Database error: {exception}'
         message = f'User \'{username}\' was deleted by \'{current_user.get_username()}\'.'
         write('users.log', message)
         if notify:
@@ -204,8 +182,7 @@ class User(UserMixin, db.Model):
                 <p>SKA Refereeing</p>
                 """
             )
-            try: mail.send(email)
+            mail.send(email)
-            except Exception as exception: write('system.log', f'SMTP Error when trying to delete account {username} with error: {exception}')
         return True, message
 
     def update(self, password:str=None, email:str=None, notify:bool=False):
@@ -213,19 +190,11 @@ class User(UserMixin, db.Model):
         if password: self.set_password(password)
         old_email = self.get_email()
         if email:
-            try:
+            for entry in User.query.all():
-                for entry in User.query.all():
+                if entry.get_email() == email and not entry == self: return False, f'The email address {email} is already in use.'
-                    if entry.get_email() == email and not entry == self: return False, f'The email address {email} is already in use.'
-            except Exception as exception:
-                write('system.log', f'Database error when setting default dataset {self.id}: {exception}')
-                return False, f'Database error {exception}.'
             self.set_email(email)
-        try: db.session.commit()
+        db.session.commit()
-        except Exception as exception:
+        _current_user = current_user.get_username() if current_user.is_authenticated else 'anonymous'
-            db.session.rollback()
-            write('system.log', f'Database error when updating user {self.get_username()}: {exception}')
-            return False, f'Database error: {exception}'
-        _current_user = 'command line' if not current_user else 'anonymous' if not current_user.is_authenticated else current_user.get_username()
         write('system.log', f'Information for user {self.get_username()} has been updated by {_current_user}.')
         if notify:
             message = Message(
@@ -254,6 +223,5 @@ class User(UserMixin, db.Model):
                 <p>SKA Refereeing</p>
                 """
             )
-            try: mail.send(message)
+            mail.send(message)
-            except Exception as exception: write('system.log', f'SMTP Error when trying to update account {self.get_username()} with error: {exception}')
         return True, f'Account {self.get_username()} has been updated.'

ref-test/app/quiz/static/js/quiz.js

@@ -1,142 +1,142 @@
 // Bind Listeners
 
 $("input[name='font-select']").change(function(){
-    let $choice = $(this).val()
+    let $choice = $(this).val();
-    set_font($choice)
+    set_font($choice);
-})
+});
 
 $("input[name='font-size']").change(function(){
-    let $choice = $(this).val()
+    let $choice = $(this).val();
-    set_font_size($choice)
+    set_font_size($choice);
-})
+});
 
 $("input[name='bg-select']").change(function(){
-    let $choice = $(this).val()
+    let $choice = $(this).val();
-    set_bg_colour($choice)
+    set_bg_colour($choice);
-})
+});
 
 $(".bg-select-area").click(function(event){
-    $(this).find("input[name='bg-select']").prop("checked", true).change()
+    $(this).find("input[name='bg-select']").prop("checked", true).change();
-})
+});
 
 $("#btn-toggle-navigator").click(function(event){
-    check_answered()
+    check_answered();
-    update_navigator()
+    update_navigator();
     if ($quiz_navigator.is(":hidden")) {
         if ($quiz_settings.is(":visible")) {
-            toggle_settings = true
+            toggle_settings = true;
-            $quiz_settings.fadeOut()
+            $quiz_settings.fadeOut();
         }
-        $quiz_render.fadeOut()
+        $quiz_render.fadeOut();
-        $quiz_navigator.fadeIn()
+        $quiz_navigator.fadeIn();
-        $(".navigator-text").fadeIn()
+        $(".navigator-text").fadeIn();
-        $(".review-text").fadeOut()
+        $(".review-text").fadeOut();
-        toggle_navigator = false
+        toggle_navigator = false;
-        $(window).scrollTop(0)
+        $(window).scrollTop(0);
     } else {
-        $quiz_navigator.fadeOut()
+        $quiz_navigator.fadeOut();
         if (toggle_settings) {
-            $quiz_settings.fadeIn()
+            $quiz_settings.fadeIn();
-            $(window).scrollTop(0)
+            $(window).scrollTop(0);
-            toggle_settings = false
+            toggle_settings = false;
         } else {
-            $quiz_render.fadeIn()
+            $quiz_render.fadeIn();
-            $(window).scrollTop(0)
+            $(window).scrollTop(0);
         }
     }
-    event.preventDefault()
+    event.preventDefault();
-})
+});
 
 $("#btn-toggle-settings").click(function(event){
     if (($quiz_settings).is(":hidden")) {
         if ($quiz_navigator.is(":visible")) {
-            toggle_navigator = true
+            toggle_navigator = true;
-            $quiz_navigator.fadeOut()
+            $quiz_navigator.fadeOut();
         }
-        $quiz_render.fadeOut()
+        $quiz_render.fadeOut();
-        $quiz_settings.fadeIn()
+        $quiz_settings.fadeIn();
-        $(window).scrollTop(0)
+        $(window).scrollTop(0);
-        toggle_settings = false
+        toggle_settings = false;
     } else {
-        $quiz_settings.fadeOut()
+        $quiz_settings.fadeOut();
         if (toggle_navigator) {
-            $quiz_navigator.fadeIn()
+            $quiz_navigator.fadeIn();
-            toggle_navigator = false
+            toggle_navigator = false;
-            $(window).scrollTop(0)
+            $(window).scrollTop(0);
         } else {
-            $quiz_render.fadeIn()
+            $quiz_render.fadeIn();
-            $(window).scrollTop(0)
+            $(window).scrollTop(0);
         }
     }
-    event.preventDefault()
+    event.preventDefault();
-})
+});
 
 $(".btn-quiz-return").click(function(event){
-    $quiz_navigator.fadeOut()
+    $quiz_navigator.fadeOut();
-    $quiz_settings.fadeOut()
+    $quiz_settings.fadeOut();
-    $quiz_render.fadeIn()
+    $quiz_render.fadeIn();
-    $(window).scrollTop(0)
+    $(window).scrollTop(0);
-    toggle_settings = false
+    toggle_settings = false;
-    toggle_navigator = false
+    toggle_navigator = false;
-    event.preventDefault()
+    event.preventDefault();
-})
+});
 
 $(".btn-dummy").click(function(event){
-    event.preventDefault()
+    event.preventDefault();
-})
+});
 
 $("#navigator-container").on("click", ".q-navigator-button", function(event){
-    check_answered()
+    check_answered();
-    update_navigator()
+    update_navigator();
-    current_question = parseInt($(this).prop("name"))
+    current_question = parseInt($(this).prop("name"));
-    $quiz_navigator.fadeOut()
+    $quiz_navigator.fadeOut();
-    $quiz_render.fadeIn()
+    $quiz_render.fadeIn();
-    $question_title.focus()
+    $question_title.focus();
-    $(window).scrollTop(0)
+    $(window).scrollTop(0);
-    toggle_navigator = false
+    toggle_navigator = false;
-    toggle_settings = false
+    toggle_settings = false;
-    render_question()
+    render_question();
-    check_flag()
+    check_flag();
-    event.preventDefault()
+    event.preventDefault();
-})
+});
 
 $(".q-question-nav").click(function(event){
-    check_answered()
+    check_answered();
-    update_navigator()
+    update_navigator();
     if ($(this).prop("id") == "q-nav-next") {
         if (current_question < questions.length) {
-            current_question ++
+            current_question ++;
         }
     } else if ($(this).prop("id") == "q-nav-prev") {
         if (current_question > 0) {
-            current_question --
+            current_question --;
         }
     } else if ($(this).hasClass("q-navigator-button")) {
-        current_question = $(this).prop("name")
+        current_question = $(this).prop("name");
-        $quiz_render.fadeIn()
+        $quiz_render.fadeIn();
-        $quiz_navigator.fadeOut()
+        $quiz_navigator.fadeOut();
-        toggle_navigator = false
+        toggle_navigator = false;
-        toggle_settings = false
+        toggle_settings = false;
     }
-    render_question()
+    render_question();
-    check_flag()
+    check_flag();
-    event.preventDefault()
+    event.preventDefault();
-})
+});
 
 $("#q-nav-flag").click(function(event){
     if (question_status[current_question] != 1) {
-        question_status[current_question] = 1
+        question_status[current_question] = 1;
-        $(this).removeClass().addClass("btn btn-warning")
+        $(this).removeClass().addClass("btn btn-warning");
-        $(this).prop("title", "Question Flagged for revision. Click to un-flag.")
+        $(this).prop("title", "Question Flagged for revision. Click to un-flag.");
     } else {
-        question_status[current_question] = 0
+        question_status[current_question] = 0;
-        $(this).removeClass().addClass("btn btn-secondary")
+        $(this).removeClass().addClass("btn btn-secondary");
-        $(this).prop("title", "Question Un-Flagged. Click to flag for revision.")
+        $(this).prop("title", "Question Un-Flagged. Click to flag for revision.");
     }
-    window.localStorage.setItem('question_status', JSON.stringify(question_status))
+    window.localStorage.setItem('question_status', JSON.stringify(question_status));
-    update_navigator()
+    update_navigator();
-    event.preventDefault()
+    event.preventDefault();
-})
+});
 
 $("#btn-start-quiz").click(function(event){
 
@@ -146,29 +146,29 @@ $("#btn-start-quiz").click(function(event){
         data: JSON.stringify({'id': id}),
         contentType: "application/json",
         success: function(response) {
-            $("#btn-start-quiz").fadeOut()
+            $("#btn-start-quiz").fadeOut();
-            $(".btn-quiz-return").fadeIn()
+            $(".btn-quiz-return").fadeIn();
-            $(".quiz-console").fadeIn()
+            $(".quiz-console").fadeIn();
-            $("#quiz-settings").fadeOut()
+            $("#quiz-settings").fadeOut();
-            $("#quiz-navigator").fadeOut()
+            $("#quiz-navigator").fadeOut();
-            $(".quiz-start-text").fadeOut()
+            $(".quiz-start-text").fadeOut();
-            time_limit = response.time_limit
+            time_limit = response.time_limit;
-            start_time = response.start_time
+            start_time = response.start_time;
-            questions = response.questions
+            questions = response.questions;
-            total_questions = questions.length
+            total_questions = questions.length;
-            window.localStorage.setItem('questions', JSON.stringify(questions))
+            window.localStorage.setItem('questions', JSON.stringify(questions));
-            window.localStorage.setItem('start_time', JSON.stringify(start_time))
+            window.localStorage.setItem('start_time', JSON.stringify(start_time));
-            window.localStorage.setItem('time_limit', JSON.stringify(time_limit))
+            window.localStorage.setItem('time_limit', JSON.stringify(time_limit));
-            render_question()
+            render_question();
-            build_navigator()
+            build_navigator();
-            check_flag()
+            check_flag();
             if (time_limit != 'null' && time_limit != null) {
-                $("#q-timer-widget").fadeIn()
+                $("#q-timer-widget").fadeIn();
-                time_remaining = get_time_remaining()
+                time_remaining = get_time_remaining();
-                clock = setInterval(timer, 1000)
+                clock = setInterval(timer, 1000);
             }
             if (response.time_adjustment > 0) {
-                const $alert = $("#alert-box")
+                const $alert = $("#alert-box");
                 $alert.html(
                     `<div class="alert alert-primary alert-dismissible fade show" role="alert">
                     <i class="bi bi-exclamation-triangle-fill" title="Alert"></i>
@@ -176,50 +176,50 @@ $("#btn-start-quiz").click(function(event){
                     <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
                 </div>
                 `
-                )
+                );
-                $alert.focus()
+                $alert.focus();
             }
         },
         error: function(response) {
-            error_response(response)
+            error_response(response);
         }
-    })
+    });
 
-    event.preventDefault()
+    event.preventDefault();
-})
+});
 
 $("#quiz-question-options").on("change", ".quiz-option", function(event){
-    $name = parseInt($(this).prop("name"))
+    $name = parseInt($(this).prop("name"));
-    $value = $(this).prop("value")
+    $value = $(this).prop("value");
-    answers[$name] = $value
+    answers[$name] = $value;
-    window.localStorage.setItem('answers', JSON.stringify(answers))
+    window.localStorage.setItem('answers', JSON.stringify(answers));
-})
+});
 
 $("#q-review-answers").click(function(event){
-    check_answered()
+    check_answered();
-    update_navigator()
+    update_navigator();
     if ($quiz_navigator.is(":hidden")) {
         if ($quiz_settings.is(":visible")) {
-            toggle_settings = true
+            toggle_settings = true;
-            $quiz_settings.fadeOut()
+            $quiz_settings.fadeOut();
         }
-        $quiz_render.fadeOut()
+        $quiz_render.fadeOut();
-        $quiz_navigator.fadeIn()
+        $quiz_navigator.fadeIn();
-        $(".navigator-text").fadeOut()
+        $(".navigator-text").fadeOut();
-        $(".review-text").fadeIn()
+        $(".review-text").fadeIn();
-        toggle_navigator = false
+        toggle_navigator = false;
-        $(window).scrollTop(0)
+        $(window).scrollTop(0);
     } else {
-        $quiz_navigator.fadeOut()
+        $quiz_navigator.fadeOut();
         if (toggle_settings) {
-            $quiz_settings.fadeIn()
+            $quiz_settings.fadeIn();
-            toggle_settings = false
+            toggle_settings = false;
         } else {
-            $quiz_render.fadeIn()
+            $quiz_render.fadeIn();
         }
     }
-    event.preventDefault()
+    event.preventDefault();
-})
+});
 
 $(".quiz-button-submit").click(function(event){
     let submission = {
@@ -233,16 +233,16 @@ $(".quiz-button-submit").click(function(event){
         data: JSON.stringify(submission),
         contentType: "application/json",
         success: function(response) {
-            window.localStorage.clear()
+            window.localStorage.clear();
-            window.location.href = `/result/`
+            window.location.href = `/result/`;
         },
         error: function(response) {
-            error_response(response)
+            error_response(response);
         }
-    })
+    });
 
-    event.preventDefault()
+    event.preventDefault();
-})
+});
 
 // Functions
 
@@ -251,17 +251,17 @@ function set_font(value = 'osdefault') {
 
     for (let i = 0; i < font_styles.length; i ++) {
         if (font_styles[i] != value) {
-            $("body").removeClass( `q-f-${font_styles[i]}` )
+            $("body").removeClass( `q-f-${font_styles[i]}` );
-        }
+        };
-    }
+    };
 
     if (value != 'osdefault') {
-        $("body").addClass(`q-f-${value}`)
+        $("body").addClass(`q-f-${value}`);
-    }
+    };
     
-    display_settings['font-select'] = value
+    display_settings['font-select'] = value;
-    window.localStorage.setItem('display_settings', JSON.stringify(display_settings))
+    window.localStorage.setItem('display_settings', JSON.stringify(display_settings));
-    $('input[name="font-select"][value="' + value + '"]').prop('checked', true)
+    $('input[name="font-select"][value="' + value + '"]').prop('checked', true);
 }
 
 function set_font_size(value = '14pt') {
@@ -269,17 +269,17 @@ function set_font_size(value = '14pt') {
 
     for (let i = 0; i < font_sizes.length; i ++) {
         if (font_sizes[i] != value) {
-            $("body").removeClass( `q-f-${font_sizes[i]}` )
+            $("body").removeClass( `q-f-${font_sizes[i]}` );
-        }
+        };
-    }
+    };
 
     if (value != '14pt') {
-        $("body").addClass(`q-f-${value}`)
+        $("body").addClass(`q-f-${value}`);
-    }
+    };
 
-    display_settings['font-size'] = value
+    display_settings['font-size'] = value;
-    window.localStorage.setItem('display_settings', JSON.stringify(display_settings))
+    window.localStorage.setItem('display_settings', JSON.stringify(display_settings));
-    $('input[name="font-size"][value="' + value + '"]').prop('checked', true)
+    $('input[name="font-size"][value="' + value + '"]').prop('checked', true);
 }
 
 function set_bg_colour(value = 'bg-light') {
@@ -287,34 +287,34 @@ function set_bg_colour(value = 'bg-light') {
 
     for (let i = 0; i < backgrounds.length; i ++) {
         if (backgrounds[i] != value) {
-            $("body").removeClass(backgrounds[i])
+            $("body").removeClass(backgrounds[i]);
             if (backgrounds[i] == 'bg-dark') {
-                $("body").removeClass('text-light')
+                $("body").removeClass('text-light');
-            }
+            };
             if (backgrounds[i] == 'alert-primary' || backgrounds[i] == 'alert-secondary' || backgrounds[i] == 'alert-dark') {
-                $("body").removeClass('text-dark')
+                $("body").removeClass('text-dark');
-            }
+            };
-        }
+        };
-    }
+    };
 
-    $("body").addClass(value)
+    $("body").addClass(value);
     if (value == 'bg-dark') {
-        $("body").addClass('text-light')
+        $("body").addClass('text-light');
-    }
+    };
     if (value == 'alert-primary' || value == 'alert-secondary' || value == 'alert-dark') {
-        $("body").addClass('text-dark')
+        $("body").addClass('text-dark');
-    }
+    };
 
-    display_settings['bg-select'] = value
+    display_settings['bg-select'] = value;
-    window.localStorage.setItem('display_settings', JSON.stringify(display_settings))
+    window.localStorage.setItem('display_settings', JSON.stringify(display_settings));
-    $('input[name="bg-select"][value="' + value + '"]').prop('checked', true)
+    $('input[name="bg-select"][value="' + value + '"]').prop('checked', true);
 }
 
 function get_settings_from_storage() {
     let display_settings = window.localStorage.getItem('display_settings')
     if (display_settings != null) {
-        return JSON.parse(display_settings)
+        return JSON.parse(display_settings);
-    }
+    };
     return {
         'font-select': 'osdefault',
         'font-size': '14pt',
@@ -323,133 +323,133 @@ function get_settings_from_storage() {
 }
 
 function apply_settings(settings) {
-    set_font(settings['font-select'])
+    set_font(settings['font-select']);
-    set_font_size(settings['font-size'])
+    set_font_size(settings['font-size']);
-    set_bg_colour(settings['bg-select'])
+    set_bg_colour(settings['bg-select']);
 }
 
 function render_question() {
     if (current_question == 0) {
-        $nav_prev.addClass('disabled')
+        $nav_prev.addClass('disabled');
     }
     if (current_question == questions.length - 1) {
-        $nav_next.addClass('disabled')
+        $nav_next.addClass('disabled');
     }
     if ($nav_prev.hasClass('disabled') && current_question > 0) {
-        $nav_prev.removeClass('disabled')
+        $nav_prev.removeClass('disabled');
     }
     if ($nav_next.hasClass('disabled') && current_question < questions.length - 1) {
-        $nav_next.removeClass('disabled')
+        $nav_next.removeClass('disabled');
     }
-    var question = questions[current_question]
+    var question = questions[current_question];
-    let header_text = question.question_header
+    let header_text = question.question_header;
-    var block_length = 0
+    var block_length = 0;
     if ('block_length' in question) {
-        block_length = question['block_length']
+        block_length = question['block_length'];
-    }
+    };
-    var block_q_no = 0
+    var block_q_no = 0;
     if ('block_q_no' in question) {
-        block_q_no = question['block_q_no']
+        block_q_no = question['block_q_no'];
     }
-    let remaining_qs = (block_length - block_q_no).toString()
+    let remaining_qs = (block_length - block_q_no).toString();
     if (block_length - block_q_no > 1) {
-        remaining_qs += ' questions'
+        remaining_qs += ' questions';
     } else {
-        remaining_qs += ' question'
+        remaining_qs += ' question';
     }
-    header_text = header_text.replace('<block_remaining_questions>', remaining_qs)
+    header_text = header_text.replace('<block_remaining_questions>', remaining_qs);
-    $question_header.html(header_text)
+    $question_header.html(header_text);
-    $question_text.html(question.text)
+    $question_text.html(question.text);
-    $question_title.html(`Question ${current_question + 1} of ${ questions.length }.`)
+    $question_title.html(`Question ${current_question + 1} of ${ questions.length }.`);
 
-    var q_no = question['q_no']
+    var q_no = question['q_no'];
-    var options = question.options
+    var options = question.options;
-    var options_output = ''
+    var options_output = '';
     for (let i = 0; i < options.length; i ++) {
         var add_checked = ''
         if (q_no in answers) {
             if (answers[q_no] == options[i][0]) {
-                add_checked = 'checked'
+                add_checked = 'checked';
             }
         }
         options_output += `<div class="form-check">
             <input type="radio" class="form-check-input quiz-option" id="q${current_question}-${i}" name="${q_no}" value="${options[i][0]}" ${add_checked}>
             <label for="q${current_question}-${i}" class="form-check-label">${options[i][1]}</label>
-        </div>`
+        </div>`;
     }
-    $question_options.html(options_output)
+    $question_options.html(options_output);
-    let skipped = count_questions(-1)
+    let skipped = count_questions(-1);
-    let answered = count_questions(2)
+    let answered = count_questions(2);
-    let flagged = count_questions(1)
+    let flagged = count_questions(1);
 
-    $progress_skipped.prop('title', `Skipped: ${skipped}`)
+    $progress_skipped.prop('title', `Skipped: ${skipped}`);
-    $progress_skipped.prop('aria-valuenow', skipped)
+    $progress_skipped.prop('aria-valuenow', skipped);
-    $progress_skipped.css('width', `${skipped}%`)
+    $progress_skipped.css('width', `${skipped}%`);
-    $skipped_count.text(`Skipped: ${skipped}`)
+    $skipped_count.text(`Skipped: ${skipped}`);
     if (skipped < 1) {
         $skipped_count.fadeOut()
     } else {
         $skipped_count.fadeIn()
     }
 
-    $progress_flagged.prop('title', `Flagged: ${flagged}`)
+    $progress_flagged.prop('title', `Flagged: ${flagged}`);
-    $progress_flagged.prop('aria-valuenow', flagged)
+    $progress_flagged.prop('aria-valuenow', flagged);
-    $progress_flagged.css('width', `${flagged}%`)
+    $progress_flagged.css('width', `${flagged}%`);
-    $flagged_count.text(`Flagged: ${flagged}`)
+    $flagged_count.text(`Flagged: ${flagged}`);
     if (flagged < 1) {
         $flagged_count.fadeOut()
     } else {
         $flagged_count.fadeIn()
     }
 
-    $progress_answered.prop('title', `Answered: ${answered}`)
+    $progress_answered.prop('title', `Answered: ${answered}`);
-    $progress_answered.prop('aria-valuenow', answered)
+    $progress_answered.prop('aria-valuenow', answered);
-    $progress_answered.css('width', `${answered}%`)
+    $progress_answered.css('width', `${answered}%`);
-    $answered_count.text(`Answered: ${answered}`)
+    $answered_count.text(`Answered: ${answered}`);
     if (answered < 1) {
         $answered_count.fadeOut()
     } else {
         $answered_count.fadeIn()
     }
 
-    $question_title.focus()
+    $question_title.focus();
-    $(window).scrollTop(0)
+    $(window).scrollTop(0);
 }
 
 function check_answered() {
-    var question = questions[current_question]
+    var question = questions[current_question];
-    var name = question.q_no
+    var name = question.q_no;
     if (question_status[current_question] == 0 || question_status[current_question] == -1) {
         if (!$(`input[name='${name}']:checked`).val()) {
-            question_status[current_question] = -1
+            question_status[current_question] = -1;
         } else {
-            question_status[current_question] = 2
+            question_status[current_question] = 2;
         }
-        window.localStorage.setItem('question_status', JSON.stringify(question_status))
+        window.localStorage.setItem('question_status', JSON.stringify(question_status));
     }
 }
 
 function check_flag() {
     if (!(current_question in question_status)) {
-        question_status[current_question] = 0
+        question_status[current_question] = 0;
-        window.localStorage.setItem('question_status', JSON.stringify(question_status))
+        window.localStorage.setItem('question_status', JSON.stringify(question_status));
     }
     switch (question_status[current_question]) {
         case -1:
-            $nav_flag.removeClass().addClass('btn btn-danger progress-bar-striped')
+            $nav_flag.removeClass().addClass('btn btn-danger progress-bar-striped');
-            $nav_flag.prop("title", "Question Incomplete. Click to flag for revision.")
+            $nav_flag.prop("title", "Question Incomplete. Click to flag for revision.");
-            break
+            break;
         case 1:
-            $nav_flag.removeClass().addClass('btn btn-warning')
+            $nav_flag.removeClass().addClass('btn btn-warning');
-            $nav_flag.prop("title", "Question Flagged for revision. Click to un-flag.")
+            $nav_flag.prop("title", "Question Flagged for revision. Click to un-flag.");
-            break
+            break;
         case 2:
-            $nav_flag.removeClass().addClass('btn btn-success')
+            $nav_flag.removeClass().addClass('btn btn-success');
-            $nav_flag.prop("title", "Question Answered. Click to flag for revision.")
+            $nav_flag.prop("title", "Question Answered. Click to flag for revision.");
-            break
+            break;
         default:
-            $nav_flag.removeClass().addClass('btn btn-secondary')
+            $nav_flag.removeClass().addClass('btn btn-secondary');
-            $nav_flag.prop("title", "Question Un-Flagged. Click to flag for revision.")
+            $nav_flag.prop("title", "Question Un-Flagged. Click to flag for revision.");
     }
 }
 
@@ -457,31 +457,31 @@ function build_navigator() {
     $nav_container.html('')
     var output = ''
     for (let i = 0; i < questions.length; i ++) {
-        let add_class, add_href, add_status = ''
+        let add_class, add_href, add_status = '';
         switch (question_status[i]) {
             case -1:
-                add_class = 'btn-danger progress-bar-striped'
+                add_class = 'btn-danger progress-bar-striped';
-                add_href = 'href="#"'
+                add_href = 'href="#"';
-                add_status = 'Incomplete'
+                add_status = 'Incomplete';
-                break
+                break;
             case 1:
-                add_class = 'btn-warning'
+                add_class = 'btn-warning';
-                add_href = 'href="#"'
+                add_href = 'href="#"';
-                add_status = 'Flagged'
+                add_status = 'Flagged';
-                break
+                break;
             case 2:
-                add_class = 'btn-success'
+                add_class = 'btn-success';
-                add_href = 'href="#"'
+                add_href = 'href="#"';
-                add_status = 'Answered'
+                add_status = 'Answered';
-                break
+                break;
             default:
-                add_class = 'btn-secondary disabled'
+                add_class = 'btn-secondary disabled';
-                add_href = ''
+                add_href = '';
-                add_status = 'Unseen'
+                add_status = 'Unseen';
         }
-        output += `<a ${add_href} class="q-navigator-button btn ${add_class}" name=${i} title="Question ${i+1}: ${add_status}">Q${i + 1}</a>`
+        output += `<a ${add_href} class="q-navigator-button btn ${add_class}" name=${i} title="Question ${i+1}: ${add_status}">Q${i + 1}</a>`;
     }
-    $nav_container.html(output)
+    $nav_container.html(output);
 }
 
 function update_navigator() {
@@ -489,162 +489,162 @@ function update_navigator() {
     if (current_question in question_status) {
         switch (question_status[current_question]) {
             case -1:
-                button.removeClass().addClass("q-navigator-button btn btn-danger progress-bar-striped")
+                button.removeClass().addClass("q-navigator-button btn btn-danger progress-bar-striped");
-                button.prop("title", `Question ${current_question + 1}: Incomplete`)
+                button.prop("title", `Question ${current_question + 1}: Incomplete`);
-                break
+                break;
             case 1:
-                button.removeClass().addClass("q-navigator-button btn btn-warning")
+                button.removeClass().addClass("q-navigator-button btn btn-warning");
-                button.prop("title", `Question ${current_question + 1}: Flagged`)
+                button.prop("title", `Question ${current_question + 1}: Flagged`);
-                break
+                break;
             case 2:
-                button.removeClass().addClass("q-navigator-button btn btn-success")
+                button.removeClass().addClass("q-navigator-button btn btn-success");
-                button.prop("title", `Question ${current_question + 1}: Answered`)
+                button.prop("title", `Question ${current_question + 1}: Answered`);
-                break
+                break;
             default:
-                button.removeClass().addClass("q-navigator-button btn btn-secondary disabled")
+                button.removeClass().addClass("q-navigator-button btn btn-secondary disabled");
-                button.prop("title", `Question ${current_question + 1}: Unseen`)
+                button.prop("title", `Question ${current_question + 1}: Unseen`);
         }
     }
 }
 
 function start() {
-    $("#btn-start-quiz").fadeOut()
+    $("#btn-start-quiz").fadeOut();
-    $(".btn-quiz-return").fadeIn()
+    $(".btn-quiz-return").fadeIn();
-    $(".quiz-console").fadeIn()
+    $(".quiz-console").fadeIn();
-    $("#quiz-settings").fadeOut()
+    $("#quiz-settings").fadeOut();
-    $("#quiz-navigator").fadeOut()
+    $("#quiz-navigator").fadeOut();
-    $(".quiz-start-text").fadeOut()
+    $(".quiz-start-text").fadeOut();
 
-    questions = JSON.parse(window.localStorage.getItem('questions'))
+    questions = JSON.parse(window.localStorage.getItem('questions'));
-    total_questions = questions.length
+    total_questions = questions.length;
-    start_time = window.localStorage.getItem('start_time')
+    start_time = window.localStorage.getItem('start_time');
-    time_limit = window.localStorage.getItem('time_limit')
+    time_limit = window.localStorage.getItem('time_limit');
 
-    let get_answers = window.localStorage.getItem('answers')
+    let get_answers = window.localStorage.getItem('answers');
     if (get_answers != null) {
-        answers = JSON.parse(get_answers)
+        answers = JSON.parse(get_answers);
     }
 
-    let get_status = window.localStorage.getItem('question_status')
+    let get_status = window.localStorage.getItem('question_status');
     if (get_status != null) {
-        question_status = JSON.parse(get_status)
+        question_status = JSON.parse(get_status);
     }
 
-    render_question()
+    render_question();
-    build_navigator()
+    build_navigator();
-    check_flag()
+    check_flag();
     if (time_limit != 'null' && time_limit != null) {
-        $("#q-timer-widget").fadeIn()
+        $("#q-timer-widget").fadeIn();
-        time_remaining = get_time_remaining()
+        time_remaining = get_time_remaining();
-        clock = setInterval(timer, 1000)
+        clock = setInterval(timer, 1000);
     }
 }
 
 function check_started() {
-    let questions = window.localStorage.getItem('questions')
+    let questions = window.localStorage.getItem('questions');
-    let time_limit = window.localStorage.getItem('time_limit')
+    let time_limit = window.localStorage.getItem('time_limit');
     let start_time = window.localStorage.getItem('start_time')
     if (questions != null && start_time != null && time_limit != null) {
-        start()
+        start();
     }
 }
 
 function get_time_remaining() {
-    var end_time = new Date(time_limit).getTime()
+    var end_time = new Date(time_limit).getTime();
-    var _start_time = new Date().getTime()
+    var _start_time = new Date().getTime();
-    return end_time - _start_time
+    return end_time - _start_time;
 }
 
 function timer() {
-    var hours = Math.floor((time_remaining % (1000 * 60 * 60 * 24)) / (1000 * 60 * 60))
+    var hours = Math.floor((time_remaining % (1000 * 60 * 60 * 24)) / (1000 * 60 * 60));
-    var minutes = Math.floor((time_remaining % (1000 * 60 * 60)) / (1000 * 60))
+    var minutes = Math.floor((time_remaining % (1000 * 60 * 60)) / (1000 * 60));
-    var seconds = Math.floor((time_remaining % (1000 * 60)) / 1000)
+    var seconds = Math.floor((time_remaining % (1000 * 60)) / 1000);
 
     if (time_remaining > 0) {
-        var timer_display = ''
+        var timer_display = '';
         if (hours > 0) {
-            timer_display = `${hours.toString()}:`
+            timer_display = `${hours.toString()}:`;
         }
         if (minutes > 0 || hours > 0) {
             if (minutes < 10) {
-                timer_display += `0${minutes.toString()}:`
+                timer_display += `0${minutes.toString()}:`;
             } else {
-                timer_display += `${minutes.toString()}:`
+                timer_display += `${minutes.toString()}:`;
             }
         }
         if (seconds < 10) {
-            timer_display += `0${seconds.toString()}`
+            timer_display += `0${seconds.toString()}`;
         } else {
-            timer_display += seconds.toString()
+            timer_display += seconds.toString();
         }
-        $timer.html(timer_display)
+        $timer.html(timer_display);
         time_remaining -= 1000
     } else {
-        $timer.html('Expired')
+        $timer.html('Expired');
-        clearInterval(clock)
+        clearInterval(clock);
         stop()
     }
 }
 
 function stop() {
-    $quiz_render.fadeOut()
+    $quiz_render.fadeOut();
-    $quiz_navigator.fadeOut()
+    $quiz_navigator.fadeOut();
-    $quiz_timeout.fadeIn()
+    $quiz_timeout.fadeIn();
-    $("#btn-toggle-navigator").addClass('disabled')
+    $("#btn-toggle-navigator").addClass('disabled');
     $("#btn-toggle-settings").addClass('disabled')
 }
 
 function count_questions(status) {
-    output = 0
+    output = 0;
     for (let i = 0; i < Object.keys(question_status).length; i++) {
-        key = Object.keys(question_status)[i]
+        key = Object.keys(question_status)[i];
         if (question_status[key] == status){
-            output ++
+            output ++;
         }
     }
-    return output
+    return output;
 }
 
 // Variable Definitions
 
-const id = window.localStorage.getItem('id')
+const id = window.localStorage.getItem('id');
 
-var current_question = 0
+var current_question = 0;
-var total_questions = 0
+var total_questions = 0;
-var question_status = {}
+var question_status = {};
-var answers = {}
+var answers = {};
-var questions = []
+var questions = [];
-var time_limit, start_time, time_remaining
+var time_limit, start_time, time_remaining;
 
-var display_settings = get_settings_from_storage()
+var display_settings = get_settings_from_storage();
 
-const $quiz_settings = $("#quiz-settings")
+const $quiz_settings = $("#quiz-settings");
-const $quiz_navigator = $("#quiz-navigator")
+const $quiz_navigator = $("#quiz-navigator");
-const $quiz_render = $("#quiz-render")
+const $quiz_render = $("#quiz-render");
-const $quiz_timeout = $("#quiz-timeout")
+const $quiz_timeout = $("#quiz-timeout");
-const $nav_flag = $("#q-nav-flag")
+const $nav_flag = $("#q-nav-flag");
-const $nav_next = $("#q-nav-next")
+const $nav_next = $("#q-nav-next");
-const $nav_prev = $("#q-nav-prev")
+const $nav_prev = $("#q-nav-prev");
-const $nav_container = $("#navigator-container")
+const $nav_container = $("#navigator-container");
-const $timer = $("#q-timer-display")
+const $timer = $("#q-timer-display");
 var clock
 
-var toggle_settings = false
+var toggle_settings = false;
-var toggle_navigator = false
+var toggle_navigator = false;
 
-const $question_title = $("#quiz-question-title")
+const $question_title = $("#quiz-question-title");
-const $question_header = $("#quiz-question-header")
+const $question_header = $("#quiz-question-header");
-const $question_text = $("#quiz-question-text")
+const $question_text = $("#quiz-question-text");
-const $question_options = $("#quiz-question-options")
+const $question_options = $("#quiz-question-options");
 
-const $progress_skipped = $("#skipped-bar")
+const $progress_skipped = $("#skipped-bar");
-const $progress_answered = $("#answered-bar")
+const $progress_answered = $("#answered-bar");
-const $progress_flagged = $("#flagged-bar")
+const $progress_flagged = $("#flagged-bar");
-const $skipped_count = $("#skipped-count")
+const $skipped_count = $("#skipped-count");
-const $answered_count = $("#answered-count")
+const $answered_count = $("#answered-count");
-const $flagged_count = $("#flagged-count")
+const $flagged_count = $("#flagged-count");
 
 // Execution on Load
 
-apply_settings(display_settings)
+apply_settings(display_settings);
-check_started()
+check_started();

ref-test/app/quiz/static/js/script.js

@@ -1,21 +1,21 @@
 $(document).ready(function() {
     $("#od-font-test").click(function(){
         $("body").css("font-family", "opendyslexic3regular")
-    })
+    });
 
     $('.test-code-input').keyup(function() {
-        var input = $(this).val().split("-").join("").split("—").join("")
+        var input = $(this).val().split("-").join("").split("—").join("");
         if (input.length > 0) {
-          input = input.match(new RegExp('.{1,4}', 'g')).join("—")
+          input = input.match(new RegExp('.{1,4}', 'g')).join("—");
         }
-        $(this).val(input)
+        $(this).val(input);
-    })
+    });
-})
+});
 
 $('form[name=form-quiz-start]').submit(function(event) {
     
-    var $form = $(this)
+    var $form = $(this);
-    var data = $form.serialize()
+    var data = $form.serialize();
 
     $.ajax({
         url: window.location.pathname,
@@ -24,21 +24,21 @@ $('form[name=form-quiz-start]').submit(function(event) {
         dataType: 'json',
         success: function(response) {
             var id = response.id
-            window.localStorage.setItem('id', id)
+            window.localStorage.setItem('id', id);
-            window.location.href = `/quiz/`
+            window.location.href = `/quiz/`;
         },
         error: function(response) {
-            error_response(response)
+            error_response(response);
         }
-    })
+    });
 
-    event.preventDefault()
+    event.preventDefault();
-})
+});
 
 function error_response(response) {
 
-    const $alert = $("#alert-box")
+    const $alert = $("#alert-box");
-    $alert.html('')
+    $alert.html('');
 
     if (typeof response.responseJSON.error === 'string' || response.responseJSON.error instanceof String) {
         $alert.html(`
@@ -47,18 +47,18 @@ function error_response(response) {
             ${response.responseJSON.error}
             <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
         </div>
-        `)
+        `);
     } else if (response.responseJSON.error instanceof Array) {
         var output = ''
-        for (let i = 0; i < response.responseJSON.error.length; i ++) {
+        for (var i = 0; i < response.responseJSON.error.length; i ++) {
             output += `
             <div class="alert alert-danger alert-dismissible fade show" role="alert">
                 <i class="bi bi-exclamation-triangle-fill" title="Danger"></i>
                 ${response.responseJSON.error[i]}
                 <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
             </div>
-            `
+            `;
-            $alert.html(output)
+            $alert.html(output);
         }
     }
 }
@@ -74,13 +74,13 @@ $('#dismiss-cookie-alert').click(function(event){
         },
         dataType: 'json',
         success: function(response){
-            console.log(response)
+            console.log(response);
         },
         error: function(response){
-            console.log(response)
+            console.log(response);
         }
     })
 
-    event.preventDefault()
+    event.preventDefault();
 
 })

ref-test/app/quiz/templates/quiz/client.html

@@ -14,9 +14,6 @@
         <div class="container quiz-start-text">
             You can use this panel to adjust the display settings for the exam. Please use the menu below to select the font face and font size. Below is a sample question so you can see how the exam will render with your chosen settings.
         </div>
-        <div class="container quiz-start-text">
-            These settings will be stored locally on your browser window. No information about your preferences below will be collected by the app.
-        </div>
         <div class="alert alert-primary quiz-start-text" role="alert">
             <strong>Note</strong>: Some fonts may not be available depending on your device and/or operating system.
         </div>

ref-test/app/quiz/templates/quiz/components/base.html

@@ -17,7 +17,7 @@
         />
         {% block style %}
         {% endblock %}
-        <title>{% block title %} SKA Referee Test {% endblock %}</title>
+        <title>{% block title %} SKA Referee Test Beta {% endblock %}</title>
         {% include "quiz/components/og-meta.html" %}
     </head>
     <body class="bg-light">
@@ -56,8 +56,6 @@
             integrity="sha384-QJHtvGhmr9XOIpI6YVutG+2QOK9T+ZnN4kzFN1RtK3zEFEIsxhlmWl5/YESvpZ13"
             crossorigin="anonymous"
         ></script>
-        <!-- jQuery UI -->
-        <script src="https://code.jquery.com/ui/1.13.2/jquery-ui.js"></script>
         <!-- Custom js -->
         <script type="text/javascript">
             var csrf_token = "{{ csrf_token() }}";

ref-test/app/quiz/templates/quiz/components/footer.html

@@ -1,3 +1,3 @@
-<p>This web app was developed and is maintained by Vivek Santayana. The source code for the web app, excluding any data pertaining to the questions in the quiz, is freely available at <a href="https://git.vsnt.uk/viveksantayana/ska-referee-test">Vivek&rsquo;s personal GIT repository</a> under an MIT License.</p>
+<p>This web app was developed by Vivek Santayana. The source code for the web app, excluding any data pertaining to the questions in the quiz, is freely available at <a href="https://git.vsnt.uk/viveksantayana/ska-referee-test">Vivek&rsquo;s personal GIT repository</a> under an MIT License.</p>
 <p>All questions in the test are &copy; The Scottish Korfball Association {{ now.year }}. All rights are reserved.</p>
 <p>OpenDyslexic 3 is an open source typeface created by Abbie Gonzalez, licensed under a <a href="https://scripts.sil.org/OFL">SIL-OFL</a>. More information about OpenDyslexic is available <a href="https://opendyslexic.org/">on the project web site</a>.</p>

ref-test/app/quiz/templates/quiz/components/navbar.html

@@ -1,6 +1,6 @@
 <nav class="navbar fixed-top navbar-expand-md navbar-dark bg-dark" id="primary-nav">
     <div class="container">
-        <p class="navbar-brand mb-0 h1">SKA Refereeing Test</p>
+        <p class="navbar-brand mb-0 h1">SKA Refereeing Test (Beta)</p>
         <div class="quiz-console w-100" style="display: none;" id="q-topbar">
             <div class="d-flex justify-content align-middle">
                 <div class="container d-flex justify-content-center">

ref-test/app/quiz/templates/quiz/instructions.html

@@ -3,36 +3,13 @@
 {% block content %}
     <div class="instruction-container">
         <h3>Instructions</h3>
-        <p>
-            Thank you for putting yourself forward to sit the SKA Referee Theory Exam. Please read the following instructions carefully.
-        </p>
-        <h4>
-            Taking the Exam
-        </h4>
         <ul>
             <li>
-                The exam consists of 100 questions, all of them multiple choice with two or three options, which are designed to test your knowledge of a wide range of rules. For each question, answer what decision you would give as a referee unless the question instructs otherwise.
+                The exam comprises 100 multiple-choice questions.
             </li>
             <li>
-                It should take around an hour to complete.
+                For each question, answer what decision you would give as a referee unless the question instructs otherwise.
             </li>
-            <li>
-                The exam should be taken under exam conditions. Materials such as the official rules, guidelines, revision resources, or similar should not be consulted during the test.
-            </li>
-            <li>
-                We would remind candidates that whilst we are relying on your honesty in this test, your theory knowledge will make up a part of the practical assessment when you are observed refereeing a game.
-            </li>
-            <li>
-                You also may not discuss the test with any other person while you are sitting it. 
-            </li>
-            <li>
-                If you have any queries before the exam or would like further feedback on the test, your emails are welcome.
-            </li>
-        </ul>
-        <h4>
-            Using the Web App
-        </h4>
-        <ul>
             <li>
                 You will be able to customise the display settings of the exam from the settings panel by clicking on the red gear button <a class="btn btn-danger" aria-title="Settings" title="Settings" onclick="return false;"><i class="bi bi-gear-fill"></i></a>.
             </li>
@@ -40,7 +17,7 @@
                 You can view your progress at a glance, as well as navigate to any question in the quiz, using the question grid, accessed via the yellow grid button <a class="btn btn-warning" aria-title="Question Grid" title="Question Grid" onclick="return false;"><i class="bi bi-table"></i></a>.
             </li>
             <li>
-                If you are unsure of the answer to a question or would like to return to a question later, you can flag the question using the flag button button <a class="btn btn-secondary" id="q-nav-flag" title="Flag Button." onclick="return false;"><i class="bi bi-flag-fill"></i></a> to serve as a reminder for you to come back to it later.
+                If you are unsure of the answer to a question or would like to revise a question, you can flag the question to review it later on using the flag button button <a class="btn btn-secondary" id="q-nav-flag" title="Flag Button." onclick="return false;"><i class="bi bi-flag-fill"></i></a>.
             </li>
         </ul>
     </div>
@@ -69,7 +46,7 @@
             Results
         </h4>
         <p>
-            The results of your exam will be processed immediately and sent to the SKA Refereeing Coordinator. You will also be emailed a copy of your results. If you do not receive an email, make sure to check your spam folder.
+            The results of your exam will be processed immediately and sent to the SKA Refereeing Coordinator. You will also be emailed a copy of your results.
         </p>
         <p>
             When you are ready to begin the quiz, click the following button.

ref-test/app/quiz/templates/quiz/start_quiz.html

@@ -1,10 +1,6 @@
 {% extends "quiz/components/base.html" %}
 {% import "bootstrap/wtf.html" as wtf %}
 
-{% block style %}
-    <link rel="stylesheet" href="https://code.jquery.com/ui/1.13.2/themes/base/jquery-ui.css">
-{% endblock %}
-
 {% block content %}
     <div class="form-container">
         <form name="form-quiz-start" class="form-quiz-start">
@@ -48,13 +44,3 @@
         </form>
     </div>
 {% endblock %}
-{% block script %}
-    <script>
-        $( function() {
-            const clubs = {{ clubs|tojson }}
-            $('#club').autocomplete({
-                source: clubs
-            })
-        } )
-    </script>
-{% endblock %}

ref-test/app/quiz/views.py

@@ -1,11 +1,10 @@
 from ..forms.quiz import StartQuiz
 from ..models import Entry, Test
 from ..tools.forms import send_errors_to_client
-from ..tools.logs import write
 from ..tools.test import redirect_if_started
 
-from flask import Blueprint, jsonify, render_template, request, session
+from flask import abort, Blueprint, jsonify, redirect, render_template, request, session
-from flask.helpers import abort, flash, redirect, url_for
+from flask.helpers import flash, url_for
 
 from datetime import datetime
 
@@ -29,23 +28,6 @@ def _instructions():
 
 @quiz.route('/start/', methods=['GET', 'POST'])
 def _start():
-    clubs = [
-        'Dundee Korfball Club',
-        'Edinburgh City Korfball Club',
-        'Edinburgh Mavericks Korfball Club',
-        'Edinburgh University Korfball Club',
-        'Glasgow Korfball Club',
-        'Saint Andrews University Korfball Club',
-        'Strathclyde University Korfball Club'
-    ]
-    try: entries = Entry.query.all()
-    except Exception as exception:
-        write('system.log', f'Database error when processing request \'{request.url}\': {exception}')
-        return abort(500)
-    for entry in entries: clubs.append(entry.get_club())
-    clubs = list(set(clubs))
-    try: clubs.remove('')
-    except: pass
     form = StartQuiz()
     if request.method == 'POST':
         if form.validate_on_submit():
@@ -55,15 +37,11 @@ def _start():
             entry.set_club(request.form.get('club'))
             entry.set_email(request.form.get('email'))
             code = request.form.get('test_code').replace('—', '').lower()
-            try: test = Test.query.filter_by(code=code).first()
+            test = Test.query.filter_by(code=code).first()
-            except Exception as exception:
-                write('system.log', f'Database error when processing request \'{request.url}\': {exception}')
-                return abort(500)
-            if not test:  return jsonify({'error': 'The exam code you entered is invalid.'}), 400
             entry.test = test
-            entry.dataset = test.dataset
             entry.user_code = request.form.get('user_code')
             entry.user_code = None if entry.user_code == '' else entry.user_code.lower()
+            if not test:  return jsonify({'error': 'The exam code you entered is invalid.'}), 400
             if entry.user_code and entry.user_code not in test.adjustments: return jsonify({'error': f'The user code you entered is not valid.'}), 400
             if test.end_date < datetime.now(): return jsonify({'error': f'The exam code you entered expired on {test["expiry_date"].strftime("%d %b %Y %H:%M")}.'}), 400
             if test.start_date > datetime.now(): return jsonify({'error': f'The exam has not yet opened. Your exam code will be valid from {test["start_date"].strftime("%d %b %Y %H:%M")}.'}), 400
@@ -76,28 +54,21 @@ def _start():
                 }), 200
             return jsonify({'error': 'There was an error processing the user test and/or user codes.'}), 400
         return send_errors_to_client(form=form)
-    return render_template('/quiz/start_quiz.html', form = form, clubs = clubs)
+    return render_template('/quiz/start_quiz.html', form = form)
 
 @quiz.route('/quiz/')
 def _quiz():
     id = session.get('id')
-    try:
+    if not id or not Entry.query.filter_by(id=id).first():
-        if not id or not Entry.query.filter_by(id=id).first():
+        flash('Your session was not recognised. Please sign in to the quiz again.', 'error')
-            flash('Your session was not recognised. Please sign in to the quiz again.', 'error')
+        session.pop('id', None)
-            session.pop('id', None)
+        return redirect(url_for('quiz._start'))
-            return redirect(url_for('quiz._start'))
-    except Exception as exception:
-        write('system.log', f'Database error when processing request \'{request.url}\': {exception}')
-        return abort(500)
     return render_template('/quiz/client.html')
 
 @quiz.route('/result/')
 def _result():
     id = session.get('id')
-    try: entry = Entry.query.filter_by(id=id).first()
+    entry = Entry.query.filter_by(id=id).first()
-    except Exception as exception:
-        write('system.log', f'Database error when processing request \'{request.url}\': {exception}')
-        return abort(500)
     if not entry: return abort(404)
     session.pop('id',None)
     score = round(100*entry.result['score']/entry.result['max'])

ref-test/app/root/js/script.js

@@ -1,21 +1,21 @@
 $(document).ready(function() {
     $("#od-font-test").click(function(){
         $("body").css("font-family", "opendyslexic3regular")
-    })
+    });
 
     $('.test-code-input').keyup(function() {
-        var input = $(this).val().split("-").join("").split("—").join("")
+        var input = $(this).val().split("-").join("").split("—").join("");
         if (input.length > 0) {
-          input = input.match(new RegExp('.{1,4}', 'g')).join("—")
+          input = input.match(new RegExp('.{1,4}', 'g')).join("—");
         }
-        $(this).val(input)
+        $(this).val(input);
-    })
+    });
-})
+});
 
 $('form[name=form-quiz-start]').submit(function(event) {
     
-    var $form = $(this)
+    var $form = $(this);
-    var data = $form.serialize()
+    var data = $form.serialize();
 
     $.ajax({
         url: window.location.pathname,
@@ -24,21 +24,21 @@ $('form[name=form-quiz-start]').submit(function(event) {
         dataType: 'json',
         success: function(response) {
             var id = response.id
-            window.localStorage.setItem('id', id)
+            window.localStorage.setItem('id', id);
-            window.location.href = `/quiz/`
+            window.location.href = `/quiz/`;
         },
         error: function(response) {
-            error_response(response)
+            error_response(response);
         }
-    })
+    });
 
-    event.preventDefault()
+    event.preventDefault();
-})
+});
 
 function error_response(response) {
 
-    const $alert = $("#alert-box")
+    const $alert = $("#alert-box");
-    $alert.html('')
+    $alert.html('');
 
     if (typeof response.responseJSON.error === 'string' || response.responseJSON.error instanceof String) {
         $alert.html(`
@@ -47,18 +47,18 @@ function error_response(response) {
             ${response.responseJSON.error}
             <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
         </div>
-        `)
+        `);
     } else if (response.responseJSON.error instanceof Array) {
         var output = ''
-        for (let i = 0; i < response.responseJSON.error.length; i ++) {
+        for (var i = 0; i < response.responseJSON.error.length; i ++) {
             output += `
             <div class="alert alert-danger alert-dismissible fade show" role="alert">
                 <i class="bi bi-exclamation-triangle-fill" title="Danger"></i>
                 ${response.responseJSON.error[i]}
                 <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
             </div>
-            `
+            `;
-            $alert.html(output)
+            $alert.html(output);
         }
     }
 }
@@ -74,13 +74,13 @@ $('#dismiss-cookie-alert').click(function(event){
         },
         dataType: 'json',
         success: function(response){
-            console.log(response)
+            console.log(response);
         },
         error: function(response){
-            console.log(response)
+            console.log(response);
         }
     })
 
-    event.preventDefault()
+    event.preventDefault();
 
 })

ref-test/app/templates/404.html

@@ -18,7 +18,7 @@
         <link rel="shortcut icon" href="{{ url_for('views.static', filename='favicon.ico') }}">
         {% block style %}
         {% endblock %}
-        <title>{% block title %} SKA Referee Test {% endblock %}</title>
+        <title>{% block title %} SKA Referee Test Beta {% endblock %}</title>
     </head>
     <body class="bg-light">
 

ref-test/app/templates/components/base.html

@@ -17,7 +17,7 @@
         />
         {% block style %}
         {% endblock %}
-        <title>{% block title %} SKA Referee Test {% endblock %}</title>
+        <title>{% block title %} SKA Referee Test Beta {% endblock %}</title>
         {% include "components/og-meta.html" %}
     </head>
     <body class="bg-light">

ref-test/app/templates/components/footer.html

@@ -1,3 +1,3 @@
-<p>This web app was developed and is maintained by Vivek Santayana. The source code for the web app, excluding any data pertaining to the questions in the quiz, is freely available at <a href="https://git.vsnt.uk/viveksantayana/ska-referee-test">Vivek&rsquo;s personal GIT repository</a> under an MIT License.</p>
+<p>This web app was developed by Vivek Santayana. The source code for the web app, excluding any data pertaining to the questions in the quiz, is freely available at <a href="https://git.vsnt.uk/viveksantayana/ska-referee-test">Vivek&rsquo;s personal GIT repository</a> under an MIT License.</p>
 <p>All questions in the test are &copy; The Scottish Korfball Association {{ now.year }}. All rights are reserved.</p>
 <p>OpenDyslexic 3 is an open source typeface created by Abbie Gonzalez, licensed under a <a href="https://scripts.sil.org/OFL">SIL-OFL</a>. More information about OpenDyslexic is available <a href="https://opendyslexic.org/">on the project web site</a>.</p>

ref-test/app/templates/components/navbar.html

@@ -1,6 +1,6 @@
 <nav class="navbar fixed-top navbar-expand-md navbar-dark bg-dark" id="primary-nav">
     <div class="container">
-        <p class="navbar-brand mb-0 h1">SKA Refereeing Test</p>
+        <p class="navbar-brand mb-0 h1">SKA Refereeing Test (Beta)</p>
         <div class="quiz-console w-100" style="display: none;" id="q-topbar">
             <div class="d-flex justify-content align-middle">
                 <div class="container d-flex justify-content-center">

ref-test/app/templates/privacy.html

@@ -3,19 +3,9 @@
 {% block content %}
     <h1>Privacy Policy</h1>
 
-    <ul>
+    This web app stores data using cookies. The web site only stores the minimum information it needs to function.
-        <li>
-            This web app stores data using cookies. The web site only stores the minimum information it needs to function.
-        </li>
-        <li>
-            All data stored on this app can be accessed by the SKA Committee and the maintainer of this app.
-        </li>
-        <li>
-            This app is currently maintained by Vivek Santayana, a member of the Edinburgh City Korfball Club, with the permission of the SKA Committee.
-        </li>
-    </ul>
-
     <h5>Site Administrators</h5>
+
     <ul>
         <li>For site administrators, this web site uses encrypted cookies to store data from your log-in session.</li>
         <li>User information for administrators is encrypted and stored in a secure database, and are expunged when an account is deleted.</li>
@@ -23,14 +13,14 @@
     
     <h5>Test Candidates</h5>
     <ul>
-        <li>The web site will not be tracking your log in, and all information about your test attempt will be stored on your device until you submit it to the server.</li>
+        <li>The web site will not be trackin your log in, and all information about your test attempt will be stored on your device until you submit it to the server.</li>
         <li>Data from your test, including identifying information such as your name and email address, will be recorded by the Scottish Korfball Association in order to oversee the training and qualification of referees.</li>
         <li>These records will be kept for three years or until the expiration of the theory exam qualification (whichever is later), and will be expunged securely thereafter.</li>
-        <li>All identifying information about candidates will be encrypted and stored in a secure database administered by the maintainer of this app.</li>
+        <li>All identifying information about candidates will be encrypted and stored in a secure database.</li>
     </ul>
 
     <h5>Requests to Delete Data</h5>
     <ul>
-        <li>You can request to view or delete data that the app stores about you by emailing <a href="mailto:refereeing@scotlandkorfball.co.uk">refereeing@scotlandkorfball.co.uk</a>.</li>
+        <li>You can request to have any of your data that is held here deleted by emailing <a href="mailto:refereeing@scotlandkorfball.co.uk">refereeing@scotlandkorfball.co.uk</a>.</li>
     </ul>
 {% endblock %}

ref-test/app/tools/auth.py

@@ -1,7 +1,8 @@
+from .data import load
 from ..models import User
-from ..tools.logs import write
 
-from flask.helpers import abort, flash, redirect, url_for
+from flask import abort, redirect
+from flask.helpers import flash, url_for
 from flask_login import current_user
 
 from functools import wraps
@@ -9,13 +10,9 @@ from functools import wraps
 def require_account_creation(function):
     @wraps(function)
     def wrapper(*args, **kwargs):
-        try:
+        if User.query.count() == 0:
-            if User.query.count() == 0:
+            flash('Please register a user account.', 'alert')
-                flash('Please register a user account.', 'alert')
+            return redirect(url_for('admin._register'))
-                return redirect(url_for('admin._register'))
-        except Exception as exception:
-            write('system.log', f'Database error when checking for existing accounts: {exception}')
-            return abort(500)
         return function(*args, **kwargs)
     return wrapper
 

ref-test/app/tools/data.py

@@ -1,15 +1,8 @@
-from ..models import Dataset, Test
-from ..tools.logs import write
-
 from flask import current_app as app
-from flask.helpers import abort, flash, redirect, url_for
 
 import json
 from pathlib import Path
 from random import shuffle
-from statistics import mean, median, stdev
-from typing import Union
-from functools import wraps
 
 def load(filename:str):
     data_dir = Path(app.config.get('DATA'))
@@ -74,95 +67,3 @@ def get_tag_list(dataset:list):
         if block['type'] == 'block':
             for question in block['questions']: output = list(set(output) | set(question['tags']))
     return output
-
-def check_dataset_exists(function):
-    @wraps(function)
-    def wrapper(*args, **kwargs):
-        try: datasets = Dataset.query.all()
-        except Exception as exception:
-            write('system.log', f'Database error when checking existing datasets: {exception}')
-            return abort(500)
-        if not datasets:
-            flash('There are no available question datasets. Please upload a question dataset first, or use the question editor to create a new dataset.', 'error')
-            return redirect(url_for('admin._questions'))
-        return function(*args, **kwargs)
-    return wrapper
-
-def check_test_exists(function):
-    @wraps(function)
-    def wrapper(*args, **kwargs):
-        try: tests = Test.query.all()
-        except Exception as exception:
-            write('system.log', f'Database error when checking existing datasets: {exception}')
-            return abort(500)
-        if not tests:
-            flash('There are no exams configured. Please create an exam first.', 'error')
-            return redirect(url_for('admin._tests'))
-        return function(*args, **kwargs)
-    return wrapper
-
-def analyse(subject:Union[Dataset,Test]) -> dict:
-    output = {
-        'answers': {},
-        'entries': 0,
-        'grades': {
-            'merit': 0,
-            'pass': 0,
-            'fail': 0
-        },
-        'scores': {
-            'mean': 0,
-            'median': 0,
-            'stdev': 0
-        }
-    }
-    scores_raw = []
-    if isinstance(subject, Test):
-        for entry in subject.entries:
-            if entry.answers:
-                for question, answer in entry.answers.items():
-                    if int(question) not in output['answers']: output['answers'][int(question)] = {}
-                    if int(answer) not in output['answers'][int(question)]: output['answers'][int(question)][int(answer)] = 0
-                    output['answers'][int(question)][int(answer)] += 1
-            if entry.result:
-                output['entries'] += 1
-                output['grades'][entry.result['grade']] += 1
-                scores_raw.append(int(entry.result['score']))        
-    else:
-        for test in subject.tests:
-            for entry in test.entries:
-                if entry.answers:
-                    for question, answer in entry.answers.items():
-                        if int(question) not in output['answers']: output['answers'][int(question)] = {}
-                        if int(answer) not in output['answers'][int(question)]: output['answers'][int(question)][int(answer)] = 0
-                        output['answers'][int(question)][int(answer)] += 1
-                if entry.result:
-                    output['entries'] += 1
-                    output['grades'][entry.result['grade']] += 1
-                    scores_raw.append(entry.result['score'])
-    output['scores']['mean'] = mean(scores_raw)
-    output['scores']['median'] = median(scores_raw)
-    output['scores']['stdev'] = stdev(scores_raw, output['scores']['mean']) if len(scores_raw) > 1 else None
-    return output
-
-def parse_questions(dataset:list):
-    output = []
-    for block in dataset:
-        if block['type'] == 'question':
-            question = {
-                'q_no': block['q_no'],
-                'tags': block['tags'],
-                'correct': block['correct']
-            }
-            question['options'] = [*enumerate(block['options'])]
-            output.append(question)
-        elif block['type'] == 'block':
-            for _question in block['questions']:
-                question = {
-                    'q_no': _question['q_no'],
-                    'tags': _question['tags'],
-                    'correct': _question['correct']
-                }
-                question['options'] = [*enumerate(_question['options'])]
-                output.append(question)
-    return output

ref-test/app/tools/forms.py

@@ -1,8 +1,30 @@
-from ..tools.logs import write
+
+from ..extensions import db
 
 from flask import jsonify
 from wtforms.validators import ValidationError
 
+import json
+from sqlalchemy.ext import mutable
+
+class JsonEncodedDict(db.TypeDecorator):
+    """Enables JSON storage by encoding and decoding on the fly."""
+    impl = db.Text
+
+    def process_bind_param(self, value, dialect):
+        if value is None:
+            return '{}'
+        else:
+            return json.dumps(value)
+
+    def process_result_value(self, value, dialect):
+        if value is None:
+            return {}
+        else:
+            return json.loads(value)
+
+mutable.MutableDict.associate_with(JsonEncodedDict)
+
 def value(min:int=0, max:int=None):
     if not max:
         message = f'Value must be greater than {min}.'
@@ -25,10 +47,7 @@ def get_time_options():
 
 def get_dataset_choices():
     from ..models import Dataset
-    try: datasets = Dataset.query.all()
+    datasets = Dataset.query.all()
-    except Exception as exception:
-        write('system.log', f'Database error when fetching dataset lists: {exception}')
-        return []
     dataset_choices = []
     for dataset in datasets:
         label = dataset.get_name()

ref-test/app/tools/test.py

@@ -1,19 +1,17 @@
 from .data import randomise_list
 from ..models import Entry
-from ..tools.logs import write
 
-from flask import request, session
+from flask import redirect, request, session
-from flask.helpers import abort, redirect, url_for
+from flask.helpers import url_for
 
 from functools import wraps
 
 def parse_test_code(code):
     return code.replace('—', '').lower()
 
-def generate_questions(dataset:list, randomise:bool=True):
+def generate_questions(dataset:list):
     output = []
-    question_dataset = randomise_list(dataset) if randomise else dataset
+    for block in randomise_list(dataset):
-    for block in question_dataset:
         if block['type'] == 'question':
             question = {
                 'type': 'question',
@@ -21,12 +19,11 @@ def generate_questions(dataset:list, randomise:bool=True):
                 'question_header': '',
                 'text': block['text']
             }
-            if block['q_type'] == 'Multiple Choice' and randomise: question['options'] = randomise_list([*enumerate(block['options'])])
+            if block['q_type'] == 'Multiple Choice': question['options'] = randomise_list([*enumerate(block['options'])])
             else: question['options'] = [*enumerate(block['options'])]
             output.append(question)
         elif block['type'] == 'block':
-            block_questions = randomise_list(block['questions']) if randomise else block['questions']
+            for key, _question in enumerate(randomise_list(block['questions'])):
-            for key, _question in enumerate(block_questions):
                 question = {
                     'type': 'block',
                     'q_no': _question['q_no'],
@@ -35,7 +32,7 @@ def generate_questions(dataset:list, randomise:bool=True):
                     'block_q_no': key,
                     'text': _question['text']
                 }
-                if _question['q_type'] == 'Multiple Choice' and randomise: question['options'] = randomise_list([*enumerate(_question['options'])])
+                if _question['q_type'] == 'Multiple Choice': question['options'] = randomise_list([*enumerate(_question['options'])])
                 else: question['options'] = [*enumerate(_question['options'])]
                 output.append(question)
     return output
@@ -132,11 +129,8 @@ def redirect_if_started(function):
     @wraps(function)
     def wrapper(*args, **kwargs):
         id = session.get('id')
-        try:
+        if request.method == 'GET' and id and Entry.query.filter_by(id=id).first():
-            if request.method == 'GET' and id and Entry.query.filter_by(id=id).first(): return redirect(url_for('quiz._quiz'))
+            return redirect(url_for('quiz._quiz'))
-        except Exception as exception:
-            write('system.log', f'Database error when checking if test has been started: {exception}')
-            return abort(500)
         return function(*args, **kwargs)
     return wrapper
 

ref-test/app/view/static/css/style.css

@@ -1,260 +0,0 @@
-body {
-    padding: 80px 0;
-}
-
-.site-footer {
-    background-color: lightgray;
-    font-size: small;
-}
-
-.site-footer p {
-    margin: 0;
-}
-
-.form-container {
-    display: -ms-flexbox;
-    display: flex;
-    -ms-flex-align: center;
-    align-items: center;
-    padding-top: 40px;
-    padding-bottom: 40px;
-}
-
-.form-display {
-    width: 100%;
-    max-width: 420px;
-    padding: 15px;
-    margin: auto;
-}
-
-.form-heading {
-    margin-bottom: 2rem;
-}
-
-.form-label-group {
-    position: relative;
-    margin-bottom: 2rem;
-}
-
-.form-label-group input,
-.form-label-group label {
-    padding: var(--input-padding-y) var(--input-padding-x);
-    font-size: 16pt;
-}
-
-.form-label-group label {
-    position: absolute;
-    top: 0;
-    left: 0;
-    display: block;
-    width: 100%;
-    margin-bottom: 0; /* Override default `<label>` margin */
-    line-height: 1.5;
-    color: #495057;
-    cursor: text; /* Match the input under the label */
-    border: 1px solid transparent;
-    border-radius: .25rem;
-    transition: all .1s ease-in-out;
-    z-index: -1;
-}
-
-.form-label-group input {
-    background-color: transparent;
-    border: none;
-    border-radius: 0%;
-    border-bottom: 2px solid #585858;
-}
-
-.form-label-group input:active, .form-label-group input:focus {
-    background-color: transparent;
-}
-
-.form-label-group input::-webkit-input-placeholder {
-    color: transparent;
-}
-  
-.form-label-group input:-ms-input-placeholder {
-    color: transparent;
-}
-  
-.form-label-group input::-ms-input-placeholder {
-    color: transparent;
-}
-  
-.form-label-group input::-moz-placeholder {
-    color: transparent;
-}
-  
-.form-label-group input::placeholder {
-    color: transparent;
-}
-  
-.form-label-group input:not(:placeholder-shown) {
-    padding-top: calc(var(--input-padding-y) + var(--input-padding-y) * (2 / 3));
-    padding-bottom: calc(var(--input-padding-y) / 3);
-}
-  
-.form-label-group input:not(:placeholder-shown) ~ label {
-    padding-top: calc(var(--input-padding-y) / 3);
-    padding-bottom: calc(var(--input-padding-y) / 3);
-    font-size: 12px;
-    color: #777;
-}
-
-.form-check {
-    margin-bottom: 2rem;
-}
-
-.checkbox input {
-    transform: scale(1.5);
-    margin-right: 1rem;
-}
-
-.signin-forgot-password {
-    font-size: 14pt;
-}
-
-.form-submission-button {
-    margin-bottom: 2rem;
-}
-
-.form-submission-button button, .form-submission-button a {
-    margin: 1rem;
-    vertical-align: middle;
-}
-
-.form-submission-button button span, .form-submission-button button svg, .form-submission-button a span, .form-submission-button a svg {
-    margin: 0 2px;
-}
-
-table.dataTable {
-    border-collapse: collapse;
-    width: 100%;
-}
-
-.table-row {
-    vertical-align: middle;
-}
-
-.row-actions {
-    text-align: center;
-    white-space: nowrap;
-}
-
-.dataTables_wrapper .dt-buttons {
-    left: 50%;
-    transform: translateX(-50%);
-    float:none;  
-    text-align:center;
-}
-
-.row-actions button, .row-actions a {
-    margin: 0px 5px;
-}
-
-#cookie-alert {
-    padding-right: 16px;
-}
-
-#dismiss-cookie-alert {
-    margin-top: 16px;
-    width: fit-content;
-}
-
-.alert-db-empty {
-    width: 100%;
-    max-width: 720px;
-    font-size: 14pt;
-    margin: 20px auto;
-}
-
-.form-date-input, .form-select-input {
-    position: relative;
-    margin: 2rem 0;
-}
-
-.form-date-input input,
-.form-date-input label, .form-select-input select, .form-select-input label {
-    padding: var(--input-padding-y) var(--input-padding-x);
-    font-size: 16pt;
-    width: 100%;
-    background-color: transparent;
-    border: none;
-    border-bottom: 2px solid #585858;
-}
-
-.datepicker::-webkit-calendar-picker-indicator {    
-    border: 1px;
-    border-color: gray;
-    border-radius: 10%;
-}
-
-.form-date-input label, .form-select-input label {
-    /* position: absolute; */
-    /* top: 0;
-    left: 0; */
-    display: block;
-    width: 100%;
-    margin-bottom: 0; /* Override default `<label>` margin */
-    line-height: 1.5;
-    color: #495057;
-    cursor: text; /* Match the input under the label */
-    border: 1px solid transparent;
-    border-radius: .25rem;
-    transition: all .1s ease-in-out;
-    z-index: -1;
-}
-
-.button-icon {
-    font-size: 20px;
-}
-
-.form-upload {
-    margin: 2rem 0;
-    font-size: 14pt;
-}
-
-.result-action-buttons, .test-action {
-    margin: 5px auto;
-    width: fit-content;
-}
-
-.accordion-item {
-    background-color: unset;
-}
-
-/* Change Autocomplete styles in Chrome*/
-input:-webkit-autofill,
-input:-webkit-autofill:hover, 
-input:-webkit-autofill:focus,
-textarea:-webkit-autofill,
-textarea:-webkit-autofill:hover,
-textarea:-webkit-autofill:focus,
-select:-webkit-autofill,
-select:-webkit-autofill:hover,
-select:-webkit-autofill:focus {
-  transition: background-color 5000s ease-in-out 0s;
-}
-
-/* Fallback for Edge
--------------------------------------------------- */
-@supports (-ms-ime-align: auto) {
-    .form-label-group label {
-      display: none;
-    }
-    .form-label-group input::-ms-input-placeholder {
-      color: #777;
-    }
-}
-  
-  /* Fallback for IE
-  -------------------------------------------------- */
-@media all and (-ms-high-contrast: none), (-ms-high-contrast: active) {
-    .form-label-group label {
-        display: none;
-    }
-    .form-label-group input:-ms-input-placeholder {
-        color: #777;
-    }
-}
-  

ref-test/app/view/static/css/view.css

@@ -1,30 +0,0 @@
-.info-panel {
-    display: none;
-}
-
-.control-panel {
-    margin-left: auto;
-    margin-right: 0;
-    width:fit-content;
-}
-
-#alert-box {
-    margin: 30px auto;
-    max-width: 460px;
-}
-
-.block {
-    border: 2px solid black;
-    border-radius: 10px;
-    margin: 10px;
-    padding: 5px;
-}
-
-.question-body, .question-block {
-    padding: 0px 2em;
-}
-
-blockquote {
-    padding: 0px 2em;
-    font-style: italic;
-}

ref-test/app/view/static/js/script.js

@@ -1,115 +0,0 @@
-// Menu Highlight Scripts
-const menuItems = document.getElementsByClassName('nav-link')
-for(let i = 0; i < menuItems.length; i++) {
-    if(menuItems[i].pathname == window.location.pathname) {
-        menuItems[i].classList.add('active')
-    }
-}
-const dropdownItems = document.getElementsByClassName('dropdown-item')
-for(let i = 0; i< dropdownItems.length; i++) {
-    if(dropdownItems[i].pathname == window.location.pathname) {
-        dropdownItems[i].classList.add('active')
-        $( "#" + dropdownItems[i].id ).closest( '.dropdown' ).find('.dropdown-toggle').addClass('active')
-    }
-}
-
-// General Post Method Form Processing Script
-$('form.form-post').submit(function(event) {
-    
-    var $form = $(this)
-    var data = $form.serialize()
-    var url = $(this).prop('action')
-    var rel_success = $(this).data('rel-success')
-
-    $.ajax({
-        url: url,
-        type: 'POST',
-        data: data,
-        dataType: 'json',
-        success: function(response) {
-            if (response.redirect_to) {
-                window.location.href = response.redirect_to
-            }
-            else {
-                window.location.href = rel_success
-            }
-        },
-        error: function(response) {
-            error_response(response)
-        }
-    })
-
-    event.preventDefault()
-})
-
-function error_response(response) {
-
-    const $alert = $("#alert-box")
-    $alert.html('')
-
-    if (typeof response.responseJSON.error === 'string' || response.responseJSON.error instanceof String) {
-        $alert.html(`
-        <div class="alert alert-danger alert-dismissible fade show" role="alert">
-            <i class="bi bi-exclamation-triangle-fill" title="Danger"></i>
-            ${response.responseJSON.error}
-            <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
-        </div>
-        `)
-    } else if (response.responseJSON.error instanceof Array) {
-        var output = ''
-        for (let i = 0; i < response.responseJSON.error.length; i ++) {
-            output += `
-            <div class="alert alert-danger alert-dismissible fade show" role="alert">
-                <i class="bi bi-exclamation-triangle-fill" title="Danger"></i>
-                ${response.responseJSON.error[i]}
-                <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
-            </div>
-            `
-            $alert.html(output)
-        }
-    }
-
-    $alert.focus()
-}
-
-// Dismiss Cookie Alert
-$('#dismiss-cookie-alert').click(function(event){
-
-    $.ajax({
-        url: '/cookies/',
-        type: 'POST',
-        data: {
-            time: Date.now()
-        },
-        dataType: 'json',
-        success: function(response){
-            console.log(response)
-        },
-        error: function(response){
-            console.log(response)
-        }
-    })
-
-    event.preventDefault()
-})
-
-// Create New Dataset
-$('.create-new-dataset').click(function(event){
-    $.ajax({
-        url: '/api/editor/new/',
-        type: 'POST',
-        data: {
-            time: Date.now()
-        },
-        dataType: 'json',
-        success: function(response){
-            if (response.redirect_to) {
-                window.location.href = response.redirect_to
-            }
-        },
-        error: function(response){
-            console.log(response)
-        }
-    })
-    event.preventDefault()
-})

ref-test/app/view/static/js/view.js

@@ -1,151 +0,0 @@
-// Variable Declarations
-const $control_panel = $('.control-panel')
-const $info_panel = $('.info-panel')
-const $viewer_panel = $('.viewer-panel')
-
-var element_index = 0
-
-// Info Button Listener
-$control_panel.find('button').click(function(event){
-    if ($info_panel.is(":hidden")) {
-        $viewer_panel.hide()
-        $info_panel.fadeIn()
-        $(this).addClass('active')
-    } else {
-        $info_panel.hide()
-        $viewer_panel.fadeIn()
-        $(this).removeClass('active')
-    }
-    event.preventDefault()
-})
-
-function parse_data(data) {
-    var block
-    var obj
-    for (let i = 0; i < data.length; i++) {
-        block = data[i]
-        obj = document.createElement('div')
-        obj.classList = 'block'
-        if (block['type'] == 'question') {
-            text = document.createElement('p')
-            text.innerHTML = `<strong>Question ${block['q_no'] + 1}.</strong> ${block['text']}`
-            obj.append(text)
-            question_body = document.createElement('div')
-            question_body.className ='question-body'
-            type = document.createElement('p')
-            type.innerHTML = `<strong>Question Type:</strong> ${block['q_type']}`
-            question_body.append(type)
-            options = document.createElement('p')
-            options.innerHTML = '<strong>Options:</strong>'
-            option_list = document.createElement('ul')
-            for (let _i = 0; _i < block['options'].length; _i++) {
-                option = document.createElement('li')
-                option.innerHTML = block['options'][_i]
-                if (block['correct'] == _i) {
-                    option.innerHTML += ' <span class="badge rounded-pill bg-success">Correct</span>'
-                }
-                option_list.append(option)
-            }
-            options.append(option_list)
-            question_body.append(options)
-            tags = document.createElement('p')
-            tags.innerHTML = `<strong>Tags:</strong>`
-            tag_list = document.createElement('ul')
-            for (let _i = 0; _i < block['tags'].length; _i++) {
-                tag = document.createElement('li')
-                tag.innerHTML = block['tags'][_i]
-                tag_list.append(tag)
-            }
-            tags.append(tag_list)
-            question_body.append(tags)
-            obj.append(question_body)
-        } else if (block['type'] == 'block') {
-            meta = document.createElement('p')
-            meta.innerHTML = `<strong>Block ${i+1}.</strong> ${block['questions'].length} questions.`
-            obj.append(meta)
-            header = document.createElement('blockquote')
-            header.innerText = block['question_header']
-            obj.append(header)
-            var block_question = document.createElement('div')
-            var question
-            block_question.className = 'question-block'
-            for (let _i = 0; _i < block['questions'].length; _i++) {
-                question = block['questions'][_i]
-                text = document.createElement('p')
-                text.innerHTML = `<strong>Question ${question['q_no'] + 1}.</strong> ${question['text']}`
-                block_question.append(text)
-                question_body = document.createElement('div')
-                question_body.className ='question-body'
-                type = document.createElement('p')
-                type.innerHTML = `<strong>Question Type:</strong> ${question['q_type']}`
-                question_body.append(type)
-                options = document.createElement('p')
-                options.innerHTML = '<strong>Options:</strong>'
-                option_list = document.createElement('ul')
-                for (let __i = 0; __i < question['options'].length; __i++) {
-                    option = document.createElement('li')
-                    option.innerHTML = question['options'][__i]
-                    if (question['correct'] == __i) {
-                        option.innerHTML += ' <span class="badge rounded-pill bg-success">Correct</span>'
-                    }
-                    option_list.append(option)
-                }
-                options.append(option_list)
-                question_body.append(options)
-                tags = document.createElement('p')
-                tags.innerHTML = `<strong>Tags:</strong>`
-                tag_list = document.createElement('ul')
-                for (let __i = 0; __i < question['tags'].length; __i++) {
-                    tag = document.createElement('li')
-                    tag.innerHTML = question['tags'][__i]
-                    tag_list.append(tag)
-                }
-                tags.append(tag_list)
-                question_body.append(tags)
-                block_question.append(question_body)
-                obj.append(block_question)
-            }
-        }
-        $viewer_panel.append(obj)
-    }
-}
-
-// Analyse Button
-$('.dataset-analyse').click(function(event) {
-    
-    let id = $(this).data('id')
-
-    $.ajax({
-        url: `/admin/analysis/`,
-        type: 'POST',
-        data: JSON.stringify({'id': id, 'class': 'dataset'}),
-        contentType: 'application/json',
-        success: function(response) {
-            window.location.href = response
-        },
-        error: function(response){
-            error_response(response)
-        },
-    })
-
-    event.preventDefault()
-})
-
-// Fetch data once page finishes loading
-$(window).on('load', function() {
-    $.ajax({
-        url: target,
-        type: 'POST',
-        data: JSON.stringify({
-            'id': id,
-            'action': 'fetch'
-        }),
-        contentType: 'application/json',
-        success: function(response) {
-            parse_data(response['data'])
-        },
-        error: function(response) {
-            console.log(response)
-        }
-    })
-})

ref-test/app/view/templates/view/components/base.html

@@ -1,84 +0,0 @@
-<!DOCTYPE html>
-<html>
-    <head>
-        <meta charset="utf8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1" />
-        <link
-            href="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/css/bootstrap.min.css"
-            rel="stylesheet"
-            integrity="sha384-1BmE4kWBq78iYhFldvKuhfTAU6auU8tT94WrHftjDbrCEXSU1oBoqyl2QvZ6jIW3"
-            crossorigin="anonymous">
-        <link
-            rel="stylesheet"
-            href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.7.1/font/bootstrap-icons.css">
-        <link 
-            rel="stylesheet"
-            href="{{ url_for('.static', filename='css/style.css') }}"
-        />
-        <link 
-            rel="stylesheet"
-            href="{{ url_for('.static', filename='css/view.css') }}"
-        />
-        {% block style %}
-        {% endblock %}
-        <title>{% block title %} SKA Referee Test | Admin Console {% endblock %}</title>
-        {% include "view/components/og-meta.html" %}
-    </head>
-    <body class="bg-light">
-
-        {% block navbar %}
-            {% include "view/components/navbar.html" %}
-        {% endblock %}
-
-        <div class="container">
-            {% block top_alerts %}
-                {% include "view/components/server-alerts.html" %}
-            {% endblock %}
-            {% block content %}{% endblock %}
-        </div>
-
-        <footer class="container site-footer mt-5">
-            {% block footer %}
-                {% include "view/components/footer.html" %}
-            {% endblock %}
-        </footer>
-
-        <!-- JQuery, Popper, and Bootstrap js dependencies -->
-        <script
-            src="https://code.jquery.com/jquery-3.6.0.min.js"
-            integrity="sha256-/xUj+3OJU5yExlq6GSYGSHk7tPXikynS7ogEvDej/m4="
-            crossorigin="anonymous">
-        </script>
-        <script>
-            window.jQuery || document.write(`<script src="{{ url_for('.static', filename='js/jquery-3.6.0.min.js') }}"><\/script>`)
-        </script>
-        <script
-            src="https://cdn.jsdelivr.net/npm/@popperjs/core@2.10.2/dist/umd/popper.min.js"
-            integrity="sha384-7+zCNj/IqJ95wo16oMtfsKbZ9ccEh31eOz1HGyDuCQ6wgnyJNSYdrPa03rtR1zdB"
-            crossorigin="anonymous">
-        </script>
-        <script
-            src="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/js/bootstrap.min.js"
-            integrity="sha384-QJHtvGhmr9XOIpI6YVutG+2QOK9T+ZnN4kzFN1RtK3zEFEIsxhlmWl5/YESvpZ13"
-            crossorigin="anonymous"
-        ></script>
-        <!-- Custom js -->
-        <script type="text/javascript">
-            var csrf_token = "{{ csrf_token() }}";
-        
-            $.ajaxSetup({
-                beforeSend: function(xhr, settings) {
-                    if (!/^(GET|HEAD|OPTIONS|TRACE)$/i.test(settings.type) && !this.crossDomain) {
-                        xhr.setRequestHeader("X-CSRFToken", csrf_token);
-                    }
-                }
-            });
-        </script>
-        <script
-            type="text/javascript"
-            src="{{ url_for('.static', filename='js/script.js') }}"
-        ></script>
-        {% block script %}
-        {% endblock %}
-    </body>
-</html>

ref-test/app/view/templates/view/components/client-alerts.html

@@ -1 +0,0 @@
-<div id="alert-box" tabindex="-1"></div>

ref-test/app/view/templates/view/components/datatable.html

@@ -1,28 +0,0 @@
-{% extends "view/components/base.html" %}
-{% block datatable_css %}
-    <link rel="stylesheet" type="text/css" href="https://cdn.datatables.net/1.11.3/css/dataTables.bootstrap5.min.css"/>
-    <link rel="stylesheet" type="text/css" href="https://cdn.datatables.net/buttons/2.0.1/css/buttons.bootstrap5.min.css"/>
-    <link rel="stylesheet" type="text/css" href="https://cdn.datatables.net/colreorder/1.5.5/css/colReorder.bootstrap5.min.css"/>
-    <link rel="stylesheet" type="text/css" href="https://cdn.datatables.net/fixedheader/3.2.0/css/fixedHeader.bootstrap5.min.css"/>
-    <link rel="stylesheet" type="text/css" href="https://cdn.datatables.net/keytable/2.6.4/css/keyTable.bootstrap5.min.css"/>
-    <link rel="stylesheet" type="text/css" href="https://cdn.datatables.net/responsive/2.2.9/css/responsive.bootstrap5.min.css"/>
-    <link rel="stylesheet" type="text/css" href="https://cdn.datatables.net/searchbuilder/1.3.0/css/searchBuilder.dataTables.min.css"/>
-{% endblock %}
-{% block datatable_scripts %}
-<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/jszip/2.5.0/jszip.min.js"></script>
-<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.36/pdfmake.min.js"></script>
-<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.36/vfs_fonts.js"></script>
-<script type="text/javascript" src="https://cdn.datatables.net/1.11.3/js/jquery.dataTables.min.js"></script>
-<script type="text/javascript" src="https://cdn.datatables.net/1.11.3/js/dataTables.bootstrap5.min.js"></script>
-<script type="text/javascript" src="https://cdn.datatables.net/buttons/2.0.1/js/dataTables.buttons.min.js"></script>
-<script type="text/javascript" src="https://cdn.datatables.net/buttons/2.0.1/js/buttons.bootstrap5.min.js"></script>
-<script type="text/javascript" src="https://cdn.datatables.net/buttons/2.0.1/js/buttons.colVis.min.js"></script>
-<script type="text/javascript" src="https://cdn.datatables.net/buttons/2.0.1/js/buttons.html5.min.js"></script>
-<script type="text/javascript" src="https://cdn.datatables.net/buttons/2.0.1/js/buttons.print.min.js"></script>
-<script type="text/javascript" src="https://cdn.datatables.net/colreorder/1.5.5/js/dataTables.colReorder.min.js"></script>
-<script type="text/javascript" src="https://cdn.datatables.net/fixedheader/3.2.0/js/dataTables.fixedHeader.min.js"></script>
-<script type="text/javascript" src="https://cdn.datatables.net/keytable/2.6.4/js/dataTables.keyTable.min.js"></script>
-<script type="text/javascript" src="https://cdn.datatables.net/responsive/2.2.9/js/dataTables.responsive.min.js"></script>
-<script type="text/javascript" src="https://cdn.datatables.net/responsive/2.2.9/js/responsive.bootstrap5.js"></script>
-<script type="text/javascript" src="https://cdn.datatables.net/searchbuilder/1.3.0/js/dataTables.searchBuilder.min.js"></script>
-{% endblock %}

ref-test/app/view/templates/view/components/footer.html

@@ -1,2 +0,0 @@
-<p>This web app was developed and is maintained by Vivek Santayana. The source code for the web app, excluding any data pertaining to the questions in the quiz, is freely available at <a href="https://git.vsnt.uk/viveksantayana/ska-referee-test">Vivek&rsquo;s personal GIT repository</a> under an MIT License.</p>
-<p>All questions in the test are &copy; The Scottish Korfball Association {{ now.year }}. All rights are reserved.</p>

ref-test/app/view/templates/view/components/input-forms.html

@@ -1,4 +0,0 @@
-{% extends "view/components/base.html" %}
-{% import "bootstrap/wtf.html" as wtf %}
-{% block top_alerts %}
-{% endblock %}

ref-test/app/view/templates/view/components/navbar.html

@@ -1,137 +0,0 @@
-<nav class="navbar fixed-top navbar-expand-md navbar-dark bg-dark">
-    <div class="container">
-        <a href="{{ url_for('admin._home') }}" class="navbar-brand mb-0 h1">RefTest | Admin</a>
-        <button
-            class="navbar-toggler"
-            type="button"
-            data-bs-toggle="collapse"
-            data-bs-target="#navbar"
-            aria-controls="navbar"
-            aria-expanded="false"
-            aria-label="Toggle Navigation"
-        >
-            <span class="navbar-toggler-icon"></span>
-        </button>
-        <div class="collapse navbar-collapse justify-content-end" id="navbar">
-            <ul class="navbar-nav">
-                {% if not current_user.is_authenticated %}
-                    <li class="nav-item" id="nav-login">
-                        <a href="{{ url_for('admin._login') }}" id="link-login" class="nav-link">Log In</a>
-                    </li>
-                {% endif %}
-                {% if current_user.is_authenticated %}
-                    <li class="nav-item dropdown" id="nav-results">
-                        <a
-                            class="nav-link dropdown-toggle"
-                            id="dropdown-results"
-                            role="button"
-                            href="{{ url_for('admin._view_entries') }}"
-                            data-bs-toggle="dropdown"
-                            aria-expanded="false"
-                        >
-                            Results
-                        </a>
-                        <ul
-                            class="dropdown-menu"
-                            aria-labelledby="dropdown-results"
-                        >
-                            <li>
-                                <a href="{{ url_for('admin._view_entries', filter='active') }}" id="link-results" class="dropdown-item">View Results</a>
-                            </li>
-                            <li>
-                                <a href="{{ url_for('analysis._analysis') }}" id="link-analysis" class="dropdown-item">Analysis</a>
-                            </li>
-                        </ul>
-                    </li>
-                    <li class="nav-item dropdown" id="nav-tests">
-                        <a
-                            class="nav-link dropdown-toggle"
-                            id="dropdown-tests"
-                            role="button"
-                            href="{{ url_for('admin._tests') }}"
-                            data-bs-toggle="dropdown"
-                            aria-expanded="false"
-                        >
-                            Exams
-                        </a>
-                        <ul
-                            class="dropdown-menu"
-                            aria-labelledby="dropdown-tests"
-                        >
-                            <li>
-                                <a href="{{ url_for('admin._tests', filter='active') }}" id="link-active" class="dropdown-item">Active</a>
-                            </li>
-                            <li>
-                                <a href="{{ url_for('admin._tests', filter='scheduled') }}" id="link-scheduled" class="dropdown-item">Scheduled</a>
-                            </li>
-                            <li>
-                                <a href="{{ url_for('admin._tests', filter='expired') }}" id="link-expired" class="dropdown-item">Expired</a>
-                            </li>
-                            <li>
-                                <a href="{{ url_for('admin._tests', filter='all') }}" id="link-all" class="dropdown-item">All</a>
-                            </li>
-                            <li>
-                                <a href="{{ url_for('admin._tests', filter='create') }}" id="link-create" class="dropdown-item">Create</a>
-                            </li>
-                        </ul>
-                    </li>
-                    <li class="nav-item dropdown" id="nav-settings">
-                        <a
-                            class="nav-link dropdown-toggle"
-                            id="dropdown-settings"
-                            role="button"
-                            href="{{ url_for('admin._settings') }}"
-                            data-bs-toggle="dropdown"
-                            aria-expanded="false"
-                        >
-                            Settings
-                        </a>
-                        <ul
-                            class="dropdown-menu"
-                            aria-labelledby="dropdown-settings"
-                        >
-                            <li>
-                                <a href="{{ url_for('admin._settings') }}" id="link-settings" class="dropdown-item">View Settings</a>
-                            </li>
-                            <li>
-                                <a href="{{ url_for('admin._users') }}" id="link-users" class="dropdown-item">Users</a>
-                            </li>
-                            <li>
-                                <a href="{{ url_for('admin._questions') }}" id="link-questions" class="dropdown-item">Manage Questions</a>
-                            </li>
-                            <li>
-                                <a href="{{ url_for('view._view') }}" id="link-editor" class="dropdown-item">View Questions</a>
-                            </li>
-                            <li>
-                                <a href="{{ url_for('editor._editor') }}" id="link-editor" class="dropdown-item">Edit Questions</a>
-                            </li>
-                        </ul>
-                    </li>
-                    <li class="nav-item dropdown" id="nav-account">
-                        <a
-                            class="nav-link dropdown-toggle"
-                            id="dropdown-account"
-                            role="button"
-                            href="{{ url_for('admin._update_user', id=current_user.id) }}"
-                            data-bs-toggle="dropdown"
-                            aria-expanded="false"
-                        >
-                            Account
-                        </a>
-                        <ul
-                            class="dropdown-menu"
-                            aria-labelledby="dropdown-account"
-                        >
-                            <li>
-                                <a href="{{ url_for('admin._update_user', id=current_user.id) }}" id="link-account" class="dropdown-item">Account Settings</a>
-                            </li>
-                            <li>
-                                <a href="{{ url_for('admin._logout') }}" id="link-logout" class="dropdown-item">Log Out</a>
-                            </li>
-                        </ul>
-                    </li>
-                {% endif %}
-            </ul>
-        </div>
-    </div>
-</nav>

ref-test/app/view/templates/view/components/og-meta.html

@@ -1,18 +0,0 @@
-<meta name="description" content="A web app for taking the Scottish Korfball Association Refereeing Theory Exam on-line." />
-<meta property="og:locale" content="en_UK" />
-<meta property="og:type" content="website" />
-<meta property="og:description" content="A web app for taking the Scottish Korfball Association Refereeing Theory Exam on-line." />
-<meta property="og:url" content="{{ url_for(request.endpoint, _external = True, **(request.view_args or {})) }}" />
-<meta property="og:site_name" content="Scottish Korfball Association Referee Theory Exam" />
-<meta property="og:image" content="{{ url_for('.static', filename='favicon.png', _external = True) }}" />
-<meta property="og:image:alt" content="Logo of the SKA Refereeing Exam App" />
-<meta property="og:image:width" content="512" />
-<meta property="og:image:height" content="512" />
-<meta name="twitter:card" content="summary" />
-<meta name="twitter:description" content="A web app for taking the Scottish Korfball Association Refereeing Theory Exam on-line." />
-<meta name="twitter:image" content="{{ url_for('.static', filename='favicon.png', _external = True) }}" />
-<meta name="twitter:image:alt" content="Logo of the SKA Refereeing Exam App" />
-<meta name="twitter:creator" content="@viveksantayana" />
-<meta name="twitter:site" content="@viveksantayana" />
-<meta name="theme-color" content="#343a40" />
-<link rel="shortcut icon" href="{{ url_for('.static', filename='favicon.ico') }}">

ref-test/app/view/templates/view/components/secondary-navs/tests.html

@@ -1,23 +0,0 @@
-<div class="navbar navbar-expand-sm navbar-light bg-light">
-    <div class="container-fluid">
-    <div class="expand navbar-expand justify-content-center" id="navbar_secondary">
-        <ul class="nav nav-pills">
-            <li class="nav-item">
-                <a class="nav-link" href="{{ url_for('admin._tests', filter='active') }}">Active</a>
-            </li>
-            <li class="nav-item">
-                <a class="nav-link" href="{{ url_for('admin._tests', filter='scheduled') }}">Scheduled</a>
-            </li>
-            <li class="nav-item">
-                <a class="nav-link" href="{{ url_for('admin._tests', filter='expired') }}">Expired</a>
-            </li>
-            <li class="nav-item">
-                <a class="nav-link" href="{{ url_for('admin._tests', filter='all') }}">All</a>
-            </li>
-            <li class="nav-item">
-                <a class="nav-link" href="{{ url_for('admin._tests', filter='create') }}">Create</a>
-            </li>
-        </ul>
-    </div>
-    </div>
-</div>

ref-test/app/view/templates/view/components/server-alerts.html

@@ -1,43 +0,0 @@
-{% with messages = get_flashed_messages(with_categories=true) %}
-    {% if messages %}
-        {% set cookie_flash_flag = namespace(value=False) %}
-        {% for category, message in messages %}
-            {% if category == "error" %}
-                <div class="alert alert-danger alert-dismissible fade show" role="alert">
-                    <i class="bi bi-exclamation-triangle-fill" title="Error" aria-title="Error"></i>
-                    {{ message|safe }}
-                    <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
-                </div>
-            {% elif category == "success" %}
-                <div class="alert alert-success alert-dismissible fade show" role="alert">
-                    <i class="bi bi-check2-circle" title="Success" aria-title="Success"></i>
-                    {{ message|safe }}
-                    <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
-                </div>
-            {% elif category == "warning" %}
-                <div class="alert alert-warning alert-dismissible fade show" role="alert">
-                    <i class="bi bi-info-circle-fill" aria-title="Warning" title="Warning"></i>
-                    {{ message|safe }}
-                    <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
-                </div>
-            {% elif category == "cookie_alert" %}
-                {% if not cookie_flash_flag.value %}
-                    <div class="alert alert-primary alert-dismissible fade show" id="cookie-alert" role="alert">
-                        <i class="bi bi-info-circle-fill" title="Cookie Alert" aria-title="Cookie Alert"></i>
-                        {{ message|safe }}
-                        <div class="d-flex justify-content-center w-100">
-                            <button type="button" id="dismiss-cookie-alert" class="btn btn-success" data-bs-dismiss="alert" aria-label="Close">Accept</button>
-                        </div>
-                    </div>
-                    {% set cookie_flash_flag.value = True %}
-                {% endif %}
-            {% else %}
-                <div class="alert alert-primary alert-dismissible fade show" role="alert">
-                    <i class="bi bi-info-circle-fill" title="Alert"></i>
-                    {{ message|safe }}
-                    <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
-                </div>
-            {% endif %}
-        {% endfor %}
-    {% endif %}
-{% endwith %}

ref-test/app/view/templates/view/console.html

@@ -1,127 +0,0 @@
-{% extends "view/components/base.html" %}
-
-{% block style %}
-<link 
-    rel="stylesheet"
-    href="{{ url_for('.static', filename='css/view.css') }}"
-/>
-{% endblock %}
-
-{% block content %}
-    <h1>View Questions</h1>
-    <div class="container">
-        <p class="lead">
-            This page lists all the questions in the selected dataset.
-        </p>
-    </div>
-    <div class="container control-panel">
-        <button class="btn btn-primary" aria-title="Information" title="Information"><i class="bi bi-info-circle-fill"></i></button>
-    </div>
-    <div class="container info-panel">
-        <h3>
-            Information
-        </h3>
-        <p>
-            Questions in the test are arranged in blocks. Blocks can be of two types: <strong>Blocks</strong> of multiple related questions, and <strong>Single Questions</strong> that are not part of a block.
-            You can add, remove, or edit both Blockss and Questions through this editor.
-        </p>
-        <p>
-            <strong>Blocks</strong> are useful when you have a section of the test that contains multiple questions that are related to each other, for example if there is a scenario-based section where a series of questions are about the same situation.
-        </p>
-        <p>
-            Blocks can contain any number of questions within them, but cannot contain nested blocks.
-        </p>
-        <p>
-            When you set up a block, you can also add <strong>header text</strong> that will be displayed with each question.
-            You can use this to provide common information for a scenario across a series of questions.
-        </p>
-        <p>
-            Questions come in three types:
-            <ul>
-                <li>
-                    <strong>Yes/No</strong> for when there is only a yes or no option, 
-                </li>
-                <li>
-                    <strong>Multiple Choice</strong> for your regular multiple choice questions, and
-                </li>
-                <li>
-                    <strong>Ordered List</strong> for multiple choice questions that will be displayed in the same order as listed here.
-                </li>
-            </ul>
-        </p>
-        <p>
-            Normally, multiple choice questions will have the order of the options randomised.
-        </p>
-        <p>
-            Questions will be displayed to candidates in a randomised order.
-            Blocks of questions will be kept together, but the order within the block will also be randomised.
-        </p>
-        <p>
-            Questions can also be categorised using <strong>tags</strong>.
-        </p>
-        <p class="lead">
-            Placeholder for Questions Remaining in a Block
-        </p>
-        <p>
-            In order to show how many questions are remaining inside a block, e.g. to say &lsquo;the next n questions are about a specific scenario&rsquo;, the app uses the placeholder <code>&lt;block_remaining_questions&gt;</code>.
-        </p>
-    </div>
-    <div class="container viewer-panel">
-        <h3>
-            Question Dataset
-        </h3>
-        <div class="container dataset-metadata">
-            <div class="input-group mb-3">
-                <span class="input-group-text">Dataset Name</span>
-                <span class="form-control">
-                    {{ dataset.get_name() }}
-                </span>
-            </div>
-            <div class="input-group mb-3">
-                <span class="input-group-text">Author</span>
-                <span class="form-control">
-                    {{ dataset.creator.get_username() }}
-                </span>
-            </div>
-            <div class="input-group mb-3">
-                <span class="input-group-text">Last Updated</span>
-                <span class="form-control">
-                    {{ dataset.date.strftime('%d %b %Y %H:%M') }}
-                </span>
-            </div>
-            {% if dataset.default %}
-                <div class="input-group mb-3">
-                    <span class="input-group-text">
-                        <input type="checkbox" aria-label="Default" class="dataset-default" checked disabled>
-                    </span>
-                    <span class="form-control">
-                        Default Dataset
-                    </select>
-                </div>
-            {% endif %}
-        </div>
-        <div class="d-flex justify-content-center">
-            <a
-                href="#"
-                class="btn btn-success dataset-analyse {% if not dataset.entries %} disabled {% endif %}"
-                data-id="{{dataset.id}}"
-                title="Analyse Answers"
-                data-action="analyse"
-            >
-                <i class="bi bi-search button-icon"></i>
-                Analyse Answers
-            </a>
-        </div>
-    </div>
-{% endblock %}
-
-{% block script %}
-<script>
-    const target = "{{ url_for('api._editor') }}"
-    const id = "{{ dataset.id }}"
-</script>
-<script
-    type="text/javascript"
-    src="{{ url_for('.static', filename='js/view.js') }}"
-></script>
-{% endblock %}

ref-test/app/view/templates/view/index.html

@@ -1,27 +0,0 @@
-{% extends "view/components/input-forms.html" %}
-
-{% block content %}
-    <div class="form-container">
-        <form name="form-editor" class="form-display form-post" action="{{ url_for(request.endpoint, **request.view_args) }}" data-rel-success="{{ url_for(request.endpoint, **request.view_args) }}">
-            {% include "admin/components/server-alerts.html" %}
-            <h2 class="form">View Questions</h2>
-            {{ form.hidden_tag() }}
-            <div class="form-select-input">
-                {{ form.dataset(placeholder="Select Question Dataset") }}
-                {{ form.dataset.label }}
-            </div>
-            {% include "admin/components/client-alerts.html" %}
-            <div class="container form-submission-button">
-                <div class="row">
-                    <div class="col text-center">
-                        <button class="btn btn-md btn-success btn-block" type="submit">
-                            <i class="bi bi-book-fill button-icon"></i>
-                            View
-                        </button>
-                    </div>
-                </div>
-            </div>
-        </form>
-    
-    </div>
-{% endblock %}

ref-test/app/view/views.py

@@ -1,46 +0,0 @@
-from ..forms.admin import EditDataset
-from ..models import Dataset, User
-from ..tools.forms import get_dataset_choices, send_errors_to_client
-from ..tools.data import check_dataset_exists
-from ..tools.logs import write
-
-from flask import Blueprint, jsonify, render_template, request
-from flask.helpers import abort, flash, redirect, url_for
-from flask_login import login_required
-
-view = Blueprint(
-    name='view',
-    import_name=__name__,
-    template_folder='templates',
-    static_folder='static'
-)
-
-@view.route('/', methods=['GET','POST'])
-@login_required
-@check_dataset_exists
-def _view():
-    form = EditDataset()
-    form.dataset.choices = get_dataset_choices()
-    if request.method == 'POST':
-        if form.validate_on_submit():
-            id = request.form.get('dataset')
-            return jsonify({'success': 'Selected dataset', 'redirect_to': url_for('view._view_console', id=id)}),200
-        return send_errors_to_client(form=form)
-    form.process()
-    return render_template('/view/index.html', form=form)
-
-@view.route('/<string:id>/')
-@login_required
-@check_dataset_exists
-def _view_console(id:str=None):
-    try:
-        dataset = Dataset.query.filter_by(id=id).first()
-        datasets = Dataset.query.count()
-        users = User.query.all()
-    except Exception as exception:
-        write('system.log', f'Database error when processing request \'{request.url}\': {exception}')
-        return abort(500)
-    if not dataset:
-        flash('Invalid dataset ID.', 'error')
-        return redirect(url_for('admin._questions'))
-    return render_template('/view/console.html', dataset=dataset)

ref-test/install.py

@@ -1,7 +1,6 @@
 #!/usr/bin/env python
 from main import app
 from app.extensions import db
-from app.models import *
 from app.tools.data import save
 from app.tools.logs import write
 from sqlalchemy_utils import create_database, database_exists
@@ -22,14 +21,14 @@ with app.app_context():
     if not path.isfile(f'./{data}/logs/users.log'): write('users.log', 'Log file created.')
     if not path.isfile(f'./{data}/logs/system.log'): write('system.log', 'Log file created.')
     if not path.isfile(f'./{data}/logs/tests.log'): write('tests.log', 'Log file created.')
+    if not database_exists(database_uri):
+        create_database(database_uri)
+        write('system.log', 'No database found. Creating a new database.')
+        from app.models import *
+        db.create_all()
+        write('system.log', 'Creating database schema.')
     if not path.isfile(f'./{data}/.encryption.key'):
         write('system.log', 'No encryption key found. Generating new encryption key.')
         with open(f'./{data}/.encryption.key', 'wb') as key_file:
             key = Fernet.generate_key()
             key_file.write(key)
-
-    """Create File for SQLite Database"""
-    if database_uri[0:6].lower() == 'sqlite':
-        if not database_exists(database_uri):
-            create_database(database_uri)
-            write('system.log', 'No SQLite file found. Creating a new database.')

ref-test/requirements.txt

@@ -1,33 +1,27 @@
-blinker==1.5
+blinker==1.4
-cffi==1.15.1
+cffi==1.15.0
 click==8.1.3
-cryptography==39.0.2
+cryptography==37.0.2
-dnspython==2.3.0
+dnspython==2.2.1
-dominate==2.7.0
+dominate==2.6.0
-email-validator==1.3.1
+email-validator==1.2.1
-Flask==2.2.3
+Flask==2.1.2
 Flask-Bootstrap==3.3.7.1
-Flask-Login==0.6.2
+Flask-Login==0.6.1
 Flask-Mail==0.9.1
-Flask-SQLAlchemy==3.0.3
+Flask-SQLAlchemy==2.5.1
-Flask-WTF==1.1.1
+Flask-WTF==1.0.1
-greenlet==2.0.2
+greenlet==1.1.2
 gunicorn==20.1.0
-idna==3.4
+idna==3.3
 itsdangerous==2.1.2
 Jinja2==3.1.2
-MarkupSafe==2.1.2
+MarkupSafe==2.1.1
-pip==23.0.1
 pycparser==2.21
-PyMySQL==1.0.2
+python-dotenv==0.20.0
-python-dotenv==1.0.0
-setuptools==67.4.0
 six==1.16.0
-SQLAlchemy==2.0.4
+SQLAlchemy==1.4.37
-sqlalchemy-json==0.5.0
+SQLAlchemy-Utils==0.38.2
-SQLAlchemy-Utils==0.40.0
-typing_extensions==4.5.0
 visitor==0.1.3
-Werkzeug==2.2.3
+Werkzeug==2.1.2
-wheel==0.38.4
 WTForms==3.0.1

ref-test/reset.py

@@ -1,49 +0,0 @@
-#!/usr/bin/env python
-from main import app
-from app.models import User
-
-import sys
-from getpass import getpass
-
-with app.app_context():
-    try: users = User.query.all()
-    except Exception as exception: sys.exit('Database error:', exception)
-    print('')
-    print('This interface will allow you to override the password for an administrator account.')
-    print('To exit this interface, press Ctrl + C.')
-    print('')
-    while True:
-        username = input('Username: ')
-        user = None
-        for _user in users:
-            if _user.get_username() == username:
-                user = _user
-                break
-        if not user:
-            print(f'Error: User \'{username}\' does not exist.')
-            continue
-        else: break
-    while True:
-        email = input('Email address: ')
-        if not email == user.get_email():
-            print(f'Error: Incorrect email address for user \'{username}\'.')
-            continue
-        else: break
-    print('')
-    print('Authenticated using username and email address.')
-    print('Update the password for the account below.')
-    print('')
-    while True:
-        password = getpass('Enter password: ')
-        if len(password) < 6 or len(password) > 20:
-            print(f'Error: Password must be between 6 and 20 characters long.')
-        reenter_password = getpass('Reenter password: ')
-        if not password == reenter_password:
-            print(f'Error: Entered passwords do not match.')
-            continue
-        else: break
-    success, message = user.update(password=password)
-    if not success:
-        sys.exit(message)
-    print('')
-    print(f'Success: Password for user \'{username}\' has been updated.')