distinct amount of views in resources and amount of views in resource is now co…

…rrect, added blank tag as well as removed duplicates from form

distinct amount of views in resources and amount of views in resource is now co…
…rrect, added blank tag as well as removed duplicates from form
fbormann
1 parent af1350ae
Showing 7 changed files with 129 additions and 51 deletions Show diff stats
file_link/views.py
pdf_file/views.py
reports/migrations/0002_reportxls.py
reports/models.py
reports/templates/reports/view.html
reports/urls.py
reports/views.py
@@ -21,7 +21,7 @@ from .models import FileLink
 class DownloadFile(LoginRequiredMixin, LogMixin, generic.DetailView):
 	log_component = 'resources'
 	log_action = 'view'
-	log_resource = 'file_link'
+	log_resource = 'filelink'
 	log_context = {}
 	login_url = reverse_lazy("users:login")
@@ -63,9 +63,9 @@ class DownloadFile(LoginRequiredMixin, LogMixin, generic.DetailView):
 		self.log_context['topic_id'] = file_link.topic.id
 		self.log_context['topic_name'] = file_link.topic.name
 		self.log_context['topic_slug'] = file_link.topic.slug
-		self.log_context['file_link_id'] = file_link.id
-		self.log_context['file_link_name'] = file_link.name
-		self.log_context['file_link_slug'] = file_link.slug
+		self.log_context['filelink_id'] = file_link.id
+		self.log_context['filelink_name'] = file_link.name
+		self.log_context['filelink_slug'] = file_link.slug
 		super(DownloadFile, self).createLog(self.request.user, self.log_component, self.log_action, self.log_resource, self.log_context) 
@@ -74,7 +74,7 @@ class DownloadFile(LoginRequiredMixin, LogMixin, generic.DetailView):
 class CreateView(LoginRequiredMixin, LogMixin, generic.edit.CreateView):
 	log_component = 'resources'
 	log_action = 'create'
-	log_resource = 'file_link'
+	log_resource = 'filelink'
 	log_context = {}
 	login_url = reverse_lazy("users:login")
@@ -163,9 +163,9 @@ class CreateView(LoginRequiredMixin, LogMixin, generic.edit.CreateView):
 		self.log_context['topic_id'] = self.object.topic.id
 		self.log_context['topic_name'] = self.object.topic.name
 		self.log_context['topic_slug'] = self.object.topic.slug
-		self.log_context['file_link_id'] = self.object.id
-		self.log_context['file_link_name'] = self.object.name
-		self.log_context['file_link_slug'] = self.object.slug
+		self.log_context['filelink_id'] = self.object.id
+		self.log_context['filelink_name'] = self.object.name
+		self.log_context['filelink_slug'] = self.object.slug
 		super(CreateView, self).createLog(self.request.user, self.log_component, self.log_action, self.log_resource, self.log_context)
@@ -192,7 +192,7 @@ class CreateView(LoginRequiredMixin, LogMixin, generic.edit.CreateView):
 class UpdateView(LoginRequiredMixin, LogMixin, generic.UpdateView):
 	log_component = 'resources'
 	log_action = 'update'
-	log_resource = 'file_link'
+	log_resource = 'filelink'
 	log_context = {}
 	login_url = reverse_lazy("users:login")
@@ -277,9 +277,9 @@ class UpdateView(LoginRequiredMixin, LogMixin, generic.UpdateView):
 		self.log_context['topic_id'] = self.object.topic.id
 		self.log_context['topic_name'] = self.object.topic.name
 		self.log_context['topic_slug'] = self.object.topic.slug
-		self.log_context['file_link_id'] = self.object.id
-		self.log_context['file_link_name'] = self.object.name
-		self.log_context['file_link_slug'] = self.object.slug
+		self.log_context['filelink_id'] = self.object.id
+		self.log_context['filelink_name'] = self.object.name
+		self.log_context['filelink_slug'] = self.object.slug
 		super(UpdateView, self).createLog(self.request.user, self.log_component, self.log_action, self.log_resource, self.log_context)
@@ -306,7 +306,7 @@ class UpdateView(LoginRequiredMixin, LogMixin, generic.UpdateView):
 class DeleteView(LoginRequiredMixin, LogMixin, generic.DeleteView):
 	log_component = 'resources'
 	log_action = 'delete'
-	log_resource = 'file_link'
+	log_resource = 'filelink'
 	log_context = {}
 	login_url = reverse_lazy("users:login")
@@ -337,9 +337,9 @@ class DeleteView(LoginRequiredMixin, LogMixin, generic.DeleteView):
 		self.log_context['topic_id'] = self.object.topic.id
 		self.log_context['topic_name'] = self.object.topic.name
 		self.log_context['topic_slug'] = self.object.topic.slug
-		self.log_context['file_link_id'] = self.object.id
-		self.log_context['file_link_name'] = self.object.name
-		self.log_context['file_link_slug'] = self.object.slug
+		self.log_context['filelink_id'] = self.object.id
+		self.log_context['filelink_name'] = self.object.name
+		self.log_context['filelink_slug'] = self.object.slug
 		super(DeleteView, self).createLog(self.request.user, self.log_component, self.log_action, self.log_resource, self.log_context)
@@ -23,7 +23,7 @@ class ViewPDFFile(LoginRequiredMixin, LogMixin, generic.TemplateView):
     template_name='pdf_file/view.html'
     log_component = 'resources'
     log_action = 'view'
-    log_resource = 'pdf_file'
+    log_resource = 'pdffile'
     log_context = {}
     def dispatch(self, request, *args, **kwargs):
         slug = self.kwargs.get('slug', '')
@@ -52,9 +52,9 @@ class ViewPDFFile(LoginRequiredMixin, LogMixin, generic.TemplateView):
         self.log_context['topic_id'] = pdf_file.topic.id
         self.log_context['topic_name'] = pdf_file.topic.name
         self.log_context['topic_slug'] = pdf_file.topic.slug
-        self.log_context['pdf_id'] = pdf_file.id
-        self.log_context['pdf_name'] = pdf_file.name
-        self.log_context['pdf_slug'] = pdf_file.slug
+        self.log_context['pdffile_id'] = pdf_file.id
+        self.log_context['pdffile_name'] = pdf_file.name
+        self.log_context['pdffile_slug'] = pdf_file.slug
         super(ViewPDFFile, self).createLog(self.request.user, self.log_component, self.log_action, self.log_resource, self.log_context)
@@ -87,6 +87,7 @@ class PDFFileCreateView(LoginRequiredMixin, LogMixin , generic.CreateView):
     login_url = reverse_lazy("users:login")
     redirect_field_name = 'next'
+    log_resource = 'pdffile'
     def dispatch(self, request, *args, **kwargs):
         slug = self.kwargs.get('slug', '')
@@ -168,9 +169,9 @@ class PDFFileCreateView(LoginRequiredMixin, LogMixin , generic.CreateView):
         self.log_context['topic_id'] = self.object.topic.id
         self.log_context['topic_name'] = self.object.topic.name
         self.log_context['topic_slug'] = self.object.topic.slug
-        self.log_context['pdf_file_id'] = self.object.id
-        self.log_context['pdf_file_name'] = self.object.name
-        self.log_context['pdf_file_slug'] = self.object.slug
+        self.log_context['pdffile_id'] = self.object.id
+        self.log_context['pdffile_name'] = self.object.name
+        self.log_context['pdffile_slug'] = self.object.slug
         super(PDFFileCreateView, self).createLog(self.request.user, self.log_component, self.log_action, self.log_resource, self.log_context)
@@ -198,7 +199,7 @@ class PDFFileCreateView(LoginRequiredMixin, LogMixin , generic.CreateView):
 class UpdateView(LoginRequiredMixin, LogMixin, generic.UpdateView):
     log_component = 'resources'
     log_action = 'update'
-    log_resource = 'pdf_file'
+    log_resource = 'pdffile'
     log_context = {}
     login_url = reverse_lazy("users:login")
@@ -283,9 +284,9 @@ class UpdateView(LoginRequiredMixin, LogMixin, generic.UpdateView):
         self.log_context['topic_id'] = self.object.topic.id
         self.log_context['topic_name'] = self.object.topic.name
         self.log_context['topic_slug'] = self.object.topic.slug
-        self.log_context['pdf_file_id'] = self.object.id
-        self.log_context['pdf_file_name'] = self.object.name
-        self.log_context['pdf_file_slug'] = self.object.slug
+        self.log_context['pdffile_id'] = self.object.id
+        self.log_context['pdffile_name'] = self.object.name
+        self.log_context['pdffile_slug'] = self.object.slug
         super(UpdateView, self).createLog(self.request.user, self.log_component, self.log_action, self.log_resource, self.log_context)
@@ -343,9 +344,9 @@ class DeleteView(LoginRequiredMixin, LogMixin, generic.DeleteView):
         self.log_context['topic_id'] = self.object.topic.id
         self.log_context['topic_name'] = self.object.topic.name
         self.log_context['topic_slug'] = self.object.topic.slug
-        self.log_context['pdf_file_id'] = self.object.id
-        self.log_context['pdf_file_name'] = self.object.name
-        self.log_context['pdf_file_slug'] = self.object.slug
+        self.log_context['pdffile_id'] = self.object.id
+        self.log_context['pdffile_name'] = self.object.name
+        self.log_context['pdffile_slug'] = self.object.slug
         super(DeleteView, self).createLog(self.request.user, self.log_component, self.log_action, self.log_resource, self.log_context)
@@ -0,0 +1,30 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.4 on 2017-03-21 00:55
+from __future__ import unicode_literals
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('reports', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='ReportXLS',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('xls_data', models.TextField()),
+                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+            ],
+            options={
+                'verbose_name': 'ReportCSV',
+                'verbose_name_plural': 'ReportCSVs',
+            },
+        ),
+    ]
@@ -12,4 +12,17 @@ class ReportCSV(models.Model):
     def __str__(self):
         pass
+    
+
+class ReportXLS(models.Model):
+
+    user = models.ForeignKey(User)
+    xls_data = models.TextField() 
+
+    class Meta:
+        verbose_name = "ReportCSV"
+        verbose_name_plural = "ReportCSVs"
+
+    def __str__(self):
+        pass
 \ No newline at end of file
@@ -65,7 +65,7 @@
     	<ul id="report-info">
     		<li> {{data.values|length}} {% trans "register(s)" %} </li>
     		<li>
-    			<a href="{% url 'subjects:reports:download_report' %}?{{csv_data}}"><i class="fa fa-download" aria-hidden="true"></i> {% trans "Interactions Data" %}</a>
+    			<a href="{% url 'subjects:reports:download_report_csv' %}"><i class="fa fa-download" aria-hidden="true"></i> {% trans "Interactions Data" %}</a>
     		</li>
@@ -7,5 +7,5 @@ urlpatterns = [
     url(r'^view/interactions/$', views.ViewReportView.as_view(), name='view_report'),
     url(r'^get/resources/$', views.get_resources, name='get_resource_and_tags'),
     url(r'^get/tags/$', views.get_tags, name='get_tags'),
-    url(r'^post/download_report/$', views.download_report, name="download_report"),
+    url(r'^post/download_report/$', views.download_report_csv, name="download_report_csv"),
 ]
 \ No newline at end of file
@@ -11,14 +11,14 @@ import django.views.generic as generic
 from mural.models import SubjectPost, Comment, MuralVisualizations
 from django.db.models import Q
 from django.contrib.auth.mixins import LoginRequiredMixin
-from datetime import datetime, date
+from datetime import datetime, date, timedelta
 from subjects.models import Subject, Tag
 from .forms import CreateInteractionReportForm, ResourceAndTagForm, BaseResourceAndTagFormset
 from log.models import Log
 from topics.models import Resource, Topic
 from collections import OrderedDict
 from django.forms import formset_factory
-from .models import ReportCSV
+from .models import ReportCSV, ReportXLS
 import pandas as pd
 class ReportView(LoginRequiredMixin, generic.FormView):
@@ -143,32 +143,47 @@ class ViewReportView(LoginRequiredMixin, generic.TemplateView):
         #this is to save the csv for further download
         df = pd.DataFrame.from_dict(context['data'], orient='index')
-
         df.columns = context['header']
         #so it does not exist more than one report CSV available for that user to download
         if ReportCSV.objects.filter(user= self.request.user).count() > 0:
             report = ReportCSV.objects.get(user=self.request.user)
             report.delete()
-           
+        
         report = ReportCSV(user= self.request.user, csv_data = df.to_csv())
         report.save()
+        #for excel files
+        """ if ReportXLS.objects.filter(user= self.request.user).count() > 0:
+            report = ReportXLS.objects.get(user=self.request.user)
+            report.delete()
+        
+        df.drop(df.columns[[0]], axis=1, inplace=True)
+        writer = pd.ExcelWriter('pandas_simple.xlsx')
+        report = ReportXLS(user= self.request.user, xls_data = df.to_excel(writer))
+        report.save()"""
+
+
         return context
     def get_mural_data(self, subject, init_date, end_date, resources_id, tags_id):
         data = {}
         students = subject.students.all()
-        formats = ["%d/%m/%Y", "%m/%d/%Y"] #so it accepts english and portuguese date formats
+        formats = ["%d/%m/%Y", "%m/%d/%Y", "%Y-%m-%d"] #so it accepts english and portuguese date formats
         for fmt in formats:
             try:
-                init_date = datetime.strptime(init_date, fmt)
-                end_date = datetime.strptime(end_date, fmt)
+                init_date = datetime.strptime(init_date, fmt).date()
+                end_date = datetime.strptime(end_date, fmt).date()
+                
             except ValueError:
                 pass
         header = ['User']
-
+       
+        #I use this so the system can gather data up to end_date 11h59 p.m.
+        end_date = end_date + timedelta(days=1)
+   
+       
         #For each student in the subject
         for student in students:
             data[student] = []
@@ -226,7 +241,7 @@ class ViewReportView(LoginRequiredMixin, generic.TemplateView):
             #VAR08 through VAR_019 of documenttation:
             if len(resources_id) > 0:
-                resources_data = self.get_resources_and_tags_data(resources_id, tags_id, student, subject)
+                resources_data = self.get_resources_and_tags_data(resources_id, tags_id, student, subject, init_date, end_date)
                 for key, value in resources_data.items():
                     interactions[key] = value
@@ -268,12 +283,26 @@ class ViewReportView(LoginRequiredMixin, generic.TemplateView):
             header.append(key)
         return data, header
-    def get_resources_and_tags_data(self, resources, tags, student, subject):
-        data = {}
+    def get_resources_and_tags_data(self, resources_types, tags, student, subject, init_date, end_date):
+        data = OrderedDict()  
-        for i in range(len(resources)):
-            data[str(resources[i]) + " with tag " + Tag.objects.get(id=int(tags[i])).name] = Log.objects.filter(action="view", resource=resources[i].lower(),
-                user_id = student.id, context__contains = {'subject_id': subject.id}).count()
+        for i in range(len(resources_types)):
+            
+            resources = Resource.objects.select_related(resources_types[i].lower()).filter(tags__in = tags, topic__in=subject.topic_subject.all())
+            distinct_resources = 0
+            total_count = 0
+            for resource in resources:
+                count = Log.objects.filter(action="view", resource=resources_types[i].lower(),
+                      user_id = student.id, context__contains = {'subject_id': subject.id, 
+                      resources_types[i].lower()+'_id': resource.id}, datetime__range=(init_date, end_date)).count()
+                if count > 0:
+                    distinct_resources += 1
+                    total_count += count
+                
+            data[str(resources_types[i]) + " with tag " + Tag.objects.get(id=int(tags[i])).name] = total_count
+            data["distintic " + str(resources_types[i]) + " with tag " + Tag.objects.get(id=int(tags[i])).name] = distinct_resources
+            """data["distinct" + str(resources[i]) + " with tag " + Tag.objects.get(id=int(tags[i])).name] = Log.objects.filter(action="view", resource=resources[i].lower(),
+                user_id = student.id, context__contains = {'subject_id': subject.id}).distinct().count()"""
         return data
@@ -317,27 +346,32 @@ def get_tags(request):
     resource_type = request.GET['resource_class_name']
     subject = Subject.objects.get(id=request.GET['subject_id'])
     topic_choice = request.GET["topic_choice"]
+    
+    #Have to fix this to accept translated options
     if topic_choice.lower() == "all" or topic_choice.lower() == "todos":
         topics = subject.topic_subject.all()
     else:
         topics = [Topic.objects.get(id=int(topic_choice))]
     data = {}
-    tags = []
+    tags = set()
     for topic in topics:
         resource_set = Resource.objects.select_related(resource_type.lower()).filter(topic = topic)
         for resource in resource_set:
             if resource._my_subclass == resource_type.lower():
                 for tag in resource.tags.all():
-                    tags.append(tag)
-    
+                    if tag.name != "":
+                        tags.add(tag)
+                
-  
+    #adding empty tag for the purpose of giving the user this option for adicional behavior
+    tags = list(tags)
+    tags.append(Tag(name=""))
     data['tags'] = [ {'id':tag.id, 'name':tag.name} for tag in  tags]
     return JsonResponse(data)
-def download_report(request):
+def download_report_csv(request):
     report = ReportCSV.objects.get(user=request.user)
     response = HttpResponse(report.csv_data,content_type='text/csv')
@@ -0,0 +1,30 @@		@@ -0,0 +1,30 @@
	1	+# -- coding: utf-8 --
	2	+# Generated by Django 1.10.4 on 2017-03-21 00:55
	3	+from __future__ import unicode_literals
	4	+
	5	+from django.conf import settings
	6	+from django.db import migrations, models
	7	+import django.db.models.deletion
	8	+
	9	+
	10	+class Migration(migrations.Migration):
	11	+
	12	+ dependencies = [
	13	+ migrations.swappable_dependency(settings.AUTH_USER_MODEL),
	14	+ ('reports', '0001_initial'),
	15	+ ]
	16	+
	17	+ operations = [
	18	+ migrations.CreateModel(
	19	+ name='ReportXLS',
	20	+ fields=[
	21	+ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
	22	+ ('xls_data', models.TextField()),
	23	+ ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
	24	+ ],
	25	+ options={
	26	+ 'verbose_name': 'ReportCSV',
	27	+ 'verbose_name_plural': 'ReportCSVs',
	28	+ },
	29	+ ),
	30	+ ]
	@@ -12,4 +12,17 @@ class ReportCSV(models.Model):		@@ -12,4 +12,17 @@ class ReportCSV(models.Model):
12		12
13	def __str__(self):	13	def __str__(self):
14	pass	14	pass
		15	+
		16	+
		17	+class ReportXLS(models.Model):
		18	+
		19	+ user = models.ForeignKey(User)
		20	+ xls_data = models.TextField()
		21	+
		22	+ class Meta:
		23	+ verbose_name = "ReportCSV"
		24	+ verbose_name_plural = "ReportCSVs"
		25	+
		26	+ def __str__(self):
		27	+ pass
15		28
16	\ No newline at end of file	29	\ No newline at end of file
	@@ -65,7 +65,7 @@		@@ -65,7 +65,7 @@
65	<ul id="report-info">	65	<ul id="report-info">
66	<li> {{data.values\|length}} {% trans "register(s)" %} </li>	66	<li> {{data.values\|length}} {% trans "register(s)" %} </li>
67	<li>	67	<li>
68	- <a href="{% url 'subjects:reports:download_report' %}?{{csv_data}}"><i class="fa fa-download" aria-hidden="true"></i> {% trans "Interactions Data" %}</a>	68	+ <a href="{% url 'subjects:reports:download_report_csv' %}"><i class="fa fa-download" aria-hidden="true"></i> {% trans "Interactions Data" %}</a>
69		69
70		70
71	</li>	71	</li>
	@@ -7,5 +7,5 @@ urlpatterns = [		@@ -7,5 +7,5 @@ urlpatterns = [
7	url(r'^view/interactions/$', views.ViewReportView.as_view(), name='view_report'),	7	url(r'^view/interactions/$', views.ViewReportView.as_view(), name='view_report'),
8	url(r'^get/resources/$', views.get_resources, name='get_resource_and_tags'),	8	url(r'^get/resources/$', views.get_resources, name='get_resource_and_tags'),
9	url(r'^get/tags/$', views.get_tags, name='get_tags'),	9	url(r'^get/tags/$', views.get_tags, name='get_tags'),
10	- url(r'^post/download_report/$', views.download_report, name="download_report"),	10	+ url(r'^post/download_report/$', views.download_report_csv, name="download_report_csv"),
11	]	11	]
12	\ No newline at end of file	12	\ No newline at end of file