Finished admin console
This commit is contained in:
@@ -6,8 +6,6 @@ from ..tools.logs import write
|
||||
from flask_login import current_user
|
||||
|
||||
from datetime import date, datetime
|
||||
from json import dump, loads
|
||||
import os
|
||||
import secrets
|
||||
from uuid import uuid4
|
||||
|
||||
@@ -24,13 +22,13 @@ class Test(db.Model):
|
||||
entries = db.relationship('Entry', backref='test')
|
||||
|
||||
def __repr__(self):
|
||||
return f'<test with code {self.code} was created by {current_user.get_username()}.>'
|
||||
return f'<Test with code {self.get_code()} was created by {current_user.get_username()}.>'
|
||||
|
||||
@property
|
||||
def generate_id(self): raise AttributeError('generate_id is not a readable attribute.')
|
||||
|
||||
generate_id.setter
|
||||
def generate_id(self): self.id = uuid4.hex()
|
||||
def generate_id(self): self.id = uuid4().hex
|
||||
|
||||
@property
|
||||
def generate_code(self): raise AttributeError('generate_code is not a readable attribute.')
|
||||
@@ -65,26 +63,26 @@ class Test(db.Model):
|
||||
if self.entries: return False, f'Cannot delete a test with submitted entries.'
|
||||
db.session.delete(self)
|
||||
db.session.commit()
|
||||
write('system.log', f'Test with code {code} has been deleted by {current_user.get_username()}.')
|
||||
return True, f'Test with code {code} has been deleted.'
|
||||
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.'
|
||||
|
||||
def start(self):
|
||||
now = datetime.now()
|
||||
if self.start_date.date() > now.date():
|
||||
self.start_date = now
|
||||
db.session.commit()
|
||||
write('system.log', f'Test with code {self.code} has been started by {current_user.get_username()}.')
|
||||
return True, f'Test with code {self.code} has been started.'
|
||||
return False, f'Test with code {self.code} has already started.'
|
||||
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.'
|
||||
|
||||
def end(self):
|
||||
now = datetime.now()
|
||||
if self.end_date.date() > now.date():
|
||||
if self.end_date >= now:
|
||||
self.end_date = now
|
||||
db.session.commit()
|
||||
write('system.log', f'Test with code {self.code} ended by {current_user.get_username()}.')
|
||||
return True, f'Test with code {self.code} has been ended.'
|
||||
return False, f'Test with code {self.code} has already ended.'
|
||||
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.'
|
||||
|
||||
def add_adjustment(self, time:int):
|
||||
adjustments = self.adjustments if self.adjustments is not None else {}
|
||||
|
Reference in New Issue
Block a user