bug nas urls, falta de template/correção de bugs #171

ifac0
1 parent 7baf9496
Showing 5 changed files with 38 additions and 16 deletions Show diff stats
exam/forms.py
exam/models.py
exam/permisissions.py
exam/urls.py
exam/views.py
@@ -4,7 +4,7 @@ from .models import Exam
 class ExamForm(forms.ModelForm):
 	def clean_end_date(self):
 		beginDate = self.data['beginDate']
-		endDate = self.data['endDate]
+		endDate = self.data['endDate']
 		if beginDate and endDate and endDate < beginDate:
 			raise forms.ValidationError(_('The end date may not be before the start date.'))
@@ -12,7 +12,7 @@ class ExamForm(forms.ModelForm):
 	def clean_begin_date(self):
 		endDate = self.data['endDate']
-		beginDate = self.data['beignDate']
+		beginDate = self.data['beginDate']
 		if enDate and benginDate and beginDate <= endDate:
 			raise forms.ValidationError(_('The exam start date must be after the end of registration.'))
@@ -28,14 +28,12 @@ class ExamForm(forms.ModelForm):
-    class Meta:
-        model = Exam
-        fields = ['name','beginDate','endDate']
+	class Meta:
+		model = Exam
+		fields = ['name','beginDate','endDate']
-        widgets = {
-            'name': forms.TextInput(attrs={'placeholder': 'Exam?'}),
-            'beginDate': forms.DateTimeInput(
-                attrs={'placeholder': 'Start date to resolve the exam'}),
-            'endDate': forms.DateTimeInput(
-                attrs={'placeholder': 'Finish date permited to resolve the exam'}),
-        }
+		widgets = {
+			'name': forms.TextInput(attrs={'placeholder': 'Exam?'}),
+			'beginDate': forms.DateTimeInput(attrs={'placeholder': 'Start date to resolve the exam'}),
+			'endDate': forms.DateTimeInput(attrs={'placeholder': 'Finish date permited to resolve the exam'}),
+			}
@@ -3,6 +3,8 @@ from django.db import models
 from autoslug.fields import AutoSlugField
 from users.models import User
 from core.models import Resource
+from courses.models import Activity
+
 class Exam(models.Model):
@@ -0,0 +1,12 @@
+from rolepermissions.permissions import register_object_checker
+from amadeus.roles import SystemAdmin
+
+@register_object_checker()
+def edit_exam(role, user, exam):
+    if (role == SystemAdmin):
+        return True
+
+    if (user in exam.topic.subject.professors.all()):
+        return True
+
+    return False
@@ -0,0 +1,9 @@
+from django.conf.urls import url
+
+from . import views
+
+urlpatterns = [
+	url(r'^create/(?P<slug>[\w\-_]+)/$', views.CreateExam.as_view(), name='create_poll'),
+	url(r'^update/(?P<slug>[\w\-_]+)/$', views.UpdateExam.as_view(), name='update_poll'),
+
+]
@@ -16,7 +16,7 @@ from core.mixins import NotificationMixin
 from users.models import User
 from courses.models import Course, Topic
-class CreatePoll(LoginRequiredMixin,generic.CreateView):
+class CreateExam(LoginRequiredMixin,generic.CreateView):
 	login_url = reverse_lazy("core:home")
 	redirect_field_name = 'next'
@@ -39,7 +39,7 @@ class CreatePoll(LoginRequiredMixin,generic.CreateView):
 		return super(CreateExam, self).form_valid(form)
-    def form_invalid(self, form,**kwargs):
+	def form_invalid(self, form,**kwargs):
 		context = super(CreateExam, self).form_invalid(form)
 		answers = {}
 		for key in self.request.POST:
@@ -61,14 +61,15 @@ class UpdateExam(LoginRequiredMixin,generic.UpdateView):
 	template_name = 'poll/form_exam.html'
 	success_url = reverse_lazy('core:home')
-    def dispatch(self, *args, **kwargs):
+	def dispatch(self, *args, **kwargs):
 		poll = get_object_or_404(Poll, slug = self.kwargs.get('slug'))
+
 		if(not has_object_permission('edit_exam', self.request.user, exam)):
 			return self.handle_no_permission()
 		return super(UpdateExam, self).dispatch(*args, **kwargs)
 	def get_object(self, queryset=None):
-	    return get_object_or_404(Poll, slug = self.kwargs.get('slug'))
+		return get_object_or_404(Poll, slug = self.kwargs.get('slug'))
 	def form_valid(self, form):
 		poll = self.object
	@@ -3,6 +3,8 @@ from django.db import models		@@ -3,6 +3,8 @@ from django.db import models
3	from autoslug.fields import AutoSlugField	3	from autoslug.fields import AutoSlugField
4	from users.models import User	4	from users.models import User
5	from core.models import Resource	5	from core.models import Resource
		6	+from courses.models import Activity
		7	+
6		8
7		9
8	class Exam(models.Model):	10	class Exam(models.Model):
@@ -0,0 +1,12 @@		@@ -0,0 +1,12 @@
	1	+from rolepermissions.permissions import register_object_checker
	2	+from amadeus.roles import SystemAdmin
	3	+
	4	+@register_object_checker()
	5	+def edit_exam(role, user, exam):
	6	+ if (role == SystemAdmin):
	7	+ return True
	8	+
	9	+ if (user in exam.topic.subject.professors.all()):
	10	+ return True
	11	+
	12	+ return False
@@ -0,0 +1,9 @@		@@ -0,0 +1,9 @@
	1	+from django.conf.urls import url
	2	+
	3	+from . import views
	4	+
	5	+urlpatterns = [
	6	+ url(r'^create/(?P<slug>[\w\-_]+)/$', views.CreateExam.as_view(), name='create_poll'),
	7	+ url(r'^update/(?P<slug>[\w\-_]+)/$', views.UpdateExam.as_view(), name='update_poll'),
	8	+
	9	+]