made progress on template using formsets, still has to send data through URL to …

…the other view and find a good way to select resources dynamically

made progress on template using formsets, still has to send data through URL to …
…the other view and find a good way to select resources dynamically
fbormann
1 parent 5456f053
Showing 6 changed files with 132 additions and 49 deletions Show diff stats
reports/forms.py
reports/static/reports/js/report.js
reports/templates/reports/_form.html
reports/templates/reports/create.html
reports/templates/reports/view.html
reports/views.py
@@ -2,6 +2,13 @@ from django import forms
 from django.utils.translation import ugettext_lazy as _
 import datetime
+from django.forms.formsets import BaseFormSet
+
+class ResourceAndTagForm(forms.Form):
+
+	resource = forms.ChoiceField(label=_("Resources"), required=True)
+	tag  = forms.ChoiceField(label=_('Tag'))
+
 class CreateInteractionReportForm(forms.Form):
@@ -17,13 +24,14 @@ class CreateInteractionReportForm(forms.Form):
 	def __init__(self, *args, **kwargs):
 		super(CreateInteractionReportForm, self).__init__(*args, **kwargs)
-		
 		initial = kwargs['initial']
 		topics = list(initial['topic'])
 		self.subject = initial['subject'] #so we can check date cleaned data
 		self.fields['topic'].choices = [(topic.id, topic.name) for topic in topics]
 		self.fields['topic'].choices.append((_("All"), _("All")))
+
+
 	def clean_init_date(self):
 		init_date = self.cleaned_data.get('init_date')
 		if init_date < self.subject.init_date:
@@ -32,6 +40,6 @@ class CreateInteractionReportForm(forms.Form):
 	def clean_end_date(self):
 		end_date = self.cleaned_data.get('init_date')
-		if end_date > self.subject.init_date:
-			self._errors['end_date'] = [_('This date should be right or before ' + str(self.subject.init_date) + ', which is when the subject finishes. ')]
+		if end_date > self.subject.end_date:
+			self._errors['end_date'] = [_('This date should be right or before ' + str(self.subject.end_date) + ', which is when the subject finishes. ')]
 		return end_date
 \ No newline at end of file
@@ -0,0 +1,5 @@
+
+//Function to get all resources of all topics related to that subjct
+$(function (){
+	
+});
 \ No newline at end of file
 {% load widget_tweaks static i18n %}
 <form action="" method="post">{% csrf_token %}
+    <p>{% trans "General Parameters" %}</p><hr>
     {% for field  in form %}
-    {% if field.auto_id == 'id_init_date' or field.auto_id == 'id_end_date' %}
-    	<label> {{field.label}} </label>
-		{% render_field field class='form-control date-picker' %}
-    	
-    {% else %}
-    	<label> {{field.label}} </label>
-			{% render_field field class='form-control' %}
-    {% endif %}
-    	
-    {% if field.errors %}
-            <div class="row">
-                </br>
-                <div class="alert alert-danger alert-dismissible" role="alert">
-                    <button type="button" class="close" data-dismiss="alert" aria-label="Close">
-                        <span aria-hidden="true">&times;</span>
-                        </button>
-                    <ul>
-                        {% for error in field.errors %}
-                            <li>{{ error }}</li>
-                        {% endfor %}
-                    </ul>
-                </div>
-            </div>
+        {% if field.auto_id == 'id_init_date' or field.auto_id == 'id_end_date' %}
+        	<label> {{field.label}} </label>
+    		{% render_field field class='form-control date-picker' %}
+        	
+        
+        {% elif field.auto_id == 'id_from_mural' %}
+            <p>{% trans "Data Source" %}</p><hr>   
+            <label> {{field.label}} </label>
+            {% render_field field class='form-control' %}
+        {% else %}
+        	<label> {{field.label}} </label>
+    		{% render_field field class='form-control' %}
         {% endif %}
+        	
+        {% if field.errors %}
+                <div class="row">
+                    </br>
+                    <div class="alert alert-danger alert-dismissible" role="alert">
+                        <button type="button" class="close" data-dismiss="alert" aria-label="Close">
+                            <span aria-hidden="true">&times;</span>
+                            </button>
+                        <ul>
+                            {% for error in field.errors %}
+                                <li>{{ error }}</li>
+                            {% endfor %}
+                        </ul>
+                    </div>
+                </div>
+            {% endif %}
     {% endfor %}
+
+    <!---Adding the selector -->
+    <div class="panel-group" id="resources_accordion" role="tablist" aria-multiselectable="true">
+                <div class="panel panel-info">
+                    <div class="panel-heading">
+                        <div class="row">
+                            <div class="col-md-12">
+                                <a data-parent="#resources_accordion" data-toggle="collapse" href="#resources">
+                                    <h4 class="panel-title">
+                                    <button class="btn btn-default btn-xs text-center cat-selector"><i class="fa fa-angle-right fa-2x" aria-hidden="true"></i></button><label for="resources">{% trans "Interaction with resources" %}</label>
+                                    </h4>
+                                </a>
+                            </div>
+                        </div>
+                    </div>
+
+                      <div id="resources" class="panel-collapse collapse">
+                           {{ resource_tag_formset.management_form }}
+
+                           {% for resource_tag_form in resource_tag_formset %}
+                               <div class="resource-tag-formset">
+                                   {% for field in resource_tag_form %}
+                                    <label>{{field.label}}</label>
+                                    {% render_field field class="form-control" %}
+                                   {% endfor %}
+                               </div>
+                           {% endfor %}
+                      </div>
+                </div>
+    </div>
+
     <div class="row text-center">
         <input type="submit" value="Search" class="btn btn-success btn-raised" />
     </div>
 </form>
+
+
@@ -11,6 +11,12 @@
     {% breadcrumb 'analytics' '' %}
 {% endblock %}
+{% block javascript %}
+    {{block.super}}
+    <script type="text/javascript" src="{% static "js/jquery.formset.js" %} "></script>
+    
+{% endblock javascript %}
+
 {% block content %}
 	<div class="panel panel-info topic-panel">
@@ -41,5 +47,11 @@
     {% include "reports/_form.html" %}
-	
+    <script type="text/javascript" src="{% static "reports/js/report.js" %}"></script>
+	<script>
+    $('.resource-tag-formset').formset({
+        addText: 'add data source',
+        deleteText: 'remove data source'
+    });
+    </script>
 {% endblock content %}
 \ No newline at end of file
@@ -6,9 +6,9 @@
 {% block breadcrumbs %}
     {{ block.super }}
-    {% breadcrumb view.subject.category 'subjects:cat_view' view.subject.category.slug %}
-    {% breadcrumb view.subject 'subjects:view' view.subject.slug %}
-    {% breadcrumb 'analytics' '' %}
+    {% breadcrumb subject.category 'subjects:cat_view' subject.category.slug %}
+    {% breadcrumb subject 'subjects:view' subject.slug %}
+    {% breadcrumb 'Analytics' '' %}
 {% endblock %}
 {% block content %}
@@ -65,10 +65,6 @@
     	<ul id="report-info">
     		<li> {{data.values|length}} {% trans "register(s)" %} </li>
     		<li>
-    			<i class="fa fa-download" aria-hidden="true"></i> {% trans "Variable Descriptions" %}
-
-    		</li>
-    		<li>
     			<i class="fa fa-download" aria-hidden="true"></i> {% trans "Interactions Data" %}
     		</li>
     	</ul>
@@ -13,9 +13,11 @@ from django.db.models import Q
 from django.contrib.auth.mixins import LoginRequiredMixin
 from datetime import datetime, date
 from subjects.models import Subject
-from .forms import CreateInteractionReportForm
+from .forms import CreateInteractionReportForm, ResourceAndTagForm
 from log.models import Log
+from topics.models import Resource
+from django.forms import formset_factory
 class ReportView(LoginRequiredMixin, generic.FormView):
     template_name = "reports/create.html"
@@ -40,7 +42,24 @@ class ReportView(LoginRequiredMixin, generic.FormView):
         subject = Subject.objects.get(id=self.request.GET['subject_id'])
         context['subject'] = subject
+
+        topics = subject.topic_subject.all()
+        #get all resources associated with topics
+        resources = []
+        tags = []
+        for topic in topics:
+            resources_set = topic.resource_topic.all()
+            for resource in resources_set:
+                for tag in resource.tags.all():
+                    tags.append(tag)
+                resources.append(resource)
+        context['resources'] = resources
+        context['tags'] = tags
+
+        #set formset
+        resourceTagFormSet = formset_factory(ResourceAndTagForm, extra= 1)
+        context['resource_tag_formset'] = resourceTagFormSet
         return context
     def get_success_url(self):
@@ -65,8 +84,9 @@ class ReportView(LoginRequiredMixin, generic.FormView):
         POST variables and then checked for validity.
         """
         form = self.get_form()
+        print(form)
         if form.is_valid():
-
+            print(form)
             self.form_data = form.cleaned_data
             return self.form_valid(form)
         else:
@@ -86,6 +106,8 @@ class ViewReportView(LoginRequiredMixin, generic.TemplateView):
         context['init_date'] = params_data['init_date']
         context['end_date'] = params_data['end_date']
         context['subject'] = subject
+
+
         if params_data['from_mural']:
             context['data'], context['header'] = self.get_mural_data(subject, params_data['init_date'], params_data['end_date'])
         return context
@@ -115,22 +137,22 @@ class ViewReportView(LoginRequiredMixin, generic.TemplateView):
                 create_date__range=(init_date, end_date))
             #number of help posts created by the student
-            interactions['v01'] = help_posts_made_by_user.count()
+            interactions['number of help posts created by the user'] = help_posts_made_by_user.count()
             help_posts = SubjectPost.objects.filter(action="help", create_date__range=(init_date, end_date), 
             space__id=subject.id)
             #comments count on help posts created by the student
-            interactions['v02'] = Comment.objects.filter(post__in = help_posts.filter(user=student), 
+            interactions['amount of comments on help posts created by the student'] = Comment.objects.filter(post__in = help_posts.filter(user=student), 
                 create_date__range=(init_date, end_date)).count()
             #count the amount of comments made by the student on posts made by one of the professors
-            interactions['v03'] = Comment.objects.filter(post__in = help_posts.filter(user__in= subject.professor.all()), create_date__range=(init_date, end_date),
+            interactions['amount of comments made by the student on teachers help posts'] = Comment.objects.filter(post__in = help_posts.filter(user__in= subject.professor.all()), create_date__range=(init_date, end_date),
              user=student).count()
              #comments made by the user on other users posts
-            interactions['v04'] = Comment.objects.filter(post__in = help_posts.exclude(user=student), 
+            interactions['amount of comments made by the student on other students help posts'] = Comment.objects.filter(post__in = help_posts.exclude(user=student), 
                 create_date__range=(init_date, end_date),
                 user= student).count()
@@ -141,7 +163,7 @@ class ViewReportView(LoginRequiredMixin, generic.TemplateView):
             for comment in  comments_by_teacher:
                 help_posts_ids.append(comment.post.id)
              #number of help posts created by the user that the teacher commented on
-            interactions['v05'] = help_posts.filter(user=student, id__in = help_posts_ids).count()
+            interactions['Number of help posts created by the user that the teacher commented on'] = help_posts.filter(user=student, id__in = help_posts_ids).count()
             comments_by_others = Comment.objects.filter(user__in=subject.students.exclude(id = student.id))
@@ -149,33 +171,33 @@ class ViewReportView(LoginRequiredMixin, generic.TemplateView):
             for comment in  comments_by_teacher:
                 help_posts_ids.append(comment.post.id)
             #number of help posts created by the user others students commented on
-            interactions['v06'] = help_posts.filter(user=student, id__in = help_posts_ids).count()
+            interactions['number of help posts created by the user others students commented on'] = help_posts.filter(user=student, id__in = help_posts_ids).count()
             #Number of student visualizations on the mural of the subject
-            interactions['v07'] = MuralVisualizations.objects.filter(post__in = SubjectPost.objects.filter(space__id=subject.id),
+            interactions['Number of student visualizations on the mural of the subject'] = MuralVisualizations.objects.filter(post__in = SubjectPost.objects.filter(space__id=subject.id),
                 user = student).count()
             #VAR20 - number of access to mural between 6 a.m to 12a.m.
-            interactions['v20'] =  Log.objects.filter(action="access", resource="subject", 
+            interactions[' number of access to mural between 6 a.m to 12a.m.'] =  Log.objects.filter(action="access", resource="subject", 
                 user_id= student.id, context__contains = {'subject_id' : subject.id}, datetime__hour__range = (5, 11)).count()
-            #VAR21 - number of access to mural between 6 a.m to 12a.m.
-            interactions['v21'] =  Log.objects.filter(action="access", resource="subject", 
+            #VAR21 - number of access to mural between 0 p.m to 6p.m.
+            interactions['number of access to mural between 0 p.m to 6p.m.'] =  Log.objects.filter(action="access", resource="subject", 
                 user_id= student.id, context__contains = {'subject_id' : subject.id}, datetime__hour__range = (11, 17)).count()
             #VAR22
-            interactions['v22'] =  Log.objects.filter(action="access", resource="subject", 
+            interactions[' number of access to mural between 6 p.m to 12p.m.'] =  Log.objects.filter(action="access", resource="subject", 
                 user_id= student.id, context__contains = {'subject_id' : subject.id}, datetime__hour__range = (17, 23)).count()
             #VAR23
-            interactions['v23'] =  Log.objects.filter(action="access", resource="subject", 
+            interactions[' number of access to mural between 0 a.m to 6a.m.'] =  Log.objects.filter(action="access", resource="subject", 
                 user_id= student.id, context__contains = {'subject_id' : subject.id}, datetime__hour__range = (23, 5)).count()
             #VAR24 through 30
             day_numbers = [0, 1, 2, 3, 4, 5, 6]
             day_names = ["sunday", "monday", "tuesday", "wednesday", "thursday", "friday", "saturday"]
             for day_num in day_numbers:
-                interactions['v'+ str(24+day_num)] =  Log.objects.filter(action="access", resource="subject", 
+                interactions['number of access to the subject on '+ day_names[day_num]] =  Log.objects.filter(action="access", resource="subject", 
                 user_id= student.id, context__contains = {'subject_id' : subject.id}, datetime__week_day = day_num).count()
             for value in interactions.values():
@@ -185,3 +207,4 @@ class ViewReportView(LoginRequiredMixin, generic.TemplateView):
                     header.append(key)
         return data, header
+
	@@ -0,0 +1,5 @@		@@ -0,0 +1,5 @@
		1	+
		2	+//Function to get all resources of all topics related to that subjct
		3	+$(function (){
		4	+
		5	+});
0	\ No newline at end of file	6	\ No newline at end of file
1	{% load widget_tweaks static i18n %}	1	{% load widget_tweaks static i18n %}
2		2
3	<form action="" method="post">{% csrf_token %}	3	<form action="" method="post">{% csrf_token %}
		4	+ <p>{% trans "General Parameters" %}</p><hr>
4	{% for field in form %}	5	{% for field in form %}
5	- {% if field.auto_id == 'id_init_date' or field.auto_id == 'id_end_date' %}
6	- <label> {{field.label}} </label>
7	- {% render_field field class='form-control date-picker' %}
8	-
9	- {% else %}
10	- <label> {{field.label}} </label>
11	- {% render_field field class='form-control' %}
12	- {% endif %}
13	-
14	- {% if field.errors %}
15	- <div class="row">
16	- </br>
17	- <div class="alert alert-danger alert-dismissible" role="alert">
18	- <button type="button" class="close" data-dismiss="alert" aria-label="Close">
19	- <span aria-hidden="true">×</span>
20	- </button>
21	- <ul>
22	- {% for error in field.errors %}
23	- <li>{{ error }}</li>
24	- {% endfor %}
25	- </ul>
26	- </div>
27	- </div>	6	+ {% if field.auto_id == 'id_init_date' or field.auto_id == 'id_end_date' %}
		7	+ <label> {{field.label}} </label>
		8	+ {% render_field field class='form-control date-picker' %}
		9	+
		10	+
		11	+ {% elif field.auto_id == 'id_from_mural' %}
		12	+ <p>{% trans "Data Source" %}</p><hr>
		13	+ <label> {{field.label}} </label>
		14	+ {% render_field field class='form-control' %}
		15	+ {% else %}
		16	+ <label> {{field.label}} </label>
		17	+ {% render_field field class='form-control' %}
28	{% endif %}	18	{% endif %}
		19	+
		20	+ {% if field.errors %}
		21	+ <div class="row">
		22	+ </br>
		23	+ <div class="alert alert-danger alert-dismissible" role="alert">
		24	+ <button type="button" class="close" data-dismiss="alert" aria-label="Close">
		25	+ <span aria-hidden="true">×</span>
		26	+ </button>
		27	+ <ul>
		28	+ {% for error in field.errors %}
		29	+ <li>{{ error }}</li>
		30	+ {% endfor %}
		31	+ </ul>
		32	+ </div>
		33	+ </div>
		34	+ {% endif %}
29	{% endfor %}	35	{% endfor %}
		36	+
		37	+ <!---Adding the selector -->
		38	+ <div class="panel-group" id="resources_accordion" role="tablist" aria-multiselectable="true">
		39	+ <div class="panel panel-info">
		40	+ <div class="panel-heading">
		41	+ <div class="row">
		42	+ <div class="col-md-12">
		43	+ <a data-parent="#resources_accordion" data-toggle="collapse" href="#resources">
		44	+ <h4 class="panel-title">
		45	+ <button class="btn btn-default btn-xs text-center cat-selector"><i class="fa fa-angle-right fa-2x" aria-hidden="true"></i></button><label for="resources">{% trans "Interaction with resources" %}</label>
		46	+ </h4>
		47	+ </a>
		48	+ </div>
		49	+ </div>
		50	+ </div>
		51	+
		52	+ <div id="resources" class="panel-collapse collapse">
		53	+ {{ resource_tag_formset.management_form }}
		54	+
		55	+ {% for resource_tag_form in resource_tag_formset %}
		56	+ <div class="resource-tag-formset">
		57	+ {% for field in resource_tag_form %}
		58	+ <label>{{field.label}}</label>
		59	+ {% render_field field class="form-control" %}
		60	+ {% endfor %}
		61	+ </div>
		62	+ {% endfor %}
		63	+ </div>
		64	+ </div>
		65	+ </div>
		66	+
30	<div class="row text-center">	67	<div class="row text-center">
31	<input type="submit" value="Search" class="btn btn-success btn-raised" />	68	<input type="submit" value="Search" class="btn btn-success btn-raised" />
32	</div>	69	</div>
33	</form>	70	</form>
		71	+
		72	+
	@@ -11,6 +11,12 @@		@@ -11,6 +11,12 @@
11	{% breadcrumb 'analytics' '' %}	11	{% breadcrumb 'analytics' '' %}
12	{% endblock %}	12	{% endblock %}
13		13
		14	+{% block javascript %}
		15	+ {{block.super}}
		16	+ <script type="text/javascript" src="{% static "js/jquery.formset.js" %} "></script>
		17	+
		18	+{% endblock javascript %}
		19	+
14	{% block content %}	20	{% block content %}
15		21
16	<div class="panel panel-info topic-panel">	22	<div class="panel panel-info topic-panel">
	@@ -41,5 +47,11 @@		@@ -41,5 +47,11 @@
41		47
42	{% include "reports/_form.html" %}	48	{% include "reports/_form.html" %}
43		49
44	-	50	+ <script type="text/javascript" src="{% static "reports/js/report.js" %}"></script>
		51	+ <script>
		52	+ $('.resource-tag-formset').formset({
		53	+ addText: 'add data source',
		54	+ deleteText: 'remove data source'
		55	+ });
		56	+ </script>
45	{% endblock content %}	57	{% endblock content %}
46	\ No newline at end of file	58	\ No newline at end of file