From a5fe640b0d6a38822ee407f3e598c1da51ca8681 Mon Sep 17 00:00:00 2001 From: Mo8it Date: Mon, 30 May 2022 04:18:35 +0200 Subject: [PATCH] Clean up --- advlabdb/adminModelViews.py | 1 - advlabdb/assistantModelViews.py | 17 +++-------------- docs/user_docs/admin.adoc | 6 ++++-- 3 files changed, 7 insertions(+), 17 deletions(-) diff --git a/advlabdb/adminModelViews.py b/advlabdb/adminModelViews.py index e6d62e1..977a930 100644 --- a/advlabdb/adminModelViews.py +++ b/advlabdb/adminModelViews.py @@ -23,7 +23,6 @@ from wtforms.fields import ( DecimalField, IntegerField, RadioField, - SelectField, StringField, SubmitField, ) diff --git a/advlabdb/assistantModelViews.py b/advlabdb/assistantModelViews.py index abb9735..6dfcf56 100644 --- a/advlabdb/assistantModelViews.py +++ b/advlabdb/assistantModelViews.py @@ -1,10 +1,7 @@ from flask import flash from flask_admin import expose -from flask_admin.contrib.sqla.fields import QuerySelectField, QuerySelectMultipleField from flask_security import admin_change_password, current_user -from sqlalchemy import and_ -from wtforms import BooleanField, Form, RadioField, SelectField, StringField -from wtforms.fields import DateField +from wtforms import BooleanField, Form, StringField from wtforms.validators import NumberRange, Optional from . import assistantSpace, db @@ -18,17 +15,9 @@ from .models import ( MIN_MARK, Appointment, Assistant, - Experiment, ExperimentMark, - Group, GroupExperiment, - Part, - PartStudent, - Program, - Role, - Semester, SemesterExperiment, - Student, User, ) @@ -110,8 +99,8 @@ class AssistantExperimentMarkView(SecureAssistantModelView): form_columns = column_editable_list form_args = { - "oral_mark": {"validators": [NumberRange(MIN_MARK, MAX_MARK)]}, - "protocol_mark": {"validators": [NumberRange(MIN_MARK, MAX_MARK)]}, + "oral_mark": {"validators": [Optional(), NumberRange(MIN_MARK, MAX_MARK)]}, + "protocol_mark": {"validators": [Optional(), NumberRange(MIN_MARK, MAX_MARK)]}, } column_default_sort = [("oral_mark", False), ("protocol_mark", False)] diff --git a/docs/user_docs/admin.adoc b/docs/user_docs/admin.adoc index 9c5322d..4d11508 100644 --- a/docs/user_docs/admin.adoc +++ b/docs/user_docs/admin.adoc @@ -1,2 +1,4 @@ -= Admin documentation -// TODO \ No newline at end of file += Admin's documentation + +// TODO: +Coming soon...