Sulley
/
khana
2
2
Fork 0
Code Issues 33 Pull Requests 3 Releases Wiki Activity

[WIP] refactoring/location-club-statistics #71

Draft
Fred wants to merge 19 commits from refactoring/location-club-statistics into master
pull from: refactoring/location-club-statistics
merge into: Sulley:master
Conversation 0 Commits 19 Files Changed 15 +2 -3
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit fa6c6d531a - Show all commits

4
src/location/views.py
View File

@ -190,10 +190,10 @@ def club_statistics(request, clubid):
courseList.append( courseList.append(
( (
course, course,
number_of_trainers, course.number_of_trainers,
number_of_gymnasts, number_of_gymnasts,
hour, hour,
counted, course.get_number_of_real_occurrences,
totalHourForCourse, totalHourForCourse,
totalHoursPaidForCourse, totalHoursPaidForCourse,
) )

1
src/planning/models.py
View File

@ -304,7 +304,6 @@ class Course(Markdownizable, Temporizable):
) )
hour_begin = models.TimeField(verbose_name="Heure de début") hour_begin = models.TimeField(verbose_name="Heure de début")
hour_end = models.TimeField(verbose_name="Heure de fin") hour_end = models.TimeField(verbose_name="Heure de fin")
season = models.ForeignKey(Season, on_delete=models.SET_NULL, null=True) season = models.ForeignKey(Season, on_delete=models.SET_NULL, null=True)
trainers = models.ManyToManyField( trainers = models.ManyToManyField(
User, verbose_name="Coach(es)", related_name="trainee" User, verbose_name="Coach(es)", related_name="trainee"