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

email from group page

Browse Source
This commit is contained in:
Sander Roosendaal
2019-07-31 13:17:52 +02:00
parent edc47786f2
commit bdeed4c277
8 changed files with 96 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rowers/views/statements.py
View File

@@ -48,7 +48,7 @@ from django.http import (
)
from django.contrib.auth import authenticate, login, logout
from rowers.forms import (
ForceCurveOptionsForm,HistoForm,
ForceCurveOptionsForm,HistoForm,TeamMessageForm,
LoginForm,DocumentsForm,UploadOptionsForm,ImageForm,CourseForm,
TeamUploadOptionsForm,WorkFlowLeftPanelForm,WorkFlowMiddlePanelForm,
WorkFlowLeftPanelElement,WorkFlowMiddlePanelElement,

33
rowers/views/teamviews.py
View File

@@ -27,7 +27,7 @@ def team_view(request,id=0,userid=0):
q = q | q2
if request.method == 'POST' and request.user == t.manager:
if request.method == 'POST' and request.user == t.manager and 'email' in request.POST:
inviteform = TeamInviteForm(request.POST)
inviteform.fields['user'].queryset = q
@@ -45,12 +45,24 @@ def team_view(request,id=0,userid=0):
else:
message = text
messages.error(request,message)
groupmessageform = TeamMessageForm()
elif request.method == 'POST' and request.user == t.manager and 'message' in request.POST:
groupmessageform = TeamMessageForm(request.POST)
inviteform = TeamInviteForm()
if groupmessageform.is_valid():
message = groupmessageform.cleaned_data['message']
teams.send_team_message(t,message)
messages.info(request,'Message was sent to all team members')
groupmessageform = TeamMessageForm()
elif request.user == t.manager:
inviteform = TeamInviteForm()
inviteform.fields['user'].queryset = q
groupmessageform = TeamMessageForm()
else:
inviteform = ''
groupmessageform = ''
members = Rower.objects.filter(team=t).order_by('user__last_name','user__first_name')
thisteammyrequests = TeamRequest.objects.filter(team=t,user=request.user)
@@ -63,7 +75,7 @@ def team_view(request,id=0,userid=0):
breadcrumbs = [
{
'url':reverse(rower_teams_view),
'name': 'Teams'
'name': 'Groups'
},
{
'url':reverse(team_view,kwargs={'id':id}),
@@ -78,6 +90,7 @@ def team_view(request,id=0,userid=0):
'teams':get_my_teams(request.user),
'myteams':myteams,
'memberteams':memberteams,
'groupmessageform': groupmessageform,
'members':members,
'breadcrumbs':breadcrumbs,
'active':'nav-teams',
@@ -98,7 +111,7 @@ def team_leaveconfirm_view(request,id=0):
breadcrumbs = [
{
'url':reverse(rower_teams_view),
'name': 'Teams'
'name': 'Groups'
},
{
'url':reverse(team_view,kwargs={'id':id}),
@@ -242,7 +255,7 @@ def rower_teams_view(request,message='',successmessage=''):
breadcrumbs = [
{
'url':reverse(rower_teams_view),
'name': 'Teams'
'name': 'Groups'
}
]
@@ -328,7 +341,7 @@ def athlete_drop_coach_confirm_view(request,id):
breadcrumbs = [
{
'url':reverse('rower_teams_view'),
'name': 'Teams'
'name': 'Groups'
},
{
'url':reverse('athlete_drop_coach_confirm_view',kwargs={'id':id}),
@@ -355,7 +368,7 @@ def coach_drop_athlete_confirm_view(request,id):
breadcrumbs = [
{
'url':reverse('rower_teams_view'),
'name': 'Teams'
'name': 'Groups'
},
{
'url':reverse('coach_drop_athlete_confirm_view',kwargs={'id':id}),
@@ -609,7 +622,7 @@ def team_edit_view(request,id=0):
breadcrumbs = [
{
'url':reverse(rower_teams_view),
'name': 'Teams'
'name': 'Groups'
},
{
'url':reverse(team_view,kwargs={'id':id}),
@@ -675,7 +688,7 @@ def team_create_view(request):
breadcrumbs = [
{
'url':reverse(rower_teams_view),
'name': 'Teams'
'name': 'Groups'
},
{
'url':reverse(team_create_view),
@@ -708,7 +721,7 @@ def team_deleteconfirm_view(request,id):
breadcrumbs = [
{
'url':reverse(rower_teams_view),
'name': 'Teams'
'name': 'Groups'
},
{
'url':reverse(team_view,kwargs={'id':id}),
@@ -764,7 +777,7 @@ def team_members_stats_view(request,id):
breadcrumbs = [
{
'url':reverse(rower_teams_view),
'name': 'Teams'
'name': 'Groups'
},
{
'url':reverse(team_view,kwargs={'id':id}),