updating create course

Matheus Lins
1 parent aeab8e3e
Showing 6 changed files with 21 additions and 15 deletions Show diff stats
amadeus/settings.py
courses/forms.py
courses/templates/course/create.html
courses/templates/course/datepicker.html
courses/views.py
requirements.txt
@@ -94,8 +94,8 @@ DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.postgresql',
         'NAME': 'amadeus',
-        'USER': 'postgres',
-        'PASSWORD': 'felipe',
+        'USER': 'amadeus_admin',
+        'PASSWORD': 'amadeus',
         'HOST': '127.0.0.1',
         'PORT': '5432',
     }
@@ -2,6 +2,7 @@ from django import forms
 from django.utils.translation import ugettext_lazy as _
 from .models import Category, Course, Subject, Topic
  
+
 class CategoryForm(forms.ModelForm):
  
 	class Meta:
@@ -17,6 +18,12 @@ class CategoryForm(forms.ModelForm):
  
 class CourseForm(forms.ModelForm):
  
+	# init_register_date = forms.DateField(widget=forms.DateField)
+	# end_register_date = forms.DateField(widget=forms.DateField)
+	# init_date = forms.DateField(widget=forms.DateField)
+	# end_date = forms.DateField(widget=forms.DateField)
+
+
 	class Meta:
 		model = Course
 		fields = ('name', 'objectivies', 'content', 'max_students', 'init_register_date', 'end_register_date',
@@ -45,9 +52,6 @@ class CourseForm(forms.ModelForm):
 			'image': _('Representative image of the course'),
 			'category': _('Category which the course belongs'),
 		}
-		widgets = {
-			'categoy': forms.Select(),
-		}
  
 class SubjectForm(forms.ModelForm):
  
@@ -19,12 +19,6 @@
 {% endblock %}
  
 {% block content %}
-	<div class="alert alert-info alert-dismissible" role="alert">
-		<button type="button" class="close" data-dismiss="alert" aria-label="Close">
-			<span aria-hidden="true">&times;</span>
-		</button>
-		<p>{% trans 'All fields are required' %}</p>
-	</div>
  
 	<form method="post" action="" enctype="multipart/form-data">
 		{% csrf_token %}
@@ -48,6 +42,7 @@
 				{% endif %}
 			</div>
 		{% endfor %}
+
 		<input type="submit" value="{% trans 'Save' %}" class="btn btn-sm btn-success" />
 	</form>
 	<br clear="all" />
@@ -0,0 +1,4 @@
+<div class="input-append date" id="dp2" data-date="12-02-2012" data-date-format="dd-mm-yyyy">
+  <input class="span2" size="16" type="text">
+  <span class="add-on"><i class="icon-th"></i></span>
+</div>
 \ No newline at end of file
@@ -40,17 +40,20 @@ class CreateView(LoginRequiredMixin, HasRoleMixin, NotificationMixin,generic.edi
 	template_name = 'course/create.html'
 	form_class = CourseForm
 	success_url = reverse_lazy('course:manage')
+
 	def form_valid(self, form):
 		self.object = form.save(commit = False)
 		self.object.slug = slugify(self.object.name)
-		print('Fooooiiii!!')
 		self.object.save()
+		messages.success(self.request, _('Course created successfully!'))
  
 		return super(CreateView, self).form_valid(form)
  
-	def render_to_response(self, context, **response_kwargs):
-		messages.success(self.request, _('Course created successfully!'))
+	def form_invalid(self, form):
+	    print(form)
+	    return self.render_to_response(self.get_context_data(form=form))
  
+	def render_to_responssse(self, context, **response_kwargs):
 		return self.response_class(request=self.request, template=self.get_template_names(), context=context, using=self.template_engine)
  
 class UpdateView(LoginRequiredMixin, HasRoleMixin, generic.UpdateView):
 click==6.6
 Django==1.10
+django-autoslug==1.9.3
 django-bootstrap-breadcrumbs==0.8
 django-discover-runner==1.0
 django-role-permissions==1.2.1
@@ -13,4 +14,3 @@ psycopg2==2.6.2
 six==1.10.0
 slugify==0.0.1
 Werkzeug==0.11.11
-wheel==0.24.0
...	...	@@ -94,8 +94,8 @@ DATABASES = {
94	94	'default': {
95	95	'ENGINE': 'django.db.backends.postgresql',
96	96	'NAME': 'amadeus',
97		- 'USER': 'postgres',
98		- 'PASSWORD': 'felipe',
	97	+ 'USER': 'amadeus_admin',
	98	+ 'PASSWORD': 'amadeus',
99	99	'HOST': '127.0.0.1',
100	100	'PORT': '5432',
101	101	}
...	...
...	...	@@ -2,6 +2,7 @@ from django import forms
2	2	from django.utils.translation import ugettext_lazy as _
3	3	from .models import Category, Course, Subject, Topic
4	4
	5	+
5	6	class CategoryForm(forms.ModelForm):
6	7
7	8	class Meta:
...	...	@@ -17,6 +18,12 @@ class CategoryForm(forms.ModelForm):
17	18
18	19	class CourseForm(forms.ModelForm):
19	20
	21	+ # init_register_date = forms.DateField(widget=forms.DateField)
	22	+ # end_register_date = forms.DateField(widget=forms.DateField)
	23	+ # init_date = forms.DateField(widget=forms.DateField)
	24	+ # end_date = forms.DateField(widget=forms.DateField)
	25	+
	26	+
20	27	class Meta:
21	28	model = Course
22	29	fields = ('name', 'objectivies', 'content', 'max_students', 'init_register_date', 'end_register_date',
...	...	@@ -45,9 +52,6 @@ class CourseForm(forms.ModelForm):
45	52	'image': _('Representative image of the course'),
46	53	'category': _('Category which the course belongs'),
47	54	}
48		- widgets = {
49		- 'categoy': forms.Select(),
50		- }
51	55
52	56	class SubjectForm(forms.ModelForm):
53	57
...	...
...	...	@@ -19,12 +19,6 @@
19	19	{% endblock %}
20	20
21	21	{% block content %}
22		- <div class="alert alert-info alert-dismissible" role="alert">
23		- <button type="button" class="close" data-dismiss="alert" aria-label="Close">
24		- <span aria-hidden="true">×</span>
25		- </button>
26		- <p>{% trans 'All fields are required' %}</p>
27		- </div>
28	22
29	23	<form method="post" action="" enctype="multipart/form-data">
30	24	{% csrf_token %}
...	...	@@ -48,6 +42,7 @@
48	42	{% endif %}
49	43	</div>
50	44	{% endfor %}
	45	+
51	46	<input type="submit" value="{% trans 'Save' %}" class="btn btn-sm btn-success" />
52	47	</form>
53	48	<br clear="all" />
...	...
...	...	@@ -0,0 +1,4 @@
	1	+<div class="input-append date" id="dp2" data-date="12-02-2012" data-date-format="dd-mm-yyyy">
	2	+ <input class="span2" size="16" type="text">
	3	+ <span class="add-on"><i class="icon-th"></i></span>
	4	+</div>
0	5	\ No newline at end of file
...	...
...	...	@@ -40,17 +40,20 @@ class CreateView(LoginRequiredMixin, HasRoleMixin, NotificationMixin,generic.edi
40	40	template_name = 'course/create.html'
41	41	form_class = CourseForm
42	42	success_url = reverse_lazy('course:manage')
	43	+
43	44	def form_valid(self, form):
44	45	self.object = form.save(commit = False)
45	46	self.object.slug = slugify(self.object.name)
46		- print('Fooooiiii!!')
47	47	self.object.save()
	48	+ messages.success(self.request, _('Course created successfully!'))
48	49
49	50	return super(CreateView, self).form_valid(form)
50	51
51		- def render_to_response(self, context, **response_kwargs):
52		- messages.success(self.request, _('Course created successfully!'))
	52	+ def form_invalid(self, form):
	53	+ print(form)
	54	+ return self.render_to_response(self.get_context_data(form=form))
53	55
	56	+ def render_to_responssse(self, context, **response_kwargs):
54	57	return self.response_class(request=self.request, template=self.get_template_names(), context=context, using=self.template_engine)
55	58
56	59	class UpdateView(LoginRequiredMixin, HasRoleMixin, generic.UpdateView):
...	...
1	1	click==6.6
2	2	Django==1.10
	3	+django-autoslug==1.9.3
3	4	django-bootstrap-breadcrumbs==0.8
4	5	django-discover-runner==1.0
5	6	django-role-permissions==1.2.1
...	...	@@ -13,4 +14,3 @@ psycopg2==2.6.2
13	14	six==1.10.0
14	15	slugify==0.0.1
15	16	Werkzeug==0.11.11
16		-wheel==0.24.0
...	...