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

profile menu and export settings

Browse Source
This commit is contained in:
Sander Roosendaal
2018-10-10 15:54:32 +02:00
parent 401fc7c82a
commit 58cdc1edc2
8 changed files with 225 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
rowers/templates/menu_profile.html
View File

@@ -1,3 +1,5 @@
{% load staticfiles %}
{% load rowerfilters %}
<h1>Profile</h1> <h1>Profile</h1>
<ul class="cd-accordion-menu animated"> <ul class="cd-accordion-menu animated">
<li id="manage-account"> <li id="manage-account">
@@ -17,3 +19,26 @@
</li> </li>
</ul><!-- cd-accordion-menu --> </ul><!-- cd-accordion-menu -->
{% if user.is_authenticated and user|is_manager %}
<p>&nbsp;</p>
<ul class="cd-accordion-menu animated">
<li class="has-children" id="athletes">
<input type="checkbox" name="athlete-selector" id="athlete-selector">
<label for="athlete-selector"><i class="fas fa-users fa-fw"></i>&nbsp;Athletes</label>
<ul>
{% for member in user|team_members %}
<a href={{ request.path|userurl:member }}>
<i class="fas fa-user fa-fw"></i>
{% if member == rower.user %}
&bull;
{% else %}
&nbsp;
{% endif %}
{{ member.first_name }} {{ member.last_name }}
</a>
{% endfor %}
</ul>
</li>
</ul>
{% endif %}

107
rowers/templates/menu_teams.html
View File

@@ -1,24 +1,101 @@
{% load staticfiles %}
{% load rowerfilters %}
<h1>Teams</h1> <h1>Teams</h1>
<ul class="cd-accordion-menu animated"> <ul class="cd-accordion-menu animated">
<li id="manage"> <li id="manage">
<a href=""> <a href="/rowers/me/teams">
<i class="fas fa-cog fa-fw"></i>&nbsp;Manage <i class="fas fa-cog fa-fw"></i>&nbsp;Overview
</a> </a>
</li> </li>
{% if teams %} {% if user|is_manager %}
<li class="has-children" id="teams"> <li id="create">
<input type="checkbox" name="group-teams" id="group-teams"> <a href="/rowers/team/create">
<label for="group-teams">Teams</label> <i class="fas fa-plus fa-fw"></i>&nbsp;New Team
<ul> </a>
{% for team in teams %}
<li id="team-{{ team.id }}">
<a href="">
<i class="fas fa-user-friends fa-fw"></i>&nbsp;{{ team.name }}
</a>
</li>
{% endfor %}
</ul>
</li> </li>
{% endif %} {% endif %}
</ul><!-- cd-accordion-menu --> </ul><!-- cd-accordion-menu -->
<p>&nbsp;</p>
{% if teams %}
<h2>Managing</h2>
<ul class="cd-accordion-menu animated">
{% for team in myteams %}
<li class="has-children" id="team-{{ team.id }}">
<input type="checkbox" name="group-team-{{ team.id }}" id="group-team-{{ team.id }}">
<label for="group-team-{{ team.id }}">{{ team.name }}</label>
<ul>
<li id="team-{{ team.id }}-view">
<a href="/rowers/team/{{ team.id }}">
<i class="fas fa-user-friends fa-fw"></i>&nbsp;View
</a>
</li>
<li id="team-{{ team.id }}-edit">
<a href="/rowers/team/{{ team.id }}/edit">
<i class="fas fa-user-friends fa-fw"></i>&nbsp;Edit
</a>
</li>
<li id="team-{{ team.id }}-stats">
<a href="/rowers/team/{{ team.id }}/memberstats">
<i class="fas fa-pencil-alt fa-fw"></i>&nbsp;Member Stats
</a>
</li>
<li id="team-{{ team.id }}-workouts">
<a href="/rowers/list-workouts/team/{{ team.id }}/">
<i class="fas fa-clipboard-list fa-fw"></i>&nbsp;Member Workouts
</a>
</li>
<li id="team-{{ team.id }}-leave">
<a href="/rowers/team/{{ team.id }}/leaveconfirm">
<i class="fas fa-sign-out fa-fw"></i>&nbsp;Leave
</a>
</li>
<li id="team-{{ team.id }}-delete">
<a href="/rowers/team/{{ team.id }}/deleteconfirm">
<i class="fas fa-trash fa-fw"></i>&nbsp;Delete
</a>
</li>
</ul>
</li>
{% endfor %}
</ul>
{% endif %}
<p>&nbsp;</p>
{% if memberteams %}
<h2>Member</h2>
<ul class="cd-accordion-menu animated">
{% for team in memberteams %}
<li class="has-children" id="team-{{ team.id }}">
<input type="checkbox" name="group-team-{{ team.id }}" id="group-team-{{ team.id }}">
<label for="group-team-{{ team.id }}">{{ team.name }}</label>
<ul>
<li id="team-{{ team.id }}-view">
<a href="/rowers/team/{{ team.id }}">
<i class="fas fa-user-friends fa-fw"></i>&nbsp;View
</a>
</li>
<li id="team-{{ team.id }}-stats">
<a href="/rowers/team/{{ team.id }}/memberstats">
<i class="fas fa-pencil-alt fa-fw"></i>&nbsp;Member Stats
</a>
</li>
<li id="team-{{ team.id }}-workouts">
<a href="/rowers/list-workouts/team/{{ team.id }}/">
<i class="fas fa-clipboard-list fa-fw"></i>&nbsp;Member Workouts
</a>
</li>
<li id="team-{{ team.id }}-leave">
<a href="/rowers/team/{{ team.id }}/leaveconfirm">
<i class="fas fa-sign-out fa-fw"></i>&nbsp;Leave
</a>
</li>
</ul>
</li>
{% endfor %}
</ul>
{% endif %}

43
rowers/templates/rower_exportsettings.html
View File

@@ -1,31 +1,28 @@
{% extends "base.html" %} {% extends "newbase.html" %}
{% block title %}Change Rower Export Settings{% endblock %} {% block title %}Change Rower Export Settings{% endblock %}
{% block content %} {% block main %}
<div class="grid_12 alpha"> <h1>Import and Export Settings for {{ rower.user.first_name }} {{ rower.user.last_name }}</h1>
<div class="grid_6 suffix_6 alpha"> {% if form.errors %}
<p> <p style="color: red;">
<h2>Export Settings</h2> Please correct the error{{ form.errors|pluralize }} below.
{% if form.errors %} </p>
<p style="color: red;"> {% endif %}
Please correct the error{{ form.errors|pluralize }} below.
</p>
{% endif %}
<form enctype="multipart/form-data" action="" method="post"> <form enctype="multipart/form-data" action="" method="post">
<table> <table>
{{ form.as_table }} {{ form.as_table }}
</table> </table>
{% csrf_token %} {% csrf_token %}
<div class="grid_2 prefix_2 suffix_2"> <input class="button green" type="submit" value="Save">
<input class="button green" type="submit" value="Save"> </form>
</form>
</p>
</div>
</div>
</div>
{% endblock %}
{% block sidebar %}
{% include 'menu_profile.html' %}
{% endblock %} {% endblock %}

106
rowers/templates/teams.html
View File

@@ -1,46 +1,39 @@
{% extends "base.html" %} {% extends "newbase.html" %}
{% block title %}Teams {% endblock %} {% block title %}Teams {% endblock %}
{% block content %} {% block main %}
<div class="grid_12 alpha"> <ul class="main-content">
<div class="grid_6 alpha"> {% if teams %}
<p> <li >
<h2>My Teams</h2> <h2>My Teams</h2>
{% if teams %} <table width="100%" class="listtable">
<table width="70%" class="listtable"> <thead>
<thead> <tr>
<tr> <th>Name</th>
<th>Name</th> <th>&nbsp;</th>
<th>&nbsp;</th> </tr>
</tr> </thead>
</thead> <tbody>
<tbody>
{% for team in teams %} {% for team in teams %}
<tr> <tr>
<td> <td>
<a href="/rowers/team/{{ team.id }}/">{{ team.name }}</a> <a href="/rowers/team/{{ team.id }}/">{{ team.name }}</a>
</td> </td>
<td> <td>
<div class="grid_1"> <a class="button small red" href="/rowers/team/{{ team.id }}/leaveconfirm">Leave</a>
<a class="button small red" href="/rowers/team/{{ team.id }}/leaveconfirm">Leave</a>
</div>
</td> </td>
</tr> </tr>
{% endfor %} {% endfor %}
</tbody> </tbody>
</table> </table>
{% else %} </li>
<p>You are not a member of any team.</p> {% endif %}
{% endif %}
</p>
</div> {% if otherteams %}
<div class="grid_6 omega"> <li >
{% if otherteams %}
<h2>Other Teams</h2> <h2>Other Teams</h2>
<table width="70%" class="listtable"> <table width="100%" class="listtable">
<thead> <thead>
<tr> <tr>
<th>Name</th> <th>Name</th>
@@ -60,21 +53,16 @@
{% endfor %} {% endfor %}
</tbody> </tbody>
</table> </table>
</li>
{% else %} {% endif %}
<p>&nbsp;</p>
{% endif %}
</div>
</div>
<div class="grid_12 alpha"> {% if user.rower.rowerplan == 'coach' %}
<div class="grid_6 alpha"> <li >
{% if user.rower.rowerplan == 'coach' %}
<h2>Teams I manage</h2> <h2>Teams I manage</h2>
<p>Number of members: {{ clubsize }}</p> <p>Number of members: {{ clubsize }}</p>
<p>Maximum club size: {{ max_clubsize }}</p> <p>Maximum club size: {{ max_clubsize }}</p>
{% if myteams %} {% if myteams %}
<table width="70%" class="listtable"> <table width="100%" class="listtable">
<thead> <thead>
<tr> <tr>
<th>Name</th> <th>Name</th>
@@ -88,31 +76,25 @@
<a href="/rowers/team/{{ team.id }}/">{{ team.name }}</a> <a href="/rowers/team/{{ team.id }}/">{{ team.name }}</a>
</td> </td>
<td> <td>
<div class="grid_1"> <a class="button small red" href="/rowers/team/{{ team.id }}/deleteconfirm">Delete</a>
<a class="button small red" href="/rowers/team/{{ team.id }}/deleteconfirm">Delete</a>
</div>
</td> </td>
</tr> </tr>
{% endfor %} {% endfor %}
</tbody> </tbody>
</table> </table>
{% endif %} {% endif %}
<div class="grid_2 suffix_4 alpha"> <a class="button green" href="/rowers/team/create">New Team</a>
<a class="button green" href="/rowers/team/create">New Team</a> </li>
</div> {% endif %}
{% else %} {% if invites or requests or myrequests or myinvites %}
<p>&nbsp;</p> <li >
{% endif %}
</div>
<div class="grid_6 omega">
{% if invites or requests or myrequests or myinvites %}
<h2>Invitations and Requests</h2> <h2>Invitations and Requests</h2>
<p>This section lists open invites to join a team. By accepting <p>This section lists open invites to join a team. By accepting
a team invite, you are agreeing with the sharing a team invite, you are agreeing with the sharing
of personal data between team members and coaches according to of personal data between team members and coaches according to
our <a href="/rowers/legal">privacy policy</a>. our <a href="/rowers/legal">privacy policy</a>.
</p> </p>
<p>As a team manager, by accepting a team invite, you are agreeing <p>As a team manager, by accepting a team invite, you are agreeing
with <a href="/rowers/legal">privacy policy</a> regarding teams and with <a href="/rowers/legal">privacy policy</a> regarding teams and
personal data owned by team members.</p> personal data owned by team members.</p>
@@ -177,8 +159,7 @@
{% endfor %} {% endfor %}
</tbody> </tbody>
</table> </table>
<h3>Manual code redeem</h3> <h3>Manual code redeem</h3>
<div class="grid_4 alpha">
<form enctype="multipart/form-data" action="{{ formloc }}" method="post"> <form enctype="multipart/form-data" action="{{ formloc }}" method="post">
{% if form.errors %} {% if form.errors %}
<p style\"color: red;"> <p style\"color: red;">
@@ -187,20 +168,17 @@
{% endif %} {% endif %}
{% csrf_token %} {% csrf_token %}
<table> <table>
{{ form.as_table }} {{ form.as_table }}
</table> </table>
</div>
<div id="formbutton" class="grid_1 suffix_1 omega">
<input class="button green" type="submit" value="Submit"> <input class="button green" type="submit" value="Submit">
</div>
</form> </form>
</p>
{% else %}
<p>&nbsp;</p>
{% endif %} {% endif %}
</div> </li>
</div> </ul>
{% endblock %} {% endblock %}
{% block sidebar %}
{% include 'menu_teams.html' %}
{% endblock %}

3
rowers/urls.py
View File

@@ -339,6 +339,7 @@ urlpatterns = [
url(r'^me/teams/$',views.rower_teams_view), url(r'^me/teams/$',views.rower_teams_view),
url(r'^me/calcdps/$',views.rower_calcdps_view), url(r'^me/calcdps/$',views.rower_calcdps_view),
url(r'^me/exportsettings/$',views.rower_exportsettings_view), url(r'^me/exportsettings/$',views.rower_exportsettings_view),
url(r'^me/exportsettings/user/(?P<userid>\d+)$',views.rower_exportsettings_view),
url(r'^team/(?P<id>\d+)/$',views.team_view), url(r'^team/(?P<id>\d+)/$',views.team_view),
url(r'^team/(?P<id>\d+)/memberstats$',views.team_members_stats_view), url(r'^team/(?P<id>\d+)/memberstats$',views.team_members_stats_view),
url(r'^team/(?P<id>\d+)/edit$',views.team_edit_view), url(r'^team/(?P<id>\d+)/edit$',views.team_edit_view),
@@ -359,7 +360,7 @@ urlpatterns = [
url(r'^me/request/(\w+.*)/$',views.manager_requests_view), url(r'^me/request/(\w+.*)/$',views.manager_requests_view),
url(r'^me/request/$',views.manager_requests_view), url(r'^me/request/$',views.manager_requests_view),
url(r'^me/edit/$',views.rower_edit_view), url(r'^me/edit/$',views.rower_edit_view),
url(r'^rower/edit/(?P<rowerid>\d+)$',views.rower_edit_view), url(r'^me/edit/user/(?P<userid>\d+)$',views.rower_edit_view),
url(r'^me/edit/(.+.*)/$',views.rower_edit_view), url(r'^me/edit/(.+.*)/$',views.rower_edit_view),
url(r'^me/c2authorize/$',views.rower_c2_authorize), url(r'^me/c2authorize/$',views.rower_c2_authorize),
url(r'^me/polarauthorize/$',views.rower_polar_authorize), url(r'^me/polarauthorize/$',views.rower_polar_authorize),

35
rowers/views.py
View File

@@ -11887,8 +11887,8 @@ def rower_favoritecharts_view(request):
# page where user sets his export settings # page where user sets his export settings
@login_required() @login_required()
def rower_exportsettings_view(request): def rower_exportsettings_view(request,userid=0):
r = getrower(request.user) r = getrequestrower(request,userid=userid)
if request.method == 'POST': if request.method == 'POST':
form = RowerExportForm(request.POST) form = RowerExportForm(request.POST)
if form.is_valid(): if form.is_valid():
@@ -11901,17 +11901,30 @@ def rower_exportsettings_view(request):
messages.info(request,'Settings saved') messages.info(request,'Settings saved')
else: else:
form = RowerExportForm(instance=r) form = RowerExportForm(instance=r)
breadcrumbs = [
{
'url':'/rowers/me',
'name': 'Profile'
},
{
'url': reverse(rower_exportsettings_view),
'name': 'Export Settings'
}
]
return render(request, 'rower_exportsettings.html', return render(request, 'rower_exportsettings.html',
{'form':form, {'form':form,
'rower':r, 'rower':r,
'breadcrumbs': breadcrumbs,
}) })
# Page where user can set his details # Page where user can set his details
# Add email address to form so user can change his email address # Add email address to form so user can change his email address
@login_required() @login_required()
def rower_edit_view(request,rowerid=0,message=""): def rower_edit_view(request,rowerid=0,userid=0,message=""):
r = getrequestrower(request,rowerid=rowerid,notpermanent=True) r = getrequestrower(request,rowerid=rowerid,userid=userid,notpermanent=True)
rowerid = r.id rowerid = r.id
@@ -12628,6 +12641,7 @@ def rower_teams_view(request,message='',successmessage=''):
r = getrower(request.user) r = getrower(request.user)
ts = Team.objects.filter(rower=r) ts = Team.objects.filter(rower=r)
myteams = Team.objects.filter(manager=request.user) myteams = Team.objects.filter(manager=request.user)
memberteams = Team.objects.filter(rower=r).exclude(manager=request.user).order_by('name')
otherteams = Team.objects.filter(private='open').exclude(rower=r).exclude(manager=request.user).order_by('name') otherteams = Team.objects.filter(private='open').exclude(rower=r).exclude(manager=request.user).order_by('name')
teams.remove_expired_invites() teams.remove_expired_invites()
@@ -12640,12 +12654,23 @@ def rower_teams_view(request,message='',successmessage=''):
messages.info(request,successmessage) messages.info(request,successmessage)
messages.error(request,message) messages.error(request,message)
breadcrumbs = [
{
'url':reverse(rower_teams_view),
'name': 'Teams'
}
]
return render(request, 'teams.html', return render(request, 'teams.html',
{ {
'teams':ts, 'teams':ts,
'active':'nav-teams',
'breadcrumbs':breadcrumbs,
'clubsize':clubsize, 'clubsize':clubsize,
'max_clubsize':max_clubsize, 'max_clubsize':max_clubsize,
'myteams':myteams, 'myteams':myteams,
'memberteams':memberteams,
'invites':invites, 'invites':invites,
'otherteams':otherteams, 'otherteams':otherteams,
'requests':requests, 'requests':requests,

14
static/css/styles2.css
View File

@@ -245,7 +245,7 @@
nav a { nav a {
margin: 1em; margin: 1em;
} }
nav a, nav a,
nav a i { nav a i {
color: white; color: white;
@@ -328,10 +328,22 @@
.sideheader { .sideheader {
grid-area: side-header; grid-area: side-header;
color: #dddddd;
background: #35383d; background: #35383d;
padding: 0; padding: 0;
} }
.side h2 {
color: #dddddd;
font-weight: bold;
text-align: left;
font-size: 1.0em;
padding: 5px;
margin: 0;
margin-left: 30px;
padding-bottom: 0;
}
.sideheader h1 { .sideheader h1 {
font-weight: bold; font-weight: bold;
text-align: left; text-align: left;

2
templates/newbase.html
View File

@@ -209,7 +209,7 @@
</a> </a>
</li> </li>
<li id="nav-teams"> <li id="nav-teams">
<a href="/rowers/analysis"> <a href="/rowers/me/teams">
<i class="fas fa-bullhorn"></i>&nbsp;Teams <i class="fas fa-bullhorn"></i>&nbsp;Teams
</a> </a>
</li> </li>