Adjusting webpage update

Zambom
1 parent da00b768
Showing 6 changed files with 72 additions and 55 deletions Show diff stats
pendencies/forms.py
pendencies/migrations/0004_auto_20170124_0128.py
pendencies/models.py
webpage/templates/webpages/_form.html
webpage/templates/webpages/view.html
webpage/views.py
@@ -13,12 +13,6 @@ class PendenciesForm(forms.ModelForm):
 	def __init__(self, *args, **kwargs):
 		super(PendenciesForm, self).__init__(*args, **kwargs)
-
-		if kwargs.get('initial'):
-			subject = kwargs['initial'].get('subject', None)
-
-			if subject:
-				self.initial['subject'] = subject.id
 	begin_date_check = forms.BooleanField(required = False)
 	end_date_check = forms.BooleanField(required = False)
@@ -30,12 +24,19 @@ class PendenciesForm(forms.ModelForm):
 	def clean(self):
 		cleaned_data = super(PendenciesForm, self).clean()
+		pend_id = cleaned_data.get('id', None)
+
+		action = cleaned_data.get('action', None)
 		begin_date = cleaned_data.get('begin_date', None)
 		end_date = cleaned_data.get('end_date', None)
 		begin_check = cleaned_data.get('begin_date_check', False)
 		end_check = cleaned_data.get('end_date_check', False)
 		subject_id = cleaned_data.get('subject', None)
+		if begin_check or end_check:
+			if not action:
+				self.add_error('action', _('This field is required.'))
+
 		if not begin_date and begin_check:
 			self.add_error('begin_date', _('This field is required.'))
@@ -52,7 +53,7 @@ class PendenciesForm(forms.ModelForm):
 			subject = Subject.objects.get(id = subject_id)
 			if not begin_date == ValueError and begin_date:
-				if begin_date.date() < datetime.datetime.today().date():
+				if not pend_id and begin_date.date() < datetime.datetime.today().date():
 					self.add_error('begin_date', _("This input should be filled with a date equal or after today's date."))
 				if begin_date.date() < subject.init_date:
@@ -62,7 +63,7 @@ class PendenciesForm(forms.ModelForm):
 					self.add_error('begin_date', _('This input should be filled with a date equal or after the subject end date.'))
 			if not end_date == ValueError and end_date:
-				if end_date.date() < datetime.datetime.today().date():
+				if not pend_id and end_date.date() < datetime.datetime.today().date():
 					self.add_error('end_date', _("This input should be filled with a date equal or after today's date."))
 				if end_date.date() < subject.init_date:
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10 on 2017-01-24 04:28
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('pendencies', '0003_pendencies_limit_date'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='pendencies',
+            name='action',
+            field=models.CharField(blank=True, choices=[('view', 'Visualize'), ('create', 'Create'), ('answer', 'Answer'), ('access', 'Access')], max_length=100, verbose_name='Action'),
+        ),
+    ]
@@ -5,7 +5,7 @@ from django.utils.translation import ugettext_lazy as _
 from topics.models import Resource
 class Pendencies(models.Model):
-	action = models.CharField(_('Action'), max_length = 100, choices = (("view", _("Visualize")), ("create", _("Create")), ("answer", _("Answer")), ("access", _("Access"))))
+	action = models.CharField(_('Action'), max_length = 100, choices = (("view", _("Visualize")), ("create", _("Create")), ("answer", _("Answer")), ("access", _("Access"))), blank = True)
 	begin_date = models.DateTimeField(_('Begin Date'), null = True, blank = True)
 	end_date = models.DateTimeField(_('End Date'), null = True, blank = True)
 	limit_date = models.DateTimeField(_('Limit Date'), null = True, blank = True)
@@ -109,7 +109,10 @@
             		<div class="notifies">
             			<div style="text-align:left">
 	            			{% if notify.instance.pk %}{{ notify.DELETE }}{% endif %}
-	            			{% render_field notify.subject %}
+	            			{% render_field notify.id %}
+	            			{% render_field notify.resource %}
+	            			{% render_field notify.subject class='pend_subj' %}
+		            		
 		            		<div class="form-group{% if notify.has_error %} has-error {% endif %} row">
 		            			<label for="{{ notify.action.auto_id }}" class="pull-left action_label contol-label">
 		            				{% trans 'Action not performed by the user' %}: 
@@ -118,13 +121,15 @@
 		        					{% render_field notify.action class='form-control' %}
 		        				</div>
+		        				<br clear="all" />
+
 		        				<span id="helpBlock" class="help-block">{{ notify.action.help_text }}</span>
 								{% if notify.action.errors %}
 									<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>
+										<button type="button" class="close" data-dismiss="alert" aria-label="Close">
+											<span aria-hidden="true">&times;</span>
+										</button>
 										<ul>
 											{% for error in notify.action.errors %}
 												<li>{{ error }}</li>
@@ -154,9 +159,9 @@
 								{% if notify.begin_date.errors %}
 									<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>
+										<button type="button" class="close" data-dismiss="alert" aria-label="Close">
+											<span aria-hidden="true">&times;</span>
+										</button>
 										<ul>
 											{% for error in notify.begin_date.errors %}
 												<li>{{ error }}</li>
@@ -180,9 +185,9 @@
 								{% if notify.end_date.errors %}
 									<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>
+										<button type="button" class="close" data-dismiss="alert" aria-label="Close">
+											<span aria-hidden="true">&times;</span>
+										</button>
 										<ul>
 											{% for error in notify.end_date.errors %}
 												<li>{{ error }}</li>
@@ -355,13 +360,14 @@
 			    subject = $("#id_control_subject").val();
-			    console.log(subject);
-			    console.log($(row).find('input[type=hidden]'));
-
-			    $(row).find('input[type=hidden]').val(subject);
+			    $(row).find('.pend_subj').val(subject);
 			}
 		});
+		subject = $("#id_control_subject").val();
+
+	    $('.pend_subj').val(subject);
+
 		{% if not pendencies_form.is_valid and pendencies_form.is_bound %}
 			$("#notifications").collapse('toggle');
 		{% endif %}
@@ -47,6 +47,8 @@
             </div>
         </div>
         <div id="{{subject.slug}}" class="panel-collapse in collapse category-panel-content">
-        	{{ webpage.content }}
+            {% autoescape off %}
+        	   {{ webpage.content }}
+            {% endautoescape %}
         </div>
 {% endblock %}
@@ -81,7 +81,7 @@ class CreateView(LoginRequiredMixin, generic.edit.CreateView):
 		slug = self.kwargs.get('slug', '')
 		topic = get_object_or_404(Topic, slug = slug)
-		pendencies_form = InlinePendenciesFormset(initial = [{'subject': topic.subject}])
+		pendencies_form = InlinePendenciesFormset(initial = [{'subject': topic.subject.id}])
 		return self.render_to_response(self.get_context_data(form = form, pendencies_form = pendencies_form))
@@ -94,7 +94,7 @@ class CreateView(LoginRequiredMixin, generic.edit.CreateView):
 		slug = self.kwargs.get('slug', '')
 		topic = get_object_or_404(Topic, slug = slug)
-		pendencies_form = InlinePendenciesFormset(self.request.POST, initial = [{'subject': topic.subject}])
+		pendencies_form = InlinePendenciesFormset(self.request.POST, initial = [{'subject': topic.subject.id}])
 		if (form.is_valid() and pendencies_form.is_valid()):
 			return self.form_valid(form, pendencies_form)
@@ -126,8 +126,13 @@ class CreateView(LoginRequiredMixin, generic.edit.CreateView):
 		self.object.save()
 		pendencies_form.instance = self.object
-		pendencies_form.save()
-        
+
+		for form in pendencies_form.forms:
+			pend_form = form.save(commit = False)
+
+			if not pend_form.action == "":
+				pend_form.save() 
+
 		return redirect(self.get_success_url())
 	def get_context_data(self, **kwargs):
@@ -174,21 +179,8 @@ class UpdateView(LoginRequiredMixin, generic.UpdateView):
 		return super(UpdateView, self).dispatch(request, *args, **kwargs)
-	# def get(self, request, *args, **kwargs):
-	# 	self.object = self.get_queryset()
-
-	# 	form_class = self.get_form_class()
-	# 	form = self.get_form(form_class)
-
-	# 	slug = self.kwargs.get('topic_slug', '')
-	# 	topic = get_object_or_404(Topic, slug = slug)
-
-	# 	pendencies_form = InlinePendenciesFormset(instance = self.object)
-
-	# 	return self.render_to_response(self.get_context_data(form = form, pendencies_form = pendencies_form))
-
 	def post(self, request, *args, **kwargs):
-		self.object = None
+		self.object = self.get_object()
 		form_class = self.get_form_class()
 		form = self.get_form(form_class)
@@ -196,7 +188,7 @@ class UpdateView(LoginRequiredMixin, generic.UpdateView):
 		slug = self.kwargs.get('topic_slug', '')
 		topic = get_object_or_404(Topic, slug = slug)
-		pendencies_form = InlinePendenciesFormset(self.request.POST, initial = [{'subject': topic.subject}])
+		pendencies_form = InlinePendenciesFormset(self.request.POST, instance = self.object, initial = [{'subject': topic.subject.id}])
 		if (form.is_valid() and pendencies_form.is_valid()):
 			return self.form_valid(form, pendencies_form)
@@ -209,16 +201,15 @@ class UpdateView(LoginRequiredMixin, generic.UpdateView):
 	def form_valid(self, form, pendencies_form):
 		self.object = form.save(commit = False)
-		slug = self.kwargs.get('topic_slug', '')
-		topic = get_object_or_404(Topic, slug = slug)
-
-		self.object.topic = topic
-		self.object.order = topic.resource_topic.count() + 1
-
 		self.object.save()
 		pendencies_form.instance = self.object
-		pendencies_form.save()
+
+		for form in pendencies_form.forms:
+			pend_form = form.save(commit = False)
+
+			if not pend_form.action == "":
+				pend_form.save()
 		return redirect(self.get_success_url())
@@ -233,12 +224,9 @@ class UpdateView(LoginRequiredMixin, generic.UpdateView):
 		context['topic'] = topic
 		context['subject'] = topic.subject
-		if self.request.POST:
-			context['form'] = WebpageForm(self.request.POST, instance=self.object, initial = {'subject': topic.subject})
-			context['pendencies_form'] = InlinePendenciesFormset(self.request.POST, instance=self.object)
-		else:
+		if not self.request.POST:
 			context['form'] = WebpageForm(instance=self.object, initial = {'subject': topic.subject})
-			context['pendencies_form'] = InlinePendenciesFormset(instance=self.object)
+			context['pendencies_form'] = InlinePendenciesFormset(instance=self.object, initial = [{'subject': topic.subject.id}])
 		return context
@@ -0,0 +1,20 @@		@@ -0,0 +1,20 @@
	1	+# -- coding: utf-8 --
	2	+# Generated by Django 1.10 on 2017-01-24 04:28
	3	+from __future__ import unicode_literals
	4	+
	5	+from django.db import migrations, models
	6	+
	7	+
	8	+class Migration(migrations.Migration):
	9	+
	10	+ dependencies = [
	11	+ ('pendencies', '0003_pendencies_limit_date'),
	12	+ ]
	13	+
	14	+ operations = [
	15	+ migrations.AlterField(
	16	+ model_name='pendencies',
	17	+ name='action',
	18	+ field=models.CharField(blank=True, choices=[('view', 'Visualize'), ('create', 'Create'), ('answer', 'Answer'), ('access', 'Access')], max_length=100, verbose_name='Action'),
	19	+ ),
	20	+ ]
	@@ -5,7 +5,7 @@ from django.utils.translation import ugettext_lazy as _		@@ -5,7 +5,7 @@ from django.utils.translation import ugettext_lazy as _
5	from topics.models import Resource	5	from topics.models import Resource
6		6
7	class Pendencies(models.Model):	7	class Pendencies(models.Model):
8	- action = models.CharField(_('Action'), max_length = 100, choices = (("view", _("Visualize")), ("create", _("Create")), ("answer", _("Answer")), ("access", _("Access"))))	8	+ action = models.CharField(_('Action'), max_length = 100, choices = (("view", _("Visualize")), ("create", _("Create")), ("answer", _("Answer")), ("access", _("Access"))), blank = True)
9	begin_date = models.DateTimeField(_('Begin Date'), null = True, blank = True)	9	begin_date = models.DateTimeField(_('Begin Date'), null = True, blank = True)
10	end_date = models.DateTimeField(_('End Date'), null = True, blank = True)	10	end_date = models.DateTimeField(_('End Date'), null = True, blank = True)
11	limit_date = models.DateTimeField(_('Limit Date'), null = True, blank = True)	11	limit_date = models.DateTimeField(_('Limit Date'), null = True, blank = True)