From c57500fa353dd14a99c69c4445e936f38742ebc0 Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <roosendaalsander@gmail.com>
Date: Tue, 2 Mar 2021 12:34:56 +0100
Subject: [PATCH] Does not save fit files

---
 rowers/models.py                                 | 4 ++++
 rowers/templates/plannedsessionedit.html         | 6 +++++-
 rowers/templates/plannedsessiontemplateedit.html | 6 +++---
 rowers/templates/plannedsessionview.html         | 4 ++--
 rowers/views/planviews.py                        | 9 +--------
 5 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/rowers/models.py b/rowers/models.py
index d83218bd..ecf5e2bb 100644
--- a/rowers/models.py
+++ b/rowers/models.py
@@ -2420,6 +2420,7 @@ class PlannedSession(models.Model):
                 file = tempfile.NamedTemporaryFile(mode='w+b',suffix='.fit',dir=settings.MEDIA_ROOT)
                 filename = file
 
+            
             steps = self.steps
 
             try:
@@ -2433,9 +2434,12 @@ class PlannedSession(models.Model):
                     self.steps = steps
             fitfile = steps_write_fit(steps)
 
+
             filelist = fitfile.split('/media/')
+
             self.fitfile.name = filelist[-1]
 
+
         #  calculate approximate distance
         if self.steps:
             sdict, totalmeters, totalseconds = ps_dict_order(self.steps)
diff --git a/rowers/templates/plannedsessionedit.html b/rowers/templates/plannedsessionedit.html
index 96050549..3e6bf769 100644
--- a/rowers/templates/plannedsessionedit.html
+++ b/rowers/templates/plannedsessionedit.html
@@ -121,6 +121,7 @@
 	  <th>Name</th>
           <th>Value</th>
           <th>&nbsp;</th>
+					<th>Edit</th>
 	  <th>Delete</th>
 	</tr>
       </thead>
@@ -138,8 +139,11 @@
           </td>
           <td> {{ ps.sessionvalue }} </td>
           <td> {{ ps.sessionunit }} </td>
+					<td>
+						<a class="small" href="/rowers/sessions/{{ ps.id }}/templateedit/"><i class="fas fa-pencil-alt fa-fw"></i></a>
+					</td>
           <td>
-            <a class="small" href="/rowers/sessions/{{ ps.id }}/deleteconfirm/">Delete</a>
+            <a class="small" href="/rowers/sessions/{{ ps.id }}/deleteconfirm/"><i class="fas fa-trash-alt fa-fw"></i> Delete</a>
           </td>
 	</tr>
 	{% endfor %}
diff --git a/rowers/templates/plannedsessiontemplateedit.html b/rowers/templates/plannedsessiontemplateedit.html
index d063cf6c..dc84e128 100644
--- a/rowers/templates/plannedsessiontemplateedit.html
+++ b/rowers/templates/plannedsessiontemplateedit.html
@@ -28,7 +28,7 @@
 
       </div>
       <p>
-        <a href="/rowers/sessions/{{ thesession.id }}/deleteconfirm">Delete</a>
+        <a href="/rowers/sessions/{{ thesession.id }}/deleteconfirm"><i class="fas fa-trash-alt fa-fw"></i> Delete</a>
       </p>
       <input class="button"
              action="/rowers/sessions/{{ thesession.id }}/templateedit/" type="submit" value="Save">
@@ -65,10 +65,10 @@
           <td> {{ ps.sessionvalue }} </td>
           <td> {{ ps.sessionunit }} </td>
 					<td>
-						<a class="small" href="/rowers/sessions/{{ ps.id }}/templateedit/">Edit Library Session</a>
+						<a class="small" href="/rowers/sessions/{{ ps.id }}/templateedit/"><i class="fas fa-pencil-alt fa-fw"></i> </a>
 					</td>
           <td>
-            <a class="small" href="/rowers/sessions/{{ ps.id }}/deleteconfirm/">Delete</a>
+            <a class="small" href="/rowers/sessions/{{ ps.id }}/deleteconfirm/"><i class="fas fa-trash-alt fa-fw"></i> </a>
           </td>
 	</tr>
 	{% endfor %}
diff --git a/rowers/templates/plannedsessionview.html b/rowers/templates/plannedsessionview.html
index 5a3ccf5b..e4097cc6 100644
--- a/rowers/templates/plannedsessionview.html
+++ b/rowers/templates/plannedsessionview.html
@@ -15,9 +15,9 @@
 {% if user.is_authenticated and psdict.id.1|is_session_manager:user %}
 <p>
   <a href="/rowers/sessions/{{ psdict.id.1 }}/edit/user/{{ rower.user.id }}">
-    Edit Session</a>
+    <i class="fas fa-pencil-alt fa-fw"></i> Edit Session</a>
 		/
-	<a href="/rowers/sessions/{{ psdict.id.1 }}/maketemplate/?next={{ request.path|urlencode }}">Save to Library</a>
+	<a href="/rowers/sessions/{{ psdict.id.1 }}/maketemplate/?next={{ request.path|urlencode }}"><i class="fas fa-books fa-fw"></i> Save to Library</a>
 </p>
 {% endif %}
 <h1>Session {{ psdict.name.1 }}</h1>
diff --git a/rowers/views/planviews.py b/rowers/views/planviews.py
index be2130df..40f9fd6a 100644
--- a/rowers/views/planviews.py
+++ b/rowers/views/planviews.py
@@ -2235,14 +2235,7 @@ class PlannedSessionDelete(DeleteView):
             w.plannedsession = None
             w.save()
 
-        if self.object.fitfile:
-            filelist = self.object.fitfile.name.split('/media')
-            filename = settings.MEDIA_ROOT+'/'+filelist[-1]
-            try:
-                os.remove(filename)
-            except FileNotFoundError:
-                print(filename)
-            self.object.fitfile = None
+        
 
         url = reverse(plannedsessions_view)
         next = self.request.GET.get('next',url)