New Speaker
+ + + +{% endblock %} diff --git a/get_together/templates/get_together/speakers/create_talk.html b/get_together/templates/get_together/speakers/create_talk.html new file mode 100644 index 0000000..1bd3b39 --- /dev/null +++ b/get_together/templates/get_together/speakers/create_talk.html @@ -0,0 +1,31 @@ +{% extends "get_together/base.html" %} +{% load static %} + + +{% block content %} +New Talk
+ + + +{% endblock %} + + +{% block javascript %} + +{% endblock %} diff --git a/get_together/templates/get_together/speakers/delete_talk.html b/get_together/templates/get_together/speakers/delete_talk.html new file mode 100644 index 0000000..c716bb8 --- /dev/null +++ b/get_together/templates/get_together/speakers/delete_talk.html @@ -0,0 +1,20 @@ +{% extends "get_together/base.html" %} + +{% block content %} +Confirm deletion
+{% if talk.future_presentations.count > 0 %} +
+
+{% endif %}
+Are you sure you want to delete {{talk.title}}?
+
+{% endblock %}
+
diff --git a/get_together/templates/get_together/speakers/edit_speaker.html b/get_together/templates/get_together/speakers/edit_speaker.html
new file mode 100644
index 0000000..b28e2f4
--- /dev/null
+++ b/get_together/templates/get_together/speakers/edit_speaker.html
@@ -0,0 +1,46 @@
+{% extends "get_together/base.html" %}
+{% load static %}
+
+
+{% block content %}
+This talk has {{ talk.future_presentations.count }} pending event!
+ Edit Speaker
+ + + +{% endblock %} + +{% block javascript %} + +{% endblock %} diff --git a/get_together/templates/get_together/speakers/edit_talk.html b/get_together/templates/get_together/speakers/edit_talk.html new file mode 100644 index 0000000..5a314c0 --- /dev/null +++ b/get_together/templates/get_together/speakers/edit_talk.html @@ -0,0 +1,32 @@ +{% extends "get_together/base.html" %} +{% load static %} + + +{% block content %} +Edit Talk
+ + + +Delete + +{% endblock %} + +{% block javascript %} + +{% endblock %} diff --git a/get_together/templates/get_together/speakers/list_user_presentations.html b/get_together/templates/get_together/speakers/list_user_presentations.html new file mode 100644 index 0000000..5ed864a --- /dev/null +++ b/get_together/templates/get_together/speakers/list_user_presentations.html @@ -0,0 +1,64 @@ +{% extends "get_together/base.html" %} +{% load static tz %} + +{% block styles %} + + +{% endblock %} + +{% block content %} +
+{% if proposed_talks %}
+
+{% endif %} +
+
+{% endblock %}
+
diff --git a/get_together/templates/get_together/speakers/list_user_talks.html b/get_together/templates/get_together/speakers/list_user_talks.html
new file mode 100644
index 0000000..dd7e26b
--- /dev/null
+++ b/get_together/templates/get_together/speakers/list_user_talks.html
@@ -0,0 +1,57 @@
+{% extends "get_together/base.html" %}
+{% load static tz %}
+
+{% block styles %}
+
+
+{% endblock %}
+
+{% block content %}
+
+{% for presentation in proposed_talks %}
+
+
+
+{% endfor %}
+
+
+
+
+ + {{presentation.talk.title}} + {% if presentation.status == -1 %} + Declined + {% elif presentation.status == 1 %} + Accepted + {% else %} + Submitted + {% endif %} +
+
+ {{ presentation.talk.speaker }}
+
+ +{% endif %} +
+{% for talk in available_talks %}
+
+{% endfor %}
+
+
+
+
+ +
+
+{% endblock %}
+
diff --git a/get_together/templates/get_together/users/show_profile.html b/get_together/templates/get_together/users/show_profile.html
index c36cfcf..ff99f78 100644
--- a/get_together/templates/get_together/users/show_profile.html
+++ b/get_together/templates/get_together/users/show_profile.html
@@ -1,4 +1,10 @@
{% extends "get_together/base.html" %}
+{% load static %}
+
+{% block styles %}
+
+
+{% endblock %}
{% block content %}
@@ -6,11 +12,19 @@
+{% for speaker in speaker_bios %}
+
+
+
+{% endfor %}
+
+ 
+
+
+
+
+
+ {{ speaker.bio }}
+
+
+
+
+ Speaker Bio
+
+ + +
+{% for talk in talks %}
+
+
+
+{% endfor %}
+
+
+
+
+
+
+ {{ talk.abstract }}
+
+
+
+
+ Talk
+
+
-
+
{{user.user}}
{% if user.user.id == request.user.id %}
- Edit Profile
+
+
+
+
iCal
{% endif %}
@@ -21,6 +35,25 @@
{% if user.weburl %}
Homepage: {{user.weburl}}
{% endif %} +{% if user.talks %} +Talks
+
+
+{% endif %}
+ {% for talk in user.talks %}
+
+
+
+ {% endfor %}
+
+
+
+
+
+
+ {{ talk.speaker }}
+
+
{% if teams %}
diff --git a/get_together/urls.py b/get_together/urls.py
index 1766586..6bb8510 100644
--- a/get_together/urls.py
+++ b/get_together/urls.py
@@ -49,6 +49,16 @@ urlpatterns = [
path('profile//', views.show_profile, name='show-profile'),
path('profile/.ics', feeds.UserEventsCalendar(), name='user-event-ical'),
+ path('profile/+add-speaker', views.add_speaker, name='add-speaker'),
+ path('speaker//+edit', views.edit_speaker, name='edit-speaker'),
+ path('speaker//+delete', views.delete_speaker, name='delete-speaker'),
+
+ path('profile/+talks', views.list_user_talks, name='user-talks'),
+ path('profile/+add-talk', views.add_talk, name='add-talk'),
+ path('talk//', views.show_talk, name='show-talk'),
+ path('talk//+edit', views.edit_talk, name='edit-talk'),
+ path('talk//+delete', views.delete_talk, name='delete-talk'),
+
path('events/', views.events_list, name='events'),
path('events/all/', views.events_list_all, name='all-events'),
path('teams/', views.teams_list, name='teams'),
@@ -70,7 +80,10 @@ urlpatterns = [
path('events//+add_place/', views.add_place_to_event, name='add-place'),
path('events//+comment/', event_views.comment_event, name='comment-event'),
path('events//+photo/', views.add_event_photo, name='add-event-photo'),
+ path('events//+propose-talk/', views.propose_event_talk, name='propose-event-talk'),
+ path('events//+schedule-talks/', views.schedule_event_talks, name='schedule-event-talks'),
path('events///', views.show_event, name='show-event'),
+
path('series//+edit/', views.edit_series, name='edit-series'),
path('series//+delete/', views.delete_series, name='delete-series'),
path('series//+add_place/', views.add_place_to_series, name='add-place-to-series'),
diff --git a/get_together/views/__init__.py b/get_together/views/__init__.py
index 9c5e8fe..1410be3 100644
--- a/get_together/views/__init__.py
+++ b/get_together/views/__init__.py
@@ -27,6 +27,7 @@ from .places import *
from .user import *
from .new_user import *
from .new_team import *
+from .speakers import *
from .utils import *
KM_PER_DEGREE_LAT = 110.574
diff --git a/get_together/views/events.py b/get_together/views/events.py
index 26c5da5..0e31d5c 100644
--- a/get_together/views/events.py
+++ b/get_together/views/events.py
@@ -65,7 +65,7 @@ def show_event(request, event_id, event_slug):
'comment_form': comment_form,
'is_attending': request.user.profile in event.attendees.all(),
'attendee_list': Attendee.objects.filter(event=event),
- 'presentation_list': event.presentations.all().order_by('start_time'),
+ 'presentation_list': event.presentations.filter(status=Presentation.ACCEPTED).order_by('start_time'),
'can_edit_event': request.user.profile.can_edit_event(event),
}
return render(request, 'get_together/events/show_event.html', context)
diff --git a/get_together/views/speakers.py b/get_together/views/speakers.py
new file mode 100644
index 0000000..c1318a0
--- /dev/null
+++ b/get_together/views/speakers.py
@@ -0,0 +1,200 @@
+from django.utils.translation import ugettext_lazy as _
+
+from django.contrib import messages
+from django.contrib.auth import logout as logout_user
+from django.shortcuts import render, redirect, get_object_or_404
+from django.http import HttpResponse, JsonResponse
+from django.core.exceptions import ObjectDoesNotExist
+
+from events.models.profiles import UserProfile, Speaker, Talk
+from events.forms import (
+ SpeakerBioForm,
+ UserTalkForm,
+ DeleteTalkForm,
+ SchedulePresentationForm,
+)
+
+from events.models.events import Event, Presentation
+
+import datetime
+import simplejson
+
+from .teams import *
+from .events import *
+
+@login_required
+def list_user_talks(request):
+ profile = request.user.profile
+ speaker_bios = Speaker.objects.filter(user=profile)
+ talks = list(Talk.objects.filter(speaker__user=profile))
+ context = {
+ 'speaker_bios': speaker_bios,
+ 'talks': talks,
+ }
+ return render(request, 'get_together/speakers/list_user_talks.html', context)
+
+def add_speaker(request):
+ new_speaker = Speaker(user=request.user.profile)
+ if request.method == 'GET':
+ speaker_form = SpeakerBioForm(instance=new_speaker)
+ context = {
+ 'speaker': new_speaker,
+ 'speaker_form': speaker_form,
+ }
+ return render(request, 'get_together/speakers/create_speaker.html', context)
+ elif request.method == 'POST':
+ speaker_form = SpeakerBioForm(request.POST, request.FILES, instance=new_speaker)
+ if speaker_form.is_valid():
+ new_speaker = speaker_form.save()
+ return redirect('show-talks')
+ else:
+ context = {
+ 'speaker': new_speaker,
+ 'speaker_form': speaker_form,
+ }
+ return render(request, 'get_together/speakers/create_speaker.html', context)
+ return redirect('home')
+
+def edit_speaker(request, speaker_id):
+ speaker = get_object_or_404(Speaker, id=speaker_id)
+ if request.method == 'GET':
+ speaker_form = SpeakerBioForm(instance=speaker)
+ context = {
+ 'speaker': speaker,
+ 'speaker_form': speaker_form,
+ }
+ return render(request, 'get_together/speakers/edit_speaker.html', context)
+ elif request.method == 'POST':
+ speaker_form = SpeakerBioForm(request.POST, request.FILES, instance=speaker)
+ if speaker_form.is_valid():
+ speaker = speaker_form.save()
+ return redirect('user-talks')
+ else:
+ context = {
+ 'speaker': speaker,
+ 'speaker_form': speaker_form,
+ }
+ return render(request, 'get_together/speakers/edit_speaker.html', context)
+ return redirect('home')
+
+def delete_speaker(request, speaker_id):
+ pass
+
+def show_talk(request, talk_id):
+ pass
+
+def add_talk(request):
+ new_talk = Talk()
+ if request.method == 'GET':
+ talk_form = UserTalkForm(instance=new_talk)
+ talk_form.fields['speaker'].queryset = request.user.profile.speaker_set
+ context = {
+ 'talk': new_talk,
+ 'talk_form': talk_form,
+ }
+ return render(request, 'get_together/speakers/create_talk.html', context)
+ elif request.method == 'POST':
+ talk_form = UserTalkForm(request.POST, instance=new_talk)
+ talk_form.fields['speaker'].queryset = request.user.profile.speaker_set
+ if talk_form.is_valid():
+ new_talk = talk_form.save()
+ return redirect('user-talks')
+ else:
+ context = {
+ 'talk': new_talk,
+ 'talk_form': talk_form,
+ }
+ return render(request, 'get_together/speakers/create_talk.html', context)
+ return redirect('home')
+
+def edit_talk(request, talk_id):
+ talk = get_object_or_404(Talk, id=talk_id)
+ if not talk.speaker.user == request.user.profile:
+ messages.add_message(request, messages.WARNING, message=_('You can not make changes to this talk.'))
+ return redirect('show-talk', talk_id)
+
+ if request.method == 'GET':
+ talk_form = UserTalkForm(instance=talk)
+ talk_form.fields['speaker'].queryset = request.user.profile.speaker_set
+ context = {
+ 'talk': talk,
+ 'talk_form': talk_form,
+ }
+ return render(request, 'get_together/speakers/edit_talk.html', context)
+ elif request.method == 'POST':
+ talk_form = UserTalkForm(request.POST, instance=talk)
+ talk_form.fields['speaker'].queryset = request.user.profile.speaker_set
+ if talk_form.is_valid():
+ talk = talk_form.save()
+ return redirect('user-talks')
+ else:
+ context = {
+ 'talk': talk,
+ 'talk_form': talk_form,
+ }
+ return render(request, 'get_together/speakers/edit_talk.html', context)
+ return redirect('home')
+
+def delete_talk(request, talk_id):
+ talk = get_object_or_404(Talk, id=talk_id)
+ if not talk.speaker.user == request.user.profile:
+ messages.add_message(request, messages.WARNING, message=_('You can not make changes to this talk.'))
+ return redirect('show-talk', talk_id)
+
+ if request.method == 'GET':
+ form = DeleteTalkForm()
+
+ context = {
+ 'talk': talk,
+ 'delete_form': form,
+ }
+ return render(request, 'get_together/speakers/delete_talk.html', context)
+ elif request.method == 'POST':
+ form = DeleteTalkForm(request.POST)
+ if form.is_valid() and form.cleaned_data['confirm']:
+ talk.delete()
+ return redirect('user-talks')
+ else:
+ context = {
+ 'talk': talk,
+ 'delete_form': form,
+ }
+ return render(request, 'get_together/speakers/delete_talk.html', context)
+ else:
+ return redirect('home')
+
+@login_required
+def propose_event_talk(request, event_id):
+ event = get_object_or_404(Event, id=event_id)
+ if request.method == 'GET':
+ profile = request.user.profile
+ talks = list(Talk.objects.filter(speaker__user=profile))
+ presentations = event.presentations.all().order_by('-status')
+ for presentation in presentations:
+ if presentation.talk in talks:
+ talks.remove(presentation.talk)
+
+ context = {
+ 'event': event,
+ 'available_talks': talks,
+ 'proposed_talks': presentations,
+ }
+ return render(request, 'get_together/speakers/list_user_presentations.html', context)
+ elif request.method == 'POST':
+ talk = get_object_or_404(Talk, id=request.POST.get('talk_id'))
+ new_proposal = Presentation.objects.create(
+ event=event,
+ talk=talk,
+ status=Presentation.PROPOSED,
+ start_time=event.local_start_time,
+ created_by=request.user.profile,
+ )
+ messages.add_message(request, messages.SUCCESS, message=_('Your talk has been submitted to the event organizer.'))
+ return redirect(event.get_absolute_url())
+ else:
+ redirect('home')
+
+def schedule_event_talks(request, event_id):
+ pass
+
+