From cc7bb2df4c62695fc7a66f58739732deddd3cf7b Mon Sep 17 00:00:00 2001 From: HooVee Date: Thu, 25 Aug 2016 21:33:44 +0300 Subject: [PATCH 1/5] Added Tommy --- members/static/html/jasenlista.html | 5 +++++ members/static/js/members_routers.js | 3 +++ 2 files changed, 8 insertions(+) diff --git a/members/static/html/jasenlista.html b/members/static/html/jasenlista.html index bc89088..ccca7d5 100644 --- a/members/static/html/jasenlista.html +++ b/members/static/html/jasenlista.html @@ -26,4 +26,9 @@ +
+
+ Tommy +
+
diff --git a/members/static/js/members_routers.js b/members/static/js/members_routers.js index 49fc3d5..6717c82 100644 --- a/members/static/js/members_routers.js +++ b/members/static/js/members_routers.js @@ -28,6 +28,9 @@ app.config(['$routeProvider', function($routeProvider){ templateUrl:"/static/html/lisaa_jasenia.html", controller:'addManyController', }) + .when('/tommy/',{ + templateUrl:"/static/html/tommy.html" + }) .otherwise({ 'redirectTo':"/" }) From fe891cf619856d68d0093dfd41a33bdc803a7c28 Mon Sep 17 00:00:00 2001 From: HooVee Date: Thu, 25 Aug 2016 21:39:18 +0300 Subject: [PATCH 2/5] More tommy --- members/static/html/tommy.html | 4 ++++ members/static/tommy.jpg | Bin 0 -> 6248 bytes 2 files changed, 4 insertions(+) create mode 100644 members/static/html/tommy.html create mode 100644 members/static/tommy.jpg diff --git a/members/static/html/tommy.html b/members/static/html/tommy.html new file mode 100644 index 0000000..2e3c9eb --- /dev/null +++ b/members/static/html/tommy.html @@ -0,0 +1,4 @@ +

Tommyn jäsenlista

+
+ +
\ No newline at end of file diff --git a/members/static/tommy.jpg b/members/static/tommy.jpg new file mode 100644 index 0000000000000000000000000000000000000000..ee1cb4d713857749e0b117dbaeffbc2fe37705d8 GIT binary patch literal 6248 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 literal 0 HcmV?d00001 From 9021c42ded916b5d7d3c5fd63128ee805adb7474 Mon Sep 17 00:00:00 2001 From: okalintu Date: Thu, 25 Aug 2016 21:51:30 +0300 Subject: [PATCH 3/5] restricted accessrights to membersapi --- members/views.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/members/views.py b/members/views.py index 8f0a1b4..637b91f 100644 --- a/members/views.py +++ b/members/views.py @@ -1,5 +1,6 @@ from django.shortcuts import render, get_object_or_404 from django.contrib.auth.decorators import permission_required +from django.views.decorators.http import require_http_methods from django.views.decorators.csrf import ensure_csrf_cookie from django.http import HttpResponse, HttpResponseBadRequest from django.core.exceptions import ValidationError @@ -7,16 +8,21 @@ from members.models import Member, MemberRequest import json @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',{}) @ensure_csrf_cookie +@require_http_methods(["GET"]) +@permission_required('members.change_member', login_url='/login') def members(request, *args, **kwargs): mems = list(map(lambda m: m.get_dict(),Member.objects.all())) return HttpResponse(json.dumps(mems)) @ensure_csrf_cookie +@require_http_methods(["GET", "POST", "DELETE","PUT"]) +@permission_required('members.change_member', login_url='/login') def member(request,*args, **kwargs): # get, put and delete together since all operate on existing objects @@ -60,6 +66,8 @@ def member(request,*args, **kwargs): return HttpResponseBadRequest('{"error" : "Invalid parameters supplied"}') @ensure_csrf_cookie +@require_http_methods(["POST"]) +@permission_required('members.change_member', login_url='/login') def csv_import(request, *args, **kwargs): data = request.body.decode("utf-8") resp_data = Member.import_csv(data) @@ -69,6 +77,8 @@ def csv_import(request, *args, **kwargs): return resp @ensure_csrf_cookie +@require_http_methods(["GET"]) +@permission_required('members.change_member', login_url='/login') def member_requests(request, *args, **kwargs): reqs = list(map(lambda r: r.get_dict(),MemberRequest.objects.all())) return HttpResponse(json.dumps(reqs)) @@ -85,6 +95,8 @@ def new_member_request(request, *args, **kwargs): return HttpResponseBadRequest('{"error" : "Invalid parameters supplied"}') @ensure_csrf_cookie +@require_http_methods(["GET", "POST", "DELETE"]) +@permission_required('members.change_member', login_url='/login') def handle_mem_request(request, idx, *args, **kwargs): try: req = MemberRequest.objects.get(pk=idx) From b2183730139fa47d39ed946d99a889da71c7415e Mon Sep 17 00:00:00 2001 From: Aarni Date: Mon, 29 Aug 2016 18:56:53 +0300 Subject: [PATCH 4/5] Logout button --- members/templates/members_index.html | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/members/templates/members_index.html b/members/templates/members_index.html index 3abedab..b86ec36 100644 --- a/members/templates/members_index.html +++ b/members/templates/members_index.html @@ -39,11 +39,18 @@ -
-

Aalto-yliopiston Sähköinsinöörikilta RY:n jäsenrekisteri

-
- -
+
+ +
From 3d5fccd0c9016a05ff43140c188987495dabccce Mon Sep 17 00:00:00 2001 From: okalintu Date: Mon, 29 Aug 2016 19:32:58 +0300 Subject: [PATCH 5/5] created skeleton for infoscreen --- infoscreen/static/html/templatedefault.html | 2 -- infoscreen/static/html/test1.html | 1 + infoscreen/static/html/test2.html | 1 + infoscreen/static/html/test3.html | 1 + infoscreen/static/js/controllers.js | 3 --- infoscreen/static/js/infoscreen_controllers.js | 16 ++++++++++++++++ infoscreen/static/js/routes.js | 13 ------------- infoscreen/templates/infoscreen_index.html | 8 ++++---- 8 files changed, 23 insertions(+), 22 deletions(-) delete mode 100644 infoscreen/static/html/templatedefault.html create mode 100644 infoscreen/static/html/test1.html create mode 100644 infoscreen/static/html/test2.html create mode 100644 infoscreen/static/html/test3.html delete mode 100644 infoscreen/static/js/controllers.js create mode 100644 infoscreen/static/js/infoscreen_controllers.js delete mode 100644 infoscreen/static/js/routes.js diff --git a/infoscreen/static/html/templatedefault.html b/infoscreen/static/html/templatedefault.html deleted file mode 100644 index 74ed902..0000000 --- a/infoscreen/static/html/templatedefault.html +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/infoscreen/static/html/test1.html b/infoscreen/static/html/test1.html new file mode 100644 index 0000000..1f62c8b --- /dev/null +++ b/infoscreen/static/html/test1.html @@ -0,0 +1 @@ +

testi1

diff --git a/infoscreen/static/html/test2.html b/infoscreen/static/html/test2.html new file mode 100644 index 0000000..95db769 --- /dev/null +++ b/infoscreen/static/html/test2.html @@ -0,0 +1 @@ +

testi2

diff --git a/infoscreen/static/html/test3.html b/infoscreen/static/html/test3.html new file mode 100644 index 0000000..eecc1a2 --- /dev/null +++ b/infoscreen/static/html/test3.html @@ -0,0 +1 @@ +

testi3

diff --git a/infoscreen/static/js/controllers.js b/infoscreen/static/js/controllers.js deleted file mode 100644 index 83eaeba..0000000 --- a/infoscreen/static/js/controllers.js +++ /dev/null @@ -1,3 +0,0 @@ -app.controller('templateDefault', function($scope){ - -}); diff --git a/infoscreen/static/js/infoscreen_controllers.js b/infoscreen/static/js/infoscreen_controllers.js new file mode 100644 index 0000000..cf6c098 --- /dev/null +++ b/infoscreen/static/js/infoscreen_controllers.js @@ -0,0 +1,16 @@ +var app = angular.module('infoApp', []); + +app.controller('infoscreen_main', function($scope, $http,$timeout){ + var index = -1; + var templates = [ + "/static/html/test1.html", + "/static/html/test2.html", + "/static/html/test3.html", + ]; + $scope.next = function(){ + index = (index + 1) % templates.length; + $scope.active = templates[index]; + $timeout($scope.next,5000); + } + $scope.next() +}); diff --git a/infoscreen/static/js/routes.js b/infoscreen/static/js/routes.js deleted file mode 100644 index 99787d5..0000000 --- a/infoscreen/static/js/routes.js +++ /dev/null @@ -1,13 +0,0 @@ -var app = angular.module('infoscreen', ['ngRoute']); - -app.config(['$routeProvider', function($routeProvider){ - $routeProvider - .when('/',{ - templateUrl:"/static/html/templatedefault.html", - controller:'templateDefault', - }) - .otherwise({ - 'redirectTo':"/" - }) -}]); - diff --git a/infoscreen/templates/infoscreen_index.html b/infoscreen/templates/infoscreen_index.html index 9ae49bc..942025f 100644 --- a/infoscreen/templates/infoscreen_index.html +++ b/infoscreen/templates/infoscreen_index.html @@ -1,5 +1,5 @@ - + @@ -11,11 +11,11 @@ - - + -
+
+