From 386b06695f12b70e96ced4a3d615fe91f85cc0d9 Mon Sep 17 00:00:00 2001
From: Felipe Bormann <felipe.bormann@gmail.com>
Date: Tue, 16 May 2017 19:21:17 -0300
Subject: [PATCH] added category selector for admin and coordinators inside categories_dashboard page

---
 dashboards/static/.sass-cache/ca9fbb140c72645dd684674b13e9ea087dfd18ab/dashboards_category.sassc            | Bin 0 -> 3174 bytes
 dashboards/static/dashboards/.sass-cache/d1f4112ca6d0e14bdf64d22b0b14a2322f24cc83/dashboards_category.sassc | Bin 0 -> 5122 bytes
 dashboards/static/dashboards/css/dashboards_category.css                                                    | 17 +++++++++++++++++
 dashboards/static/dashboards/css/dashboards_category.css.map                                                |  7 +++++++
 dashboards/static/dashboards/css/dashboards_category.sass                                                   | 15 +++++++++++++++
 dashboards/static/dashboards/js/behavior_categories.js                                                      |  0
 dashboards/templates/dashboards/category.html                                                               | 18 ++++++++++++------
 dashboards/templates/dashboards/general.html                                                                |  2 +-
 dashboards/urls.py                                                                                          |  2 +-
 dashboards/views.py                                                                                         | 15 +++++++++++++--
 10 files changed, 66 insertions(+), 10 deletions(-)
 create mode 100644 dashboards/static/.sass-cache/ca9fbb140c72645dd684674b13e9ea087dfd18ab/dashboards_category.sassc
 create mode 100644 dashboards/static/dashboards/.sass-cache/d1f4112ca6d0e14bdf64d22b0b14a2322f24cc83/dashboards_category.sassc
 create mode 100644 dashboards/static/dashboards/css/dashboards_category.css
 create mode 100644 dashboards/static/dashboards/css/dashboards_category.css.map
 create mode 100644 dashboards/static/dashboards/css/dashboards_category.sass
 create mode 100644 dashboards/static/dashboards/js/behavior_categories.js

diff --git a/dashboards/static/.sass-cache/ca9fbb140c72645dd684674b13e9ea087dfd18ab/dashboards_category.sassc b/dashboards/static/.sass-cache/ca9fbb140c72645dd684674b13e9ea087dfd18ab/dashboards_category.sassc
new file mode 100644
index 0000000..79b14b7
Binary files /dev/null and b/dashboards/static/.sass-cache/ca9fbb140c72645dd684674b13e9ea087dfd18ab/dashboards_category.sassc differ
diff --git a/dashboards/static/dashboards/.sass-cache/d1f4112ca6d0e14bdf64d22b0b14a2322f24cc83/dashboards_category.sassc b/dashboards/static/dashboards/.sass-cache/d1f4112ca6d0e14bdf64d22b0b14a2322f24cc83/dashboards_category.sassc
new file mode 100644
index 0000000..a4e0da3
Binary files /dev/null and b/dashboards/static/dashboards/.sass-cache/d1f4112ca6d0e14bdf64d22b0b14a2322f24cc83/dashboards_category.sassc differ
diff --git a/dashboards/static/dashboards/css/dashboards_category.css b/dashboards/static/dashboards/css/dashboards_category.css
new file mode 100644
index 0000000..0558fa8
--- /dev/null
+++ b/dashboards/static/dashboards/css/dashboards_category.css
@@ -0,0 +1,17 @@
+#category-selector {
+  background: transparent;
+  font-size: 1.5em;
+  font-weight: 700;
+  color: #5b8583;
+  border: none;
+  border-right: 2px solid;
+  border-left: 2px solid; }
+
+#category-selector option {
+  background: #ffffff;
+  color: #5b8583; }
+
+#category-selector option:hover {
+  background: red; }
+
+/*# sourceMappingURL=dashboards_category.css.map */
diff --git a/dashboards/static/dashboards/css/dashboards_category.css.map b/dashboards/static/dashboards/css/dashboards_category.css.map
new file mode 100644
index 0000000..7e5989c
--- /dev/null
+++ b/dashboards/static/dashboards/css/dashboards_category.css.map
@@ -0,0 +1,7 @@
+{
+"version": 3,
+"mappings": "AAAA,kBAAkB;EACjB,UAAU,EAAE,WAAW;EACvB,SAAS,EAAE,KAAK;EAChB,WAAW,EAAE,GAAG;EAChB,KAAK,EAAE,OAAO;EACd,MAAM,EAAE,IAAI;EACZ,YAAY,EAAE,SAAS;EACvB,WAAW,EAAE,SAAS;;AAEvB,yBAAyB;EACxB,UAAU,EAAE,OAAO;EACnB,KAAK,EAAE,OAAO;;AAEf,+BAA+B;EAC9B,UAAU,EAAE,GAAG",
+"sources": ["dashboards_category.sass"],
+"names": [],
+"file": "dashboards_category.css"
+}
\ No newline at end of file
diff --git a/dashboards/static/dashboards/css/dashboards_category.sass b/dashboards/static/dashboards/css/dashboards_category.sass
new file mode 100644
index 0000000..a02c9ee
--- /dev/null
+++ b/dashboards/static/dashboards/css/dashboards_category.sass
@@ -0,0 +1,15 @@
+#category-selector
+	background: transparent
+	font-size: 1.5em
+	font-weight: 700
+	color: #5b8583
+	border: none
+	border-right: 2px solid
+	border-left: 2px solid
+
+#category-selector option
+	background: #ffffff
+	color: #5b8583
+
+#category-selector option:hover
+	background: red
\ No newline at end of file
diff --git a/dashboards/static/dashboards/js/behavior_categories.js b/dashboards/static/dashboards/js/behavior_categories.js
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/dashboards/static/dashboards/js/behavior_categories.js
diff --git a/dashboards/templates/dashboards/category.html b/dashboards/templates/dashboards/category.html
index b2b4ee2..2b33bf3 100644
--- a/dashboards/templates/dashboards/category.html
+++ b/dashboards/templates/dashboards/category.html
@@ -4,11 +4,11 @@
 {% load django_bootstrap_breadcrumbs %}
 {% block style %}
     <link rel="stylesheet" type="text/css" href="{% static 'analytics/general.css' %}">  
+    <link rel="stylesheet" type="text/css" href="{% static 'dashboards/css/dashboards_category.css' %}">
 {% endblock style %}
 
 {% block javascript %}
     <script type="text/javascript" src="{% static "analytics/js/charts.js" %}"></script>
-    <script type="text/javascript" src=" {% static "dashboards/js/behavior.js" %} "></script>
 {% endblock javascript %}
 
 {% block breadcrumbs %}
@@ -24,11 +24,13 @@
 	 <section id="core-subjects-options-div">
         <nav>
             <ul class="core-subjects-options report-menu-choice">
-              
-                    <li>
+                    {% if user.is_staff %}
+                          <a href="{% url 'dashboards:view_general' %}"><li>
                         {% trans "Platform Report" %}
-                    </li>
-                   <a href="{% url 'dashboards:' %}"><li class="active">
+                            </li></a>
+                    {% endif %}
+                  
+                   <a href="{% url 'dashboards:view_categories' %}"><li class="active">
                         {% trans "Category Report" %}
                     </li></a> 
                     <li>
@@ -42,7 +44,11 @@
     <section id="general-report">
         <header id="general-report-header">
             <h3>{{category.name}} {% trans "Category Report" %}</h3>
-
+            <select id="category-selector">
+                {% for category in categories %}
+                    <option>{{category.name}}</option>
+                {% endfor %}
+            </select>
             <ul id="report-header-options">
                 <li  class="selected">
                     {% trans "Focus" %}
diff --git a/dashboards/templates/dashboards/general.html b/dashboards/templates/dashboards/general.html
index 6e10e59..3ca3d9b 100644
--- a/dashboards/templates/dashboards/general.html
+++ b/dashboards/templates/dashboards/general.html
@@ -29,7 +29,7 @@
                     <li class="active">
                         {% trans "Platform Report" %}
                     </li>
-                   <a href=""><li>
+                   <a href="{% url 'dashboards:view_categories' %}"><li>
                         {% trans "Category Report" %}
                     </li></a> 
                     <li>
diff --git a/dashboards/urls.py b/dashboards/urls.py
index 3dabf9c..1ea612e 100644
--- a/dashboards/urls.py
+++ b/dashboards/urls.py
@@ -4,5 +4,5 @@ from . import views
 
 urlpatterns = [
 	url(r'^general/$', views.GeneralView.as_view(), name='view_general'),
-	
+	url(r'^categories/$', views.CategoryView.as_view(), name='view_categories'),
 ]
\ No newline at end of file
diff --git a/dashboards/views.py b/dashboards/views.py
index 7f86680..381049c 100644
--- a/dashboards/views.py
+++ b/dashboards/views.py
@@ -17,6 +17,8 @@ from datetime import date, timedelta, datetime
 import calendar
 from collections import OrderedDict
 
+from categories.models import Category
+
 
 class GeneralView(generic.TemplateView):
     template_name = "dashboards/general.html"
@@ -24,7 +26,7 @@ class GeneralView(generic.TemplateView):
     def dispatch(self, request, *args, **kwargs):
        
         if not request.user.is_staff:
-            return redirect('analytics:view_category_data')
+            return redirect('dashboards:view_categories')
         return super(GeneralView, self).dispatch(request, *args, **kwargs)
 
 
@@ -44,5 +46,14 @@ class CategoryView(generic.TemplateView):
 
     def get_context_data(self, **kwargs):
         context = {}
+
+        context['categories'] = self.categories_associated_with_user(self.request.user)
         
-        return context
\ No newline at end of file
+        return context
+
+    def categories_associated_with_user(self, user):
+        if user.is_staff:
+            categories = Category.objects.all()
+        else:
+            categories = Category.objects.filter(coordinators__in = [user])
+        return categories
\ No newline at end of file
--
libgit2 0.21.2