+ {{ form.dataset(placeholder="Select Question Dataset") }}
+ {{ form.dataset.label }}
+
{% include "admin/components/client-alerts.html" %}
diff --git a/ref-test/admin/views.py b/ref-test/admin/views.py
index 43edb22..5ff95cf 100644
--- a/ref-test/admin/views.py
+++ b/ref-test/admin/views.py
@@ -3,16 +3,20 @@ from flask.helpers import url_for
from functools import wraps
from datetime import datetime
+import os
+from glob import glob
+from json import loads
from werkzeug.security import check_password_hash
from common.security.database import decrypt_find, decrypt_find_one
from .models.users import User
from flask_mail import Message
-from main import db
+from main import app, db
from uuid import uuid4
import secrets
from main import mail
from datetime import datetime, date, timedelta
from .models.tests import Test
+from common.data_tools import get_default_dataset
views = Blueprint(
'admin_views',
@@ -65,6 +69,18 @@ def disable_if_logged_in(function):
return function(*args, **kwargs)
return decorated_function
+def available_datasets():
+ files = glob(os.path.join(app.config["DATA_FILE_DIRECTORY"],'*.json'))
+ default = get_default_dataset()
+ output = []
+ for file in files:
+ filename = file.rsplit('/')[-1]
+ label = f'{filename[:-5]} (Default)' if filename == default else filename[:-5]
+ element = (filename, label)
+ output.append(element)
+ output.reverse()
+ return output
+
@views.route('/')
@views.route('/home/')
@views.route('/dashboard/')
@@ -236,41 +252,96 @@ def update_user(_id:str):
@admin_account_required
@login_required
def questions():
- from main import app
from .models.forms import UploadDataForm
from common.data_tools import check_json_format, validate_json_contents, store_data_file
form = UploadDataForm()
if request.method == 'GET':
- return render_template('/admin/settings/questions.html', form=form)
+ files = glob(os.path.join(app.config["DATA_FILE_DIRECTORY"],'*.json'))
+ data = []
+ if files:
+ for file in files:
+ filename = file.rsplit('/')[-1]
+ with open(file) as _file:
+ load = loads(_file.read())
+ _author = load['meta']['author']
+ author = decrypt_find_one(db.users, {'_id': _author})['username']
+ data_element = {
+ 'filename': filename,
+ 'timestamp': datetime.strptime(load['meta']['timestamp'], '%Y-%m-%d %H%M%S'),
+ 'author': author,
+ 'use': len(load['meta']['tests'])
+ }
+ data.append(data_element)
+ default = get_default_dataset()
+ return render_template('/admin/settings/questions.html', form=form, data=data, default=default)
if request.method == 'POST':
if form.validate_on_submit():
upload = form.data_file.data
+ default = True if request.form.get('default') else False
if not check_json_format(upload):
return jsonify({ 'error': 'Invalid file selected. Please upload a JSON file.'}), 400
if not validate_json_contents(upload):
return jsonify({'error': 'The data in the file is invalid.'}), 400
- store_data_file(upload)
- return jsonify({ 'success': 'File uploaded.'}), 200
+ filename = store_data_file(upload, default=default)
+ flash(f'Dataset {form.data_file.data.filename} has been uploaded as {filename}.', 'success')
+ return jsonify({ 'success': f'Dataset {form.data_file.data.filename} has been uploaded as {filename}.'}), 200
errors = [*form.errors]
return jsonify({ 'error': errors}), 400
-@views.route('/settings/questions/upload/')
+@views.route('/settings/questions/delete/')
@admin_account_required
@login_required
-def upload_questions():
- return render_template('/admin/settings/upload-questions.html')
+def delete_questions(filename):
+ data_files = glob(os.path.join(app.config["DATA_FILE_DIRECTORY"],'*.json'))
+ if any(filename in file for file in data_files):
+ default = get_default_dataset()
+ if default == filename:
+ return jsonify({'error': 'Cannot delete the default question dataset.'}), 400
+ data_file = os.path.join(app.config["DATA_FILE_DIRECTORY"],filename)
+ with open(data_file, 'r') as _data_file:
+ data = loads(_data_file.read())
+ if data['meta']['tests']:
+ return jsonify({'error': 'Cannot delete a dataset that is in use by an exam.'}), 400
+ if len(data_files) == 1:
+ return jsonify({'error': 'Cannot delete the only question dataset.'}), 400
+ os.remove(data_file)
+ flash(f'Question dataset {filename} has been deleted.', 'success')
+ return jsonify({'success': f'Question dataset {filename} has been deleted.'}), 200
+ return abort(404)
+
+@views.route('/settings/questions/default/')
+@admin_account_required
+@login_required
+def make_default_questions(filename):
+ data_files = glob(os.path.join(app.config["DATA_FILE_DIRECTORY"],'*.json'))
+ default_file_path = os.path.join(app.config['DATA_FILE_DIRECTORY'], '.default.txt')
+ if any(filename in file for file in data_files):
+ with open(default_file_path, 'r') as default_file:
+ default = default_file.read()
+ if default == filename:
+ return jsonify({'error': 'Cannot delete default question dataset.'}), 400
+ with open(default_file_path, 'w') as default_file:
+ default_file.write(filename)
+ flash(f'Set dataset f{filename} as the default.', 'success')
+ return jsonify({'success': f'Set dataset {filename} as the default.'})
+ return abort(404)
@views.route('/tests//', methods=['GET'])
@views.route('/tests/', methods=['GET'])
@admin_account_required
@login_required
def tests(filter=''):
+ if not available_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_views.questions'))
if filter not in ['', 'create', 'active', 'scheduled', 'expired', 'all']:
return abort(404)
if filter == 'create':
from .models.forms import CreateTest
form = CreateTest()
+ form.dataset.choices=available_datasets()
form.time_limit.default='none'
+ form.dataset.default=get_default_dataset()
form.process()
display_title = ''
error_none = ''
@@ -300,13 +371,13 @@ def tests(filter=''):
def _tests():
from .models.forms import CreateTest
form = CreateTest()
- form.time_limit.default='none'
- form.process()
+ form.dataset.choices = available_datasets()
if form.validate_on_submit():
start_date = request.form.get('start_date')
start_date = datetime.strptime(start_date, '%Y-%m-%d')
expiry_date = request.form.get('expiry_date')
expiry_date = datetime.strptime(expiry_date, '%Y-%m-%d')
+ dataset = request.form.get('dataset')
errors = []
if start_date.date() < date.today():
errors.append('The start date cannot be in the past.')
@@ -323,7 +394,8 @@ def _tests():
start_date = start_date,
expiry_date = expiry_date,
time_limit = request.form.get('time_limit'),
- creator = creator
+ creator = creator,
+ dataset = dataset
)
test.create()
return jsonify({'success': 'New exam created.'}), 200
diff --git a/ref-test/common/data_tools.py b/ref-test/common/data_tools.py
index dbc92e8..716ad75 100644
--- a/ref-test/common/data_tools.py
+++ b/ref-test/common/data_tools.py
@@ -1,5 +1,4 @@
import os
-from shutil import rmtree
import pathlib
from json import dump, loads
from datetime import datetime
@@ -11,16 +10,16 @@ def check_data_folder_exists():
if not os.path.exists(app.config['DATA_FILE_DIRECTORY']):
pathlib.Path(app.config['DATA_FILE_DIRECTORY']).mkdir(parents='True', exist_ok='True')
-def check_current_indicator():
- if not os.path.isfile(os.path.join(app.config['DATA_FILE_DIRECTORY'], '.current.txt')):
- open(os.path.join(app.config['DATA_FILE_DIRECTORY'], '.current.txt'),'w').close()
+def check_default_indicator():
+ if not os.path.isfile(os.path.join(app.config['DATA_FILE_DIRECTORY'], '.default.txt')):
+ open(os.path.join(app.config['DATA_FILE_DIRECTORY'], '.default.txt'),'w').close()
-def make_temp_dir(file):
- if not os.path.isdir('tmp'):
- os.mkdir('tmp')
- if os.path.isfile(f'tmp/{file.filename}'):
- os.remove(f'tmp/{file.filename}')
- file.save(f'tmp/{file.filename}')
+def get_default_dataset():
+ check_default_indicator()
+ default_file_path = os.path.join(app.config['DATA_FILE_DIRECTORY'], '.default.txt')
+ with open(default_file_path, 'r') as default_file:
+ default = default_file.read()
+ return default
def check_json_format(file):
if not '.' in file.filename:
@@ -42,9 +41,9 @@ def validate_json_contents(file):
return False
return True
-def store_data_file(file):
+def store_data_file(file, default:bool=None):
from admin.views import get_id_from_cookie
- check_current_indicator()
+ check_default_indicator()
timestamp = datetime.utcnow()
filename = '.'.join([timestamp.strftime('%Y%m%d%H%M%S'),'json'])
filename = secure_filename(filename)
@@ -53,7 +52,10 @@ def store_data_file(file):
data = loads(file.read())
data['meta']['timestamp'] = timestamp.strftime('%Y-%m-%d %H%M%S')
data['meta']['author'] = get_id_from_cookie()
+ data['meta']['tests'] = []
with open(file_path, 'w') as _file:
- dump(data, _file, indent=4)
- with open(os.path.join(app.config['DATA_FILE_DIRECTORY'], '.current.txt'), 'w') as _file:
- _file.write(filename)
\ No newline at end of file
+ dump(data, _file, indent=2)
+ if default:
+ with open(os.path.join(app.config['DATA_FILE_DIRECTORY'], '.default.txt'), 'w') as _file:
+ _file.write(filename)
+ return filename
\ No newline at end of file
diff --git a/ref-test/quiz/views.py b/ref-test/quiz/views.py
index cd88bd2..d08476e 100644
--- a/ref-test/quiz/views.py
+++ b/ref-test/quiz/views.py
@@ -37,7 +37,7 @@ def start():
user_code = None if user_code == '' else user_code
if not db.tests.find_one({'test_code': test_code}):
return jsonify({'error': 'The exam code you entered is invalid.'}), 400
- attempt = {
+ entry = {
'_id': uuid4().hex,
'name': encrypt(name),
'email': encrypt(email),
@@ -47,8 +47,8 @@ def start():
'start_time': datetime.utcnow(),
'status': 'started'
}
- if db.results.insert(attempt):
- return jsonify({ 'success': f'Exam started at started {attempt["start_time"].strftime("%H:%M:%S")}.' })
+ if db.entries.insert(entry):
+ return jsonify({ 'success': f'Exam started at started {entry["start_time"].strftime("%H:%M:%S")}.' })
else:
errors = [*form.errors]
return jsonify({ 'error': errors}), 400