CLERC/Reskreen
6
0
Fork 0
Code Issues 5 Pull Requests Actions Packages Projects 1 Releases 1 Wiki Activity

débug

Browse Source
This commit is contained in:
brocasm
2023-09-10 23:52:05 +02:00
parent c4b7fcd629
commit a4f2488732
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
studenteval/admin.py
View File

@@ -29,15 +29,16 @@ class _cl_Student_eval_admin(admin.ModelAdmin):
search_fields = ['sStudent', 'sRef'] search_fields = ['sStudent', 'sRef']
list_filter = ['sStudent',"sAuthor", "nEval_Type", "nEval_Mode", ('dtDate', DateRangeFilter)] list_filter = ['sStudent',"sAuthor", "nEval_Type", "nEval_Mode"]
def get_form(self, request, obj=None, **kwargs): def get_form(self, request, obj=None, **kwargs):
user_obj = request.user user_obj = request.user
author_id = obj.Author.id if obj.Author is not None else 0 if obj is not None:
student_id = obj.Student.id if obj.Student is not None else 0 author_id = obj.Author.id if obj.Author is not None else 0
student_id = obj.Student.id if obj.Student is not None else 0
if not user_obj.id == author_id and not user_obj.id == student_id and not is_member(user_obj, "FI-Encadrants"): if not user_obj.id == author_id and not user_obj.id == student_id and not is_member(user_obj, "FI-Encadrants"):
raise PermissionDenied raise PermissionDenied
return super().get_form(request, obj, **kwargs) return super().get_form(request, obj, **kwargs)

6
studenteval/models.py
View File

@@ -118,7 +118,7 @@ class cl_Student_eval(models.Model):
if eval.ID == self.ID: if eval.ID == self.ID:
to_be_set = True to_be_set = True
else: else:
#print(f"check eval {eval}") #print(f"check eval {eval} {eval.nEval_Type} ({eval.nEval_Type == 1}) ? {eval.sRef} == {self.sRef} => {eval.sRef == self.sRef} {self}")
if eval.nEval_Type == "1" and eval.sRef == self.sRef: if eval.nEval_Type == "1" and eval.sRef == self.sRef:
print(f"Eval mirror found {eval} / {self}") print(f"Eval mirror found {eval} / {self}")
to_be_set = True to_be_set = True
@@ -127,9 +127,9 @@ class cl_Student_eval(models.Model):
to_be_set = True to_be_set = True
if to_be_set: if to_be_set:
if eval.nEval_Mode == 1: if eval.nEval_Mode == "1":
self.o_Auto_eval = eval self.o_Auto_eval = eval
elif eval.nEval_Mode == 2: elif eval.nEval_Mode == "2":
self.o_Encadrant_eval = eval self.o_Encadrant_eval = eval