Finished admin console

ref-test/app/tools/auth.py

@@ -2,7 +2,7 @@ from .data import load
 from ..models import User
 
 from flask import abort, redirect
-from flask.helpers import url_for
+from flask.helpers import flash, url_for
 from flask_login import current_user
 
 from functools import wraps
@@ -10,7 +10,9 @@ from functools import wraps
 def require_account_creation(function):
     @wraps(function)
     def wrapper(*args, **kwargs):
-        if User.query.count() == 0: return redirect(url_for('views._register'))
+        if User.query.count() == 0:
+            flash('Please register a user account.', 'alert')
+            return redirect(url_for('admin._register'))
         return function(*args, **kwargs)
     return wrapper
 

ref-test/app/tools/data.py

@@ -18,7 +18,8 @@ def check_is_json(file):
 def validate_json(file):
     file.stream.seek(0)
     data = json.loads(file.read())
-    if not type(data) is list: return False
+    if not isinstance(data, list): return False
+    return True
 
 def randomise_list(list:list):
     _list = list.copy()

ref-test/app/tools/forms.py

@@ -1,5 +1,4 @@
 
-from ..models import Dataset
 from ..modules import db
 
 from wtforms.validators import ValidationError
@@ -46,11 +45,12 @@ def get_time_options():
     return time_options
 
 def get_dataset_choices():
+    from ..models import Dataset
     datasets = Dataset.query.all()
     dataset_choices = []
     for dataset in datasets:
-        label = dataset['date'].strftime('%Y%m%d%H%M%S')
+        label = dataset.date.strftime('%Y%m%d%H%M%S')
         label = f'{label} (Default)' if dataset.default else label
-        choice = (dataset['id'], label)
+        choice = (dataset.id, label)
         dataset_choices.append(choice)
     return dataset_choices