mo8it/AdvLabDB
1
0
Fork 0
mirror of https://codeberg.org/Mo8it/AdvLabDB.git synced 2024-12-20 23:41:20 +00:00
Code Releases Activity

Can't edit final_part_mark and fixed setting edited_by_admin

Browse source
This commit is contained in:
Mo 2021-08-18 19:07:56 +02:00
parent bd393796f5
commit 05d17d151d
1 changed files with 17 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
advlabdb/adminModelViews.py
View file

@ -312,9 +312,6 @@ def groupQueryFactory():
return Group.query.filter(Group.semester == userActiveSemester()) return Group.query.filter(Group.semester == userActiveSemester())
markChoices = [(-1, "-")] + list(zip(range(16)[::-1], range(16)[::-1]))
class PartStudentView(SecureAdminModelView): class PartStudentView(SecureAdminModelView):
class CreateForm(Form): class CreateForm(Form):
def studentQueryFactory(): def studentQueryFactory():
@ -344,7 +341,6 @@ class PartStudentView(SecureAdminModelView):
class EditForm(CreateForm): class EditForm(CreateForm):
student = None student = None
part = None part = None
final_part_mark = SelectField("Final Part Mark", choices=markChoices, coerce=int)
form = EditForm form = EditForm
@ -360,12 +356,6 @@ class PartStudentView(SecureAdminModelView):
def on_model_change(self, form, model, is_created): def on_model_change(self, form, model, is_created):
PartStudent.check(model.group, model.part) PartStudent.check(model.group, model.part)
def update_model(self, form, model):
if form.final_part_mark.data == -1:
form.final_part_mark.data = None
return super().update_model(form, model)
def partStudentQueryFactory(): def partStudentQueryFactory():
return PartStudent.query.filter(PartStudent.part.has(Part.semester == userActiveSemester())) return PartStudent.query.filter(PartStudent.part.has(Part.semester == userActiveSemester()))
@ -446,10 +436,8 @@ class ExperimentView(SecureAdminModelView):
form_args = { form_args = {
"wiki_link": {"validators": [URL()]}, "wiki_link": {"validators": [URL()]},
"oral_weighting": { "oral_weighting": {
"default": 0.5, "description": "Oral and protocol weighting have to add to 1! Both are rounded to 2 decimal digits."
"description": "Oral and protocol weighting have to add to 1! Both are rounded to 2 decimal digits.",
}, },
"protocol_weighting": {"default": 0.5},
} }
form_extra_fields = { form_extra_fields = {
"program": QuerySelectField( "program": QuerySelectField(
@ -702,6 +690,8 @@ class ExperimentMarkView(SecureAdminModelView):
blank_text="-", blank_text="-",
) )
markChoices = [(-1, "-")] + list(zip(range(16)[::-1], range(16)[::-1]))
oral_mark = SelectField("Oral Mark", choices=markChoices, coerce=int) oral_mark = SelectField("Oral Mark", choices=markChoices, coerce=int)
protocol_mark = SelectField("Protocol Mark", choices=markChoices, coerce=int) protocol_mark = SelectField("Protocol Mark", choices=markChoices, coerce=int)
@ -753,15 +743,9 @@ class ExperimentMarkView(SecureAdminModelView):
def create_model(self, form): def create_model(self, form):
form = ExperimentMarkView.checkForm(form) form = ExperimentMarkView.checkForm(form)
return super().create_model(form) model = super().create_model(form)
def update_model(self, form, model): if model and (model.oral_mark or model.protocol_mark):
form = ExperimentMarkView.checkForm(form)
return super().update_model(form, model)
def after_model_change(self, form, model, is_created):
if model.oral_mark or model.protocol_mark:
try: try:
model.edited_by_admin = True model.edited_by_admin = True
@ -771,6 +755,18 @@ class ExperimentMarkView(SecureAdminModelView):
self.session.rollback() self.session.rollback()
return model
def update_model(self, form, model):
form = ExperimentMarkView.checkForm(form)
if (form.oral_mark and form.oral_mark.data != model.oral_mark) or (
form.protocol_mark and form.protocol_mark.data != model.protocol_mark
):
model.edited_by_admin = True
return super().update_model(form, model)
class ProgramView(SecureAdminModelView): class ProgramView(SecureAdminModelView):
can_view_details = True can_view_details = True