+
+
+
diff --git a/members/templates/members_index.html b/members/templates/members_index.html
index a666be0..6cac673 100644
--- a/members/templates/members_index.html
+++ b/members/templates/members_index.html
@@ -1,66 +1,31 @@
-
-
-
-
-
-
-
+{% extends "members_base.html" %}
-
+
+ {% block content %}
+ {% endblock content %}
+
+
+ Aalto-yliopiston Sähköinsinöörikilta RY:n jäsenrekisteri
+
+
+
+
-
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
- {%load staticfiles %}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- \d+)$', edit_member),
+ url(r'^members/applications$', list_applications),
+ url(r'^members/edit_application/(?P\d+)$', edit_application),
url(r'^members/api/members$', mems),
url(r'^members/api/member/(?P\d+)$', mem),
url(r'^members/api/member/$', mem),
@@ -76,6 +88,7 @@ urlpatterns = [
url(r'^members/api/request$', new_member_request),
url(r'^members/api/request/(?P\d+)$', handle_mem_request),
url(r'^members/api/getCSV$', mem_csv_export),
+ url(r'^members/tommy$', tommy_blooper),
#infoscreen
url(r'^infoscreen/$', infodefault),
url(r'^infoscreen/(?P\d+)$', infoindex),
-
-
-
+
+
-
-
-
-
- Aalto-yliopiston Sähköinsinöörikilta RY:n jäsenrekisteri
-
-
-
-
+
+{% endblock content %}
diff --git a/members/templates/tommy_blooper.html b/members/templates/tommy_blooper.html
new file mode 100644
index 0000000..ef0528b
--- /dev/null
+++ b/members/templates/tommy_blooper.html
@@ -0,0 +1,8 @@
+{% extends "members_base.html" %}
+
+{% block content %}
+
+
+
+
+
+ Aalto-yliopiston Sähköinsinöörikilta RY:n jäsenrekisteri
+
+
+
+ Tommyn jäsenlista
+
+ 
+
+{% endblock content %}
diff --git a/members/views.py b/members/views.py
index 7444e59..418a431 100644
--- a/members/views.py
+++ b/members/views.py
@@ -45,15 +45,58 @@ def send_mail_wrapper(subject, message):
@ensure_csrf_cookie
@require_http_methods(["GET"])
@permission_required('members.change_member', login_url='/login')
-def index(request, *args, **kwargs):
- return render(request, 'members_index.html', {})
+def member_list(request, *args, **kwargs):
+ context = {}
+ return render(request, 'member_list.html', context)
+@ensure_csrf_cookie
+@require_http_methods(["GET"])
+@permission_required('members.change_member', login_url='/login')
+def add_member(request, *args, **kwargs):
+ return render(request, 'add_member.html', {})
+
+@ensure_csrf_cookie
+@require_http_methods(["GET"])
+@permission_required('members.change_member', login_url='/login')
+def add_many_members(request, *args, **kwargs):
+ return render(request, 'add_many_members.html', {})
+
+@ensure_csrf_cookie
+@require_http_methods(["GET"])
+@permission_required('members.change_member', login_url='/login')
+def list_applications(request, *args, **kwargs):
+ return render(request, 'list_applications.html', {})
+
+@ensure_csrf_cookie
+@require_http_methods(["GET"])
+@permission_required('members.change_member', login_url='/login')
+def tommy_blooper(request, *args, **kwargs):
+ return render(request, 'tommy_blooper.html', {})
+
+@ensure_csrf_cookie
+@require_http_methods(["GET"])
+@permission_required('members.change_member', login_url='/login')
+def edit_member(request, *args, **kwargs):
+ i = kwargs.pop('index', None);
+ if i is None:
+ return HttpResponse(status=500, error="{'error': 'No member id specified'}")
+ else:
+ return render(request, 'edit_member.html', {'member_id' : i})
+
+@ensure_csrf_cookie
+@require_http_methods(["GET"])
+@permission_required('members.change_member', login_url='/login')
+def edit_application(request, *args, **kwargs):
+ i = kwargs.pop('index', None);
+ if i is None:
+ return HttpResponse(status=500, error="{'error': 'No member id specified'}")
+ else:
+ return render(request, 'edit_application.html', {'member_id' : i})
@ensure_csrf_cookie
def application_index(request, *args, **kwargs):
return render(request, 'application_index.html', {})
-
@ensure_csrf_cookie
def application_success_index(request, *args, **kwargs):
return render(request, 'application_success.html', {})
@@ -210,4 +253,4 @@ def export_csv(request, *args, **kwargs):
writer.writerow(field_list)
- return response
\ No newline at end of file
+ return response
diff --git a/sikweb/urls.py b/sikweb/urls.py
index a63cf05..e563a20 100644
--- a/sikweb/urls.py
+++ b/sikweb/urls.py
@@ -23,7 +23,10 @@ from webapp.views import main_index
from webapp.views import login_view
from webapp.views import logout_view
# members
-from members.views import index as mindex
+from members.views import member_list
+from members.views import add_member
+from members.views import add_many_members
+from members.views import edit_member
from members.views import members as mems
from members.views import member as mem
from members.views import handle_mem_request
@@ -31,6 +34,7 @@ from members.views import csv_import as mem_csv_import
from members.views import new_member_request
from members.views import member_requests
from members.views import export_csv as mem_csv_export
+from members.views import tommy_blooper
#infoscreen
from infoscreen.views import index as infoindex
from infoscreen.views import default as infodefault
@@ -54,6 +58,8 @@ from infoscreen.views import admin as infoscreen_admin
from infoscreen.views import hsl_timetable_settings
#application
from members.views import application_index
+from members.views import list_applications
+from members.views import edit_application
from members.views import application_success_index
favicon_view = RedirectView.as_view(url='static/img/favicon.ico', permanent=True)
@@ -67,7 +73,13 @@ urlpatterns = [
url(r'^login$', login_view),
url(r'^logout$', logout_view),
# members
- url(r'^members/$', mindex),
+ url(r'^members/$', member_list),
+ url(r'^members/list$', member_list),
+ url(r'^members/add$', add_member),
+ url(r'^members/add_many$', add_many_members),
+ url(r'^members/edit/(?P
+