Merge branch 'release/v8.42'

rowers/templates/plannedsession_multicreate.html

@@ -61,15 +61,16 @@
 </ul>
 
  
-<script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.4/jquery.min.js"></script>
+<script src="/static/js/jquery-3.1.0.js">
+</script>
 <script src="/static/js/jquery.formset.js"></script>
 <script>
-  $(document).ready(function(){
 
   $('#ps-form-table tbody tr').formset({
   addText: ''
   });
 
+  $(document).ready(function(){
 
 
   $("tr.session_form_row").each(function() {

rowers/views.py

@@ -7164,6 +7164,8 @@ def workout_smoothenpace_view(request,id=0,message="",successmessage=""):
     row.write_csv(filename,gzip=True)
     dataprep.update_strokedata(id,row.df)
 
+    messages.info(request,'A smoothening filter was applied to your pace data')
+
     if previousurl:
         url = previousurl
     else:
@@ -13987,6 +13989,7 @@ def plannedsession_multiclone_view(
             std = min([ps.startdate for ps in sps])
             shiftstartdate = dateshiftform.cleaned_data['shiftstartdate']
             delta = shiftstartdate-std
+            lastdate = shiftstartdate
             for ps in sps:
                 rowers = ps.rower.all()
                 teams = ps.team.all()
@@ -13994,19 +13997,24 @@ def plannedsession_multiclone_view(
                 ps.startdate += delta
                 ps.preferreddate += delta
                 ps.enddate += delta
+                if ps.enddate > lastdate:
+                    lastdate = ps.enddate
                 ps.save()
                 for rower in rowers:
                     add_rower_session(rower,ps)
                 for team in teams:
                     add_team_session(team,ps)
 
-            url = reverse(plannedsession_multicreate_view,
+            startdatestring = shiftstartdate.strftime('%Y-%m-%d')
+            enddatestring = lastdate.strftime('%Y-%m-%d')
+
+            url = reverse(plannedsessions_view,
                           kwargs = {
                               'userid':r.user.id,
+                              'startdatestring':startdatestring,
+                              'enddatestring':enddatestring,
                               })
-            if when:
+
-                url += '?when='+when
-            
             return HttpResponseRedirect(url)
 
     sps = PlannedSession.objects.filter(
@@ -14219,33 +14227,15 @@ def plannedsession_multicreate_view(request,
     except IndexError:
         trainingplan = None
 
-    sps = get_sessions(r,startdate=startdate,enddate=enddate)
-
     m = Rower.objects.get(user=request.user)
 
-    if m.rowerplan == 'coach':
+    qset = PlannedSession.objects.filter(
-        teams = Team.objects.filter(manager=request.user)
+        rower__in=[r],
-        members = Rower.objects.filter(team__in=teams).distinct()
+        manager = request.user,
-        if r in members:
+        startdate__lte=enddate,
-            qset = PlannedSession.objects.filter(
+        enddate__gte=startdate,
-                rower__in=[r],
+    ).order_by("startdate","preferreddate","enddate").exclude(
-                startdate__lte=enddate,
+        sessiontype='race')
-                enddate__gte=startdate,
-            ).order_by("startdate","preferreddate","enddate").exclude(
-                sessiontype='race')
-        else:
-            qset = []
-    else:
-        qset = []
-
-    if not qset:
-            qset = PlannedSession.objects.filter(
-                rower__in=[r],
-                manager = request.user,
-                startdate__lte=enddate,
-                enddate__gte=startdate,
-            ).order_by("startdate","preferreddate","enddate").exclude(
-                sessiontype='race')