Merge branch 'develop' into 'master'

Changes ready to be published See merge request !5
2017-02-06 12:35:14 +02:00
parent 84f66a88c9 8f4c8701ae
commit cbfbae2984
17 changed files with 382 additions and 64 deletions
@@ -0,0 +1,251 @@
+{
+    "env": {
+        "browser": true
+    },
+    "globals": {
+        "angular": 1,
+        "noty": 1,
+        "app": 1,
+        "_": 1,
+        "moment": 1
+    },
+    "extends": "eslint:recommended",
+    "rules": {
+        "no-unused-vars": "warn",
+        "accessor-pairs": "error",
+        "array-bracket-spacing": "off",
+        "array-callback-return": "error",
+        "arrow-body-style": "error",
+        "arrow-parens": "error",
+        "arrow-spacing": "error",
+        "block-scoped-var": "off",
+        "block-spacing": "off",
+        "brace-style": "off",
+        "callback-return": "off",
+        "camelcase": "off",
+        "capitalized-comments": "off",
+        "class-methods-use-this": "error",
+        "comma-dangle": "off",
+        "comma-spacing": "off",
+        "comma-style": "off",
+        "complexity": "off",
+        "computed-property-spacing": "off",
+        "consistent-return": "off",
+        "consistent-this": "off",
+        "curly": "off",
+        "default-case": "off",
+        "dot-location": [
+            "error",
+            "property"
+        ],
+        "dot-notation": "off",
+        "eol-last": "off",
+        "eqeqeq": "off",
+        "func-call-spacing": "error",
+        "func-name-matching": "error",
+        "func-names": "off",
+        "func-style": "off",
+        "generator-star-spacing": "error",
+        "global-require": "off",
+        "guard-for-in": "off",
+        "handle-callback-err": "off",
+        "id-blacklist": "error",
+        "id-length": "off",
+        "id-match": "error",
+        "indent": "off",
+        "init-declarations": "off",
+        "jsx-quotes": "error",
+        "key-spacing": "off",
+        "keyword-spacing": "off",
+        "line-comment-position": "off",
+        "linebreak-style": "off",
+        "lines-around-comment": "off",
+        "lines-around-directive": "off",
+        "max-depth": "off",
+        "max-len": "off",
+        "max-lines": "off",
+        "max-nested-callbacks": "error",
+        "max-params": "off",
+        "max-statements": "off",
+        "max-statements-per-line": "off",
+        "multiline-ternary": "off",
+        "new-parens": "off",
+        "newline-after-var": "off",
+        "newline-before-return": "off",
+        "newline-per-chained-call": "off",
+        "no-alert": "error",
+        "no-array-constructor": "off",
+        "no-await-in-loop": "error",
+        "no-bitwise": "off",
+        "no-caller": "error",
+        "no-catch-shadow": "off",
+        "no-confusing-arrow": "error",
+        "no-constant-condition": [
+            "error",
+            {
+                "checkLoops": false
+            }
+        ],
+        "no-continue": "off",
+        "no-div-regex": "error",
+        "no-duplicate-imports": "error",
+        "no-else-return": "off",
+        "no-empty-function": "off",
+        "no-eq-null": "off",
+        "no-eval": "error",
+        "no-extend-native": "error",
+        "no-extra-bind": "error",
+        "no-extra-label": "error",
+        "no-extra-parens": "off",
+        "no-floating-decimal": "off",
+        "no-implicit-coercion": [
+            "error",
+            {
+                "boolean": false,
+                "number": false,
+                "string": false
+            }
+        ],
+        "no-implicit-globals": "off",
+        "no-implied-eval": "error",
+        "no-inline-comments": "off",
+        "no-inner-declarations": [
+            "error",
+            "functions"
+        ],
+        "no-invalid-this": "off",
+        "no-iterator": "error",
+        "no-label-var": "error",
+        "no-labels": "error",
+        "no-lone-blocks": "error",
+        "no-lonely-if": "off",
+        "no-loop-func": "error",
+        "no-magic-numbers": "off",
+        "no-mixed-operators": "off",
+        "no-mixed-requires": "error",
+        "no-multi-assign": "off",
+        "no-multi-spaces": "off",
+        "no-multi-str": "error",
+        "no-multiple-empty-lines": "off",
+        "no-native-reassign": "off",
+        "no-negated-condition": "off",
+        "no-negated-in-lhs": "error",
+        "no-nested-ternary": "off",
+        "no-new": "error",
+        "no-new-func": "off",
+        "no-new-object": "error",
+        "no-new-require": "error",
+        "no-new-wrappers": "error",
+        "no-octal-escape": "error",
+        "no-param-reassign": "off",
+        "no-path-concat": "error",
+        "no-plusplus": "off",
+        "no-process-env": "error",
+        "no-process-exit": "error",
+        "no-proto": "error",
+        "no-prototype-builtins": "off",
+        "no-restricted-globals": "error",
+        "no-restricted-imports": "error",
+        "no-restricted-modules": "error",
+        "no-restricted-properties": "error",
+        "no-restricted-syntax": "error",
+        "no-return-assign": "off",
+        "no-return-await": "error",
+        "no-script-url": "error",
+        "no-self-compare": "error",
+        "no-sequences": "off",
+        "no-shadow": "off",
+        "no-shadow-restricted-names": "error",
+        "no-spaced-func": "error",
+        "no-sync": "error",
+        "no-tabs": "off",
+        "no-template-curly-in-string": "error",
+        "no-ternary": "off",
+        "no-throw-literal": "off",
+        "no-trailing-spaces": "off",
+        "no-undef-init": "error",
+        "no-undefined": "off",
+        "no-underscore-dangle": "off",
+        "no-unmodified-loop-condition": "error",
+        "no-unneeded-ternary": [
+            "error",
+            {
+                "defaultAssignment": true
+            }
+        ],
+        "no-unused-expressions": "off",
+        "no-use-before-define": "off",
+        "no-useless-call": "off",
+        "no-useless-computed-key": "error",
+        "no-useless-concat": "error",
+        "no-useless-constructor": "error",
+        "no-useless-escape": "off",
+        "no-useless-rename": "error",
+        "no-useless-return": "error",
+        "no-var": "off",
+        "no-void": "off",
+        "no-warning-comments": "off",
+        "no-whitespace-before-property": "error",
+        "no-with": "error",
+        "object-curly-newline": "off",
+        "object-curly-spacing": "off",
+        "object-property-newline": "off",
+        "object-shorthand": "off",
+        "one-var": "off",
+        "one-var-declaration-per-line": "off",
+        "operator-assignment": "off",
+        "operator-linebreak": "off",
+        "padded-blocks": "off",
+        "prefer-arrow-callback": "off",
+        "prefer-const": "error",
+        "prefer-destructuring": [
+            "error",
+            {
+                "array": false,
+                "object": false
+            }
+        ],
+        "prefer-numeric-literals": "error",
+        "prefer-promise-reject-errors": "error",
+        "prefer-reflect": "off",
+        "prefer-rest-params": "off",
+        "prefer-spread": "off",
+        "prefer-template": "off",
+        "quote-props": "off",
+        "quotes": "off",
+        "radix": "off",
+        "require-await": "error",
+        "require-jsdoc": "off",
+        "rest-spread-spacing": "error",
+        "semi": "off",
+        "semi-spacing": "off",
+        "sort-imports": "error",
+        "sort-keys": "off",
+        "sort-vars": "off",
+        "space-before-blocks": "off",
+        "space-before-function-paren": "off",
+        "space-in-parens": "off",
+        "space-infix-ops": "off",
+        "space-unary-ops": [
+            "error",
+            {
+                "nonwords": false,
+                "words": false
+            }
+        ],
+        "spaced-comment": "off",
+        "strict": "off",
+        "symbol-description": "error",
+        "template-curly-spacing": "error",
+        "unicode-bom": [
+            "error",
+            "never"
+        ],
+        "valid-jsdoc": "off",
+        "vars-on-top": "off",
+        "wrap-iife": "off",
+        "wrap-regex": "off",
+        "yield-star-spacing": "error",
+        "yoda": "off"
+    }
+}
@@ -1,5 +1,6 @@
 from django.contrib import admin
 from infoscreen.models import Rotation, InfoItem, InfoInstance, ImageInfoItem, ExternalImageInfoItem, ABBInfoItem
+from infoscreen.models import CoffeeInfoItem

 # Register your models here.
 admin.site.register(Rotation)
@@ -8,3 +9,4 @@ admin.site.register(ImageInfoItem)
 admin.site.register(ExternalImageInfoItem)
 admin.site.register(ABBInfoItem)
 admin.site.register(InfoInstance)
+admin.site.register(CoffeeInfoItem)
@@ -9,7 +9,6 @@ class HSLFetcher:
    
    last_fetched = datetime.fromtimestamp(0)  # epoch
    INTERVAL = 1  # minutes
-
    logging.info("Set up scheduled HSL API fetch every {} minutes".format(INTERVAL))

    def fetch_if_needed(self):
@@ -26,10 +25,13 @@ class HSLFetcher:
        data = json.loads(src)

        arr = []
+        
+        time=datetime.now()+timedelta(minutes = settings.HSL_DEPARTURE_THRESHOLD)
+        time="{0:02d}{0:02d}".format(time.hour,time.minute)
        for element in data:
            src = urllib.request.urlopen(
-                "http://api.reittiopas.fi/hsl/prod/?userhash={}&request=stop&code={}"
-                .format(settings.HSL_USERHASH, element['code'])).read().decode("utf-8")
+                "http://api.reittiopas.fi/hsl/prod/?userhash={}&request=stop&code={}&dep_limit=20&time={}"
+                .format(settings.HSL_USERHASH, element['code'],time)).read().decode("utf-8")

            parsed = json.loads(src)[0]
            arr.append({"name": parsed['name_fi'], "lines": parsed['lines'],
@@ -75,7 +75,14 @@ class ABBInfoItem(InfoItem):
    @staticmethod
    def get_create_template_url():
        return "/static/html/abb_create.html"
+        
+class CoffeeInfoItem(InfoItem):
+    def get_template_url(self):
+        return "/static/html/coffee.html"

+    @staticmethod
+    def get_create_template_url():
+        return "/static/html/coffee_create.html"

 class SossoInfoItem(InfoItem):
    def get_template_url(self):
@@ -0,0 +1,10 @@
+body{
+	margin: 0;
+}
+iframe {
+	display: block;
+	background: #000;
+	border: none;
+	height: 100vh;
+	width: 100vw;
+}
@@ -0,0 +1,4 @@
+<link rel="stylesheet" href="/static/css/coffee.css">
+<iframe src="http://ka.dy.fi" allowfullscreen=true sandbox="allow-scripts allow-pointer-lock allow-same-origin">
+  <p>Your browser does not support iframes.</p>
+</iframe>
@@ -0,0 +1,10 @@
+<div ng-controller="infoadmin_coffeeitem_create" style="margin-top:20px;">
+    <div>
+        Create new item to show coffee website. 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>
@@ -8,7 +8,7 @@
 		    Aika
 		</th>
 		<th>
-		    Bussin numero
+		    Numero
 		</th>
 		<th>
 		    Pys&#228;kki
@@ -23,7 +23,7 @@
        <td ng-class='{red : x.hurry, black: !x.hurry}'>
            {{x.time}}
        </td>
-        <td>
+        <td style="margin-left: 15px">
            {{x.bus}}
        </td>
        <td>
@@ -44,10 +44,8 @@ app.service("InstanceList", ["$http", function($http){
        });
    }
    this.createRotation = function(name) {
-        data = {'name': name}
-        console.log(name)
-        $http.post("/infoscreen/create_rotation", data).then(function(response) {
-        });
+        var data = {'name': name}
+        $http.post("/infoscreen/create_rotation", data);
    }
    this.deleteRotation = function(id) {
        $http.delete("/infoscreen/delete_rotation/" + id).then(function(response) {
@@ -142,10 +140,15 @@ app.controller('infoadmin_hslitem_create', function($scope, $http,ItemList){
        $http.post("/infoscreen/create_hslitem", $scope.item).then(ItemList.loadItems)
    }
 });
+app.controller('infoadmin_coffeeitem_create', function($scope, $http,ItemList){
+    $scope.item = {}
+    $scope.send = function(){
+        $http.post("/infoscreen/create_coffeeitem", $scope.item).then(ItemList.loadItems)
+    }
+});

 app.controller('infoadmin_image_create', ['$scope', 'Upload', '$timeout',"ItemList", function ($scope, Upload, $timeout,ItemList) {
    $scope.send = function(file) {
-        console.log("name: "+$scope.imagename);
        file.upload = Upload.upload({
            url: '/infoscreen/create_image',
            data: {name: $scope.imagename, image: file},
@@ -1,4 +1,3 @@
-var activescope;
 var app = angular.module('infoApp', ['ngAnimate', 'ngRoute', 'monospaced.qrcode']);
 app.controller('infoscreen_main', function($scope,$http,$timeout){
    var templates = [];
@@ -30,7 +29,7 @@ app.controller('infoscreen_main', function($scope,$http,$timeout){
        $scope.active = {
            template: temp.item.template_url,
            onload: function(){
-                for (key in temp.item.options){
+                for (var key in temp.item.options){
                    $scope[key] = temp.item.options[key]
                }
            }
@@ -92,60 +91,76 @@ app.controller('timetableCtrl',
            objects=data['data'];
            for(var objectIndex in objects){
                var stop = objects[objectIndex];
-                for(var lineIndex in stop['lines']){
+                
+                var lineIndex;
+                for (lineIndex in stop['lines']){
                    var elem=stop['lines'][lineIndex].split(":");
                    dict[elem[0]]=elem[1];
                }
-                for(var lineIndex in stop['departures']){
+                for (lineIndex in stop['departures']){
                    var line = stop['departures'][lineIndex];
-                    var time=line['time'];
-                    date=line['date'];
-                    var hours= Math.floor(line['time']/100);
-                    if(hours>=24){
-                        hours-=24;
+                    var time = line['time'];
+                    var date = line['date'];
+                    var hours = Math.floor(line['time'] / 100);
+                    var minutes = line['time'] % 100;
+                    if (hours >= 24) {
+                        hours -= 24;
                        date++;
                    }
-                    var minutes= line['time']%100;
-                    var code= line['code'].substring(1,5);
-                    if(code.charAt(0)=='0')
-                        code=code.substring(1,4);
-                    temp={"stop":stop['name'].split(",")[0],
-                          "dist":stop['dist'],
-                          "bus":code,
-                          "date":date,
-                          "time":pad(hours,2)+":"+pad(minutes,2),
-                          "laststop":dict[line['code']].split(",")[0].split(" l.")[0],
-                          "hurry":false
-                         };
-                    var trigger=true;
-                    for(var objectIndex= $scope.arr.length-1;objectIndex>=0;objectIndex--)
-                        if( $scope.arr[objectIndex]['bus']==temp['bus'] && $scope.arr[objectIndex]['laststop']==temp['laststop']){
-                            if( $scope.arr[objectIndex]['dist']==temp['dist']){
-                                break;
-                            }
-                            else if( $scope.arr[objectIndex]['dist'] > temp['dist']){
-                                $scope.arr.splice(objectIndex,1);
-                            }
-                            else
-                                trigger=false;
-                    }
-                    if(trigger){
-                        $scope.arr.push(temp);
+                    var code = line['code'].substring(1, 5);
+                    if (code.charAt(0) == '0') {
+                        code = code.substring(1,4);
                    }

+                    var departure = {
+                        "stop":       stop['name'].split(",")[0],
+                        "dist":       stop['dist'],
+                        "bus":        code,
+                        "date":       date,
+                        "time":       pad(hours, 2) + ":" + pad(minutes, 2),
+                        "laststop":   dict[line['code']].split(",")[0].split(" l.")[0],
+                        "hurry":      false
+                    };
+                    if(departure['laststop']=='Otaniemi')
+                        break;
+                    if(departure['stop']=='Alvar Aallon puisto')
+                        departure['stop']="A. A. puisto"
+                    var trigger = true;
+                    for (var arrIndex = $scope.arr.length - 1; arrIndex >= 0; arrIndex--) {
+                        if ($scope.arr[arrIndex]['bus'] == departure['bus'] && 
+                            $scope.arr[arrIndex]['laststop'] == departure['laststop']) {
+
+                            if ($scope.arr[arrIndex]['dist'] == departure['dist']){
+                                break;
+                            }
+                            else if ($scope.arr[arrIndex]['dist'] > departure['dist']){
+                                $scope.arr.splice(arrIndex, 1);
+                            }
+                            else {
+                                trigger = false;
+                            }
+                        }
+                    }
+                    if (trigger) {
+                            $scope.arr.push(departure);
+                    }
                }
            }
+
            function pad(num, size) {
-                var s = num+"";
-                while (s.length < size) s = "0" + s;
+                var s = num + "";
+                while (s.length < size) {
+                    s = "0" + s;
+                }
                return s;
            }
+
            delOld();
        }
        function delOld(){
-            tooSoon = typeof($scope.departureThreshold) != 'undefined' ? $scope.departureThreshold: 0;
-            hurry = typeof($scope.hurryThreshold) != 'undefined' ? $scope.hurryThreshold : 0;
-            f= new Date();
+            var tooSoon = typeof($scope.departureThreshold) != 'undefined' ? $scope.departureThreshold: 0;
+            var hurry = typeof($scope.hurryThreshold) != 'undefined' ? $scope.hurryThreshold : 0;
+            f = new Date();
            for(var a=$scope.arr.length-1; a>=0; a--){
                var time=$scope.arr[a]['time'].split(":");
                date=$scope.arr[a]['date'].toString();
@@ -154,11 +169,12 @@ app.controller('timetableCtrl',
                d.setHours(time[0]);
                d.setMinutes(time[1]);
                var diff=(d.getTime()-f.getTime());
-                if(diff < tooSoon*60000)
+                if(diff < tooSoon*60000) {
                    $scope.arr.splice(a,1);
-                else if(diff < hurry*60000)
+                }
+                else if (diff < hurry*60000) {
                    $scope.arr[a]['hurry']=true;
-
+                }
            }
        }

@@ -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 CoffeeInfoItem
 from infoscreen.models import ImageUploadForm
 from infoscreen.models import HSLDataModel
 from infoscreen.hsl_fetcher import HSLFetcher
@@ -211,3 +212,4 @@ createABBItem = create_item_generator(ABBInfoItem)
 createSossoItem = create_item_generator(SossoInfoItem)
 createHslItem = create_item_generator(HslInfoItem)
 createExternalImageInfoItem = create_item_generator(ExternalImageInfoItem)
+createCoffeeItem = create_item_generator(CoffeeInfoItem)
@@ -15,3 +15,6 @@ h4 {
 #sendmember {
    float: right;
 }
+#captcha {
+    margin-bottom: 10px;
+}
@@ -27,7 +27,7 @@ function memberDataEditor(returnpath) {
        });

        $scope.send = function() {
-            $http.put("/members/api/member/" + $scope.member.id, $scope.member).then( function(data){
+            $http.put("/members/api/member/" + $scope.member.id, $scope.member).then(function(response){
                notySuccess("Jäsentiedot tallennettu");
                $location.path(returnpath);
            });
@@ -62,7 +62,7 @@ app.directive('ngConfirmClick', [ function() { return {

 // controllers

-app.controller("getController", function($scope, $document, $http, $window, $location){
+app.controller("getController", function($scope, $document, $http){
    /* List of all members that are fetched from the database */
 	$scope.members = [];

@@ -98,9 +98,8 @@ app.controller("getController", function($scope, $document, $http, $window, $loc
    /* Update the payment date of a single member to the current time and send
     * the member to the database */
    $scope.updatePayment= function(id){
-        $http.put("/members/api/member/"+id, { paid: moment().format("YYYY-MM-DD kk:mm:ss") }).then(function(resp) {
+        $http.put("/members/api/member/"+id, { paid: moment().format("YYYY-MM-DD kk:mm:ss") }).then(function(response) {
            $scope.updateMember(id);
-
            notySuccess("Maksupäivämäärä päivitetty.");
        });
    };
@@ -213,7 +212,7 @@ app.controller("getController", function($scope, $document, $http, $window, $loc
 app.controller("postController", function($scope, $http, $location) {
 	$scope.member = {};
 	$scope.send = function() {
-		$http.post("/members/api/member/", $scope.member).then(function(data){
+		$http.post("/members/api/member/", $scope.member).then(function(response){
            notySuccess("Jäsen lisätty!");
 			$location.path("/list");
 		});
@@ -221,7 +220,7 @@ app.controller("postController", function($scope, $http, $location) {
 });

 /* Controller for application page */
-app.controller("applController", function($scope, $http, $route, $routeParams, $window, $location){
+app.controller("applController", function($scope, $http){
 	$scope.applUpdateAll = function() {
 		$http.get("/members/api/requests").then(function(response){
 			$scope.applications = response.data;
@@ -236,7 +235,7 @@ app.controller("applController", function($scope, $http, $route, $routeParams, $
 	$scope.sendAppl = function(id) {
 		$http.post("/members/api/request/" + id).then(
 			function(response) {
-			    notySuccess("Hakemus hyväksytty");
+                notySuccess("Hakemus hyväksytty");
 				$scope.applUpdateAll();
 			},
 			function(response) {
@@ -6,8 +6,6 @@
 	<meta name="description" content="uli uli">
 	<meta name="author" content="veedeeämkoo">

-	<title>Jäseneksi Aalto-yliopiston Sähköinsinöörikiltaan</title>
-
 	<!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
 	<script src = "https://ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script>
 	<link href = "https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.css" rel = "stylesheet">
@@ -24,6 +22,11 @@
    <script src="/static/js/angular-recaptcha.js"></script>
 </head>
 <body>
+	<!-- include finnish form and then button for changing the language -->
+	<div ng-include="">
+
+	</div>
+	<title>Jäseneksi Aalto-yliopiston Sähköinsinöörikiltaan</title>
 	<h3>Killan jäseneksi liittyminen on helppoa ja hauskaa!</h3>
 	<h3>Täytä vain alla oleva lomake</h3>
 	<h4>Muista myös maksaa jäsenmaksusi!</h4>
@@ -78,7 +81,7 @@
 	            ></div>
 			</div>
 			<div class="col-xs-10 col-xs-offset-1">
-				<button ng-click="applicationForm.$valid && send()" type="submit" class="btn btn-success" id="sendmember">Tallenna</button>
+				<button ng-click="applicationForm.$valid && send()" type="submit" class="btn btn-success" id="sendmember">Liity</button>
 			</div>
 		</form>
 	</div>
@@ -15,3 +15,4 @@ qrcode==5.3
 Pillow==3.3.1
 requests==2.11.1
 django-nocaptcha-recaptcha==0.0.19
+django-cors-headers==2.0.1
@@ -39,6 +39,7 @@ INSTALLED_APPS = [
    'django.contrib.sessions',
    'django.contrib.messages',
    'django.contrib.staticfiles',
+    'corsheaders',
    'webapp',
    'members',
    'infoscreen',
@@ -47,6 +48,7 @@ INSTALLED_APPS = [
 MIDDLEWARE_CLASSES = [
    'django.middleware.security.SecurityMiddleware',
    'django.contrib.sessions.middleware.SessionMiddleware',
+    'corsheaders.middleware.CorsMiddleware',
    'django.middleware.common.CommonMiddleware',
    'django.middleware.csrf.CsrfViewMiddleware',
    'django.contrib.auth.middleware.AuthenticationMiddleware',
@@ -54,6 +56,7 @@ MIDDLEWARE_CLASSES = [
    'django.contrib.messages.middleware.MessageMiddleware',
    'django.middleware.clickjacking.XFrameOptionsMiddleware',
 ]
+CORS_ORIGIN_ALLOW_ALL = True   

 ROOT_URLCONF = 'sikweb.urls'

@@ -137,7 +140,7 @@ LOGPATH = "logs/debug.log"

 LANGUAGE_CODE = 'en-us'

-TIME_ZONE = 'UTC'
+TIME_ZONE = 'Europe/Helsinki'

 USE_I18N = True

@@ -46,6 +46,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 createCoffeeItem
 from infoscreen.views import create_rotation
 from infoscreen.views import delete_rotation
 from infoscreen.views import CurrentHSLView
@@ -90,6 +91,7 @@ urlpatterns = [
    url(r'^infoscreen/create_abbitem$', createABBItem),
    url(r'^infoscreen/create_sossoitem$', createSossoItem),
    url(r'^infoscreen/create_hslitem$', createHslItem),
+    url(r'^infoscreen/create_coffeeitem$', createCoffeeItem),
    url(r'^infoscreen/admin$', infoscreen_admin),
    url(r'^infoscreen/create_rotation$', create_rotation),
    url(r'^infoscreen/delete_rotation/(?P<id>\d+)$', delete_rotation),