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

Merge branch 'release/v9.88'

Browse Source
This commit is contained in:
Sander Roosendaal
2019-05-10 16:14:12 +02:00
parent 4c868b9dcb c86cac2c19
commit 17a3bcc7a7
4 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
rowers/templates/trainingplan.html
View File

@@ -10,12 +10,13 @@
function toggle(source) {
checkboxes = document.querySelectorAll("input[type='checkbox']");
for (var i=0, n=checkboxes.length;i<n;i++) {
if (checkboxes[i].name.includes('selector')) {
if (checkboxes[i].name.includes('selector')) {
checkboxes[i].checked = source.checked
}
}
}
</script>
</script>
<h1>Training Plan - {{ plan.name }}</h1>
<p>This plan starts on {{ plan.startdate }} and ends on {{ plan.enddate }}.
@@ -47,7 +48,7 @@
{{ macrocycle.0.name }} ({{ macrocycle.0.startdate }} - {{ macrocycle.0.enddate }})
</th>
</tr>
{% if todays_date <= macrocycle.0.enddate|date:"Y-m-d" %}
{% if todays_date <= macrocycle.0.enddate %}
<tr>
&nbsp;
</tr>
@@ -114,7 +115,7 @@
<td>{{ macrocycle.0.actualtrimp }}</td>
</tr>
{% endif %}
{% if todays_date <= macrocycle.0.enddate|date:"Y-m-d" %}
{% if todays_date <= macrocycle.0.enddate %}
<tr>
<td>&nbsp;</td>
</tr>
@@ -166,7 +167,7 @@
Meso {{ mesocycle.0.name }} ({{ mesocycle.0.startdate }} - {{ mesocycle.0.enddate }})
</th>
</tr>
{% if todays_date <= mesocycle.0.enddate|date:"Y-m-d" %}
{% if todays_date <= mesocycle.0.enddate %}
{% if mesocycle.0.plan.type == 'userdefined' %}
<tr>
&nbsp;
@@ -235,7 +236,7 @@
<td>{{ mesocycle.0.actualtrimp }}</td>
</tr>
{% endif %}
{% if todays_date <= mesocycle.0.enddate|date:"Y-m-d" %}
{% if todays_date <= mesocycle.0.enddate %}
<tr>
<td>&nbsp;</td>
</tr>
@@ -292,7 +293,7 @@
Micro {{ microcycle.name }} ({{ microcycle.startdate }} - {{ microcycle.enddate }})
</th>
</tr>
{% if todays_date <= microcycle.enddate|date:"Y-m-d" %}
{% if todays_date <= microcycle.enddate %}
{% if microcycle.plan.type == 'userdefined' %}
<tr>
<td>&nbsp;</td>
@@ -365,7 +366,7 @@
<td>{{ microcycle.actualtrimp }}</td>
</tr>
{% endif %}
{% if todays_date <= microcycle.enddate|date:"Y-m-d" %}
{% if todays_date <= microcycle.enddate %}
<tr>
<td>&nbsp;</td>
</tr>

BIN
rowers/tests/testdata/testdata.csv.gz vendored
View File

Binary file not shown.

1
rowers/views/planviews.py
View File

@@ -2301,6 +2301,7 @@ def rower_trainingplan_view(request,
return render(request,'trainingplan.html',
{
'plan':plan,
'todays_date': timezone.now().date(),
'active':'nav-plan',
'breadcrumbs':breadcrumbs,
'rower':r,

2
static/css/styles2.css
View File

@@ -288,6 +288,8 @@
{
/* icons */
font: normal normal normal 1.0em/1 FontAwesome;
font-family: "Font Awesome 5 Pro";
font-weight: 900;
font-size: inherit;
text-rendering: auto;
content: '\f0da';