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

graph / delete view

Browse Source
This commit is contained in:
Sander Roosendaal
2018-10-08 16:48:57 +02:00
parent 9025a0d8dc
commit da821f1bff
5 changed files with 177 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
rowers/templates/graphimage_delete_confirm.html
View File

@@ -1,43 +1,30 @@
{% extends "base.html" %}
{% extends "newbase.html" %}
{% load staticfiles %}
{% load rowerfilters %}
{% block title %}Delete Graph Image {% endblock %}
{% block content %}
<div id="workouts" class="grid_6 alpha">
{% if form.errors %}
<p style="color: red;">
Please correct the error{{ form.errors|pluralize }} below.
</p>
{% endif %}
<h1>Confirm Graph Delete</h1>
<p>This will permanently delete the graph</p>
<div class="grid_2 alpha">
<p>
<a class="button green small" href="/rowers/list-workouts/">Cancel</a>
</div>
<div class="grid_2">
<p>
<a class="button red small" href="/rowers/graph/{{ graph.id }}/delete">Delete</a>
</p>
</div>
</div>
<div id="images" class="grid_6 omega">
<p>
<a href="/{{ graph.filename }}" download="myimage">
<image src="/{{ graph.filename }}" alt="/{{ graph.filename }}" width="480"/>
</a>
</p>
</div>
{% block main %}
<ul class="main-content">
<li class="grid_2">
<form action="" method="post">
{% csrf_token %}
<p>Are you sure you want to delete this chart?</p>
<p>
<input class="button red" type="submit" value="Confirm">
</p>
</form>
</li>
<li class="grid_2">
<a href="/rowers/graph/{{ object.id }}">
<image src="/{{ object.filename }}" alt="{{ object.filename }}"/>
</a>
</li>
</ul>
{% endblock %}
{% block sidebar %}
{% include 'menu_workouts.html' %}
{% endblock %}

110
rowers/templates/show_graph.html
View File

@@ -1,4 +1,4 @@
{% extends "base.html" %}
{% extends "newbase.html" %}
{% load staticfiles %}
{% load rowerfilters %}
@@ -14,60 +14,64 @@
<meta property="og:image:width" content="{{ graph.width }}" />
<meta property="og:image:height" content="{{ graph.height }}" />
{% endblock %}
{% block content %}
<h1>{{ workout.name }}</h1>
<div class="grid_12">
<div class="grid_1 alpha">
<div class="fb-share-button" data-href="https://rowsandall.com/rowers/graph/{{ graph.id }}" data-layout="button" data-size="small" data-mobile-iframe="false">
<a class="fb-xfbml-parse-ignore" target="_blank" href="https://www.facebook.com/sharer/sharer.php?u=https://rowsandall.com/rowers/graph/{{ graph.id }}">Share</a></div>
</div>
<div class="grid_1">
{% block main %}
<h1>{{ workout.name }}</h1>
<ul class="main-content">
<li class="grid_4">
<p>
<a href="/{{ graph.filename }}" download="myimage">
<image src="/{{ graph.filename }}" alt="/{{ graph.filename }}" width="960"/>
</a>
</p>
</li>
<li>
<p>
<span class="fb-share-button" data-href="https://rowsandall.com/rowers/graph/{{ graph.id }}" data-layout="button" data-size="small" data-mobile-iframe="false">
<a class="fb-xfbml-parse-ignore" target="_blank" href="https://www.facebook.com/sharer/sharer.php?u=https://rowsandall.com/rowers/graph/{{ graph.id }}">
Share
</a>
</span>
</p>
<p>
<span>
<a class="twitter-share-button"
href="https://twitter.com/intent/tweet"
data-url="https://rowsandall.com/rowers/graph/{{ graph.id }}"
data-text="@rowsandall #rowingdata">Tweet</a>
</div>
</div>
<p>&nbsp;</p>
<div class="grid_12">
<div class="grid_2 alpha">
{% if user.is_authenticated and user == rower.user %}
<p>
<a class="button gray small" href="/rowers/workout/{{ graph.workout.id }}/edit">Edit Workout</a>
</p>
{% else %}
<p>
<a class="button gray small" href="/rowers/workout/{{ graph.workout.id }}">See Workout</a>
</p>
{% endif %}
</div>
<div class="grid_2">
{% if user.is_authenticated and user == rower.user %}
<p>
<a class="button gray small" href="/rowers/workout/{{ graph.workout.id }}/workflow">Workflow View</a>
</p>
{% else %}
<p>&nbsp;</p>
{% endif %}
</div>
<div class="grid_2 suffix_6 omega">
{% if user.is_authenticated and user == rower.user %}
<p>
<a class="button red small" href="/rowers/graph/{{ graph.id }}/deleteconfirm">Delete Chart</a>
</p>
{% else %}
<p>&nbsp;</p>
{% endif %}
</div>
</div>
<div class="grid_12">
<p>
<a href="/{{ graph.filename }}" download="myimage">
<image src="/{{ graph.filename }}" alt="/{{ graph.filename }}" width="960"/>
</a>
</p>
</div>
data-text="@rowsandall #rowingdata">Tweet
</a>
</span>
</p>
</li>
<li>
{% if user.is_authenticated and user == rower.user %}
<p>
<a class="button gray small" href="/rowers/workout/{{ graph.workout.id }}/edit">Edit Workout</a>
</p>
{% else %}
<p>
<a class="button gray small" href="/rowers/workout/{{ graph.workout.id }}">See Workout</a>
</p>
{% endif %}
{% if user.is_authenticated and user == rower.user %}
<p>
<a class="button gray small" href="/rowers/workout/{{ graph.workout.id }}/workflow">Workflow View</a>
</p>
{% else %}
<p>&nbsp;</p>
{% endif %}
</li>
<li>
{% if user.is_authenticated and user == rower.user %}
<p>
<a class="button red small" href="/rowers/graph/{{ graph.id }}/delete">Delete Chart</a>
</p>
{% else %}
<p>&nbsp;</p>
{% endif %}
</li>
</ul>
{% endblock %}
{% block sidebar %}
{% include 'menu_workouts.html' %}
{% endblock %}

3
rowers/urls.py
View File

@@ -216,8 +216,7 @@ urlpatterns = [
url(r'^cumstats/(?P<startdatestring>\w+.*)/(?P<enddatestring>\w+.*)$',views.cumstats),
url(r'^cumstats/$',views.cumstats),
url(r'^graph/(?P<id>\d+)/$',views.graph_show_view),
url(r'^graph/(?P<id>\d+)/deleteconfirm$',views.graph_delete_confirm_view),
url(r'^graph/(?P<id>\d+)/delete$',views.graph_delete_view),
url(r'^graph/(?P<pk>\d+)/delete$',views.GraphDelete.as_view(),name='graph_delete'),
url(r'^workout/(?P<id>\d+)/get-thumbnails$',views.get_thumbnails),
url(r'^workout/(?P<id>\d+)/toggle-ranking$',views.workout_toggle_ranking),
url(r'^workout/(?P<id>\d+)/get-testscript$',views.get_testscript),

83
rowers/views.py
View File

@@ -236,7 +236,7 @@ def getrequestrower(request,rowerid=0,userid=0,notpermanent=False):
request.session['rowerid'] = r.id
return r
def getrower(user):
try:
@@ -6396,10 +6396,18 @@ def workouts_view(request,message='',successmessage='',
messages.info(request,successmessage)
messages.error(request,message)
breadcrumbs = [
{
'url':'/rowers/list-workouts',
'name':'Workouts'
},
]
return render(request, 'list_workouts.html',
{'workouts': workouts,
'active': 'nav-workouts',
'rower':r,
'breadcrumbs':breadcrumbs,
'dateform':dateform,
'startdate':startdate,
'enddate':enddate,
@@ -7963,6 +7971,15 @@ def workflow_default_view(request):
return HttpResponseRedirect(url)
def get_workout_default_page(request,id):
if request.user.is_anonymous():
return reverse(workout_view,kwargs={'id':str(id)})
else:
r = Rower.objects.get(user=request.user)
if r.defaultlandingpage == 'workout_edit_view':
return reverse(workout_edit_view,kwargs={'id':str(id)})
else:
return reverse(workout_workflow_view,kwargs={'id':str(id)})
# Workflow Configuration
@login_required()
@@ -10571,10 +10588,29 @@ def graph_show_view(request,id):
w = Workout.objects.get(id=g.workout.id)
r = Rower.objects.get(id=w.user.id)
breadcrumbs = [
{
'url':'/rowers/list-workouts',
'name':'Workouts'
},
{
'url':get_workout_default_page(request,w.id),
'name': str(w.id)
},
{
'url':reverse(graph_show_view,kwargs={'id':id}),
'name': 'Chart'
}
]
return render(request,'show_graph.html',
{'graph':g,
'teams':get_my_teams(request.user),
'workout':w,
'breadcrumbs':breadcrumbs,
'active':'nav-workouts',
'rower':r,})
except GraphImage.DoesNotExist:
@@ -14382,6 +14418,51 @@ class MesoCycleDelete(DeleteView):
return obj
class GraphDelete(DeleteView):
login_required = True
model = GraphImage
template_name = 'graphimage_delete_confirm.html'
# extra parameters
def get_context_data(self, **kwargs):
context = super(GraphDelete, self).get_context_data(**kwargs)
breadcrumbs = [
{
'url':'/rowers/list-workouts',
'name':'Workouts'
},
{
'url':get_workout_default_page(self.request,self.object.workout.id),
'name': str(self.object.workout.id)
},
{
'url':reverse(graph_show_view,kwargs={'id':self.object.pk}),
'name': 'Chart'
},
{ 'url':reverse('graph_delete',kwargs={'pk':str(self.object.pk)}),
'name': 'Delete'
}
]
context['active'] = 'nav-workouts'
context['rower'] = getrower(self.request.user)
context['breadcrumbs'] = breadcrumbs
return context
def get_success_url(self):
w = self.object.workout
return reverse(workout_edit_view,kwargs={'id':str(w.id)})
def get_object(self, *args, **kwargs):
obj = super(GraphDelete, self).get_object(*args, **kwargs)
if not checkaccessuser(self.request.user,obj.workout.user):
raise PermissionDenied('You are not allowed to delete this chart')
return obj
class MacroCycleDelete(DeleteView):
model = TrainingMacroCycle

15
templates/newbase.html
View File

@@ -253,6 +253,21 @@
</li>
{% endfor %}
{% endif %}
{% if breadcrumbs %}
<li class="grid_4">
<p>
<span>
<em>You are here:</em>
{% for crumb in breadcrumbs %}
<a href="{{ crumb.url }}"><em>{{ crumb.name }}</em></a>
{% if not forloop.last %}
&nbsp;/&nbsp;
{% endif %}
{% endfor %}
</span>
</p>
</li>
{% endif %}
</ul>
{% block main %}