retirando o exesso de prints

Jailson Dias
1 parent 4974b066
Showing 12 changed files with 24 additions and 52 deletions Show diff stats
core/decorators.py
core/mixins.py
core/views.py
courses/templates/category/create.html
courses/templates/category/delete.html
courses/templates/category/index.html
courses/templates/category/update.html
courses/templates/category/view.html
courses/tests/test_topic.py
courses/views.py
exam/views.py
poll/views.py
@@ -48,16 +48,15 @@ def log_decorator(log_action = &#39;&#39;, log_resource = &#39;&#39;):
 def notification_decorator(read = False, message = '', actor = None, users = [], not_action='', not_resource='', resource_link=''):
-	
+
 	def _notification_decorator(view_function):
 		def _decorator(request, *args, **kwargs):
 			#Do something before the call
-			
+
 			response = view_function(request, *args, **kwargs)
 			action = Action.objects.filter(name = not_action)
 			resource = Resource.objects.filter(name = not_resource)
-			print(resource_link)
 			if action.exists():
 				action = action[0]
 			else:
@@ -68,7 +67,6 @@ def notification_decorator(read = False, message = &#39;&#39;, actor = None, users = [],
 				resource = resource[0]
 			else:
 				resource = Resource(name = not_resource, url= resource_link)
-				print(resource)
 				resource.save()
 			action_resource = Action_Resource.objects.filter(action = action, resource = resource)
@@ -82,11 +80,11 @@ def notification_decorator(read = False, message = &#39;&#39;, actor = None, users = [],
 			for user in users:
 				notification = Notification(user=user, actor= actor, message=message, action_resource= action_resource)
 				notification.save()
-					
-			
+
+
 			#Do something after the call
 			return response
 		return wraps(view_function)(_decorator)
-	
-	return _notification_decorator
 \ No newline at end of file
+
+	return _notification_decorator
@@ -47,7 +47,6 @@ class NotificationMixin(object):
 	def createNotification(self, message='', actor=None, users = User.objects.all(), resource_slug='' ,action_name = '', resource_name='', resource_link=''): #the default will be a broadcast
 		action = Action.objects.filter(name = action_name)
 		resource = Resource.objects.filter(slug = resource_slug)
-		print(message)
 		if action.exists():
 			action = action[0]
 		else:
@@ -76,5 +75,4 @@ class NotificationMixin(object):
 	def dispatch(self, request, *args, **kwargs):
 		"""
 		Not quite sure how to do about it"""
-		print("testing IF IT REACHES HERE")
-		return super(NotificationMixin, self).dispatch(request, *args, **kwargs)
 \ No newline at end of file
+		return super(NotificationMixin, self).dispatch(request, *args, **kwargs)
@@ -102,7 +102,7 @@ def processNotification(self, notificationId):
 def getNotifications(request):
 	context = {}
 	if request.user.is_authenticated:
-		
+
 		steps = int(request.GET['steps'])
 		amount = int(request.GET['amount'])
 		notifications = Notification.objects.filter(user= request.user, read=False).order_by('-datetime')[steps:steps+amount]
@@ -110,18 +110,6 @@ def getNotifications(request):
 	else: #go to login page
 		return HttpResponse('teste')
-	
+
 	html = render_to_string("notifications.html", context)
-	print(html)
 	return HttpResponse(html)
-	 
-
-
-
-# class LoginClass(LoginView):
-# 	template_name='index.html'
-#
-# 	def get_context_data(self, **kwargs):
-# 		context = super(LoginClass,self).get_context_data(**kwargs)
-# 		print ("deu certo")
-# 		return context
-{% extends 'app/base.html' %}
+{% extends 'base.html' %}
 {% load static i18n permission_tags %}
 {% load widget_tweaks %}
-{% extends 'app/base.html' %}
+{% extends 'base.html' %}
 {% load static i18n %}
 {% load static i18n permission_tags %}
-{% extends 'app/base.html' %}
+{% extends 'base.html' %}
 {% load static i18n %}
 {% load static i18n permission_tags %}
-{% extends 'app/base.html' %}
+{% extends 'base.html' %}
 {% load static i18n %}
 {% load static i18n permission_tags %}
-{% extends 'app/base.html' %}
+{% extends 'base.html' %}
 {% load static i18n permission_tags %}
 {% load widget_tweaks %}
@@ -85,7 +85,6 @@ class TopicTestCase(TestCase):
     def test_topic_update(self):
         self.client.login(username='professor', password='testing')
-        print (self.subject.topics.all())
         url = reverse('course:update_topic',kwargs={'slug':self.subject.topics.all()[0].slug})
         data = {
             "name": 'new name',
@@ -40,9 +40,9 @@ class IndexView(LoginRequiredMixin, NotificationMixin, generic.ListView):
 		else:
 			list_courses = Course.objects.filter(students__name = self.request.user.name)
 			categorys_courses = CourseCategory.objects.filter(course_category__students__name = self.request.user.name).distinct()
-		
+
 		courses_category = Course.objects.filter(category__name = self.request.GET.get('category'))
-		
+
 		none = None
 		q = self.request.GET.get('category', None)
 		if q is  None:
@@ -58,7 +58,7 @@ class IndexView(LoginRequiredMixin, NotificationMixin, generic.ListView):
 		    list_courses = paginator.page(1)
 		except EmptyPage:
 		    list_courses = paginator.page(paginator.num_pages)
-		
+
 		context['courses_category'] = courses_category
 		context['list_courses'] = list_courses
 		context['categorys_courses'] = categorys_courses
@@ -74,7 +74,6 @@ class IndexView(LoginRequiredMixin, NotificationMixin, generic.ListView):
 		    object_list = Course.objects.filter(name__icontains = name)
 		else:
 		    object_list = Course.objects.all()
-		print(object_list)
 		return object_list
 class CreateCourseView(LoginRequiredMixin, HasRoleMixin, NotificationMixin,generic.edit.CreateView):
@@ -159,7 +158,6 @@ class DeleteCourseView(LoginRequiredMixin, HasRoleMixin, generic.DeleteView):
 		elif has_role(self.request.user,'professor'):
 			courses = self.request.user.courses.all()
 		context['courses'] = courses
-		print (courses,"jdhksjbjs")
 		context['title'] = course.name
 		return context
@@ -198,15 +196,15 @@ class CourseView(LoginRequiredMixin, NotificationMixin, generic.DetailView):
 			categorys_subjects = CategorySubject.objects.filter(subject_category__professors__name = self.request.user.name).distinct()
 		else:
 			categorys_subjects = CategorySubject.objects.filter(subject_category__students__name = self.request.user.name).distinct()
-		
+
 		subjects_category = Subject.objects.filter(category__name = self.request.GET.get('category'))
-		
+
 		none = None
 		q = self.request.GET.get('category', None)
 		if q is  None:
 			none = True
 		context['none'] = none
-		
+
 		context['subjects_category'] = subjects_category
 		context['categorys_subjects'] = categorys_subjects
 		context['courses'] = courses
@@ -329,14 +327,14 @@ class SubjectsView(LoginRequiredMixin, generic.ListView):
 		else:
 			context['files'] = TopicFile.objects.filter(students__name = self.request.user.name)
 		return context
-		
+
 class UploadMaterialView(LoginRequiredMixin, generic.edit.CreateView):
-	login_url = reverse_lazy("core:home")	
+	login_url = reverse_lazy("core:home")
 	redirect_field_name = 'next'
 	template_name = 'files/create_file.html'
 	form_class = FileForm
-	
+
 	def form_invalid(self, form):
 		context = super(UploadMaterialView, self).form_invalid(form)
 		context.status_code = 400
@@ -345,7 +343,7 @@ class UploadMaterialView(LoginRequiredMixin, generic.edit.CreateView):
 	def get_success_url(self):
 		self.success_url = reverse('course:view_subject', args = (self.object.slug, ))
-		
+
 		return self.success_url
 class TopicsView(LoginRequiredMixin, generic.ListView):
@@ -67,7 +67,6 @@ class ViewExam(LoginRequiredMixin,generic.DetailView):
 		context['answers'] = answers
 		context['keys'] = keys
-		print (context)
 		return context
@@ -170,7 +169,6 @@ class UpdateExam(LoginRequiredMixin,HasRoleMixin,generic.UpdateView):
 		answers = {}
 		for answer in exam.answers.all():
-			# print (key.answer)
 			answers[answer.order] = answer.answer
 		keys = sorted(answers)
@@ -34,7 +34,6 @@ class ViewPoll(LoginRequiredMixin,generic.DetailView):
 		context['subject'] = poll.topic.subject
 		context['subjects'] = poll.topic.subject.course.subjects.all()
 		answered = AnswersStudent.objects.filter(poll = poll, student=self.request.user)
-		print (answered)
 		if answered.count()<1:
 			context['status'] = False
 		else:
@@ -144,12 +143,8 @@ class UpdatePoll(LoginRequiredMixin,HasRoleMixin,generic.UpdateView):
 		context['course'] = poll.topic.subject.course
 		context['subject'] = poll.topic.subject
 		context['subjects'] = poll.topic.subject.course.subjects.all()
-
-		print (self.request.user)
-
 		answers = {}
 		for answer in poll.answers.all():
-			# print (key.answer)
 			answers[answer.order] = answer.answer
 		keys = sorted(answers)
@@ -215,7 +210,6 @@ class AnswerStudentPoll(LoginRequiredMixin,generic.CreateView):
 	def get_context_data(self, **kwargs):
 		context = super(AnswerStudentPoll, self).get_context_data(**kwargs)
-		print (self.kwargs.get('slug'))
 		poll = get_object_or_404(Poll, slug = self.kwargs.get('slug'))
 		context['poll'] = poll
 		context['topic'] = poll.topic
@@ -223,7 +217,6 @@ class AnswerStudentPoll(LoginRequiredMixin,generic.CreateView):
 		context['subject'] = poll.topic.subject
 		context['subjects'] = poll.topic.subject.course.subjects.all()
-		print (self.request.method)
 		answers = {}
 		for answer in poll.answers.all():
 			answers[answer.order] = answer.answer
	@@ -102,7 +102,7 @@ def processNotification(self, notificationId):		@@ -102,7 +102,7 @@ def processNotification(self, notificationId):
102	def getNotifications(request):	102	def getNotifications(request):
103	context = {}	103	context = {}
104	if request.user.is_authenticated:	104	if request.user.is_authenticated:
105	-	105	+
106	steps = int(request.GET['steps'])	106	steps = int(request.GET['steps'])
107	amount = int(request.GET['amount'])	107	amount = int(request.GET['amount'])
108	notifications = Notification.objects.filter(user= request.user, read=False).order_by('-datetime')[steps:steps+amount]	108	notifications = Notification.objects.filter(user= request.user, read=False).order_by('-datetime')[steps:steps+amount]
	@@ -110,18 +110,6 @@ def getNotifications(request):		@@ -110,18 +110,6 @@ def getNotifications(request):
110	else: #go to login page	110	else: #go to login page
111	return HttpResponse('teste')	111	return HttpResponse('teste')
112		112
113	-	113	+
114	html = render_to_string("notifications.html", context)	114	html = render_to_string("notifications.html", context)
115	- print(html)
116	return HttpResponse(html)	115	return HttpResponse(html)
117	-
118	-
119	-
120	-
121	-# class LoginClass(LoginView):
122	-# template_name='index.html'
123	-#
124	-# def get_context_data(self, **kwargs):
125	-# context = super(LoginClass,self).get_context_data(**kwargs)
126	-# print ("deu certo")
127	-# return context
1	-{% extends 'app/base.html' %}	1	+{% extends 'base.html' %}
2		2
3	{% load static i18n permission_tags %}	3	{% load static i18n permission_tags %}
4	{% load widget_tweaks %}	4	{% load widget_tweaks %}
1	-{% extends 'app/base.html' %}	1	+{% extends 'base.html' %}
2		2
3	{% load static i18n %}	3	{% load static i18n %}
4	{% load static i18n permission_tags %}	4	{% load static i18n permission_tags %}
	@@ -85,7 +85,6 @@ class TopicTestCase(TestCase):		@@ -85,7 +85,6 @@ class TopicTestCase(TestCase):
85		85
86	def test_topic_update(self):	86	def test_topic_update(self):
87	self.client.login(username='professor', password='testing')	87	self.client.login(username='professor', password='testing')
88	- print (self.subject.topics.all())
89	url = reverse('course:update_topic',kwargs={'slug':self.subject.topics.all()[0].slug})	88	url = reverse('course:update_topic',kwargs={'slug':self.subject.topics.all()[0].slug})
90	data = {	89	data = {
91	"name": 'new name',	90	"name": 'new name',