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

first cut at list_workouts

Browse Source
This commit is contained in:
Sander Roosendaal
2018-09-27 18:42:44 +02:00
parent 7abf144e17
commit 8aa72c49f4
4 changed files with 140 additions and 209 deletions
Download Patch File Download Diff File Expand all files Collapse all files

205
rowers/templates/list_workouts.html
View File

@@ -1,4 +1,4 @@
{% extends "base.html" %} {% extends "newbase.html" %}
{% load staticfiles %} {% load staticfiles %}
{% load rowerfilters %} {% load rowerfilters %}
@@ -41,59 +41,49 @@
{% endblock %} {% endblock %}
{% block content %} {% block main %}
<style> <style>
#mypointer { #mypointer {
cursor: pointer; cursor: pointer;
} }
</style> </style>
<div class="grid_12"> <ul class="main-content">
<li class="grid_2">
<div class="grid_4 alpha"> <p>
{% if team %}
<form enctype="multipart/form-data" method="post"> <form enctype="multipart/form-data" method="post">
{% else %}
<form enctype="multipart/form-data" method="post">
{% endif %}
<table> <table>
{{ dateform.as_table }} {{ dateform.as_table }}
</table> </table>
{% csrf_token %} {% csrf_token %}
</div> <input name='daterange' type="submit" value="Submit">
<div class="grid_2 alpha"> </form>
<input name='daterange' class="button green" type="submit" value="Submit"> </form> </p>
</div> {% if team %}
{% if user.is_authenticated and user|is_manager %} <p>
<div class="grid_2 dropdown"> <form id="searchform" action="/rowers/list-workouts/team/{{ team.id }}/{{ startdate|date:"Y-m-d" }}/{{ enddate|date:"Y-m-d" }}"
<button class="grid_2 alpha button green small dropbtn"> method="get" accept-charset="utf-8">
{{ rower.user.first_name }} {{ rower.user.last_name }}
</button>
<div class="dropdown-content">
{% for member in user|team_members %}
<a class="button green small" href="/rowers/u/{{ member.id }}/list-workouts/{{ startdate|date:"Y-m-d" }}/{{ enddate|date:"Y-m-d" }}">{{ member.first_name }} {{ member.last_name }}</a>
{% endfor %}
</div>
</div>
{% else %} {% else %}
&nbsp; <form id="searchform" action="/rowers/list-workouts/{{ startdate|date:"Y-m-d" }}/{{ enddate|date:"Y-m-d" }}"
method="get" accept-charset="utf-8">
{% endif %} {% endif %}
<input class="searchfield" id="searchbox" name="q" type="text" placeholder="Search">
<input type="submit">
</input>
</form>
</p>
</li>
<li>
<script type="text/javascript" src="/static/js/bokeh-0.12.3.min.js"></script>
<script async="true" type="text/javascript">
Bokeh.set_log_level("info");
</script>
{{ interactiveplot |safe }}
</div> {{ the_div |safe }}
</li>
{% if team %} <li class="grid_4">
<div class="grid_12 alpha">
{% include "teambuttons.html" with teamid=team.id team=team %}
</div>
{% endif %}
<div class="grid_12">
<div id="workouts_table" class="grid_8 alpha">
{% if team %} {% if team %}
<h3>{{ team.name }} Team Workouts</h3> <h3>{{ team.name }} Team Workouts</h3>
{% else %} {% else %}
@@ -189,121 +179,38 @@
{% else %} {% else %}
<p> No workouts found </p> <p> No workouts found </p>
{% endif %} {% endif %}
</div> </li>
<div class="grid_4 omega">
{% if team %}
<div class="grid_4" id="teambuttons">
<div class="grid_3 alpha">
<p>
&nbsp;
</p>
</div>
</div>
{% endif %}
<div class="grid_4" id="interactiveplot">
<script type="text/javascript" src="/static/js/bokeh-0.12.3.min.js"></script>
<script async="true" type="text/javascript">
Bokeh.set_log_level("info");
</script>
{{ interactiveplot |safe }}
<script>
// Set things up to resize the plot on a window resize. You can play with
// the arguments of resize_width_height() to change the plot's behavior.
var plot_resize_setup = function () {
var plotid = Object.keys(Bokeh.index)[0]; // assume we have just one plot
var plot = Bokeh.index[plotid];
var plotresizer = function() {
// arguments: use width, use height, maintain aspect ratio
plot.resize_width_height(true, true, true);
};
window.addEventListener('resize', plotresizer);
plotresizer();
};
window.addEventListener('load', plot_resize_setup);
</script>
<style>
/* Need this to get the page in "desktop mode"; not having an infinite height.*/
html, body {height: 100%; margin:5px;}
</style>
{{ the_div |safe }}
</div>
<div class="grid_4" id="announcements">
{% if announcements %} {% if announcements %}
<h3>What's New?</h3> <li class="grid_4">
<h2>What's New?</h2>
</li>
{% for a in announcements %} {% for a in announcements %}
<li>
<div class="site-announcement-box"> <div class="site-announcement-box">
<div class="site-announcement"> <div class="site-announcement">
<i>{{ a.created }}:</i> <i>{{ a.created }}:</i>
{{ a.announcement|urlize }} {{ a.announcement|urlize }}
</div> </div>
</div> </div>
</li>
{% endfor %} {% endfor %}
<p>&nbsp;</p>
{% endif %} {% endif %}
</div> <li class="grid_2">
<div class="grid_4" id="about">
<h3>About</h3>
<p>This site is a beta site, pioneering rowing data
visualization and analysis. No warranties. The site's author is
Sander Roosendaal. A Masters rower.
Read his <a href="http://blog.rowsandall.com/">blog</a>
</p>
<p><a href="/rowers/email/">&copy; Rowsandall s.r.o.</a></p>
<div style="text-align: right; padding: 2em">
<a href="http://blog.rowsandall.com/">
<img src="/static/img/sander.jpg" width="80"></a>
</div>
</div>
</div>
</div>
</div>
<div class="grid_6 alpha">
{% if rankingonly and not team %} {% if rankingonly and not team %}
<div class="grid_2 alpha"> <a href="/rowers/list-workouts">All Workouts</a>
<a class="button small green" href="/rowers/list-workouts">All Workouts</a>
</div>
{% elif not team %} {% elif not team %}
<div class="grid_2 alpha"> <a href="/rowers/list-workouts/ranking">Ranking Pieces Only</a>
<a class="button small green" href="/rowers/list-workouts/ranking">Ranking Pieces Only</a>
</div>
{% endif %} {% endif %}
<div class="grid_2"> </li>
<li class="grid_2">
{% if user|is_promember %} {% if user|is_promember %}
<a class="button small gray" href="/rowers/workouts-join-select">Glue Workouts</a> <a href="/rowers/workouts-join-select">Glue Workouts</a>
{% else %} {% else %}
<a class="button blue small" href="/rowers/promembership">Glue</a> <a href="/rowers/promembership">Glue</a>
{% endif %} {% endif %}
</div> </li>
<div class="grid_2 omega"> <li class="grid_4">
<a class="button small gray" href="/rowers/update_empower">Empower Repair</a> <span>
</div>
<p>&nbsp;</p>
{% if team %}
<form id="searchform" action="/rowers/list-workouts/team/{{ team.id }}/{{ startdate|date:"Y-m-d" }}/{{ enddate|date:"Y-m-d" }}"
method="get" accept-charset="utf-8">
{% else %}
<form id="searchform" action="/rowers/list-workouts/{{ startdate|date:"Y-m-d" }}/{{ enddate|date:"Y-m-d" }}"
method="get" accept-charset="utf-8">
{% endif %}
<div class="grid_3 prefix_1 alpha">
<input class="searchfield" id="searchbox" name="q" type="text" placeholder="Search">
</div>
<div class="grid_1 omega">
<button class="button blue small" type="submit">
Search
</button>
</div>
</form>
</div>
<div class="grid_2 omega">
<span class="button gray small">
{% if workouts.has_previous %} {% if workouts.has_previous %}
{% if request.GET.q %} {% if request.GET.q %}
<a class="wh" href="?page={{ workouts.previous_page_number }}&q={{ request.GET.q }}">&lt;</a> <a class="wh" href="?page={{ workouts.previous_page_number }}&q={{ request.GET.q }}">&lt;</a>
@@ -324,5 +231,25 @@
{% endif %} {% endif %}
{% endif %} {% endif %}
</span> </span>
</li>
<li>
{% if user.is_authenticated and user|is_manager %}
<button class="dropbtn">
{{ rower.user.first_name }} {{ rower.user.last_name }}
</button>
<div class="dropdown-content">
{% for member in user|team_members %}
<a href="/rowers/u/{{ member.id }}/list-workouts/{{ startdate|date:"Y-m-d" }}/{{ enddate|date:"Y-m-d" }}">{{ member.first_name }} {{ member.last_name }}</a>
{% endfor %}
{% else %}
&nbsp;
{% endif %}
</div>
</li>
</ul>
{% endblock %} {% endblock %}
{% block sidebar %}
{% include 'menu_workouts.html' %}
{% endblock %}

1
rowers/views.py
View File

@@ -6469,6 +6469,7 @@ def workouts_view(request,message='',successmessage='',
return render(request, 'list_workouts.html', return render(request, 'list_workouts.html',
{'workouts': workouts, {'workouts': workouts,
'active': 'nav-workouts',
'rower':r, 'rower':r,
'dateform':dateform, 'dateform':dateform,
'startdate':startdate, 'startdate':startdate,

49
templates/newbase.html
View File

@@ -149,7 +149,7 @@
</li> </li>
{% if user.is_authenticated %} {% if user.is_authenticated %}
<li> <li>
<a href="/rowers/new_profile" title="Profile"> <a href="/rowers/me/edit" title="Profile">
{% if user.rower.rowerplan == 'pro' %} {% if user.rower.rowerplan == 'pro' %}
<i class="fas fa-user-ninja "></i> <i class="fas fa-user-ninja "></i>
{% elif user.rower.rowerplan == 'coach' %} {% elif user.rower.rowerplan == 'coach' %}
@@ -157,7 +157,7 @@
{% elif user.rower.rowerplan == 'plan' %} {% elif user.rower.rowerplan == 'plan' %}
<i class="fas fa-user-tie "></i> <i class="fas fa-user-tie "></i>
{% else %} {% else %}
<a href="/rowers/new_profile" title="Profile"> <a href="/rowers/me/edit" title="Profile">
<i class="fas fa-user"></i> <i class="fas fa-user"></i>
{% endif %} {% endif %}
</a> </a>
@@ -189,27 +189,27 @@
<nav class="main-nav"> <nav class="main-nav">
<ul> <ul>
<li id="nav-workouts"> <li id="nav-workouts">
<a href="/rowers/new_workouts"> <a href="/rowers/list-workouts">
<i class="fas fa-clipboard-list"></i>&nbsp;Workouts <i class="fas fa-clipboard-list"></i>&nbsp;Workouts
</a> </a>
</li> </li>
<li id="nav-racing"> <li id="nav-racing">
<a href="/rowers/new_racing"> <a href="/rowers/virtualevents">
<i class="fas fa-flag-checkered"></i>&nbsp;Racing <i class="fas fa-flag-checkered"></i>&nbsp;Racing
</a> </a>
</li> </li>
<li id="nav-analysis"> <li id="nav-analysis">
<a href="/rowers/new_analysis"> <a href="/rowers/analysis">
<i class="fas fa-analytics"></i>&nbsp;Analysis <i class="fas fa-analytics"></i>&nbsp;Analysis
</a> </a>
</li> </li>
<li id="nav-plan"> <li id="nav-plan">
<a href="/rowers/new_plan"> <a href="/rowers/sessions">
<i class="fas fa-calendar-alt"></i>&nbsp;Plan <i class="fas fa-calendar-alt"></i>&nbsp;Plan
</a> </a>
</li> </li>
<li id="nav-teams"> <li id="nav-teams">
<a href="/rowers/new_teams"> <a href="/rowers/analysis">
<i class="fas fa-bullhorn"></i>&nbsp;Teams <i class="fas fa-bullhorn"></i>&nbsp;Teams
</a> </a>
</li> </li>
@@ -235,16 +235,16 @@
<footer class="main-footer"> <footer class="main-footer">
<p>Follow us on <p>Follow us on
<a href=""> <a href="https://twitter.com/rowsandall">
<i class="fab fa-twitter"></i> <i class="fab fa-twitter"></i>
</a>&nbsp; </a>&nbsp;
<a href=""> <a href="https://www.instagram.com/roosendaalsander/">
<i class="fab fa-instagram"></i> <i class="fab fa-instagram"></i>
</a>&nbsp; </a>&nbsp;
<a href=""> <a href="https://analytics.rowsandall.com/">
<i class="fab fa-wordpress-simple"></i> <i class="fab fa-wordpress-simple"></i>
</a>&nbsp; </a>&nbsp;
<a href=""> <a href="https://www.facebook.com/rowsandall">
<i class="fab fa-facebook"></i> <i class="fab fa-facebook"></i>
</a>&nbsp; </a>&nbsp;
</p> </p>
@@ -254,16 +254,19 @@
<h1>Help</h1> <h1>Help</h1>
<ul> <ul>
<li> <li>
<a href="">Help</a> <a href="/rowers/help">Help</a>
</li> </li>
<li> <li>
<a href="">Rowing Analytics Blog</a> <a href="https://analytics.rowsandall.com/">
Rowing Analytics Blog
</a>
</li> </li>
<li> <li>
<a href="">Rowing Data Facebook Group</a> <a href="https://www.facebook.com/rowsandall">
Rowing Data Facebook Group</a>
</li> </li>
<li> <li>
<a href="">Rowing Physics</a> <a href="/rowers/physics">Rowing Physics</a>
</li> </li>
</ul> </ul>
</li> </li>
@@ -271,19 +274,19 @@
<h1>About</h1> <h1>About</h1>
<ul> <ul>
<li> <li>
<a href="">Contact</a> <a href="/rowers/email/">Contact</a>
</li> </li>
<li> <li>
<a href="">Rowsandall s.r.o.</a> <a href="/rowers/email/">Rowsandall s.r.o.</a>
</li> </li>
<li> <li>
<a href="">Brochure</a> <a href="/rowers/brochure">Brochure</a>
</li> </li>
<li> <li>
<a href="">Partnering?</a> <a href="/rowers/partners">Partnering?</a>
</li> </li>
<li> <li>
<a href="">Developers Info</a> <a href="/rowers/develop">Developers Info</a>
</li> </li>
</ul> </ul>
</li> </li>
@@ -291,7 +294,7 @@
<h1>Paid Plans</h1> <h1>Paid Plans</h1>
<ul> <ul>
<li> <li>
<a href="">Paid Plans</a> <a href="/rowers/promembership">Paid Plans</a>
</li> </li>
</ul> </ul>
</li> </li>
@@ -299,10 +302,10 @@
<h1>Legal</h1> <h1>Legal</h1>
<ul> <ul>
<li> <li>
<a href="">Terms and Conditions</a> <a href="/rowers/legal">Terms and Conditions</a>
</li> </li>
<li> <li>
<a href="">Privacy Policy</a> <a href="/rowers/legal">Privacy Policy</a>
</li> </li>
</ul> </ul>
</ul> </ul>