From 0e8cad75899dd218d133c582c8716a9882d29e56 Mon Sep 17 00:00:00 2001
From: okalintu <ilkka.oks4nen@gmail.com>
Date: Mon, 27 Mar 2017 12:29:36 +0300
Subject: [PATCH] Add barebone skeleton for infoscreens event view

---
 infoscreen/models.py                           | 11 +++++++++++
 infoscreen/static/html/events.html             | 17 +++++++++++++++++
 infoscreen/static/html/events_create.html      | 10 ++++++++++
 infoscreen/static/js/infoadmin_controllers.js  |  7 +++++++
 infoscreen/static/js/infoscreen_controllers.js |  9 ++++++++-
 infoscreen/views.py                            |  2 ++
 sikweb/urls.py                                 |  2 ++
 7 files changed, 57 insertions(+), 1 deletion(-)
 create mode 100644 infoscreen/static/html/events.html
 create mode 100644 infoscreen/static/html/events_create.html

diff --git a/infoscreen/models.py b/infoscreen/models.py
index 8927c6d..95a6c7e 100644
--- a/infoscreen/models.py
+++ b/infoscreen/models.py
@@ -136,6 +136,17 @@ class SossoInfoItem(InfoItem):
     def get_create_template_url():
         return "/static/html/sosso_create.html"
 
+class EventInfoItem(InfoItem):
+    display_name = _("Events")
+
+    def get_template_url(self):
+        return "/static/html/events.html"
+
+    @staticmethod
+    def get_create_template_url():
+        return "/static/html/events_create.html"
+
+
 
 class ImageInfoItem(InfoItem):
     display_name = _("Image")
diff --git a/infoscreen/static/html/events.html b/infoscreen/static/html/events.html
new file mode 100644
index 0000000..876f2cb
--- /dev/null
+++ b/infoscreen/static/html/events.html
@@ -0,0 +1,17 @@
+<link rel="stylesheet" href="/static/css/sosso.css">
+<div ng-controller="EventController">
+    <div id="header">
+        <img id="header-image" src="/static/img/sossoheader.png" >
+    </div>
+        <div id="container">
+            <div class="article-row row" ng-repeat="event in events">
+                <div>
+                    <h1 class="col-md-6">
+                        <div class="article-title-col">
+                            {{ event.name }}, {{event.event_start}}
+                        </div>
+                    </h1>
+                </div>
+            </div>
+        </div>
+</div>
diff --git a/infoscreen/static/html/events_create.html b/infoscreen/static/html/events_create.html
new file mode 100644
index 0000000..d534dcb
--- /dev/null
+++ b/infoscreen/static/html/events_create.html
@@ -0,0 +1,10 @@
+<div ng-controller="infoadmin_eventitem_create" style="margin-top:20px;">
+    <div>
+        Create new item to show events Name is used only as identifier
+    </div>
+    <div class="form-group">
+        <label>Name:</label>
+        <input type="text" ng-model="item.name"></input>
+    </div>
+    <input type="button" class="btn btn-success" ng-click="send()" value="create"></input>
+</div>
diff --git a/infoscreen/static/js/infoadmin_controllers.js b/infoscreen/static/js/infoadmin_controllers.js
index 9a49e0d..c4b11d6 100644
--- a/infoscreen/static/js/infoadmin_controllers.js
+++ b/infoscreen/static/js/infoadmin_controllers.js
@@ -141,6 +141,13 @@ app.controller('infoadmin_sossoitem_create', function($scope, $http,ItemList){
         $http.post("/infoscreen/create_sossoitem", $scope.item).then(ItemList.loadItems)
     }
 });
+app.controller('infoadmin_eventitem_create', function($scope, $http,ItemList){
+    $scope.item = {}
+    $scope.send = function(){
+        $http.post("/infoscreen/create_eventitem", $scope.item).then(ItemList.loadItems)
+    }
+});
+
 app.controller('infoadmin_hslitem_create', function($scope, $http,ItemList){
     $scope.item = {}
     $scope.send = function(){
diff --git a/infoscreen/static/js/infoscreen_controllers.js b/infoscreen/static/js/infoscreen_controllers.js
index a499fda..8fde48b 100644
--- a/infoscreen/static/js/infoscreen_controllers.js
+++ b/infoscreen/static/js/infoscreen_controllers.js
@@ -48,7 +48,7 @@ app.filter('trusted_url', ['$sce', function ($sce) {
 app.controller('ABBController', function($scope, $http){
     $scope.jobs = [];
     var min_date = moment().subtract(30,'days').format("YYYY-MM-DD%20HH:mm:ss");
-    var url = "http://sahkoinsinoorikilta.fi/api/news.php";
+    var url = "https://sahkoinsinoorikilta.fi/api/news.php";
     var params = "?type=11&lang=fi&title_search=ABB&min_date="+min_date
     $http.get(url+params).then(function(response){
         $scope.jobs = _.filter(response.data, function(job){
@@ -73,6 +73,13 @@ app.controller('SossoController', function($scope, $http) {
             $scope.data = response.data;
         })
 });
+app.controller('EventController', function($scope, $http) {
+    $scope.data = [];
+    $http.get("https://sik.ayy.fi/api/events.php?limit=3").then(function(response)
+        {
+            $scope.events = response.data;
+        })
+});
 
 app.controller('timetableCtrl',
     function($scope, $http, $interval) {
diff --git a/infoscreen/views.py b/infoscreen/views.py
index 6f0ab36..ed7108b 100644
--- a/infoscreen/views.py
+++ b/infoscreen/views.py
@@ -7,6 +7,7 @@ from django.contrib.auth.decorators import permission_required
 
 from infoscreen.models import Rotation, InfoItem, InfoInstance
 from infoscreen.models import ABBInfoItem, ExternalImageInfoItem, ImageInfoItem, SossoInfoItem, HslInfoItem
+from infoscreen.models import EventInfoItem
 from infoscreen.models import ExternalWebsiteInfoItem
 from infoscreen.models import ImageUploadForm
 from infoscreen.models import HSLDataModel
@@ -215,3 +216,4 @@ createSossoItem = create_item_generator(SossoInfoItem)
 createHslItem = create_item_generator(HslInfoItem)
 createExternalImageInfoItem = create_item_generator(ExternalImageInfoItem)
 createExternalWebsiteItem = create_item_generator(ExternalWebsiteInfoItem)
+createEventItem = create_item_generator(EventInfoItem)
diff --git a/sikweb/urls.py b/sikweb/urls.py
index b8a544a..5af072d 100644
--- a/sikweb/urls.py
+++ b/sikweb/urls.py
@@ -62,6 +62,7 @@ from infoscreen.views import create_image_item
 from infoscreen.views import createABBItem
 from infoscreen.views import createSossoItem
 from infoscreen.views import createHslItem
+from infoscreen.views import createEventItem
 from infoscreen.views import createExternalWebsiteItem
 from infoscreen.views import create_rotation
 from infoscreen.views import delete_rotation
@@ -123,6 +124,7 @@ urlpatterns = [
         url(r'^infoscreen/create_image$', create_image_item),
         url(r'^infoscreen/create_abbitem$', createABBItem),
         url(r'^infoscreen/create_sossoitem$', createSossoItem),
+        url(r'^infoscreen/create_eventitem$', createEventItem),
         url(r'^infoscreen/create_hslitem$', createHslItem),
         url(r'^infoscreen/create_websiteitem$', createExternalWebsiteItem),
         url(r'^infoscreen/admin$', infoscreen_admin),