From 3f6e86dae138dbb3bea825d93727a293097864bf Mon Sep 17 00:00:00 2001 From: Mo8it Date: Thu, 30 Jun 2022 04:21:38 +0200 Subject: [PATCH] Remove unneeded filters --- advlabdb/adminModelViews.py | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/advlabdb/adminModelViews.py b/advlabdb/adminModelViews.py index c7cb1d5..61a70b1 100644 --- a/advlabdb/adminModelViews.py +++ b/advlabdb/adminModelViews.py @@ -1065,16 +1065,6 @@ class AppointmentView(SecureAdminModelView): class ExperimentMarkView(SecureAdminModelView): - class StudentFilter(FilterEqual): - def validate(self, value): - if db.session.get(Student, value) is not None: - return True - else: - return False - - def apply(self, query, value, alias=None): - return query.join(PartStudent).where(PartStudent.student_id == int(value)) - class AssistantFilter(AssistantRowFilter): def apply(self, query, value, alias=None): return query.where(ExperimentMark.assistant_id == int(value)) @@ -1109,12 +1099,6 @@ class ExperimentMarkView(SecureAdminModelView): def apply(self, query, value, alias=None): return query.join(PartStudent).where(PartStudent.part_id == int(value)) - class SemesterFilter(SemesterRowFilter): - def apply(self, query, value, alias=None): - return ( - query.join(GroupExperiment).join(SemesterExperiment).where(SemesterExperiment.semester_id == int(value)) - ) - class CreateForm(FlaskForm): part_student = QuerySelectField( "Part Student", @@ -1144,8 +1128,6 @@ class ExperimentMarkView(SecureAdminModelView): } column_filters = ( - StudentFilter(ExperimentMark, "Student / ID"), - SemesterFilter(ExperimentMark, "Semester"), AssistantFilter(ExperimentMark, "Assistant"), AdminFilter(ExperimentMark, "Admin"), ExperimentFilter(ExperimentMark, "Experiment"),