course view - urls.py done!
This commit is contained in:
Sander Roosendaal
@@ -1,4 +1,4 @@
|
||||
{% extends "base.html" %}
|
||||
{% extends "newbase.html" %}
|
||||
{% load staticfiles %}
|
||||
{% load rowerfilters %}
|
||||
{% block scripts %}
|
||||
@@ -7,49 +7,32 @@
|
||||
|
||||
{% block title %}{{ course.name }} {% endblock %}
|
||||
{% block og_title %}{{ course.name }} {% endblock %}
|
||||
{% block content %}
|
||||
<div class="grid_12 alpha">
|
||||
<div class="grid_2 alpha">
|
||||
{% if nosessions %}
|
||||
<a class="button small red" href="/rowers/courses/{{ course.id }}/delete">Delete</a>
|
||||
{% else %}
|
||||
<a class="button small red" href="/rowers/courses/{{ course.id }}/replace">
|
||||
Update</a>
|
||||
{% endif %}
|
||||
</div>
|
||||
<div class="grid_2">
|
||||
{% if course.manager == rower %}
|
||||
<a class="button small gray" href="/rowers/courses/{{ course.id }}">View Course</a>
|
||||
{% else %}
|
||||
|
||||
{% endif %}
|
||||
</div>
|
||||
<div class="grid_2">
|
||||
<a class="button small gray" href="/rowers/list-courses">Courses</a>
|
||||
</div>
|
||||
</div>
|
||||
<div class="grid_12 alpha">
|
||||
{% block main %}
|
||||
<h1>{{ course.name }}</h1>
|
||||
|
||||
<h1>{{ course.name }}</h1>
|
||||
|
||||
<div class="grid_6 alpha">
|
||||
<ul class="main-content">
|
||||
<li class="grid_2">
|
||||
<form id="course_form" method="post">
|
||||
<table>
|
||||
{{ form.as_table }}
|
||||
</table>
|
||||
{% csrf_token %}
|
||||
<div id="formbutton" class="grid_1 prefix_4 suffix_1 alpha">
|
||||
<table>
|
||||
{{ form.as_table }}
|
||||
</table>
|
||||
{% csrf_token %}
|
||||
<input class="button green" type="submit" value="Submit">
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
<div class="grid_6 omega">
|
||||
{{ mapdiv|safe }}
|
||||
</li>
|
||||
<li class="grid_2">
|
||||
<div class="mapdiv">
|
||||
{{ mapdiv|safe }}
|
||||
|
||||
|
||||
{{ mapscript|safe }}
|
||||
</div>
|
||||
{{ mapscript|safe }}
|
||||
</div>
|
||||
</li>
|
||||
|
||||
</div>
|
||||
</ul>
|
||||
|
||||
{% endblock %}
|
||||
|
||||
{% block sidebar %}
|
||||
{% include 'menu_racing.html' %}
|
||||
{% endblock %}
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{% extends "base.html" %}
|
||||
{% extends "newbase.html" %}
|
||||
{% load staticfiles %}
|
||||
{% load rowerfilters %}
|
||||
{% block scripts %}
|
||||
@@ -7,24 +7,12 @@
|
||||
|
||||
{% block title %}{{ course.name }} {% endblock %}
|
||||
{% block og_title %}{{ course.name }} {% endblock %}
|
||||
{% block content %}
|
||||
<div class="grid_12 alpha">
|
||||
<div class="grid_2 prefix_2 alpha">
|
||||
{% if course.manager == rower %}
|
||||
<a class="button small gray" href="/rowers/courses/{{ course.id }}">View Course</a>
|
||||
{% else %}
|
||||
|
||||
{% endif %}
|
||||
</div>
|
||||
<div class="grid_2">
|
||||
<a class="button small gray" href="/rowers/list-courses">Courses</a>
|
||||
</div>
|
||||
</div>
|
||||
<div class="grid_12 alpha">
|
||||
{% block main %}
|
||||
<h1>Replace {{ course.name }}</h1>
|
||||
|
||||
<h1>Replace {{ course.name }}</h1>
|
||||
<ul class="main-content">
|
||||
|
||||
<div class="grid_8 alpha">
|
||||
<li class="grid_2">
|
||||
<p>
|
||||
This replaces the course {{ course.name }} with the course you select below for all
|
||||
planned sessions and virtual races, and then deletes this course.
|
||||
@@ -34,18 +22,21 @@
|
||||
{{ form.as_table }}
|
||||
</table>
|
||||
{% csrf_token %}
|
||||
<div id="formbutton" class="grid_1 prefix_4 suffix_1 alpha">
|
||||
<input class="button green" type="submit" value="Submit">
|
||||
</div>
|
||||
<input class="button green" type="submit" value="Submit">
|
||||
</form>
|
||||
</div>
|
||||
<div class="grid_4 omega">
|
||||
{{ mapdiv|safe }}
|
||||
|
||||
|
||||
{{ mapscript|safe }}
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</li>
|
||||
<li class="grid_2">
|
||||
<div class="mapdiv">
|
||||
{{ mapdiv|safe }}
|
||||
|
||||
|
||||
{{ mapscript|safe }}
|
||||
</div>
|
||||
</li>
|
||||
</ul>
|
||||
|
||||
{% endblock %}
|
||||
|
||||
{% block sidebar %}
|
||||
{% include 'menu_racing.html' %}
|
||||
{% endblock %}
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{% extends "base.html" %}
|
||||
{% extends "newbase.html" %}
|
||||
{% load staticfiles %}
|
||||
{% load rowerfilters %}
|
||||
{% block scripts %}
|
||||
@@ -7,34 +7,11 @@
|
||||
|
||||
{% block title %}{{ course.name }} {% endblock %}
|
||||
{% block og_title %}{{ course.name }} {% endblock %}
|
||||
{% block content %}
|
||||
<div class="grid_12 alpha">
|
||||
<div class="grid_2 alpha">
|
||||
{% if nosessions %}
|
||||
<a class="button small red" href="/rowers/courses/{{ course.id }}/delete">Delete</a>
|
||||
{% else %}
|
||||
|
||||
{% endif %}
|
||||
</div>
|
||||
<div class="grid_2">
|
||||
{% if course.manager == rower %}
|
||||
<a class="button small gray" href="/rowers/courses/{{ course.id }}/edit">Edit</a>
|
||||
{% else %}
|
||||
|
||||
{% endif %}
|
||||
</div>
|
||||
<div class="grid_2">
|
||||
<a class="button small gray" href="/rowers/list-courses">Courses</a>
|
||||
</div>
|
||||
<div class="grid_2">
|
||||
<a class="button small gray" href="/rowers/courses/{{ course.id }}/emailkml">Export to KML</a>
|
||||
</div>
|
||||
</div>
|
||||
<div class="grid_12 alpha">
|
||||
{% block main %}
|
||||
<h1>{{ course.name }}</h1>
|
||||
|
||||
<h1>{{ course.name }}</h1>
|
||||
|
||||
<div class="grid_6 alpha">
|
||||
<ul class="main-content">
|
||||
<li class="grid_2">
|
||||
<table class="listtable shortpadded" width="100%">
|
||||
<tr>
|
||||
<th>Name</th><td>{{ course.name }}</td>
|
||||
@@ -46,14 +23,19 @@
|
||||
<th>Notes</th><td>{{ course.notes|linebreaks }}</td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
<div class="grid_6 omega">
|
||||
{{ mapdiv|safe }}
|
||||
|
||||
|
||||
{{ mapscript|safe }}
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</li>
|
||||
<li class="grid_2">
|
||||
<div class="mapdiv">
|
||||
{{ mapdiv|safe }}
|
||||
|
||||
|
||||
{{ mapscript|safe }}
|
||||
</div>
|
||||
</li>
|
||||
</ul>
|
||||
|
||||
{% endblock %}
|
||||
|
||||
{% block sidebar %}
|
||||
{% include 'menu_racing.html' %}
|
||||
{% endblock %}
|
||||
|
||||
@@ -1,7 +1,23 @@
|
||||
<div>
|
||||
{{ mapscript|safe }}
|
||||
{% extends "newbase.html" %}
|
||||
{% load staticfiles %}
|
||||
{% load rowerfilters %}
|
||||
{% block scripts %}
|
||||
{% include "monitorjobs.html" %}
|
||||
{% endblock %}
|
||||
|
||||
{% block title %}{{ course.name }} {% endblock %}
|
||||
{% block og_title %}{{ course.name }} {% endblock %}
|
||||
{% block main %}
|
||||
<h1>{{ course.name }}</h1>
|
||||
<div class="mapdiv">
|
||||
{{ mapdiv|safe }}
|
||||
{{ mapscript|safe }}
|
||||
</div>
|
||||
|
||||
{% endblock %}
|
||||
|
||||
{% block sidebar %}
|
||||
{% include 'menu_racing.html' %}
|
||||
{% endblock %}
|
||||
|
||||
|
||||
|
||||
@@ -14,5 +14,43 @@
|
||||
<a href="/rowers/list-courses">
|
||||
<i class="fas fa-map-marked fa-fw"></i> Courses
|
||||
</a>
|
||||
</li>
|
||||
</li>
|
||||
{% if course %}
|
||||
<li class="has-children" id="course">
|
||||
<input type="checkbox" name="group-course" id="group-course" checked>
|
||||
<label for="group-course"><i class="fas fa-map-marked fa-fw"></i> {{ course.name }}</label>
|
||||
<ul>
|
||||
<li id="course-view">
|
||||
<a href="/rowers/courses/{{ course.id }}">
|
||||
<i class="fas fa-search fa-fw"></i> View
|
||||
</a>
|
||||
</li>
|
||||
<li id="course-mapview">
|
||||
<a href="/rowers/courses/{{ course.id }}/map">
|
||||
<i class="fas fa-map fa-fw"></i> Map View
|
||||
</a>
|
||||
</li>
|
||||
{% if course.manager == rower %}
|
||||
<li id="course-emailkml">
|
||||
<a href="/rowers/courses/{{ course.id }}/emailkml">
|
||||
<i class="fas fa-envelope fa-fw"></i> Export as KML</a>
|
||||
</li>
|
||||
<li id="course-editview">
|
||||
<a href="/rowers/courses/{{ course.id }}/edit">
|
||||
<i class="fas fa-pencil-alt fa-fw"></i> Edit</a>
|
||||
</li>
|
||||
{% if nosessions %}
|
||||
<li id="course-deleteview">
|
||||
<a href="/rowers/courses/{{ course.id }}/delete">
|
||||
<i class="fas fa-trash-alt fa-fw"></i> Delete</a>
|
||||
</li>
|
||||
{% endif %}
|
||||
<li id="course-view">
|
||||
<a href="/rowers/courses/{{ course.id }}/replace">
|
||||
<i class="fas fa-map-marked-alt fa-fw"></i> Update Markers</a>
|
||||
</li>
|
||||
{% endif %}
|
||||
</ul>
|
||||
</li>
|
||||
{% endif %}
|
||||
</ul> <!-- cd-accordion-menu -->
|
||||
|
||||
113
rowers/views.py
113
rowers/views.py
@@ -9187,23 +9187,46 @@ def workout_comment_view(request,id=0):
|
||||
|
||||
# for ajax calls
|
||||
def course_map_view(request,id=0):
|
||||
if id != 0:
|
||||
try:
|
||||
course = GeoCourse.objects.get(id=id)
|
||||
except GeoCourse.DoesNotExist:
|
||||
return Http404("Course doesn't exist")
|
||||
try:
|
||||
course = GeoCourse.objects.get(id=id)
|
||||
except GeoCourse.DoesNotExist:
|
||||
return Http404("Course doesn't exist")
|
||||
|
||||
script,div = course_map(course)
|
||||
script,div = course_map(course)
|
||||
|
||||
breadcrumbs = [
|
||||
{
|
||||
'url': reverse(virtualevents_view),
|
||||
'name': 'Racing'
|
||||
},
|
||||
{
|
||||
'url': reverse(courses_view),
|
||||
'name': 'Courses'
|
||||
},
|
||||
{
|
||||
'url': reverse(course_view,kwargs={'id':course.id}),
|
||||
'name': course.name
|
||||
},
|
||||
{
|
||||
'url': reverse(course_map_view,kwargs={'id':course.id}),
|
||||
'name': 'Map'
|
||||
}
|
||||
]
|
||||
|
||||
r = getrower(request.user)
|
||||
|
||||
|
||||
return render(request,
|
||||
'coursemap.html',
|
||||
{
|
||||
'mapdiv':div,
|
||||
'course':course,
|
||||
'mapscript':script,
|
||||
'active':'nav-racing',
|
||||
'rower':r,
|
||||
'breadcrumbs':breadcrumbs,
|
||||
})
|
||||
|
||||
return render(request,
|
||||
'coursemap.html',
|
||||
{
|
||||
'mapdiv':div,
|
||||
'mapscript':script
|
||||
})
|
||||
|
||||
else:
|
||||
return ""
|
||||
|
||||
@login_required()
|
||||
def course_replace_view(request,id=0):
|
||||
@@ -9238,9 +9261,31 @@ def course_replace_view(request,id=0):
|
||||
|
||||
script,div = course_map(course)
|
||||
|
||||
breadcrumbs = [
|
||||
{
|
||||
'url': reverse(virtualevents_view),
|
||||
'name': 'Racing'
|
||||
},
|
||||
{
|
||||
'url': reverse(courses_view),
|
||||
'name': 'Courses'
|
||||
},
|
||||
{
|
||||
'url': reverse(course_view,kwargs={'id':course.id}),
|
||||
'name': course.name
|
||||
},
|
||||
{
|
||||
'url': reverse(course_replace_view,kwargs={'id':course.id}),
|
||||
'name': 'Replace Markers'
|
||||
}
|
||||
]
|
||||
|
||||
return render(request,
|
||||
'course_replace.html',
|
||||
{'course':course,
|
||||
'active':'nav-racing',
|
||||
'breadcrumbs':breadcrumbs,
|
||||
'rower':r,
|
||||
'mapdiv':div,
|
||||
'mapscript':script,
|
||||
'form':form})
|
||||
@@ -9301,10 +9346,31 @@ def course_edit_view(request,id=0):
|
||||
course.save()
|
||||
|
||||
form = GeoCourseEditForm(instance=course)
|
||||
|
||||
breadcrumbs = [
|
||||
{
|
||||
'url': reverse(virtualevents_view),
|
||||
'name': 'Racing'
|
||||
},
|
||||
{
|
||||
'url': reverse(courses_view),
|
||||
'name': 'Courses'
|
||||
},
|
||||
{
|
||||
'url': reverse(course_view,kwargs={'id':course.id}),
|
||||
'name': course.name
|
||||
},
|
||||
{
|
||||
'url': reverse(course_edit_view,kwargs={'id':course.id}),
|
||||
'name': 'Edit'
|
||||
}
|
||||
]
|
||||
|
||||
return render(request, 'course_edit_view.html',
|
||||
{
|
||||
'course':course,
|
||||
'active':'nav-racing',
|
||||
'breadcrumbs':breadcrumbs,
|
||||
'mapscript':script,
|
||||
'mapdiv':div,
|
||||
'nosessions':nosessions,
|
||||
@@ -9324,8 +9390,25 @@ def course_view(request,id=0):
|
||||
|
||||
script,div = course_map(course)
|
||||
|
||||
breadcrumbs = [
|
||||
{
|
||||
'url': reverse(virtualevents_view),
|
||||
'name': 'Racing'
|
||||
},
|
||||
{
|
||||
'url': reverse(courses_view),
|
||||
'name': 'Courses'
|
||||
},
|
||||
{
|
||||
'url': reverse(course_view,kwargs={'id':course.id}),
|
||||
'name': course.name
|
||||
},
|
||||
]
|
||||
|
||||
return render(request, 'course_view.html',
|
||||
{
|
||||
'active':'nav-racing',
|
||||
'breadcrumbs':breadcrumbs,
|
||||
'course':course,
|
||||
'mapscript':script,
|
||||
'mapdiv':div,
|
||||
|
||||
Reference in New Issue
Block a user