posted data from more than one dynamic form

fbormann
1 parent 2846f023
Showing 3 changed files with 45 additions and 31 deletions Show diff stats
reports/forms.py
reports/templates/reports/_form.html
reports/views.py
@@ -4,6 +4,21 @@ import datetime
 from django.forms.formsets import BaseFormSet
+
+class BaseResourceAndTagFormset(BaseFormSet):
+    def clean(self):
+        """
+        Adds validation to check that no two links have the same anchor or URL
+        and that all links have both an anchor and URL.
+        """
+        print("here 2")
+        print(self.errors)
+        if any(self.errors):
+            return
+
+        for form in self.forms:
+        	print(form)
+
 class ResourceAndTagForm(forms.Form):
 	resource = forms.ChoiceField(label=_("Kind Of Resource"), required=True)
@@ -13,7 +28,7 @@ class ResourceAndTagForm(forms.Form):
 		super(ResourceAndTagForm, self).__init__(*args, **kwargs)
 		if kwargs.get('initial'):
 			initial = kwargs['initial']
-			self.fields['resource'].choices = [(resource.id, resource.name) for resource in initial['resource']]
+			self.fields['resource'].choices = [(classes.__name__, classes.__name__) for classes in initial['class_name']]
 			self.fields['tag'].choices = [(tag.id, tag.name) for tag in initial['tag']]
@@ -65,29 +65,21 @@
                       <div id="resources" class="panel-collapse collapse">
                            {{ resource_tag_formset.management_form }}
-                            {{ resource_tag_formset.non_form_errors }}
+
                            {% for resource_tag_form in resource_tag_formset %}
+
+                                {% if resource_tag_form.anchor.errors %}
+                                    {% for error in resource_tag_form.anchor.errors %}
+                                        {{ error|escape }}
+                                    {% endfor %}
+                                {% endif %}
                                <div class="resource-tag-formset">
                                    {% for field in resource_tag_form %}
                                     <label>{{field.label}}</label>
                                     {% render_field field class="form-control" %}
-                                     {% 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 %}
                                </div>
                            {% endfor %}
@@ -13,7 +13,7 @@ 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, ResourceAndTagForm
+from .forms import CreateInteractionReportForm, ResourceAndTagForm, BaseResourceAndTagFormset
 from log.models import Log
 from topics.models import Resource, Topic
@@ -45,21 +45,20 @@ class ReportView(LoginRequiredMixin, generic.FormView):
         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
+        classes = Resource.__subclasses__()    
+
+
         #set formset
-        resourceTagFormSet = formset_factory(ResourceAndTagForm)
-        resourceTagFormSet = resourceTagFormSet()
+        resourceTagFormSet = formset_factory(ResourceAndTagForm, formset=BaseResourceAndTagFormset)
+        resourceTagFormSet = resourceTagFormSet(initial=[{'class_name': classes, 'tag':tags}])
         context['resource_tag_formset'] = resourceTagFormSet
         return context
@@ -94,16 +93,22 @@ class ReportView(LoginRequiredMixin, generic.FormView):
         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)
-        resourceTagFormSet = formset_factory(ResourceAndTagForm)
-        resources_formset = resourceTagFormSet(self.request.POST, initial=[{'resource':resources, 'tag':tags}])
+
+        classes = Resource.__subclasses__()  
+        amount_of_forms = self.request.POST['form-TOTAL_FORMS']
+        initial_datum = {'class_name': classes , 'tag': tags}
+        initial_data = []
+        for i in range(int(amount_of_forms)):
+            initial_data.append(initial_datum)
+
+        resourceTagFormSet = formset_factory(ResourceAndTagForm, formset=BaseResourceAndTagFormset)
+        resources_formset = resourceTagFormSet(self.request.POST, initial = initial_data)
         if form.is_valid() and resources_formset.is_valid():
             self.form_data = form.cleaned_data
             self.formset_data = resources_formset.cleaned_data
@@ -125,7 +130,7 @@ class ViewReportView(LoginRequiredMixin, generic.TemplateView):
         context['init_date'] = params_data['init_date']
         context['end_date'] = params_data['end_date']
         context['subject'] = subject
-
+        print(params_data)
         if params_data['from_mural']:
             context['data'], context['header'] = self.get_mural_data(subject, params_data['init_date'], params_data['end_date'])
@@ -197,6 +202,8 @@ class ViewReportView(LoginRequiredMixin, generic.TemplateView):
                 user = student).count()
+            #VAR08 - 
+
             #VAR20 - number of access to mural between 6 a.m to 12a.m.
             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()
@@ -205,11 +212,11 @@ class ViewReportView(LoginRequiredMixin, generic.TemplateView):
             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[' number of access to mural between 6 p.m to 12p.m.'] =  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[' number of access to mural between 0 a.m to 6a.m.'] =  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
	@@ -4,6 +4,21 @@ import datetime		@@ -4,6 +4,21 @@ import datetime
4		4
5	from django.forms.formsets import BaseFormSet	5	from django.forms.formsets import BaseFormSet
6		6
		7	+
		8	+class BaseResourceAndTagFormset(BaseFormSet):
		9	+ def clean(self):
		10	+ """
		11	+ Adds validation to check that no two links have the same anchor or URL
		12	+ and that all links have both an anchor and URL.
		13	+ """
		14	+ print("here 2")
		15	+ print(self.errors)
		16	+ if any(self.errors):
		17	+ return
		18	+
		19	+ for form in self.forms:
		20	+ print(form)
		21	+
7	class ResourceAndTagForm(forms.Form):	22	class ResourceAndTagForm(forms.Form):
8		23
9	resource = forms.ChoiceField(label=_("Kind Of Resource"), required=True)	24	resource = forms.ChoiceField(label=_("Kind Of Resource"), required=True)
	@@ -13,7 +28,7 @@ class ResourceAndTagForm(forms.Form):		@@ -13,7 +28,7 @@ class ResourceAndTagForm(forms.Form):
13	super(ResourceAndTagForm, self).__init__(args, *kwargs)	28	super(ResourceAndTagForm, self).__init__(args, *kwargs)
14	if kwargs.get('initial'):	29	if kwargs.get('initial'):
15	initial = kwargs['initial']	30	initial = kwargs['initial']
16	- self.fields['resource'].choices = [(resource.id, resource.name) for resource in initial['resource']]	31	+ self.fields['resource'].choices = [(classes.__name__, classes.__name__) for classes in initial['class_name']]
17	self.fields['tag'].choices = [(tag.id, tag.name) for tag in initial['tag']]	32	self.fields['tag'].choices = [(tag.id, tag.name) for tag in initial['tag']]
18		33
19		34