From 7d4a2f2251b6219ed48975686d2eebbaad8bb438 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Tue, 13 Feb 2018 16:03:58 +0100 Subject: [PATCH 1/4] initial multicreate plannedsesssion not working --- rowers/models.py | 35 +++++ .../templates/plannedsession_multicreate.html | 139 ++++++++++++++++++ rowers/templates/plannedsessioncreate.html | 2 +- rowers/urls.py | 9 ++ rowers/views.py | 52 ++++++- 5 files changed, 234 insertions(+), 3 deletions(-) create mode 100644 rowers/templates/plannedsession_multicreate.html diff --git a/rowers/models.py b/rowers/models.py index 5b30abb6..5513d86b 100644 --- a/rowers/models.py +++ b/rowers/models.py @@ -614,6 +614,12 @@ class BaseFavoriteFormSet(BaseFormSet): if not yparam2: yparam2 = 'None' +class BasePlannedSessionFormSet(BaseFormSet): + def clean(self): + if any(self.serrors): + return + + # Check if workout is owned by this user def checkworkoutuser(user,workout): try: @@ -918,6 +924,35 @@ class PlannedSessionForm(ModelForm): 'enddate': AdminDateWidget(), } +class PlannedSessionFormSmall(ModelForm): + + class Meta: + model = PlannedSession + fields = ['startdate', + 'enddate', + 'name', + 'sessiontype', + 'sessionmode', + 'criterium', + 'sessionvalue', + 'sessionunit', + 'comment', + ] + + dateTimeOptions = { + 'format': 'yyyy-mm-dd', + 'autoclose': True, + } + + widgets = { + 'startdate': DateInput(attrs={'size':10}), + 'enddate': DateInput(attrs={'size':10}), + 'name': forms.TextInput(attrs={'size':10}), + 'comment': forms.TextInput(attrs={'size':10}), + 'sessionvalue': forms.TextInput(attrs={'style':'width:3em', + 'type':'number'}), + } + # Workout class Workout(models.Model): diff --git a/rowers/templates/plannedsession_multicreate.html b/rowers/templates/plannedsession_multicreate.html new file mode 100644 index 00000000..44aba51e --- /dev/null +++ b/rowers/templates/plannedsession_multicreate.html @@ -0,0 +1,139 @@ +{% extends "base.html" %} +{% load staticfiles %} +{% load rowerfilters %} + +{% block title %}New Planned Session{% endblock %} + +{% block content %} +
+ {% include "planningbuttons.html" %} +
+ +
+
+

Create Sessions for {{ rower.user.first_name }} {{ rower.user.last_name }}

+
+ +{% if user.is_authenticated and user|is_manager %} +
+ +
+ {% for member in user|team_rowers %} + {{ member.user.first_name }} {{ member.user.last_name }} + {% endfor %} +
+
+{% endif %} +
+ +
+
+ {% csrf_token %} + {{ ps_formset.management_form }} + + + + + + {% for field in ps_formset.0.visible_fields %} + + {% endfor %} + + + + {% for form in ps_formset %} + + + {% endfor %} + + {% endfor %} + +
 {{ field.label_tag }}
{{ forloop.counter }} + {% if form.instance.pk %}{{ form.DELETE }}{% endif %} + {% for field in form.visible_fields %} + + {{ field }} +
+ +
+ +
+{% endblock %} + +{% block scripts %} + + + + +{% endblock %} diff --git a/rowers/templates/plannedsessioncreate.html b/rowers/templates/plannedsessioncreate.html index b2d643cd..5263c3f5 100644 --- a/rowers/templates/plannedsessioncreate.html +++ b/rowers/templates/plannedsessioncreate.html @@ -11,7 +11,7 @@
-

Create Session for {{ rower.user.first_name }} {{ rower.user.last_name }}

+

Create Sessions for {{ rower.user.first_name }} {{ rower.user.last_name }}

+

+ On this page, you can create and edit sessions for an entire time + period. +

{% csrf_token %} {{ ps_formset.management_form }} @@ -68,9 +72,13 @@ {% for form in ps_formset %} - + {{ forloop.counter }} {% if form.instance.pk %}{{ form.DELETE }}{% endif %} + {{ form.id }} + {% for field in form.hidden_fields %} + {{ field }} + {% endfor %} {% for field in form.visible_fields %} {{ field }} @@ -80,7 +88,8 @@ {% endfor %} - + Add More +
@@ -94,10 +103,9 @@ $(document).ready(function(){ $('#ps-form-table tbody tr').formset({ - prefix: '{{ formset.prefix }}' + addText: '' }); - $("td #id_sessionmode").change(function() { if (this.value == 'TRIMP') { diff --git a/rowers/urls.py b/rowers/urls.py index 509efae6..6e093cfa 100644 --- a/rowers/urls.py +++ b/rowers/urls.py @@ -420,6 +420,8 @@ urlpatterns = [ views.plannedsession_create_view), url(r'^sessions/multicreate$',views.plannedsession_multicreate_view), + url(r'^sessions/multicreate/(?P[\w\ ]+.*)/rower/(?P\d+)/extra/(?P\d+)$', + views.plannedsession_multicreate_view), url(r'^sessions/multicreate/rower/(?P\d+)$', views.plannedsession_multicreate_view), url( diff --git a/rowers/views.py b/rowers/views.py index f10ff612..4d5453a2 100644 --- a/rowers/views.py +++ b/rowers/views.py @@ -8811,7 +8811,6 @@ def workout_uploadimage_view(request,id): if f is not None: filename,path_and_filename = handle_uploaded_image(f) - print path_and_filename,'aap' try: width,height = Image.open(path_and_filename).size except: @@ -11647,8 +11646,6 @@ def plannedsession_create_view(request,timeperiod='thisweek',rowerid=0): else: forminitial = {} - print forminitial - sessioncreateform = PlannedSessionForm(initial=forminitial) startdate,enddate = get_dates_timeperiod(timeperiod) @@ -11666,7 +11663,9 @@ def plannedsession_create_view(request,timeperiod='thisweek',rowerid=0): @user_passes_test(hasplannedsessions,login_url="/rowers/planmembership/", redirect_field_name=None) def plannedsession_multicreate_view(request,timeperiod='thisweek', - teamid=0,rowerid=0): + teamid=0,rowerid=0,extrasessions=0): + + extrasessions=int(extrasessions) if rowerid==0: r = getrower(request.user) @@ -11680,29 +11679,78 @@ def plannedsession_multicreate_view(request,timeperiod='thisweek', startdate,enddate = get_dates_timeperiod(timeperiod) sps = get_sessions(r,startdate=startdate,enddate=enddate) - qset = PlannedSession.objects.filter( - rower__in=[r], - startdate__lte=enddate, - enddate__gte=startdate, - ).order_by("startdate","enddate") + + m = Rower.objects.get(user=request.user) + + if m.rowerplan == 'coach': + teams = Team.objects.filter(manager=request.user) + members = Rower.objects.filter(team__in=teams).distinct() + if r in members: + qset = PlannedSession.objects.filter( + rower__in=[r], + startdate__lte=enddate, + enddate__gte=startdate, + ).order_by("startdate","enddate") + else: + qset = [] + + if not qset: + qset = PlannedSession.objects.filter( + rower__in=[r], + manager = request.user, + startdate__lte=enddate, + enddate__gte=startdate, + ).order_by("startdate","enddate") + - extrasessions = (enddate-startdate).days+1 - - PlannedSessionFormSet = modelformset_factory(PlannedSession, - form=PlannedSessionFormSmall, -# formset=BasePlannedSessionFormSet, - can_delete=True, - extra=extrasessions, -) - ps_formset = PlannedSessionFormSet(queryset = qset) + initial = { + 'startdate':startdate, + 'enddate':enddate, + 'sessionvalue':60, + 'manager':request.user, + 'name': 'NEW SESSION' + } + + initials = [initial for i in range(extrasessions)] + PlannedSessionFormSet = modelformset_factory( + PlannedSession, + form=PlannedSessionFormSmall, + can_delete=True, + extra=extrasessions, + ) + if request.method == "POST": + ps_formset = PlannedSessionFormSet(queryset = qset, + data = request.POST) + if ps_formset.is_valid(): + instances = ps_formset.save(commit=False) + for ps in instances: + ps.save() + add_rower_session(r,ps) + for obj in ps_formset.deleted_objects: + obj.delete() + else: + print ps_formset.errors + + url = reverse(plannedsession_multicreate_view, + kwargs = { + 'rowerid':r.id, + 'timeperiod':timeperiod + } + ) + return HttpResponseRedirect(url) + + ps_formset = PlannedSessionFormSet(queryset = qset, + initial=initials) + context = { 'ps_formset':ps_formset, 'rower':r, 'timeperiod':timeperiod, - 'teams':get_my_teams(request.user) + 'teams':get_my_teams(request.user), + 'extrasessions': extrasessions+1 } return render(request,'plannedsession_multicreate.html',context) From 4b5b33b1f566b92b51d4b71190deb794bfc31728 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Tue, 13 Feb 2018 21:45:52 +0100 Subject: [PATCH 3/4] small improvement --- rowers/templates/plannedsession_multicreate.html | 1 - rowers/templates/plannedsessions.html | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/rowers/templates/plannedsession_multicreate.html b/rowers/templates/plannedsession_multicreate.html index b1f3ab62..8ec43d64 100644 --- a/rowers/templates/plannedsession_multicreate.html +++ b/rowers/templates/plannedsession_multicreate.html @@ -60,7 +60,6 @@
{% csrf_token %} {{ ps_formset.management_form }} - diff --git a/rowers/templates/plannedsessions.html b/rowers/templates/plannedsessions.html index f1252d32..72065862 100644 --- a/rowers/templates/plannedsessions.html +++ b/rowers/templates/plannedsessions.html @@ -102,7 +102,7 @@
{% if ps.manager == request.user %} Edit + href="/rowers/sessions/{{ ps.id }}/edit/{{ timeperiod }}/rower/{{ rower.id }} ">Edit {% else %}   {% endif %} From 1030b3f1264be432c00fe689570232295e58d7f1 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Tue, 13 Feb 2018 21:50:25 +0100 Subject: [PATCH 4/4] bulk edit links --- rowers/templates/planningbuttons.html | 3 +++ 1 file changed, 3 insertions(+) diff --git a/rowers/templates/planningbuttons.html b/rowers/templates/planningbuttons.html index 20648d28..4bfeb6c0 100644 --- a/rowers/templates/planningbuttons.html +++ b/rowers/templates/planningbuttons.html @@ -32,6 +32,9 @@ {% endif %}

+
+ Bulk Session Edit ({{ timeperiod|verbosetimeperiod }}) +
{% if user.is_authenticated and user|is_manager %} {% if timeperiod %}