From e1cd70f0163f89b213a6fc7904f062b5dcaa4ed2 Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <roosendaalsander@gmail.com>
Date: Mon, 15 Oct 2018 12:47:36 +0200
Subject: [PATCH] plannedsession_delete_view line 470

---
 .../plannedsessiondeleteconfirm.html          | 64 ++++++++---------
 rowers/urls.py                                |  5 +-
 rowers/views.py                               | 72 +++++++++++++++++++
 3 files changed, 106 insertions(+), 35 deletions(-)

diff --git a/rowers/templates/plannedsessiondeleteconfirm.html b/rowers/templates/plannedsessiondeleteconfirm.html
index 0a6f3d7f..a299e6b0 100644
--- a/rowers/templates/plannedsessiondeleteconfirm.html
+++ b/rowers/templates/plannedsessiondeleteconfirm.html
@@ -1,45 +1,43 @@
-{% extends "base.html" %}
+{% extends "newbase.html" %}
 {% load staticfiles %}
 
 {% block title %}Planned Session{% endblock %}
 
-{% block content %}
-<div class="grid_12 alpha">
-  {% include "planningbuttons.html" %}
-
-</div>
-<div id="left" class="grid_6 alpha">
-  <h1>Confirm Delete</h1>
-  <p>This will permanently delete the planned session</p>
+{% block main %}
+<h1>Confirm Delete</h1>
+<p>This will permanently delete the planned session</p>
   
-	
-  <div class="grid_2 alpha">
+<ul class="main-content">
+  <li class="grid_2">
     <p>
-      <a class="button green small" href="/rowers/sessions/">Cancel</a>
-  </div>
-  
-  <div class="grid_2">
-    <p>
-      <a class="button red small" href="/rowers/sessions/{{ ps.id }}/delete">Delete</a>
+      <form action="" method="post">
+        {% csrf_token %}
+        <p>Are you sure you want to delete <em>{{ object }}</em>?</p>
+        <input class="button red" type="submit" value="Confirm">
+      </form>
     </p>
-  </div>
+  </li>
 
-</div>
-<div id="right" class="grid_6 omega">
-  <h1>Session {{ psdict.name.1 }}</h1>
-  <table class="listtable shortpadded">
-    {% for attr in attrs %}
-    {% for key,value in psdict.items %}
-    {% if key == attr %}
-    <tr>
-      <td><b>{{ value.0 }}</b></td><td>{{ value.1 }}</td>
-    </tr>
-    {% endif %}
-    {% endfor %}
-    {% endfor %}
-  </table>
-</div>
+  <li class="grid_2">
+    <h2>Session {{ psdict.name.1 }}</h2>
+    <table class="listtable shortpadded">
+      {% for attr in attrs %}
+      {% for key,value in psdict.items %}
+      {% if key == attr %}
+      <tr>
+        <td><b>{{ value.0 }}</b></td><td>{{ value.1 }}</td>
+      </tr>
+      {% endif %}
+      {% endfor %}
+      {% endfor %}
+    </table>
+  </li>
+</ul>
   
 
 
+{% endblock %}
+
+{% block sidebar %}
+{% include 'menu_plan.html' %}
 {% endblock %}
diff --git a/rowers/urls.py b/rowers/urls.py
index 080a7b61..c6184a05 100644
--- a/rowers/urls.py
+++ b/rowers/urls.py
@@ -466,8 +466,9 @@ urlpatterns = [
         name='plannedsession_view'),
     url(r'^sessions/(?P<id>\d+)/user/(?P<userid>\d+)$',views.plannedsession_view,
         name='plannedsession_view'),
-    url(r'^sessions/(?P<id>\d+)/deleteconfirm$',views.plannedsession_deleteconfirm_view),
-    url(r'^sessions/(?P<id>\d+)/delete$',views.plannedsession_delete_view),
+    url(r'^sessions/(?P<pk>\d+)/deleteconfirm$',views.PlannedSessionDelete.as_view()),
+    url(r'^sessions/(?P<pk>\d+)/delete$',views.PlannedSessionDelete.as_view(),
+        name='plannedsession_delete_view'),
     url(r'^sessions/manage/session/(?P<initialsession>\d+)$',
         views.plannedsessions_manage_view),
     url(r'^sessions/manage/user/(?P<userid>\d+)/session/(?P<initialsession>\d+)$',
diff --git a/rowers/views.py b/rowers/views.py
index 0c33fa4b..f2216340 100644
--- a/rowers/views.py
+++ b/rowers/views.py
@@ -14786,6 +14786,78 @@ def plannedsession_view(request,id=0,userid=0):
                       }
                   )
 
+class PlannedSessionDelete(DeleteView):
+    model = PlannedSession
+    template_name = 'plannedsessiondeleteconfirm.html'
+
+    # extra parameters
+    def get_context_data(self, **kwargs):
+        context = super(PlannedSessionDelete,self).get_context_data(**kwargs)
+
+        if 'userid' in kwargs:
+            userid = kwargs['userid']
+        else:
+            userid = 0
+
+        context['active']= 'nav-plan'
+        context['rower'] = getrequestrower(self.request,userid=userid)
+        context['ps'] = self.object
+
+        psdict = my_dict_from_instance(self.object,PlannedSession)
+
+        context['psdict'] = psdict
+
+        context['attrs'] = ['name','startdate','enddate','sessiontype']
+
+        breadcrumbs = [
+            {
+                'url':reverse(plannedsessions_view,
+                              kwargs={'userid':userid}),
+                'name': 'Plan'
+            },
+            {
+                'url': reverse(plannedsessions_view,
+                               kwargs={'userid':userid}),
+                'name': 'Sessions'
+            },
+            {
+                'url':reverse(plannedsession_view,
+                              kwargs={
+                                  'userid':userid,
+                                  'id':self.object.pk,
+                              }
+                ),
+                'name': self.object.pk
+            },
+            {
+                'url':reverse('plannedsession_delete_view',
+                              kwargs={'pk':self.object.pk}),
+                'name': 'Delete'
+                }
+        ]
+
+        context['breadcrumbs'] = breadcrumbs
+
+        return context
+
+    def get_success_url(self):
+        ws = Workout.objects.filter(plannedsession=self.object)
+        for w in ws:
+            w.plannedsession = None
+            w.save()
+
+        url = reverse(plannedsessions_view)
+        
+        return url
+
+    def get_object(self, *args, **kwargs):
+        obj = super(PlannedSessionDelete, self).get_object(*args, **kwargs)
+        m = Rower.objects.get(user=obj.manager)
+        if not checkaccessuser(self.request.user,m):
+            raise PermissionDenied('You are not allowed to delete this planned session')
+
+        return obj
+
 @login_required()
 def plannedsession_delete_view(request,id=0):
     r = getrower(request.user)