valentin
/
colles.mp2i-vms.fr
46
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Marketplace, CSS, iCal and a lot of things... #4

Closed
valentin wants to merge 59 commits from dev into main
pull from: dev
merge into: valentin:main
Conversation 0 Commits 59 Files Changed 60 +10 -3
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 271e1c0464 - Show all commits

4
colloscope/models.py
View File

@ -314,6 +314,10 @@ class Colle(models.Model):
& ~Q(id__in=swaps.filter(enroll=False).values("student_id")) & ~Q(id__in=swaps.filter(enroll=False).values("student_id"))
) )
def is_attendee(self, student):
return self.final_group().contains(student)
def volume(self): def volume(self):
""" """
Renvoie le nombre d'étudiants inscrits à la colle en tenant compte des swaps. Renvoie le nombre d'étudiants inscrits à la colle en tenant compte des swaps.

9
colloscope/views.py
View File

@ -254,9 +254,12 @@ def amend(request, colle_id, do_enroll):
.get(id=colle_id, slot__term__cls=student.cls) .get(id=colle_id, slot__term__cls=student.cls)
.amend(enroll=True, student=student, notify=True)) .amend(enroll=True, student=student, notify=True))
else: else:
(Colle.objects colle = Colle.objects.get(id=colle_id)
.get(id=colle_id, groups__student=student)
.amend(enroll=False, student=student, notify=True)) if colle.is_attendee(student):
colle.amend(enroll=False, student=student, notify=True)
else:
raise Exception("vous n'êtes pas dans la colle...")
@require_POST @require_POST