diff --git a/rowers/models.py b/rowers/models.py index ab28bf6c..bb9db4cb 100644 --- a/rowers/models.py +++ b/rowers/models.py @@ -1561,6 +1561,7 @@ class InstantPlan(models.Model): duration = models.IntegerField(default=6,verbose_name='Duration in Calendar Days') target = models.TextField(max_length=450,blank=True,verbose_name='What the plan will achieve') hoursperweek = models.IntegerField(default=4,verbose_name='Hours Per Week') + sessionsperweek = models.IntegerField(default=3,verbose_name='Number of sessions per week') yaml = models.FileField(upload_to=get_file_path,verbose_name="Plan YAML file",null=True,blank=True) def __str__(self): @@ -1578,6 +1579,9 @@ class InstantPlan(models.Model): self.yaml.name = data['filename'] self.uuid = data['ID'] self.name = data['name'] + self.description = data['description'] + self.duration = data['duration'] + print(data['duration']) self.yaml = None super(InstantPlan, self).save(*args, **kwargs) @@ -1591,6 +1595,7 @@ class InstantPlanForm(ModelForm): 'duration', 'target', 'hoursperweek', + 'sessionsperweek', 'yaml', ] diff --git a/rowers/templates/instantplan.html b/rowers/templates/instantplan.html index 572102b8..74e56684 100644 --- a/rowers/templates/instantplan.html +++ b/rowers/templates/instantplan.html @@ -16,6 +16,7 @@

{{ plan.target }}

Goal: {{ plan.goal }}

{{ plan.hoursperweek }} hours per week

+

{{ plan.sessionsperweek }} sessions per week

  • diff --git a/rowers/templates/instantplans.html b/rowers/templates/instantplans.html index d20df48c..920b2aa0 100644 --- a/rowers/templates/instantplans.html +++ b/rowers/templates/instantplans.html @@ -18,6 +18,7 @@

    {{ plan.target }}

    Goal: {{ plan.goal }}

    {{ plan.hoursperweek }} hours per week

    +

    {{ plan.sessionsperweek }} sessoins per week

    {% endfor %} diff --git a/rowers/templates/plannedsessions.html b/rowers/templates/plannedsessions.html index a9ed371a..d9ceb02d 100644 --- a/rowers/templates/plannedsessions.html +++ b/rowers/templates/plannedsessions.html @@ -122,7 +122,8 @@ {% else %} -   + {% endif %} diff --git a/rowers/urls.py b/rowers/urls.py index 18cb25ff..a67cc0ee 100644 --- a/rowers/urls.py +++ b/rowers/urls.py @@ -815,6 +815,8 @@ urlpatterns = [ name='template_share_view'), re_path(r'^sessions/(?P\d+)/makeprivate/$',views.template_makeprivate_view, name='template_makeprivate_view'), + re_path(r'^sessions/(?P\d+)/removeme/$',views.remove_groupsession_view, + name='remove_groupsession_view'), re_path(r'^sessions/teamedit/(?P\d+)/user/(?P\d+)/$', views.plannedsession_teamedit_view, name='plannedsession_teamedit_view'), diff --git a/rowers/views/planviews.py b/rowers/views/planviews.py index 724936b7..55216fc5 100644 --- a/rowers/views/planviews.py +++ b/rowers/views/planviews.py @@ -2600,6 +2600,23 @@ def rower_view_instantplan(request,id='',userid=0): 'form':form, }) +@login_required() +def remove_groupsession_view(request,id=0): + r = getrequestrower(request) + + ps = get_object_or_404(PlannedSession,pk=id) + + res = remove_rower_session(r,ps) + + if res: + messages.info(request,"We have removed you from this group session") + else: + messages.error(request,"For some reason we could not remove you from this group session") + + url = reverse('plannedsessions_view') + + return HttpResponseRedirect(url) + @login_required() def add_instantplan_view(request): if not request.user.is_staff:
    {{ ps.sessionvalue }}