THEPortatCERN · benkrikler · Oct 4, 2020 · Oct 4, 2020 · Oct 4, 2020 · Oct 4, 2020
diff --git a/.gitignore b/.gitignore
@@ -6,3 +6,4 @@ env
 /humanitarian_feedback/mediafiles/
 .env.*
 .env
+.*.sw[op]
diff --git a/humanitarian_feedback/dashboard_flexmonster/__init__.py b/humanitarian_feedback/dashboard_flexmonster/__init__.py
diff --git a/humanitarian_feedback/dashboard_flexmonster/admin.py b/humanitarian_feedback/dashboard_flexmonster/admin.py
@@ -0,0 +1,3 @@
+from django.contrib import admin
+
+# Register your models here.
diff --git a/humanitarian_feedback/dashboard_flexmonster/apps.py b/humanitarian_feedback/dashboard_flexmonster/apps.py
@@ -0,0 +1,5 @@
+from django.apps import AppConfig
+
+
+class DashboardFlexmonsterConfig(AppConfig):
+    name = 'dashboard_flexmonster'
diff --git a/humanitarian_feedback/dashboard_flexmonster/migrations/__init__.py b/humanitarian_feedback/dashboard_flexmonster/migrations/__init__.py
diff --git a/humanitarian_feedback/dashboard_flexmonster/models.py b/humanitarian_feedback/dashboard_flexmonster/models.py
@@ -0,0 +1,3 @@
+from django.db import models
+
+# Create your models here.
diff --git a/humanitarian_feedback/dashboard_flexmonster/templates/dashboard_with_pivot.html b/humanitarian_feedback/dashboard_flexmonster/templates/dashboard_with_pivot.html
@@ -0,0 +1,60 @@
+<head>
+  <meta charset="UTF-8">
+  <title>Dashboard with Flexmonster</title>
+  <script src="https://cdn.flexmonster.com/flexmonster.js"></script>
+  <script src="https://code.jquery.com/jquery-3.3.1.min.js"></script>
+  <link rel="stylesheet" href="https://cdn.flexmonster.com/demo.css">
+</head>
+<body>
+<!-- TODO: Somehow I need to pass pivot_data url / function the survey_id parameter -->
+<div id="pivot-table-container" data-url="{% url 'pivot_data' survey_id=4%}"></div>
+<div id="pivot-chart-container"></div>
+<script type="text/javascript">
+function processData(dataset) {
+    var result = []
+    dataset = JSON.parse(dataset);
+    dataset.forEach(item => result.push(item.fields));
+    return result;
+}
+$.ajax({
+    url: $("#pivot-table-container").attr("data-url"),
+    dataType: 'json',
+    success: function(data) {
+        new Flexmonster({
+            container: "#pivot-table-container",
+            componentFolder: "https://cdn.flexmonster.com/",
+            width: "100%",
+            height: 430,
+            toolbar: true,
+            report: {
+                dataSource: {
+                    type: "json",
+                    data: processData(data)
+                },
+                slice: {}
+            }
+        });
+        new Flexmonster({
+            container: "#pivot-chart-container",
+            componentFolder: "https://cdn.flexmonster.com/",
+            width: "100%",
+            height: 430,
+            //toolbar: true,
+            report: {
+                dataSource: {
+                    type: "json",
+                    data: processData(data)
+                },
+                slice: {},
+                "options": {
+                    "viewType": "charts",
+                    "chart": {
+                        "type": "pie"
+                    }
+                }
+            }
+        });
+    }
+});
+</script>
+</body>
diff --git a/humanitarian_feedback/dashboard_flexmonster/tests.py b/humanitarian_feedback/dashboard_flexmonster/tests.py
@@ -0,0 +1,3 @@
+from django.test import TestCase
+
+# Create your tests here.
diff --git a/humanitarian_feedback/dashboard_flexmonster/urls.py b/humanitarian_feedback/dashboard_flexmonster/urls.py
@@ -0,0 +1,7 @@
+from django.conf.urls import url
+from django.urls import path
+from . import views
+
+urlpatterns = [path('', views.dashboard_with_pivot, name='dashboard_with_pivot'),
+               path('data/', views.pivot_data, name='pivot_data', ),
+              ]
diff --git a/humanitarian_feedback/dashboard_flexmonster/views.py b/humanitarian_feedback/dashboard_flexmonster/views.py
@@ -0,0 +1,25 @@
+from django.http import JsonResponse
+from django.shortcuts import render
+#from dashboard_flexmonster.models import Order
+from django.core import serializers
+
+
+from sms_auto_surveys.models import Survey
+
+
+def dashboard_with_pivot(request, survey_id):
+    return render(request, 'dashboard_with_pivot.html', {})
+
+
+def pivot_data(request, survey_id):
+    print("BEK", survey_id)
+	# DONE: BEK change this line to get data from our survey models
+    # dataset = Order.objects.all()
+
+    # TODO: add the survey_id as a parameter of the request
+    #survey_id = 4
+    survey = Survey.objects.get(id=survey_id)
+    dataset = [response for response in survey.responses]
+
+    data = serializers.serialize('json', dataset)
+    return JsonResponse(data, safe=False)
diff --git a/humanitarian_feedback/humanitarian_feedback/settings.py b/humanitarian_feedback/humanitarian_feedback/settings.py
@@ -49,6 +49,7 @@
     # Local Apps
     'users',
     'sms_auto_surveys',
+    'dashboard_flexmonster',
 ]
 
 MIDDLEWARE = [

diff --git a/humanitarian_feedback/sms_auto_surveys/urls.py b/humanitarian_feedback/sms_auto_surveys/urls.py
@@ -1,4 +1,4 @@
-from django.conf.urls import url
+from django.conf.urls import include, url
 from django.views.decorators.csrf import csrf_exempt
 from django.contrib.auth.decorators import login_required
 
@@ -46,4 +46,7 @@
         name='csv_download'),
 
     url(r"^set-questions/", login_required(SetQuestionsView.as_view()), name="set_questions"),
+
+    # Analytics dashboard
+    url(r'survey/(?P<survey_id>\d+)/dashboard/', include('dashboard_flexmonster.urls')),
 ]
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,3 +6,4 @@ env @@
     /humanitarian_feedback/mediafiles/
     .env.*
     .env
+    .*.sw[op]
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		from django.contrib import admin

		# Register your models here.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		from django.db import models

		# Create your models here.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		from django.test import TestCase

		# Create your tests here.