viveksantayana/ska-referee-test
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases 19 Wiki Activity

Finished admin console

Browse Source
This commit is contained in:
Vivek Santayana
2022-06-15 23:54:44 +01:00
parent 62160beab2
commit 2ea778143e
33 changed files with 198 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ref-test/app/models/dataset.py
View File

@ -26,7 +26,7 @@ class Dataset(db.Model):
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
def make_default(self):
for dataset in Dataset.query.all():

2
ref-test/app/models/entry.py
View File

@ -32,7 +32,7 @@ class Entry(db.Model):
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 set_first_name(self): raise AttributeError('set_first_name is not a readable attribute.')

24
ref-test/app/models/test.py
View File

@ -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 {}

9
ref-test/app/models/user.py
View File

@ -26,7 +26,7 @@ class User(UserMixin, db.Model):
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 set_username(self): raise AttributeError('set_username is not a readable attribute.')
@ -83,7 +83,7 @@ class User(UserMixin, db.Model):
print('Password', new_password)
print('Reset Token', self.reset_token)
print('Verification Token', self.verification_token)
print('Reset Link', f'{url_for("auth._reset", token=self.reset_token, verification=self.verification_token, _external=True)}')
print('Reset Link', f'{url_for("admin._reset", token=self.reset_token, verification=self.verification_token, _external=True)}')
return jsonify({'success': 'Your password reset link has been generated.'}), 200
def clear_reset_tokens(self):
@ -103,6 +103,5 @@ class User(UserMixin, db.Model):
if password: self.set_password(password)
if email: self.set_email(email)
db.session.commit()
message = f'Information for user {self.get_username()} has been updated by {current_user.get_username()}.'
write('system.log', message)
return True, message
write('system.log', f'Information for user {self.get_username()} has been updated by {current_user.get_username()}.')
return True, f'Account {self.get_username()} has been updated.'