From 5e6b4153e66520cfbc0810c394320a0f8236d352 Mon Sep 17 00:00:00 2001
From: Lavikainen Joel <joel.lavikainen@aalto.fi>
Date: Sun, 19 Nov 2017 17:40:04 +0200
Subject: [PATCH] Add data endpoint and create infoscreen view for coffee stats

---
 infoscreen/admin.py                           |  2 ++
 .../migrations/0007_coffeestatsinfoitem.py    | 23 +++++++++++++++++++
 infoscreen/models.py                          | 15 ++++++++++++
 infoscreen/static/html/coffee_stats.html      |  9 ++++++++
 .../static/html/coffee_stats_create.html      | 11 +++++++++
 infoscreen/static/js/infoadmin_controllers.js |  1 +
 .../static/js/infoscreen_controllers.js       | 16 ++++++++++++-
 infoscreen/urls.py                            |  4 ++++
 infoscreen/views/admin_views.py               |  2 ++
 infoscreen/views/public_views.py              | 15 ++++++++++++
 package.json                                  |  5 +++-
 11 files changed, 101 insertions(+), 2 deletions(-)
 create mode 100644 infoscreen/migrations/0007_coffeestatsinfoitem.py
 create mode 100644 infoscreen/static/html/coffee_stats.html
 create mode 100644 infoscreen/static/html/coffee_stats_create.html

diff --git a/infoscreen/admin.py b/infoscreen/admin.py
index d7b314c..a03205c 100644
--- a/infoscreen/admin.py
+++ b/infoscreen/admin.py
@@ -5,6 +5,7 @@ from infoscreen.models import Rotation, InfoItem, InfoInstance
 from infoscreen.models import ImageInfoItem, ExternalImageInfoItem, ABBInfoItem
 from infoscreen.models import ExternalWebsiteInfoItem
 from infoscreen.models import VideoInfoItem
+from infoscreen.models import CoffeeStatsInfoItem
 
 # Register your models here.
 admin.site.register(Rotation)
@@ -15,3 +16,4 @@ admin.site.register(ABBInfoItem)
 admin.site.register(InfoInstance)
 admin.site.register(ExternalWebsiteInfoItem)
 admin.site.register(VideoInfoItem)
+admin.site.register(CoffeeStatsInfoItem)
diff --git a/infoscreen/migrations/0007_coffeestatsinfoitem.py b/infoscreen/migrations/0007_coffeestatsinfoitem.py
new file mode 100644
index 0000000..c7fb36d
--- /dev/null
+++ b/infoscreen/migrations/0007_coffeestatsinfoitem.py
@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11 on 2017-11-19 14:41
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('infoscreen', '0006_delete_hsldatamodel'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='CoffeeStatsInfoItem',
+            fields=[
+                ('infoitem_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='infoscreen.InfoItem')),
+            ],
+            bases=('infoscreen.infoitem',),
+        ),
+    ]
diff --git a/infoscreen/models.py b/infoscreen/models.py
index ff1613d..6188aa2 100644
--- a/infoscreen/models.py
+++ b/infoscreen/models.py
@@ -269,6 +269,21 @@ class HslInfoItem(InfoItem):
         return "/static/html/hsl_create.html"
 
 
+class CoffeeStatsInfoItem(InfoItem):
+    """Class for Coffee statistics Infoscreen item."""
+
+    display_name = _("Coffee statistics")
+
+    def get_template_url(self):
+        """Return HSL infoitem template url."""
+        return "/static/html/coffee_stats.html"
+
+    @staticmethod
+    def get_create_template_url():
+        """Call create HSL infoitem template url command."""
+        return "/static/html/coffee_stats_create.html"
+
+
 class ExternalImageInfoItem(InfoItem):
     """Class for External Image Infoscreen item."""
 
diff --git a/infoscreen/static/html/coffee_stats.html b/infoscreen/static/html/coffee_stats.html
new file mode 100644
index 0000000..cb95201
--- /dev/null
+++ b/infoscreen/static/html/coffee_stats.html
@@ -0,0 +1,9 @@
+<link rel="stylesheet" href="/static/css/hsl.css">
+<link href="https://fonts.googleapis.com/css?family=Droid+Sans+Mono" rel="stylesheet"> 
+<script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.19.1/locale/fi.js"></script>
+<script type="text/javascript" src="dygraph.js"></script>
+<link rel="stylesheet" src="dygraph.css" /></head>
+
+<div class="container" ng-controller="CoffeeStatsController">
+    <div id="div_g"></div>    
+</div>
diff --git a/infoscreen/static/html/coffee_stats_create.html b/infoscreen/static/html/coffee_stats_create.html
new file mode 100644
index 0000000..3a16e54
--- /dev/null
+++ b/infoscreen/static/html/coffee_stats_create.html
@@ -0,0 +1,11 @@
+<div ng-controller="infoadmin_coffeestatsitem_create" style="margin-top:20px;">
+    <div>
+        Create new item to show coffee statistics. 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>
+<!--maybe later add option to choose data range, daily, monthly...etc.
diff --git a/infoscreen/static/js/infoadmin_controllers.js b/infoscreen/static/js/infoadmin_controllers.js
index c9fa019..7771bf8 100644
--- a/infoscreen/static/js/infoadmin_controllers.js
+++ b/infoscreen/static/js/infoadmin_controllers.js
@@ -186,5 +186,6 @@ var simple_controllers = [
     "hslitem",
     "websiteitem",
     "apyitem",
+    "coffeestatsitem",
 ];
 _.each(simple_controllers, controllerGenerator);
diff --git a/infoscreen/static/js/infoscreen_controllers.js b/infoscreen/static/js/infoscreen_controllers.js
index 543ed65..1cd35a4 100644
--- a/infoscreen/static/js/infoscreen_controllers.js
+++ b/infoscreen/static/js/infoscreen_controllers.js
@@ -142,5 +142,19 @@ app.controller('timetableCtrl',
 
         update_clock();
         load();
+});
+
+app.controller('CoffeeStatsController', function($scope, $http) {
+    function load() {
+        $http.get('/infoscreen/coffee_data')
+            .then(function(response) {
+                const g = new Dygraph(document.getElementById('div_g'), response.data, {
+                    drawPoints: true,
+                    valueRange: [0, 10],
+                    labels: ['Time', 'Cups']
+                });
+            });
     }
-);
+
+    load();
+});
diff --git a/infoscreen/urls.py b/infoscreen/urls.py
index 5a16fe7..6b685e6 100644
--- a/infoscreen/urls.py
+++ b/infoscreen/urls.py
@@ -26,6 +26,8 @@ from infoscreen.views import CurrentHSLView
 from infoscreen.views import createApyItem
 from infoscreen.views import hsl_timetable_settings
 from infoscreen.views import get_apy_json
+from infoscreen.views import createCoffeeStatsItem
+from infoscreen.views import CoffeeStatsView
 
 urlpatterns = [
     url(r'^$', default),
@@ -45,6 +47,7 @@ urlpatterns = [
     url(r'^create_sossoitem$', createSossoItem),
     url(r'^create_eventitem$', createEventItem),
     url(r'^create_hslitem$', createHslItem),
+    url(r'^create_coffeestatsitem$', createCoffeeStatsItem),
     url(r'^create_apyitem$', createApyItem),
     url(r'^create_websiteitem$', createExternalWebsiteItem),
     url(r'^create_rotation$', create_rotation),
@@ -52,5 +55,6 @@ urlpatterns = [
     url(r'^hsl_data$', CurrentHSLView),
     url(r'^hsl_data/settings$', hsl_timetable_settings),
     url(r'^apyjson', get_apy_json),
+    url(r'^coffee_data$', CoffeeStatsView),
 
 ]
diff --git a/infoscreen/views/admin_views.py b/infoscreen/views/admin_views.py
index ff0bab6..411a830 100644
--- a/infoscreen/views/admin_views.py
+++ b/infoscreen/views/admin_views.py
@@ -22,6 +22,7 @@ from infoscreen.models import ExternalWebsiteInfoItem
 from infoscreen.models import ImageUploadForm
 from infoscreen.models import ApyInfoItem
 from infoscreen.models import VideoInfoItem
+from infoscreen.models import CoffeeStatsInfoItem
 
 
 @login_required(login_url='/login')
@@ -188,3 +189,4 @@ createExternalWebsiteItem = create_item_generator(ExternalWebsiteInfoItem)
 createEventItem = create_item_generator(EventInfoItem)
 createApyItem = create_item_generator(ApyInfoItem)
 createVideoItem = create_item_generator(VideoInfoItem)
+createCoffeeStatsItem = create_item_generator(CoffeeStatsInfoItem)
diff --git a/infoscreen/views/public_views.py b/infoscreen/views/public_views.py
index 2ee3e34..4f8dccf 100644
--- a/infoscreen/views/public_views.py
+++ b/infoscreen/views/public_views.py
@@ -2,8 +2,11 @@ from django.shortcuts import render
 from django.http import HttpResponse, JsonResponse, HttpResponseBadRequest
 from django.views.decorators.http import require_http_methods
 from django.conf import settings
+from django.utils import timezone
+from django.db.models.functions import ExtractWeek
 
 from infoscreen.models import Rotation, InfoItem, InfoInstance
+from coffee_scale.models import Brewing
 from infoscreen.hsl_fetcher import fetch as hsl_fetch
 
 import json
@@ -99,3 +102,15 @@ def CurrentHSLView(request, *args, **kwargs):
         return JsonResponse(error, status=200)
 
     return JsonResponse(api_resp, status=200, safe=False)
+
+
+@require_http_methods(["GET"])
+def CoffeeStatsView(request, *args, **kwargs):
+    # stats_data = Brewing.objects.annotate(
+    #     week=ExtractWeek('time')).values('week').get(time__week=timezone.now().isocalendar()[2])
+    # do filtering here based on the data we want to show
+    stats_data = {}
+    for entry in Brewing.objects.all():
+        stats_data[entry.id] = {'cups': entry.cups, 'time': entry.time}
+
+    return JsonResponse(stats_data, status=200, safe=False)
diff --git a/package.json b/package.json
index 1fe48ae..7c2e353 100644
--- a/package.json
+++ b/package.json
@@ -14,11 +14,14 @@
   "author": "SIK ry",
   "license": "ISC",
   "dependencies": {
+    "dygraphs": "^2.0.0",
     "eslint": "3.19.0",
     "remark-cli": "^4.0.0",
     "remark-preset-lint-recommended": "^3.0.1"
   },
   "remarkConfig": {
-    "plugins": ["remark-preset-lint-recommended"]
+    "plugins": [
+      "remark-preset-lint-recommended"
+    ]
   }
 }