improved dashboard looks, changed url path structure for dashboards and curate sites in general, changed fa icons for curate, changed model return to python 3

Author: Paul Boes

conf/settings/base.py

@@ -139,7 +139,8 @@
 CONTROLCENTER_CHARTIST_COLORS = 'material'
 
 STATIC_URL = '/static/'
-LOGIN_REDIRECT_URL = '/profile'
+LOGIN_REDIRECT_URL = '/curate/dashboard/1'
+LOGIN_URL = '/login'
 
 LOGGING = {
     'version': 1,

conf/settings/local.py

@@ -33,8 +33,8 @@
                          'PORT': ''}}
 
 
-# STATICFILES_DIRS += [
-#     os.path.join(BASE_DIR, "static"),
-# ]
+STATICFILES_DIRS += [
+    os.path.join(BASE_DIR, "static"),
+]
 
-STATIC_ROOT = os.path.join(BASE_DIR, 'static/')
+# STATIC_ROOT = os.path.join(BASE_DIR, 'static/')

conf/urls.py

@@ -23,9 +23,10 @@
     url(r'^', include('django.contrib.auth.urls')),
     url(r'^captcha/', include('captcha.urls')),
     url(r'^admin/', include(admin.site.urls)),
-    url(r'^admin/dashboard/', include(controlcenter.urls)),
+    #url(r'^admin/dashboard/', include(controlcenter.urls)),
     # url(r'^admin/dashboard/(?P<query_pk>\d+)/', include(controlcenter.urls)),
     url(r'^curate/', include('curate.urls',namespace="curate")),
+    url(r'^curate/dashboard/', include(controlcenter.urls)),
     url(r'^explore/', include('explore.urls',namespace="explore")),
     url(r'^', include('homepage.urls', namespace='homepage')),
     url(r'^misc/', include('misc.urls', namespace='misc')),

controlcenter/dashboards.py

@@ -13,6 +13,7 @@
 
 class Dashboard(six.with_metaclass(MediaDefiningClass, BaseModel)):
     pk = None
+    customer_key = None
     widgets = ()
 
     class Media:
@@ -35,9 +36,13 @@ class Media:
     def __init__(self, pk):
         super(Dashboard, self).__init__()
         self.pk = self.id = pk
+        
+
+    def add_customer_key(self, customer_key):
+        self.customer_key = customer_key
 
     def get_absolute_url(self):
-        return reverse('controlcenter:dashboard', kwargs={'pk': self.pk})
+        return reverse('curate:controlcenter_with_key:dashboard', kwargs={'pk': self.pk, 'customer_key':self.customer_key})#
 
     def get_widgets(self, request, **options):
         # TODO: permission check

controlcenter/static/controlcenter/css/all.css

@@ -1,7 +1,7 @@
 .controlcenter {
-  line-height: 1.4;
+/*  line-height: 1.4;
   font-size: 12px;
-  color: #333;
+  color: #333;*/
   width: 100%;
 }
 
@@ -40,7 +40,7 @@
   background-color: #f2f2f2;
   background-repeat: repeat-x, repeat;
   background-size: auto 35px, auto;
-  background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAABGCAAAAAAoI6GBAAAAOElEQVR4ATWNhQEAMAjDoP/fO3cJkwrmTU1dprmfX/TLwfefA6J2xWEfh4wJ1NJLLTtuNbuYEpUWQ5QZZ928F4cAAAAASUVORK5CYII="), url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAAAAADFHGIkAAAAQElEQVR4AXXIOQHAAACEMPzbxMEp6NafjMG7XYiXeImXeImXeImXeImXeImXeImX+BE/4kf8iB/xI37Ej/gRvwPQEA5XmMlaIAAAAABJRU5ErkJggg==");
+  /*background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAABGCAAAAAAoI6GBAAAAOElEQVR4ATWNhQEAMAjDoP/fO3cJkwrmTU1dprmfX/TLwfefA6J2xWEfh4wJ1NJLLTtuNbuYEpUWQ5QZZ928F4cAAAAASUVORK5CYII="), url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAAAAADFHGIkAAAAQElEQVR4AXXIOQHAAACEMPzbxMEp6NafjMG7XYiXeImXeImXeImXeImXeImXeImX+BE/4kf8iB/xI37Ej/gRvwPQEA5XmMlaIAAAAABJRU5ErkJggg==");*/
 }
 
 .controlcenter__widget__tab {
@@ -56,7 +56,7 @@
   position: relative;
   cursor: pointer;
   text-transform: uppercase;
-  font-size: 11px;
+  font-size: 13px;
   font-weight: bold;
   color: #aaa;
 }
@@ -128,7 +128,7 @@
   background: #f2f2f2;
   line-height: 26px;
   padding: 0 15px;
-  font-size: 12px;
+  font-size: 14px;
   margin-right: -1px;
 }
 
@@ -307,15 +307,17 @@
   }
 
   .controlcenter__masonry__block--w2 {
-    width: 33.333333333333336%;
+    width: 33%;
+    /*.333333333333336%;*/
   }
 
   .controlcenter__masonry__block--w3 {
     width: 50%;
   }
 
   .controlcenter__masonry__block--w4 {
-    width: 66.66666666666667%;
+    width: 66%;
+    /*.66666666666667%;*/
   }
 
   .controlcenter__masonry__block--w5 {

controlcenter/templates/controlcenter/dashboard.html

@@ -7,7 +7,7 @@
     {{ dashboard.media }}
 {% endblock %}
 {% block content %}
-<div class="controlcenter" id="{{ dashboard.slug }}">
+<div class="controlcenter dashwidth" id="{{ dashboard.slug }}">
     {% if dashboards|length > 1 %}
         <nav class="controlcenter__nav">
             {% for item in dashboards %}

controlcenter/templates/controlcenter/widgets/itemlist.html

@@ -16,7 +16,7 @@
     <tbody class="controlcenter__table__tbody">
         {% for obj in widget.values %}
             <tr class="controlcenter__table__tr">
-                {% change_url widget obj as url %}
+               {% change_url widget obj as url %}
                 {% for attr in widget.list_display %}
                     <td class="controlcenter__table__td controlcenter__table__td--{% if attr == sharp %}row-counter{% else %}{{ attr }}{% endif %}">
                         {% if attr == sharp %}

controlcenter/views.py

@@ -1,16 +1,23 @@
 from django.conf.urls import url
 from django.contrib import admin
 from django.contrib.admin.views.decorators import staff_member_required
+from django.contrib.auth.decorators import user_passes_test
 from django.core.exceptions import ImproperlyConfigured
 from django.http import Http404
 from django.utils.decorators import method_decorator
 from django.utils.module_loading import import_string
 from django.views.generic.base import TemplateView
+from django.contrib.auth.mixins import UserPassesTestMixin
+from django.contrib.auth.mixins import LoginRequiredMixin
+from django.shortcuts import redirect, render
+from django.contrib.auth.decorators import login_required
 
+from scope.models import UserProfile
 from . import app_settings
 
 
 class ControlCenter(object):
+
     def __init__(self, view_class):
         self.view_class = view_class
 
@@ -35,29 +42,70 @@ def get_urls(self):
     def urls(self):
         return self.get_urls(), 'controlcenter', 'controlcenter'
 
+    @property
+    def urls_with_key(self):
+        return self.get_urls(), 'controlcenter_with_key', 'controlcenter_with_key'
+
+
+
+# def user_corresponds_to_customer_key(user):
+#     user_profile = UserProfile.objects.get(user=request.user)
+#     return customer_key == user_profile.customer.customer_key:
+#     pass
+
+
+class DashboardView(LoginRequiredMixin, TemplateView): #UserPassesTestMixin,
 
-class DashboardView(TemplateView):
     dashboards = NotImplemented
     template_name = 'controlcenter/dashboard.html'
+    # def determine_login_path(self):
+    #     return redirect('/login/?next=%s' % self.request.path)
+
+    # login_url = 
+    # @method_decorator(staff_member_required)
+    # def test_func(self):
+    #     try:
+    #         user_profile = UserProfile.objects.get(user=self.request.user)
+    #         customer_key = self.kwargs['customer_key']
+    #         return customer_key == user_profile.customer.customer_key
+    #     except:
+    #         return False
 
-    @method_decorator(staff_member_required)
     def dispatch(self, *args, **kwargs):
         return super(DashboardView, self).dispatch(*args, **kwargs)
 
     def get(self, request, *args, **kwargs):
         pk = int(self.kwargs['pk'])
+        if self.request.user.is_superuser:
+            try:
+                customer_key = self.kwargs['customer_key']
+            except:
+                return redirect('/admin')
+        else:
+            user_profile = UserProfile.objects.get(user=self.request.user)
+            customer_key = user_profile.customer.customer_key
+
+        for dashboard in self.dashboards:
+                dashboard.add_customer_key(customer_key)
         try:
             self.dashboard = self.dashboards[pk]
         except IndexError:
             raise Http404('Dashboard not found.')
         return super(DashboardView, self).get(request, *args, **kwargs)
 
     def get_context_data(self, **kwargs):
+        if self.request.user.is_superuser:
+            customer_key = self.kwargs['customer_key']
+        else: 
+            user_profile = UserProfile.objects.get(user=self.request.user)
+            customer_key = user_profile.customer.customer_key
+        options = {'customer_key': customer_key}
         context = {
+            'customer_key': customer_key,
             'title': self.dashboard.title,
             'dashboard': self.dashboard,
             'dashboards': self.dashboards,
-            'groups': self.dashboard.get_widgets(self.request),
+            'groups': self.dashboard.get_widgets(self.request, **options),
             'sharp': app_settings.SHARP,
         }
 

curate/convenience/functions.py

@@ -30,7 +30,7 @@ def create_customer_from_config_file(customer_key):
 
     # Create Curate Customer
     curate_customer, created_customer = Curate_Customer.objects.get_or_create(
-        customer=customer, expires=date.today())
+        customer=customer, default={'expires':date.today()})
 
     # Create curate_query
     query = Curate_Query(

curate/methods/curate_process.py

@@ -4,6 +4,7 @@
 from scope.methods.semantics import document_embedding
 from scope.methods.graphs import clustering_methods
 import scope.methods.dataprovider.provider as provider
+from scope.methods.semantics import summarizer
 
 from scope.models import Customer
 
@@ -99,18 +100,29 @@ def _produce_cluster_dict(self, labels):
         return articles_dict
 
     def produce_and_save_clusters(self, labels):
+        words, rep = self.produce_keywords_and_summaries(labels)
         articles_dict = self._produce_cluster_dict(labels)
         counter = 1
         for key in articles_dict:
-            cluster = Curate_Query_Cluster(rank=counter, center=key)
-            cluster.save()
+            cluster, created = Curate_Query_Cluster.objects.get_or_create(rank=counter, center=key, defaults={'keywords':words[counter-1], 'summary':rep[counter-1]})
+            cluster.cluster_articles.clear()
             for instance in articles_dict[key]:
                 cluster.cluster_articles.add(instance)
             cluster.save()
             counter += 1
         self.query.no_clusters = counter
         self.query.save()
 
+    def produce_keywords_and_summaries(self, cluster_articles):
+        nlp = spacy.load(self.language)
+        representative_model = summarizer.Summarizer(self.language, nlp)
+
+        summary_max_len_words = 40
+
+        words = representative_model.get_keywords(cluster_articles)
+        rep = representative_model.text_rank(cluster_articles, max_size=summary_max_len_words)
+        return words, rep
+
     def _process(self, filtered_articles):
 
         # filtered_articles = remove_duplicate_articles_for_processing(filtered_articles)
@@ -125,7 +137,7 @@ def _process(self, filtered_articles):
 
             print([a.title for a in selected_articles])
 
-            # you can generate the dict at this point actually.
+         #you can generate the dict at this point actually.
             self.produce_and_save_clusters(cluster_articles)
         else:
             selected_articles = []

curate/migrations/0025_auto_20170601_1922.py

@@ -0,0 +1,35 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.1 on 2017-06-01 19:22
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('curate', '0024_auto_20170522_2054'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='curate_customer_selection',
+            name='color',
+            field=models.CharField(default='#fff', max_length=100),
+        ),
+        migrations.AlterField(
+            model_name='curate_customer_selection',
+            name='kind',
+            field=models.CharField(choices=[('sel', 'selection'), ('mis', 'mistake'), ('oth', 'other')], default='sel', max_length=3),
+        ),
+        migrations.AlterField(
+            model_name='curate_query_cluster',
+            name='summary',
+            field=models.CharField(max_length=500),
+        ),
+        migrations.AlterField(
+            model_name='curate_rejection_reasons',
+            name='kind',
+            field=models.CharField(choices=[('sou', 'bad source'), ('con', 'bad content'), ('frq', 'too frequent'), ('oth', 'other')], default='con', max_length=3),
+        ),
+    ]

curate/models.py

@@ -11,10 +11,9 @@ class Curate_Customer(models.Model):
     expires = models.DateField(blank=True)
     bad_source = models.ManyToManyField(Source, blank=True)
 
-    def __unicode__(self):              # __unicode__ on Python 2
+    def __str__(self):           
         return self.customer.name
 
-
 class Curate_Customer_Selection(models.Model):
     curate_customer = models.ForeignKey(Curate_Customer)
     kind = models.CharField(max_length=3, choices=(
@@ -25,7 +24,7 @@ class Curate_Customer_Selection(models.Model):
         )
     name = models.CharField(max_length=100)
     color = models.CharField(max_length=100, default="#fff")
-    def __unicode__(self):              # __unicode__ on Python 2
+    def __str__(self):              # __str__ on Python 2
         return self.name + ', ' + self.curate_customer.customer.name
 
     def human_readable_name(self):
@@ -42,7 +41,7 @@ class Curate_Rejection_Reasons(models.Model):
         ), default="con"
         )
     current_members = models.ManyToManyField('Article_Curate_Query', blank=True)
-    def __unicode__(self):              # __unicode__ on Python 2
+    def __str__(self):              # __str__ on Python 2
         return self.name + ', ' + self.selection.name + ', ' + self.selection.curate_customer.customer.name
     def human_readable_name(self):
         return self.name.replace('_', ' ')
@@ -56,7 +55,7 @@ class Curate_Query(models.Model):
     no_clusters = models.IntegerField(null=True, blank=True)
     selection_made = models.BooleanField(default=False)
 
-    def __unicode__(self):              # __unicode__ on Python 2
+    def __str__(self):              # __str__ on Python 2
         return self.time_stamp.isoformat() + ', ' + self.curate_customer.customer.name
 
     def selected_articles(self):
@@ -75,15 +74,15 @@ class Article_Curate_Query(models.Model):
     agent = models.ForeignKey(Agent, null=True, blank=True)
     newsletter =  models.ForeignKey(Newsletter, null=True, blank=True)
     bad_article = models.BooleanField(default=False)
-    def __unicode__(self):              # __unicode__ on Python 2
+    def __str__(self):              # __str__ on Python 2
         return self.article.title + ', ' + self.curate_query.time_stamp.isoformat() + ', ' + self.curate_query.curate_customer.customer.name
 
 class Curate_Query_Cluster(models.Model):
     rank = models.IntegerField(null=True, blank=True)
     center = models.ForeignKey(Article_Curate_Query)
     cluster_articles = models.ManyToManyField(Article_Curate_Query, blank=True, related_name='cluster_articles')
     keywords = models.CharField(max_length=50)
-    summary = models.CharField(max_length=300)
+    summary = models.CharField(max_length=500)