Adjusts in create goal and added update goal (not 100% finished)

Zambom
1 parent d0dd81e0
Showing 13 changed files with 267 additions and 50 deletions Show diff stats
amadeus/formats/__init__.py
amadeus/formats/en/__init__.py
amadeus/formats/en/formats.py
amadeus/formats/pt_BR/__init__.py
amadeus/formats/pt_BR/formats.py
amadeus/settings.py
goals/forms.py
goals/models.py
goals/templates/goals/_form.html
goals/templates/goals/update.html
goals/urls.py
goals/views.py
pendencies/forms.py
@@ -0,0 +1,2 @@
+DATETIME_FORMAT = '%m/%d/%Y %I:%M %p'
+DATETIME_INPUT_FORMATS = ('%m/%d/%Y %I:%M %p',)
 \ No newline at end of file
@@ -0,0 +1,2 @@
+DATETIME_FORMAT = '%d/%m/%Y %H:%M'
+DATETIME_INPUT_FORMATS = ('%d/%m/%Y %H:%M',)
 \ No newline at end of file
@@ -172,7 +172,7 @@ USE_L10N = True
 USE_TZ = True
-
+FORMAT_MODULE_PATH = 'amadeus.formats'
 # Static files (CSS, JavaScript, Images)
 # https://docs.djangoproject.com/en/1.9/howto/static-files/
@@ -269,10 +269,6 @@ OAUTH2_PROVIDER = {
 #For date purposes
-DATETIME_INPUT_FORMATS.append('%d/%m/%y')
-DATETIME_INPUT_FORMATS.append('%m/%d/%y')
-DATETIME_INPUT_FORMATS.append('%m/%d/%Y %I:%M %p')
-DATETIME_INPUT_FORMATS.append('%d/%m/%Y %H:%M')
 DATE_INPUT_FORMATS.append('%d/%m/%y')
 DATE_INPUT_FORMATS.append('%m/%d/%y')
 # coding=utf-8
 from django import forms
+from datetime import datetime
 from django.conf import settings
 from django.utils.translation import ugettext_lazy as _
 from django.forms.models import inlineformset_factory
@@ -13,21 +14,23 @@ from .models import Goals, GoalItem
 class GoalsForm(forms.ModelForm):
 	subject = None
+	topic = None
 	control_subject = forms.CharField(widget = forms.HiddenInput())
 	def __init__(self, *args, **kwargs):
 		super(GoalsForm, self).__init__(*args, **kwargs)
 		self.subject = kwargs['initial'].get('subject', None)
+		self.topic = kwargs['initial'].get('topic', None)
 		if self.instance.id:
 			self.subject = self.instance.topic.subject
+			self.topic = self.instance.topic
 			self.initial['tags'] = ", ".join(self.instance.tags.all().values_list("name", flat = True))
 		self.initial['control_subject'] = self.subject.id
 	tags = forms.CharField(label = _('Tags'), required = False)
-	#limit_submission_date = forms.DateTimeField(input_formats = settings.DATETIME_INPUT_FORMATS)
 	class Meta:
 		model = Goals
@@ -43,16 +46,27 @@ class GoalsForm(forms.ModelForm):
 	def clean(self):
 		cleaned_data = super(GoalsForm, self).clean()
-		topic = cleaned_data.get('topic', None)
+		limit_submission_date = cleaned_data.get('limit_submission_date', None)
-		if topic:
+		if self.topic:
 			if self.instance.id:
-				exist = topic.resource_topic.filter(goals__isnull = False).exclude(id = self.instance.id).exists()
+				exist = self.topic.resource_topic.filter(goals__isnull = False).exclude(id = self.instance.id).exists()
 			else:
-				exist = topic.resource_topic.filter(goals__isnull = False).exists()
+				exist = self.topic.resource_topic.filter(goals__isnull = False).exists()
 			if exist:
-				self.add_error('name', _('There already is another resource with the goals specification for the Topic %s')%(str(topic)))
+				self.add_error('name', _('There already is another resource with the goals specification for the Topic %s')%(str(self.topic)))
+
+		if limit_submission_date:
+			if not limit_submission_date == ValueError:
+				if not self.instance.id and limit_submission_date.date() < datetime.today().date():
+					self.add_error('limit_submission_date', _("This input should be filled with a date equal or after today's date."))
+
+				if limit_submission_date.date() < self.subject.init_date:
+					self.add_error('limit_submission_date', _('This input should be filled with a date equal or after the subject begin date.'))
+
+				if limit_submission_date.date() > self.subject.end_date:
+					self.add_error('limit_submission_date', _('This input should be filled with a date equal or after the subject end date.'))
 		return cleaned_data
@@ -90,5 +104,18 @@ class GoalItemForm(forms.ModelForm):
 		model = GoalItem
 		fields = ['description', 'ref_value']
+	def clean(self):
+		cleaned_data = super(GoalItemForm, self).clean()
+
+		description = cleaned_data.get('description', None)
+		ref_value = cleaned_data.get('ref_value', None)
+
+		if ref_value and ref_value != "0":
+			if not description:
+				self.add_error('description', _('This field is required.'))
+
+		return cleaned_data
+
+
 InlinePendenciesFormset = inlineformset_factory(Goals, Pendencies, form = PendenciesLimitedForm, extra = 1, max_num = 3, validate_max = True, can_delete = True)
 InlineGoalItemFormset = inlineformset_factory(Goals, GoalItem, form = GoalItemForm, extra = 1, can_delete = True)
 \ No newline at end of file
@@ -20,7 +20,7 @@ class Goals(Resource):
 		return reverse_lazy('file_links:download', args = (), kwargs = {'slug': self.slug})
 	def update_link(self):
-		return 'file_links:update'
+		return 'goals:update'
 	def delete_link(self):
 		return 'file_links:delete'
@@ -29,7 +29,7 @@ class Goals(Resource):
 		return _('Are you sure you want delete the goals')
 class GoalItem(models.Model):
-	description = models.CharField(_('Description'), max_length = 255)
+	description = models.CharField(_('Description'), max_length = 255, blank = True)
 	ref_value = models.IntegerField(_('Referential Value'))
 	order = models.PositiveSmallIntegerField(_('Order'), null = True)
 	goal = models.ForeignKey(Goals, verbose_name = _('Goal'), related_name = 'item_goal')
 \ No newline at end of file
@@ -102,7 +102,9 @@
 		        				</label>
 		        				<div class="col-md-9">
 		        					<span class="label">0%</span>
-		        					{% render_field item.ref_value class='slider_value' data-slider-min="0" data-slider-max="100" %}
+		        					{% with item.ref_value.value|default:"0" as item_value %}
+		        						{% render_field item.ref_value class='slider_value' data-slider-value=item_value data-slider-min="0" data-slider-max="100" %}
+		        					{% endwith %}
 		        					<span class="label">100%</span>
 		        				</div>
@@ -192,7 +194,7 @@
 				</div>
 			{% endif %}
 		</div>
-	
+		
 		<div class="panel panel-info">
 			<div class="panel-heading">
     			<div class="row">
@@ -212,6 +214,7 @@
 				{% for notify in pendencies_form %}
 	        		<div class="notifies">
 	        			<div style="text-align:left">
+	        				{{ notify.errors }}
 	            			{% render_field notify.id %}
 	            			{% render_field notify.resource %}
 	            			{% render_field notify.subject class='pend_subj' %}
@@ -390,7 +393,6 @@
 	$(function() {
 		$(".slider_value").bootstrapSlider({
 			tooltip: 'always',
-			value: '0'
 		});
 		$('.goalitems').formset({
@@ -477,6 +479,10 @@
 		{% if not pendencies_form.is_valid and pendencies_form.is_bound %}
 			$("#notifications").collapse('toggle');
 		{% endif %}
+
+		{% if not goalitems_form.is_valid and goalitems_form.is_bound %}
+			$("#goal_items").collapse('toggle');
+		{% endif %}
 	});
 </script>
 <script type="text/javascript" src="{% static 'js/resources.js' %}"></script>
 \ No newline at end of file
@@ -0,0 +1,37 @@
+{% extends 'subjects/view.html' %}
+
+{% load static i18n django_bootstrap_breadcrumbs %}
+
+{% block style %}
+	{{block.super}}
+	<link rel="stylesheet" type="text/css" href="{% static "css/bootstrap-tagsinput.css" %}">
+	<link rel="stylesheet" type="text/css" href="{% static "css/bootstrap-slider.css" %}">
+{% endblock %}
+
+{% block javascript %}
+	{{block.super}}
+	<script type="text/javascript" src="{% static "js/bootstrap-tagsinput.js" %} "></script>
+	<script type="text/javascript" src="{% static "js/bootstrap-slider.js" %} "></script>
+	<script type="text/javascript" src="{% static "js/jquery.formset.js" %} "></script>
+{% endblock %}
+
+{% block breadcrumbs %}
+	{{ block.super }}
+
+	{% breadcrumb topic 'subjects:topic_view' topic.subject.slug topic.slug %}
+	
+	{% trans 'Edit: Topic Goals ' as bread %}
+	{% breadcrumb bread 'goals:update' topic.slug goal.slug %}
+{% endblock %}
+
+{% block content %}
+	<div class="card">
+		<div class="card-content">
+			<div class="card-body">
+				{% include 'goals/_form.html' %}
+			</div>
+		</div>
+	</div>
+	<br clear="all" />
+	<br clear="all" />
+{% endblock %}
@@ -5,4 +5,5 @@ from . import views
 urlpatterns = [
 	url(r'^create/(?P<slug>[\w_-]+)/$', views.CreateView.as_view(), name = 'create'),
+	url(r'^update/(?P<topic_slug>[\w_-]+)/(?P<slug>[\w_-]+)/$', views.UpdateView.as_view(), name = 'update'),
 ]
@@ -90,7 +90,7 @@ class CreateView(LoginRequiredMixin, generic.edit.CreateView):
 		if not self.object.topic.visible and not self.object.topic.repository:
 			self.object.visible = False
-		#self.object.save()
+		self.object.save()
 		pendencies_form.instance = self.object
 		pendencies_form.save(commit = False)
@@ -98,11 +98,22 @@ class CreateView(LoginRequiredMixin, generic.edit.CreateView):
 		for pform in pendencies_form.forms:
 			pend_form = pform.save(commit = False)
-			#if not pend_form.action == "":
-				#pend_form.save()
+			if not pend_form.action == "":
+				pend_form.save()
 		goalitems_form.instance = self.object
 		goalitems_form.save(commit = False)
+
+		g_order = 1
+
+		for gform in goalitems_form.forms:
+			goal_form = gform.save(commit = False)
+
+			if not goal_form.description == "":
+				goal_form.order = g_order
+				goal_form.save()
+
+				g_order += 1
 		return redirect(self.get_success_url())
@@ -131,4 +142,119 @@ class CreateView(LoginRequiredMixin, generic.edit.CreateView):
 		success_url = reverse_lazy('subjects:view', kwargs = {'slug': self.object.topic.subject.slug})
+		return success_url
+
+class UpdateView(LoginRequiredMixin, generic.UpdateView):
+	login_url = reverse_lazy("users:login")
+	redirect_field_name = 'next'
+
+	template_name = 'goals/update.html'
+	model = Goals
+	form_class = GoalsForm
+	context_object_name = 'goal'
+
+	def dispatch(self, request, *args, **kwargs):
+		slug = self.kwargs.get('topic_slug', '')
+		topic = get_object_or_404(Topic, slug = slug)
+
+		if not has_subject_permissions(request.user, topic.subject):
+			return redirect(reverse_lazy('subjects:home'))
+
+		return super(UpdateView, self).dispatch(request, *args, **kwargs)
+
+	def get(self, request, *args, **kwargs):
+		self.object = self.get_object()
+		
+		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, initial = [{'subject': topic.subject.id, 'actions': [("", "-------"),("view", _("Visualize")), ("submit", _("Submit"))]}])
+		goalitems_form = InlineGoalItemFormset(instance = self.object)
+
+		return self.render_to_response(self.get_context_data(form = form, pendencies_form = pendencies_form, goalitems_form = goalitems_form))
+
+	def post(self, request, *args, **kwargs):
+		self.object = self.get_object()
+		
+		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(self.request.POST, instance = self.object, initial = [{'subject': topic.subject.id, 'actions': [("", "-------"),("view", _("Visualize")), ("submit", _("Submit"))]}])
+		goalitems_form = InlineGoalItemFormset(self.request.POST, instance = self.object)
+
+		if (form.is_valid() and pendencies_form.is_valid() and goalitems_form.is_valid()):
+			return self.form_valid(form, pendencies_form, goalitems_form)
+		else:
+			return self.form_invalid(form, pendencies_form, goalitems_form)
+	
+	def form_invalid(self, form, pendencies_form, goalitems_form):
+		for p_form in pendencies_form.forms:
+			p_form.fields['action'].choices = [("", "-------"),("view", _("Visualize")), ("submit", _("Submit"))]
+
+		return self.render_to_response(self.get_context_data(form = form, pendencies_form = pendencies_form, goalitems_form = goalitems_form))
+
+	def form_valid(self, form, pendencies_form, goalitems_form):
+		self.object = form.save(commit = False)
+
+		if not self.object.topic.visible and not self.object.topic.repository:
+			self.object.visible = False
+		
+		self.object.save()
+
+		pendencies_form.instance = self.object
+		pendencies_form.save(commit = False)
+
+		for form in pendencies_form.forms:
+			pend_form = form.save(commit = False)
+
+			if not pend_form.action == "":
+				pend_form.save()
+
+		goalitems_form.instance = self.object
+		goalitems_form.save(commit = False)
+
+		g_order = self.object.item_goal.count() + 1
+
+		for gform in goalitems_form.forms:
+			goal_form = gform.save(commit = False)
+
+			if not goal_form.description == "":
+				goal_form.order = g_order
+				goal_form.save()
+
+				g_order += 1
+		
+		return redirect(self.get_success_url())
+
+	def get_context_data(self, **kwargs):
+		context = super(UpdateView, self).get_context_data(**kwargs)
+
+		context['title'] = _('Update Topic Goals')
+
+		slug = self.kwargs.get('topic_slug', '')
+		topic = get_object_or_404(Topic, slug = slug)
+
+		context['topic'] = topic
+		context['subject'] = topic.subject
+
+		return context
+
+	def get_success_url(self):
+		messages.success(self.request, _('The YouTube Video "%s" was updated successfully!')%(self.object.name))
+
+		#success_url = reverse_lazy('youtube:view', kwargs = {'slug': self.object.slug})
+
+		#if self.object.show_window:
+		#	self.request.session['resources'] = {}
+		#	self.request.session['resources']['new_page'] = True
+		#	self.request.session['resources']['new_page_url'] = reverse('youtube:window_view', kwargs = {'slug': self.object.slug})
+
+		success_url = reverse_lazy('subjects:view', kwargs = {'slug': self.object.topic.subject.slug})
+
 		return success_url
 \ No newline at end of file
@@ -4,6 +4,8 @@ import datetime
 from django import forms
 from django.conf import settings
 from django.utils.translation import ugettext_lazy as _
+from django.utils.formats import get_format
+from django.utils import timezone
 from subjects.models import Subject
@@ -18,8 +20,10 @@ class PendenciesForm(forms.ModelForm):
 		if kwargs.get('initial', None):
 			self.fields['action'].choices = kwargs['initial'].get('actions', [])
-		self.fields['begin_date'].input_formats = settings.DATETIME_INPUT_FORMATS
-		self.fields['end_date'].input_formats = settings.DATETIME_INPUT_FORMATS
+		datetime_formats = get_format('DATETIME_INPUT_FORMATS')
+
+		self.fields['begin_date'].input_formats = datetime_formats
+		self.fields['end_date'].input_formats = datetime_formats
 	begin_date_check = forms.BooleanField(required = False)
 	end_date_check = forms.BooleanField(required = False)
@@ -89,21 +93,23 @@ class PendenciesLimitedForm(forms.ModelForm):
 		if kwargs.get('initial', None):
 			self.fields['action'].choices = kwargs['initial'].get('actions', [])
+
+		datetime_formats = get_format('DATETIME_INPUT_FORMATS')
+
+		self.fields['begin_date'].input_formats = datetime_formats
+		self.fields['end_date'].input_formats = datetime_formats
+		self.fields['limit_date'].input_formats = datetime_formats
 	begin_date_check = forms.BooleanField(required = False)
 	end_date_check = forms.BooleanField(required = False)
 	limit_date_check = forms.BooleanField(required = False)
-	begin_date = forms.DateTimeField(input_formats = settings.DATETIME_INPUT_FORMATS)
-	end_date = forms.DateTimeField(input_formats = settings.DATETIME_INPUT_FORMATS)
-	limit_date = forms.DateTimeField(input_formats = settings.DATETIME_INPUT_FORMATS)
-
+	
 	class Meta:
 		model = Pendencies
-		fields = ['action']
+		fields = ['action', 'begin_date', 'end_date', 'limit_date']
 	def clean(self):
 		cleaned_data = super(PendenciesLimitedForm, self).clean()
-		print(self.data)
 		pend_id = cleaned_data.get('id', None)
@@ -111,14 +117,12 @@ class PendenciesLimitedForm(forms.ModelForm):
 		action = cleaned_data.get('action', None)
 		begin_date = cleaned_data.get('begin_date', None)
 		end_date = cleaned_data.get('end_date', None)
-		#limit_date = cleaned_data.get('limit_date', None)
+		limit_date = cleaned_data.get('limit_date', None)
 		begin_check = cleaned_data.get('begin_date_check', False)
 		end_check = cleaned_data.get('end_date_check', False)
-		#limit_check = cleaned_data.get('limit_date_check', False)
+		limit_check = cleaned_data.get('limit_date_check', False)
 		subject_id = cleaned_data.get('subject', None)
-		print(limit_submission_date)
-
 		if begin_check or end_check or limit_date:
 			if not action:
 				self.add_error('action', _('This field is required.'))
@@ -129,8 +133,8 @@ class PendenciesLimitedForm(forms.ModelForm):
 		if not end_date and end_check:
 			self.add_error('end_date', _('This field is required.'))
-		#if not limit_date and limit_check:
-		#	self.add_error('limit_date', _('This field is required.'))
+		if not limit_date and limit_check:
+			self.add_error('limit_date', _('This field is required.'))
 		if begin_date and end_date:
 			if not begin_date == ValueError and not end_date == ValueError:
@@ -138,17 +142,17 @@ class PendenciesLimitedForm(forms.ModelForm):
 					self.add_error('begin_date', _('This input should be filled with a date equal or before the End Date.'))
 					self.add_error('end_date', _('This input should be filled with a date equal or after the Begin Date.'))
-		#if begin_date and limit_date:
-		#	if not begin_date == ValueError and not limit_date == ValueError:
-		#		if begin_date > limit_date:
-		#			self.add_error('begin_date', _('This input should be filled with a date equal or before the Limit Date.'))
-		#			self.add_error('limit_date', _('This input should be filled with a date equal or after the Begin Date.'))
+		if begin_date and limit_date:
+			if not begin_date == ValueError and not limit_date == ValueError:
+				if begin_date > limit_date:
+					self.add_error('begin_date', _('This input should be filled with a date equal or before the Limit Date.'))
+					self.add_error('limit_date', _('This input should be filled with a date equal or after the Begin Date.'))
-		#if end_date and limit_date:
-		#	if not end_date == ValueError and not limit_date == ValueError:
-		#		if end_date > limit_date:
-		#			self.add_error('end_date', _('This input should be filled with a date equal or before the Limit Date.'))
-		#			self.add_error('limit_date', _('This input should be filled with a date equal or after the End Date.'))
+		if end_date and limit_date:
+			if not end_date == ValueError and not limit_date == ValueError:
+				if end_date > limit_date:
+					self.add_error('end_date', _('This input should be filled with a date equal or before the Limit Date.'))
+					self.add_error('limit_date', _('This input should be filled with a date equal or after the End Date.'))
 		if subject_id:
 			subject = Subject.objects.get(id = subject_id)
@@ -173,14 +177,30 @@ class PendenciesLimitedForm(forms.ModelForm):
 				if end_date.date() > subject.end_date:
 					self.add_error('end_date', _('This input should be filled with a date equal or before the subject end date.'))
-			#if not limit_date == ValueError and limit_date:
-			#	if not self.instance.id and limit_date.date() < datetime.datetime.today().date():
-			#		self.add_error('limit_date', _("This input should be filled with a date equal or after today's date."))
+			if not limit_date == ValueError and limit_date:
+				if not self.instance.id and limit_date.date() < datetime.datetime.today().date():
+					self.add_error('limit_date', _("This input should be filled with a date equal or after today's date."))
-			#	if limit_date.date() < subject.init_date:
-			#		self.add_error('limit_date', _('This input should be filled with a date equal or after the subject begin date.'))
+				if limit_date.date() < subject.init_date:
+					self.add_error('limit_date', _('This input should be filled with a date equal or after the subject begin date.'))
+
+				if limit_date.date() > subject.end_date:
+					self.add_error('limit_date', _('This input should be filled with a date equal or before the subject end date.'))
+
+		if limit_submission_date:
+			limit_submission_date = datetime.datetime.strptime(limit_submission_date, get_format('DATETIME_FORMAT'))
+			limit_submission_date = timezone.make_aware(limit_submission_date, timezone.get_current_timezone())
+
+			if not begin_date == ValueError and begin_date:
+				if begin_date > limit_submission_date:
+					self.add_error('begin_date', _('This input should be filled with a date equal or before the goals submission limit date.'))
+
+			if not end_date == ValueError and end_date:
+				if end_date > limit_submission_date:
+					self.add_error('end_date', _('This input should be filled with a date equal or before the goals submission limit date.'))
-			#	if limit_date.date() > subject.end_date:
-			#		self.add_error('limit_date', _('This input should be filled with a date equal or before the subject end date.'))
+			if not limit_date == ValueError and limit_date:
+				if limit_date > limit_submission_date:
+					self.add_error('limit_date', _('This input should be filled with a date equal or before the goals submission limit date.'))
 		return cleaned_data
	@@ -0,0 +1,2 @@		@@ -0,0 +1,2 @@
		1	+DATETIME_FORMAT = '%m/%d/%Y %I:%M %p'
		2	+DATETIME_INPUT_FORMATS = ('%m/%d/%Y %I:%M %p',)
0	\ No newline at end of file	3	\ No newline at end of file
	@@ -0,0 +1,2 @@		@@ -0,0 +1,2 @@
		1	+DATETIME_FORMAT = '%d/%m/%Y %H:%M'
		2	+DATETIME_INPUT_FORMATS = ('%d/%m/%Y %H:%M',)
0	\ No newline at end of file	3	\ No newline at end of file
	@@ -20,7 +20,7 @@ class Goals(Resource):		@@ -20,7 +20,7 @@ class Goals(Resource):
20	return reverse_lazy('file_links:download', args = (), kwargs = {'slug': self.slug})	20	return reverse_lazy('file_links:download', args = (), kwargs = {'slug': self.slug})
21		21
22	def update_link(self):	22	def update_link(self):
23	- return 'file_links:update'	23	+ return 'goals:update'
24		24
25	def delete_link(self):	25	def delete_link(self):
26	return 'file_links:delete'	26	return 'file_links:delete'
	@@ -29,7 +29,7 @@ class Goals(Resource):		@@ -29,7 +29,7 @@ class Goals(Resource):
29	return _('Are you sure you want delete the goals')	29	return _('Are you sure you want delete the goals')
30		30
31	class GoalItem(models.Model):	31	class GoalItem(models.Model):
32	- description = models.CharField(_('Description'), max_length = 255)	32	+ description = models.CharField(_('Description'), max_length = 255, blank = True)
33	ref_value = models.IntegerField(_('Referential Value'))	33	ref_value = models.IntegerField(_('Referential Value'))
34	order = models.PositiveSmallIntegerField(_('Order'), null = True)	34	order = models.PositiveSmallIntegerField(_('Order'), null = True)
35	goal = models.ForeignKey(Goals, verbose_name = _('Goal'), related_name = 'item_goal')	35	goal = models.ForeignKey(Goals, verbose_name = _('Goal'), related_name = 'item_goal')
36	\ No newline at end of file	36	\ No newline at end of file
@@ -0,0 +1,37 @@		@@ -0,0 +1,37 @@
	1	+{% extends 'subjects/view.html' %}
	2	+
	3	+{% load static i18n django_bootstrap_breadcrumbs %}
	4	+
	5	+{% block style %}
	6	+ {{block.super}}
	7	+ <link rel="stylesheet" type="text/css" href="{% static "css/bootstrap-tagsinput.css" %}">
	8	+ <link rel="stylesheet" type="text/css" href="{% static "css/bootstrap-slider.css" %}">
	9	+{% endblock %}
	10	+
	11	+{% block javascript %}
	12	+ {{block.super}}
	13	+ <script type="text/javascript" src="{% static "js/bootstrap-tagsinput.js" %} "></script>
	14	+ <script type="text/javascript" src="{% static "js/bootstrap-slider.js" %} "></script>
	15	+ <script type="text/javascript" src="{% static "js/jquery.formset.js" %} "></script>
	16	+{% endblock %}
	17	+
	18	+{% block breadcrumbs %}
	19	+ {{ block.super }}
	20	+
	21	+ {% breadcrumb topic 'subjects:topic_view' topic.subject.slug topic.slug %}
	22	+
	23	+ {% trans 'Edit: Topic Goals ' as bread %}
	24	+ {% breadcrumb bread 'goals:update' topic.slug goal.slug %}
	25	+{% endblock %}
	26	+
	27	+{% block content %}
	28	+ <div class="card">
	29	+ <div class="card-content">
	30	+ <div class="card-body">
	31	+ {% include 'goals/_form.html' %}
	32	+ </div>
	33	+ </div>
	34	+ </div>
	35	+ <br clear="all" />
	36	+ <br clear="all" />
	37	+{% endblock %}
	@@ -5,4 +5,5 @@ from . import views		@@ -5,4 +5,5 @@ from . import views
5		5
6	urlpatterns = [	6	urlpatterns = [
7	url(r'^create/(?P<slug>[\w_-]+)/$', views.CreateView.as_view(), name = 'create'),	7	url(r'^create/(?P<slug>[\w_-]+)/$', views.CreateView.as_view(), name = 'create'),
		8	+ url(r'^update/(?P<topic_slug>[\w_-]+)/(?P<slug>[\w_-]+)/$', views.UpdateView.as_view(), name = 'update'),
8	]	9	]
	@@ -90,7 +90,7 @@ class CreateView(LoginRequiredMixin, generic.edit.CreateView):		@@ -90,7 +90,7 @@ class CreateView(LoginRequiredMixin, generic.edit.CreateView):
90	if not self.object.topic.visible and not self.object.topic.repository:	90	if not self.object.topic.visible and not self.object.topic.repository:
91	self.object.visible = False	91	self.object.visible = False
92		92
93	- #self.object.save()	93	+ self.object.save()
94		94
95	pendencies_form.instance = self.object	95	pendencies_form.instance = self.object
96	pendencies_form.save(commit = False)	96	pendencies_form.save(commit = False)
	@@ -98,11 +98,22 @@ class CreateView(LoginRequiredMixin, generic.edit.CreateView):		@@ -98,11 +98,22 @@ class CreateView(LoginRequiredMixin, generic.edit.CreateView):
98	for pform in pendencies_form.forms:	98	for pform in pendencies_form.forms:
99	pend_form = pform.save(commit = False)	99	pend_form = pform.save(commit = False)
100		100
101	- #if not pend_form.action == "":
102	- #pend_form.save()	101	+ if not pend_form.action == "":
		102	+ pend_form.save()
103		103
104	goalitems_form.instance = self.object	104	goalitems_form.instance = self.object
105	goalitems_form.save(commit = False)	105	goalitems_form.save(commit = False)
		106	+
		107	+ g_order = 1
		108	+
		109	+ for gform in goalitems_form.forms:
		110	+ goal_form = gform.save(commit = False)
		111	+
		112	+ if not goal_form.description == "":
		113	+ goal_form.order = g_order
		114	+ goal_form.save()
		115	+
		116	+ g_order += 1
106		117
107	return redirect(self.get_success_url())	118	return redirect(self.get_success_url())
108		119
	@@ -131,4 +142,119 @@ class CreateView(LoginRequiredMixin, generic.edit.CreateView):		@@ -131,4 +142,119 @@ class CreateView(LoginRequiredMixin, generic.edit.CreateView):
131		142
132	success_url = reverse_lazy('subjects:view', kwargs = {'slug': self.object.topic.subject.slug})	143	success_url = reverse_lazy('subjects:view', kwargs = {'slug': self.object.topic.subject.slug})
133		144
		145	+ return success_url
		146	+
		147	+class UpdateView(LoginRequiredMixin, generic.UpdateView):
		148	+ login_url = reverse_lazy("users:login")
		149	+ redirect_field_name = 'next'
		150	+
		151	+ template_name = 'goals/update.html'
		152	+ model = Goals
		153	+ form_class = GoalsForm
		154	+ context_object_name = 'goal'
		155	+
		156	+ def dispatch(self, request, args, *kwargs):
		157	+ slug = self.kwargs.get('topic_slug', '')
		158	+ topic = get_object_or_404(Topic, slug = slug)
		159	+
		160	+ if not has_subject_permissions(request.user, topic.subject):
		161	+ return redirect(reverse_lazy('subjects:home'))
		162	+
		163	+ return super(UpdateView, self).dispatch(request, args, *kwargs)
		164	+
		165	+ def get(self, request, args, *kwargs):
		166	+ self.object = self.get_object()
		167	+
		168	+ form_class = self.get_form_class()
		169	+ form = self.get_form(form_class)
		170	+
		171	+ slug = self.kwargs.get('topic_slug', '')
		172	+ topic = get_object_or_404(Topic, slug = slug)
		173	+
		174	+ pendencies_form = InlinePendenciesFormset(instance = self.object, initial = [{'subject': topic.subject.id, 'actions': [("", "-------"),("view", _("Visualize")), ("submit", _("Submit"))]}])
		175	+ goalitems_form = InlineGoalItemFormset(instance = self.object)
		176	+
		177	+ return self.render_to_response(self.get_context_data(form = form, pendencies_form = pendencies_form, goalitems_form = goalitems_form))
		178	+
		179	+ def post(self, request, args, *kwargs):
		180	+ self.object = self.get_object()
		181	+
		182	+ form_class = self.get_form_class()
		183	+ form = self.get_form(form_class)
		184	+
		185	+ slug = self.kwargs.get('topic_slug', '')
		186	+ topic = get_object_or_404(Topic, slug = slug)
		187	+
		188	+ pendencies_form = InlinePendenciesFormset(self.request.POST, instance = self.object, initial = [{'subject': topic.subject.id, 'actions': [("", "-------"),("view", _("Visualize")), ("submit", _("Submit"))]}])
		189	+ goalitems_form = InlineGoalItemFormset(self.request.POST, instance = self.object)
		190	+
		191	+ if (form.is_valid() and pendencies_form.is_valid() and goalitems_form.is_valid()):
		192	+ return self.form_valid(form, pendencies_form, goalitems_form)
		193	+ else:
		194	+ return self.form_invalid(form, pendencies_form, goalitems_form)
		195	+
		196	+ def form_invalid(self, form, pendencies_form, goalitems_form):
		197	+ for p_form in pendencies_form.forms:
		198	+ p_form.fields['action'].choices = [("", "-------"),("view", _("Visualize")), ("submit", _("Submit"))]
		199	+
		200	+ return self.render_to_response(self.get_context_data(form = form, pendencies_form = pendencies_form, goalitems_form = goalitems_form))
		201	+
		202	+ def form_valid(self, form, pendencies_form, goalitems_form):
		203	+ self.object = form.save(commit = False)
		204	+
		205	+ if not self.object.topic.visible and not self.object.topic.repository:
		206	+ self.object.visible = False
		207	+
		208	+ self.object.save()
		209	+
		210	+ pendencies_form.instance = self.object
		211	+ pendencies_form.save(commit = False)
		212	+
		213	+ for form in pendencies_form.forms:
		214	+ pend_form = form.save(commit = False)
		215	+
		216	+ if not pend_form.action == "":
		217	+ pend_form.save()
		218	+
		219	+ goalitems_form.instance = self.object
		220	+ goalitems_form.save(commit = False)
		221	+
		222	+ g_order = self.object.item_goal.count() + 1
		223	+
		224	+ for gform in goalitems_form.forms:
		225	+ goal_form = gform.save(commit = False)
		226	+
		227	+ if not goal_form.description == "":
		228	+ goal_form.order = g_order
		229	+ goal_form.save()
		230	+
		231	+ g_order += 1
		232	+
		233	+ return redirect(self.get_success_url())
		234	+
		235	+ def get_context_data(self, **kwargs):
		236	+ context = super(UpdateView, self).get_context_data(**kwargs)
		237	+
		238	+ context['title'] = _('Update Topic Goals')
		239	+
		240	+ slug = self.kwargs.get('topic_slug', '')
		241	+ topic = get_object_or_404(Topic, slug = slug)
		242	+
		243	+ context['topic'] = topic
		244	+ context['subject'] = topic.subject
		245	+
		246	+ return context
		247	+
		248	+ def get_success_url(self):
		249	+ messages.success(self.request, _('The YouTube Video "%s" was updated successfully!')%(self.object.name))
		250	+
		251	+ #success_url = reverse_lazy('youtube:view', kwargs = {'slug': self.object.slug})
		252	+
		253	+ #if self.object.show_window:
		254	+ # self.request.session['resources'] = {}
		255	+ # self.request.session['resources']['new_page'] = True
		256	+ # self.request.session['resources']['new_page_url'] = reverse('youtube:window_view', kwargs = {'slug': self.object.slug})
		257	+
		258	+ success_url = reverse_lazy('subjects:view', kwargs = {'slug': self.object.topic.subject.slug})
		259	+
134	return success_url	260	return success_url
135	\ No newline at end of file	261	\ No newline at end of file