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

Merge branch 'develop' into feature/charts-microservice

Browse Source
This commit is contained in:
Sander Roosendaal
2024-04-05 13:17:16 +02:00
parent f2d163ad92 394752da5d
commit c75023f2b3
11 changed files with 416 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
rowers/templates/course_view.html
View File

@@ -136,7 +136,36 @@
</p>
</li>
{% endif %}
{% endif %}
{% endif %}
{% if ownrecords %}
<li class="grid_4">
<h2>Own (Private) Results</h2>
<p>
<table class="listtable shortpadded">
<thead>
<tr>
<th>Time</th>
<th>Distance</th>
<th>Date</th>
</tr>
</thead>
<tbody>
{% for record in ownrecords %}
<tr>
<td>{{ record.duration |durationprint:"%H:%M:%S.%f" }}</td>
<td>{{ record.distance }} m</td>
<td>{{ record.workoutid|workoutdate }}</td>
<td>
<a title="Details" href="/rowers/workout/{{ record.workoutid|encode }}/view/">
<i class="fas fa-search-plus fa-fw"></i></a>
</td>
</tr>
{% endfor %}
</tbody>
</table>
</p>
</li>
{% endif %}
</ul>
{% endblock %}

105
rowers/templates/courses_challenges.html Normal file
View File

@@ -0,0 +1,105 @@
{% extends "newbase.html" %}
{% load static %}
{% load rowerfilters %}
{% load leaflet_tags %}
{% block meta %}
{% leaflet_js %}
{% leaflet_css %}
{% endblock %}
{% block title %}Rowsandall Virtual Challenges{% endblock %}
{% block scripts %}
<script type='text/javascript'
src='https://ajax.googleapis.com/ajax/libs/jquery/2.1.4/jquery.min.js'>
</script>
{% endblock %}
{% block main %}
<ul class="main-content">
<li class="grid_4">
<h1>Courses you might like</h1>
</li>
<li>
<p>
<a href="/rowers/list-courses/">All Courses</a>
</p>
<a href="/rowers/list-courses/?liked=true">Courses I like</a>
</p>
</li>
{% for course in coursesdicts %}
<li class="rounder">
<a href="/rowers/courses/{{ course.course.id }}/">
<h2>{{ course.course.name }}</h2>
</a>
<p>{{ course.course.country }}</p>
<p>{{ course.course.distance }}m</p>
<div class="mapdiv" id="{{ course.course.id }}">
{{ course.div|safe}}
{{ course.script|safe}}
</div>
</li>
{% endfor %}
<li class="grid_4">
<h1>Interesting Challenges</h1>
</li>
<li>
<p>
<a href="/rowers/virtualevents/">All Active Challenges</a>
</p>
<a href="/rowers/virtualevents/?nearby=true">Nearby Challenges</a>
</p>
</li>
{% for challenge in challengesdicts %}
<li class="rounder">
<a href="/rowers/virtualevent/{{ challenge.challenge.id }}/">
<h2>{{ challenge.challenge.name }}</h2>
</a>
<p>{{ challenge.challenge.startdate|date:"Y-m-d" }}
{{ challenge.challenge.start_time|time:"H:i e" }}
to
{{ challenge.challenge.enddate|date:"Y-m-d" }}
{{ challenge.challenge.end_time|time:"H:i e" }}
({{ challenge.challenge.timezone }})</p>
<p>{% if challenge.challenge.sessiontype == 'fastest_time' %}
Time Challenge: To be rowed on the water
{% elif challenge.challenge.sessiontype == 'fastest_distance' %}
Distance Challenge: To be rowed on the water
{% elif challenge.challenge.sessiontype != 'race' %}
Indoor Race: To be rowed on a Concept2 ergometer
{% endif %}
</p>
{% if challenge.challenge.sessiontype == 'fastest_time' %}
<div class="vignet">
<img src="/static/img/sculler.png"
alt="Marked Course">
</div>
{% elif challenge.challenge.sessiontype == 'fastest_distance' %}
<div class="vignet">
<img src="/static/img/sculler.png"
alt="Marked Course">
</div>
{% elif challenge.challenge.sessiontype != 'race' %}
<div class="vignet">
<img src="/static/img/domca.png"
alt="Marked Course">
</div>
{% endif %}
<div class="mapdiv" id="{{ challenge.challenge.id }}">
{{ challenge.div|safe}}
{{ challenge.script|safe}}
</div>
</li>
{% endfor %}
</ul>
{% endblock %}
{% block sidebar %}
{% include 'menu_racing.html' %}
{% endblock %}

2
rowers/templates/plannedsessionview.html
View File

@@ -172,7 +172,7 @@
</li>
{% if coursescript %}
<li class="grid_2">
<h2>Course</h2>
<h2><a href="/rowers/courses/{{ plannedsession.course.id }}">{{ plannedsession.course.name }}</h2>
{{ coursediv|safe }}
{{ coursescript|safe }}