Download as
Browse Code »

Commit fe3b3af0fe70580709fa6c956ca264f36ccabb8e

Authored by Matheus Lins
1 parent aeab8e3e
Exists in master and in 5 other branches amadeus_univasf, dev, image-crop, pdf_file_html, refactoring

updating create course

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