Finished client result API.

Need to work on adjustment user codes and server email notifications.
This commit is contained in:
2021-11-30 18:06:24 +00:00
parent 42f9cd9ea8
commit ee71044421
15 changed files with 710 additions and 54 deletions

View File

@ -47,14 +47,8 @@ class UpdateAccountForm(FlaskForm):
class CreateTest(FlaskForm):
start_date = DateField('Start Date', format="%Y-%m-%d", validators=[InputRequired()], default = date.today() )
time_options = [
('none', 'None'),
('60', '1 hour'),
('90', '1 hour 30 minutes'),
('120', '2 hours')
]
expiry_date = DateField('Expiry Date', format="%Y-%m-%d", validators=[InputRequired()], default = date.today() + timedelta(days=1) )
time_limit = SelectField('Time Limit', choices=time_options)
time_limit = SelectField('Time Limit')
dataset = SelectField('Question Dataset')
class UploadDataForm(FlaskForm):

View File

@ -14,7 +14,7 @@ class Test:
self._id = _id
self.start_date = start_date
self.expiry_date = expiry_date
self.time_limit = None if time_limit == 'none' or time_limit == '' else time_limit
self.time_limit = None if time_limit == 'none' or time_limit == '' else int(time_limit)
self.creator = creator
self.dataset = dataset
@ -88,7 +88,7 @@ class Test:
test['expiry_date'] = self.expiry_date
updated.append('expiry date')
if not self.time_limit == '' and self.time_limit is not None:
test['time_limit'] = self.time_limit
test['time_limit'] = int(self.time_limit)
updated.append('time limit')
output = ''
if len(updated) == 0:

View File

@ -16,7 +16,7 @@ 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
from common.data_tools import get_default_dataset, get_time_options
views = Blueprint(
'admin_views',
@ -339,6 +339,7 @@ def tests(filter=''):
if filter == 'create':
from .models.forms import CreateTest
form = CreateTest()
form.time_limit.choices = get_time_options()
form.dataset.choices=available_datasets()
form.time_limit.default='none'
form.dataset.default=get_default_dataset()