claudep/epcstages
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Teacher.next_report was reversed

Browse source
This commit is contained in:
Claude Paroz 2017-08-22 11:26:18 +02:00
parent 7dc641edff
commit dbe8396e6c
2 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
stages/models.py
View file

@ -78,6 +78,7 @@ class Teacher(models.Model):
def calc_activity(self):
"""
Return a dictionary of calculations relative to teacher courses.
Store plus/minus periods to self.next_report.
"""
mandats = self.course_set.filter(subject__startswith='#')
ens = self.course_set.exclude(subject__startswith='#')
@ -91,10 +92,11 @@ class Teacher(models.Model):
# Special situations triggering reporting (positive or negative) hours for next year:
# - full-time teacher with a total charge under 100%
# - teachers with a total charge over 100%
self.next_report = 0
if (self.rate == 100 and tot_paye < max_periods) or (tot_paye > max_periods):
tot_paye = max_periods
self.next_report = tot_paye - tot_trav
self.save()
self.next_report = tot_trav - tot_paye
self.save()
return {
'mandats': mandats,