sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

Does not save fit files

Browse Source
This commit is contained in:
Sander Roosendaal
2021-03-02 12:34:56 +01:00
parent d537ce66da
commit c57500fa35
5 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
rowers/models.py
View File

@@ -2420,6 +2420,7 @@ class PlannedSession(models.Model):
file = tempfile.NamedTemporaryFile(mode='w+b',suffix='.fit',dir=settings.MEDIA_ROOT) file = tempfile.NamedTemporaryFile(mode='w+b',suffix='.fit',dir=settings.MEDIA_ROOT)
filename = file filename = file
steps = self.steps steps = self.steps
try: try:
@@ -2433,9 +2434,12 @@ class PlannedSession(models.Model):
self.steps = steps self.steps = steps
fitfile = steps_write_fit(steps) fitfile = steps_write_fit(steps)
filelist = fitfile.split('/media/') filelist = fitfile.split('/media/')
self.fitfile.name = filelist[-1] self.fitfile.name = filelist[-1]
# calculate approximate distance # calculate approximate distance
if self.steps: if self.steps:
sdict, totalmeters, totalseconds = ps_dict_order(self.steps) sdict, totalmeters, totalseconds = ps_dict_order(self.steps)

6
rowers/templates/plannedsessionedit.html
View File

@@ -121,6 +121,7 @@
<th>Name</th> <th>Name</th>
<th>Value</th> <th>Value</th>
<th>&nbsp;</th> <th>&nbsp;</th>
<th>Edit</th>
<th>Delete</th> <th>Delete</th>
</tr> </tr>
</thead> </thead>
@@ -138,8 +139,11 @@
</td> </td>
<td> {{ ps.sessionvalue }} </td> <td> {{ ps.sessionvalue }} </td>
<td> {{ ps.sessionunit }} </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> <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> </td>
</tr> </tr>
{% endfor %} {% endfor %}

6
rowers/templates/plannedsessiontemplateedit.html
View File

@@ -28,7 +28,7 @@
</div> </div>
<p> <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> </p>
<input class="button" <input class="button"
action="/rowers/sessions/{{ thesession.id }}/templateedit/" type="submit" value="Save"> action="/rowers/sessions/{{ thesession.id }}/templateedit/" type="submit" value="Save">
@@ -65,10 +65,10 @@
<td> {{ ps.sessionvalue }} </td> <td> {{ ps.sessionvalue }} </td>
<td> {{ ps.sessionunit }} </td> <td> {{ ps.sessionunit }} </td>
<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>
<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> </td>
</tr> </tr>
{% endfor %} {% endfor %}

4
rowers/templates/plannedsessionview.html
View File

@@ -15,9 +15,9 @@
{% if user.is_authenticated and psdict.id.1|is_session_manager:user %} {% if user.is_authenticated and psdict.id.1|is_session_manager:user %}
<p> <p>
<a href="/rowers/sessions/{{ psdict.id.1 }}/edit/user/{{ rower.user.id }}"> <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> </p>
{% endif %} {% endif %}
<h1>Session {{ psdict.name.1 }}</h1> <h1>Session {{ psdict.name.1 }}</h1>

9
rowers/views/planviews.py
View File

@@ -2235,14 +2235,7 @@ class PlannedSessionDelete(DeleteView):
w.plannedsession = None w.plannedsession = None
w.save() 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) url = reverse(plannedsessions_view)
next = self.request.GET.get('next',url) next = self.request.GET.get('next',url)