From 764d1b43aa23584f6721614fcaeb94f984125328 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Tue, 15 May 2018 14:02:02 +0200 Subject: [PATCH] added course distance to database --- rowers/courses.py | 3 +++ rowers/models.py | 10 ++++++++-- rowers/templates/list_courses.html | 2 +- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/rowers/courses.py b/rowers/courses.py index 16c3f7cd..d63ec28e 100644 --- a/rowers/courses.py +++ b/rowers/courses.py @@ -193,6 +193,9 @@ def createcourse( j += 1 i += 1 + c.distance = int(course_length(c)) + c.save() + return c def coursetime_first(data,paths): diff --git a/rowers/models.py b/rowers/models.py index 6a15539b..23455021 100644 --- a/rowers/models.py +++ b/rowers/models.py @@ -866,17 +866,23 @@ timezones = ( class GeoCourse(models.Model): manager = models.ForeignKey(Rower) + distance = models.IntegerField(default=0) name = models.CharField(max_length=150,blank=True) country = models.CharField(max_length=150,blank=True) notes = models.CharField(blank=True,max_length=200,verbose_name='Course Notes') def __unicode__(self): name = self.name country = self.country + d = self.distance + if d == 0: + self.distance = course_length(self) + self.save() + d = self.distance return u'{country} - {name} - {d}m'.format( name=name, country=country, - d = course_length(self) + d = d, ) class GeoCourseEditForm(ModelForm): @@ -1163,7 +1169,7 @@ class PlannedSession(models.Model): self.criterium = 'none' if self.course == None: self.course = GeoCourse.objects.all()[0] - self.sessionvalue = course_length(self.course) + self.sessionvalue = self.course.distance elif self.sessiontype != 'coursetest' and self.sessiontype != 'race': self.course = None diff --git a/rowers/templates/list_courses.html b/rowers/templates/list_courses.html index 5505a2ef..559a554a 100644 --- a/rowers/templates/list_courses.html +++ b/rowers/templates/list_courses.html @@ -43,7 +43,7 @@ {% endif %} - {{ course|courselength }} m + {{ course.distance }} m