colocando o campo de public no template de course

Jailson Dias
1 parent e74bef54
Showing 4 changed files with 61 additions and 18 deletions Show diff stats
courses/forms.py
courses/templates/course/create.html
courses/templates/course/update.html
courses/views.py
@@ -42,16 +42,11 @@ class CourseForm(forms.ModelForm):
 			raise forms.ValidationError(_('The end date may not be before the start date.'))
 		return end_date
-	# 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',
-					'init_date', 'end_date', 'category', 'coordenator')
+					'init_date', 'end_date', 'category', 'coordenator','public')
 		labels = {
                             'name': _('Name'),
                             'objectivies': _('Objectives'),
@@ -61,8 +56,9 @@ class CourseForm(forms.ModelForm):
                             'end_register_date': _('Course registration end date'),
                             'init_date': _('Course start date'),
                             'end_date': _('Course end date'),
-                            'category': _('CourseCategory'),
+                            'category': _('Category'),
                             'coordenator': _('Coordenator'),
+							'public':_('Public'),
 		}
 		help_texts = {
                             'name': _('Course name'),
@@ -75,16 +71,42 @@ class CourseForm(forms.ModelForm):
                             'end_date': _('Date that the course ends (dd/mm/yyyy)'),
                             'category': _('CourseCategory which the course belongs'),
                             'coordenator': _('Course Coordenator'),
+							'public':_('To define if the course can be accessed by people not registered'),
 		}
 		widgets = {
-                            'categoy': forms.Select(),
+                            'ategoy': forms.Select(),
                             'coordenator': forms.Select(),
-                            'objectivies': SummernoteWidget(attrs={'cols': 80, 'rows': 5}),
-                            'content': SummernoteWidget(attrs={'cols': 80, 'rows': 5}),
+                            'content': SummernoteWidget(),
+							'objectivies': SummernoteWidget(),
 		}
 class UpdateCourseForm(CourseForm):
+
+	def clean_end_register_date(self):
+		init_register_date = self.cleaned_data['init_register_date']
+		end_register_date = self.cleaned_data['end_register_date']
+
+		if init_register_date and end_register_date and end_register_date < init_register_date:
+			raise forms.ValidationError(_('The end date may not be before the start date.'))
+		return end_register_date
+
+	def clean_init_date(self):
+		end_register_date = self.cleaned_data['end_register_date']
+		init_date = self.cleaned_data['init_date']
+
+		if end_register_date and init_date and init_date <= end_register_date:
+			raise forms.ValidationError(_('The course start date must be after the end of registration.'))
+		return init_date
+
+	def clean_end_date(self):
+		init_date = self.cleaned_data['init_date']
+		end_date = self.cleaned_data['end_date']
+
+		if init_date and end_date and end_date < init_date:
+			raise forms.ValidationError(_('The end date may not be before the start date.'))
+		return end_date
+
 	def __init__(self, *args, **kwargs):
 		super(UpdateCourseForm, self).__init__(*args, **kwargs)
 		self.fields["students"].required = False
@@ -92,7 +114,7 @@ class UpdateCourseForm(CourseForm):
 	class Meta:
 		model = Course
 		fields = ('name', 'objectivies', 'content', 'max_students', 'init_register_date', 'end_register_date',
-					'init_date', 'end_date', 'category','students', 'coordenator')
+					'init_date', 'end_date', 'category','students', 'coordenator','public')
 		labels = {
                             'name': _('Name'),
                             'objectivies': _('Objectives'),
@@ -102,9 +124,10 @@ class UpdateCourseForm(CourseForm):
                             'end_register_date': _('Course registration end date'),
                             'init_date': _('Course start date'),
                             'end_date': _('Course end date'),
-                            'category': _('CourseCategory'),
+                            'category': _('Category'),
                             'coordenator': _('Coordenator'),
                             'students': _('Student'),
+							'public':_('Public'),
 		}
 		help_texts = {
                             'name': _('Course name'),
@@ -118,12 +141,13 @@ class UpdateCourseForm(CourseForm):
                             'category': _('CourseCategory which the course belongs'),
                             'coordenator': _('Course Coordenator'),
                             'students': _("Course's Students"),
+							'public':_('To define if the course can be accessed by people not registered'),
 		}
 		widgets = {
                             'categoy': forms.Select(),
                             'coordenator': forms.Select(),
-                            'objectivies': SummernoteWidget(attrs={'cols': 80, 'rows': 5}),
-                            'content': SummernoteWidget(attrs={'cols': 80, 'rows': 5}),
+                            'content': SummernoteWidget(),
+							'objectivies': SummernoteWidget(),
 		}
 class SubjectForm(forms.ModelForm):
@@ -17,10 +17,17 @@
 			{% csrf_token %}
 			{% for field in form %}
 				<div class="form-group {% if form.has_error %} has-error {% endif %} is-fileinput">
-					<label for="{{ field.auto_id }}">{{ field.label }}</label>
+					{% if field.auto_id != 'id_public' %}
+						<label for="{{ field.auto_id }}">{{ field.label }}</label>
+					{% endif %}
 					{% if field.auto_id == 'id_init_register_date' or field.auto_id == 'id_end_register_date' or field.auto_id == 'id_init_date' or field.auto_id == 'id_end_date'%}
 						<input type="text" class="form-control date-picker" name="{{field.name}}" value="{{field.value|date:'SHORT_DATE_FORMAT'}}" min="{{now|date:'SHORT_DATE_FORMAT'}}">
-
+					{% elif field.auto_id == 'id_public' %}
+						<div class="checkbox">
+							<label>
+									<input type="checkbox" name="{{field.name}}" {% if field.value %}checked="checked"{% endif %}><span class="checkbox-material"></span> {{field.name}}
+							</label>
+						</div>
 					{% else %}
 						{% render_field field class='form-control' %}
 					{% endif %}
@@ -49,6 +56,8 @@
 	</div>
 </div>
 </br>
+</br>
+</br>
 <script type="text/javascript">
     var locale = navigator.language || navigator.userLanguage;
@@ -16,9 +16,17 @@
 			{% csrf_token %}
 			{% for field in form %}
 				<div class="form-group {% if form.has_error %} has-error {% endif %} is-fileinput">
-					<label for="{{ field.auto_id }}">{{ field.label }}</label>
+					{% if field.auto_id != 'id_public' %}
+						<label for="{{ field.auto_id }}">{{ field.label }}</label>
+					{% endif %}
 					{% if field.auto_id == 'id_init_register_date' or field.auto_id == 'id_end_register_date' or field.auto_id == 'id_init_date' or field.auto_id == 'id_end_date'%}
 						<input type="text" class="form-control date-picker" name="{{field.name}}" value="{{field.value|date:'SHORT_DATE_FORMAT'}}" min="{{now|date:'SHORT_DATE_FORMAT'}}">
+					{% elif field.auto_id == 'id_public' %}
+						<div class="checkbox">
+							<label>
+									<input type="checkbox" name="{{field.name}}" {% if field.value %}checked="checked"{% endif %}><span class="checkbox-material"></span> {{field.name}}
+							</label>
+						</div>
 					{% else %}
 						{% render_field field class='form-control' %}
 					{% endif %}
@@ -216,6 +216,7 @@ class ReplicateCourseView(LoginRequiredMixin, HasRoleMixin, LogMixin, Notificati
         context['categorys_courses'] = categorys_courses
         context['title'] = _("Replicate Course")
         context['now'] = date.today()
+        print (course.public)
         return context
     def get_success_url(self):
@@ -243,6 +244,7 @@ class UpdateCourseView(LoginRequiredMixin, HasRoleMixin, LogMixin, generic.Updat
     def form_valid(self, form):
         self.object = form.save()
+        print (form)
         self.log_context['course_id'] = self.object.id
         self.log_context['course_name'] = self.object.name
         self.log_context['course_slug'] = self.object.slug
@@ -256,7 +258,7 @@ class UpdateCourseView(LoginRequiredMixin, HasRoleMixin, LogMixin, generic.Updat
     def get_context_data(self, **kwargs):
         context = super(UpdateCourseView, self).get_context_data(**kwargs)
         course = get_object_or_404(Course, slug = self.kwargs.get('slug'))
-
+        print (course.public)
         if has_role(self.request.user,'system_admin'):
             courses = Course.objects.all()
         elif has_role(self.request.user,'professor'):