From 802258df00a4702629f04ae8f181258f43468682 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Mon, 5 Feb 2018 17:01:40 +0100 Subject: [PATCH] added some model forms --- rowers/models.py | 26 ++++++++++++++ rowers/plannedsessions.py | 14 ++++++-- templates/base.html | 73 +++++++++++++++++++++------------------ templates/basebase.html | 8 +++++ 4 files changed, 86 insertions(+), 35 deletions(-) diff --git a/rowers/models.py b/rowers/models.py index a5e38523..44d0380f 100644 --- a/rowers/models.py +++ b/rowers/models.py @@ -678,6 +678,17 @@ class TrainingTarget(models.Model): default=timezone.now()+datetime.timedelta(days=182)) notes = models.TextField(max_length=300,blank=True) +class TrainingTargetForm(ModelForm): + class Meta: + model = TrainingTarget + fields = ['name','date','notes'] + + widgets = { + 'date': SelectDateWidget( + years=range( + timezone.now().year-1,timezone.now().year+1)), + } + # SportTracks has a TrainingGoal like this #class TrainingGoal(models.Model): # rower = models.ForeignKey(Rower) @@ -701,6 +712,21 @@ class TrainingPlan(models.Model): enddate = models.DateField( default=timezone.now()+datetime.timedelta(days=182)) +class TrainingPlanForm(ModelForm): + class Meta: + model = TrainingPlan + fields = ['name','target','startdate','enddate'] + + widgets = { + 'startdate': SelectDateWidget( + years=range( + timezone.now().year-1,timezone.now().year+1)), + 'enddate': SelectDateWidget( + years=range( + timezone.now().year-1,timezone.now().year+1)), + } + + cycletypechoices = ( ('filler','System Defined'), ('userdefined','User Defined') diff --git a/rowers/plannedsessions.py b/rowers/plannedsessions.py index 438e2e44..3de50ad2 100644 --- a/rowers/plannedsessions.py +++ b/rowers/plannedsessions.py @@ -82,14 +82,24 @@ def is_session_complete(ps): def rank_results(ps): return 1 -def add_team(t,ps): +def add_team_session(t,ps): ps.team.add(t) ps.save() return 1 -def add_rower(r,ps): +def add_rower_session(r,ps): ps.rower.add(r) ps.save() return 1 + +def remove_team_session(t,ps): + ps.team.remove(t) + + return 1 + +def remove_rower_session(r,ps): + ps.rower.remove(r) + + return 1 diff --git a/templates/base.html b/templates/base.html index 21de4904..c1b47ac0 100644 --- a/templates/base.html +++ b/templates/base.html @@ -1,42 +1,49 @@ {% extends "basebase.html" %} {% block filters %} - {% load rowerfilters %} +{% load rowerfilters %} +{% endblock %} + +{% block plans %} +{% if user.rower.rowerplan == 'pro' or user.rower.rowerplan == 'coach' %} +

Plans

+{% else %} +

Plans

+{% endif %} {% endblock %} - {% block teams %} - {% if user.is_authenticated and user|has_teams %} -
- -
- Manage Teams - {% if user|is_manager %} - Upload Team Member Workout - {% endif %} - {% for t in user|user_teams %} - {{ t.name }} - {% endfor %} -
-
- See recent workouts for your team - {% elif user.is_authenticated and user.rower.team.all %} -
- -
- {% for t in user.rower.team.all %} - {{ t.name }} - {% endfor %} -
-
- See recent workouts for your team - {% else %} -

 

- {% endif %} +{% if user.is_authenticated and user|has_teams %} +
+ +
+ Manage Teams + {% if user|is_manager %} + Upload Team Member Workout + {% endif %} + {% for t in user|user_teams %} + {{ t.name }} + {% endfor %} +
+
+See recent workouts for your team +{% elif user.is_authenticated and user.rower.team.all %} +
+ +
+ {% for t in user.rower.team.all %} + {{ t.name }} + {% endfor %} +
+
+See recent workouts for your team +{% else %} +

 

+{% endif %} {% endblock %} {% block content %} diff --git a/templates/basebase.html b/templates/basebase.html index 2a97d27c..662f60c3 100644 --- a/templates/basebase.html +++ b/templates/basebase.html @@ -201,6 +201,14 @@ {% block teams %} {% endblock %} +
+ {% block plans %} + {% endblock %} +
+
+ {% block challenges %} + {% endblock %} +