Merge

ailsoncgt
2 parents c57544fa 3f007a5f
Showing 4 changed files with 45 additions and 16 deletions Show diff stats
courses/templates/subject/form_view_teacher.html
files/views.py
requirements.txt
users/views.py
@@ -61,8 +61,8 @@
             <div class="dropdown">
               <a href="#" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fa fa-plus-circle fa-lg" aria-hidden="true"></i></a>
               <ul class="dropdown-menu" aria-labelledby="dLabel">
-                <li><a href="javascript:modal.get('{% url 'course:links:create_link' topic.slug %}', '#createLinksModal','#divModalLink')  ">{% trans 'Create a Link' %}</a></li>
-                <li><a href="javascript:modal.get('{% url 'course:file:create_file' topic.slug %}', '#fileModal', '#divModalFile')">{% trans "Create a file" %}</a></li>
+                <li><a href="javascript:get_modal_link('{% url 'course:links:create_link' topic.slug %}', '#createLinksModal','#divModalLink')  ">{% trans 'Create a Link' %}</a></li>
+                <li><a href="javascript:get_modal_file('{% url 'course:file:create_file' topic.slug %}', '#fileModal', '#divModalFile')">{% trans "Create a file" %}</a></li>
               </ul>
             </div>
           </div>
@@ -10,13 +10,17 @@ from .forms import FileForm, UpdateFileForm
 from .models import TopicFile
 from .utils import mime_type_to_material_icons
 from courses.models import Topic
+
 from core.decorators import log_decorator
 from core.models import Log, MimeType
 from core.mixins import LogMixin, NotificationMixin
+
 from django.urls import reverse
 from datetime import datetime
+
 # Create your views here.
+
 class CreateFile(LoginRequiredMixin, HasRoleMixin, LogMixin, NotificationMixin, generic.edit.CreateView):
 	log_component = 'file'
 	log_resource = 'file'
@@ -31,6 +35,11 @@ class CreateFile(LoginRequiredMixin, HasRoleMixin, LogMixin, NotificationMixin, 
 	form_class = FileForm
 	success_url = reverse_lazy('course:file:render_file')
+	log_component = "subject"
+	log_resource = "file"
+	log_action = "create"
+	log_context = {}
+
 	def form_invalid(self, form, **kwargs):
 		context = super(CreateFile, self).form_invalid(form)
 		context.status_code = 400
@@ -67,6 +76,18 @@ class CreateFile(LoginRequiredMixin, HasRoleMixin, LogMixin, NotificationMixin, 
 			# self.object.file_type = MimeType.objects.get(id = 1)
 		self.object.save()
+		#CREATE LOG 
+		self.log_context['topic_id'] = topic.id
+		self.log_context['topic_name'] = topic.name
+		self.log_context['topic_slug'] = topic.slug
+		self.log_context['subject_id'] = topic.subject.id
+		self.log_context['subject_name'] = topic.subject.name
+		self.log_context['subject_slug'] = topic.subject.slug
+
+		super(CreateFile, self).createLog(self.request.user, self.log_component, self.log_action, self.log_resource, self.log_context)
+
+
+
 		#CREATE NOTIFICATION
 		super(CreateFile, self).createNotification(message="uploaded a File "+ self.object.name, actor=self.request.user,
 			resource_name=self.object.name, resource_link= reverse('course:view_topic', args=[self.object.topic.slug]), 
@@ -107,7 +128,8 @@ class CreateFile(LoginRequiredMixin, HasRoleMixin, LogMixin, NotificationMixin, 
 		return self.success_url
-@log_decorator("file", "viewed", "file")
+
+#@log_decorator("topic","acessar","file")
 def render_file(request, id):
 	template_name = 'files/render_file.html'
 	file = get_object_or_404(TopicFile, id = id)
@@ -16,7 +16,6 @@ django-widget-tweaks==1.4.1
 django-wysiwyg==0.8.0
 djangorestframework==3.4.6
 gunicorn==19.6.0
-itsdangerous==0.24
 Jinja2==2.8
 lxml==3.6.4
 MarkupSafe==0.23
@@ -24,9 +23,7 @@ Pillow==3.3.1
 psycopg2==2.6.2
 pycpfcnpj==1.0.2
 requests==2.11.1
-six==1.10.0
 slugify==0.0.1
 validators==0.11.0
-virtualenv==15.0.3
 Werkzeug==0.11.11
 whitenoise==3.2.2
@@ -176,6 +176,7 @@ class SearchView(LoginRequiredMixin, generic.ListView):
 	def get_context_data(self, **kwargs):
 		context = super(SearchView, self).get_context_data(**kwargs)
+		#result_list = []
 		search = self.request.GET.get('search', None)
 		link_list = []
 		file_list = []
@@ -189,11 +190,11 @@ class SearchView(LoginRequiredMixin, generic.ListView):
 			polls = Poll.objects.all()
 			exams = Exam.objects.all()
 			forums = Forum.objects.all()
-			link_list = sorted([link for link in links for topic in topics if link.topic == topic])
-			exam_list = sorted([exam for exam in exams for topic in topics if exam.topic == topic])
-			file_list = sorted([arquivo for arquivo in files for topic in topics if arquivo.topic == topic])
-			poll_list = sorted([poll for poll in polls for topic in topics if poll.topic == topic])
-			forum_list = sorted([forum for forum in forums for topic in topics if forum.topic == topic])
+			link_list = sorted([link for link in links for topic in topics if link.topic == topic],key = lambda x:x.name)
+			exam_list = sorted([exam for exam in exams for topic in topics if exam.topic == topic],key = lambda x:x.name)
+			file_list = sorted([arquivo for arquivo in files for topic in topics if arquivo.topic == topic],key = lambda x:x.name)
+			poll_list = sorted([poll for poll in polls for topic in topics if poll.topic == topic],key = lambda x:x.name)
+			forum_list = sorted([forum for forum in forums for topic in topics if forum.topic == topic],key = lambda x:x.name)
 		elif has_role(self.request.user,'system_admin'):
 			link_list = Link.objects.filter( Q(name__icontains=search)).order_by('name')
 			file_list = TopicFile.objects.filter(Q(name__icontains=search)).order_by('name')
@@ -208,15 +209,23 @@ class SearchView(LoginRequiredMixin, generic.ListView):
 			forum_list = Forum.objects.filter(Q(name__icontains=search)and Q(students__name = self.request.user.name)).order_by('name')
 		'''
-		paginator = Paginator(list_links, self.paginate_by)
+		result_list = list(chain(link_list,file_list,poll_list,exam_list,forum_list))
+		for x in result_list:
+			if isinstance(x,Link):
+				print(x)
+		paginator = Paginator(result_list, self.paginate_by)
+		print(paginator.num_pages)
+		print(paginator.count)
 		page = self.request.GET.get('page')
-
 		try:
-		    list_links = paginator.page(page)
+			result_list = paginator.page(page)
+			print (result_list)
 		except PageNotAnInteger:
-		    list_links = paginator.page(1)
+		    result_list = paginator.page(1)
 		except EmptyPage:
-		    list_links = paginator.page(paginator.num_pages)
+			#print ((paginator.num_pages))
+			result_list = paginator.page(paginator.num_pages)
+
 		'''
 		context['link_list'] = link_list
@@ -224,5 +233,6 @@ class SearchView(LoginRequiredMixin, generic.ListView):
 		context['poll_list'] = poll_list
 		context['exam_list'] = exam_list
 		context['forum_list'] = forum_list
+		#context['result_list'] = result_list
 		return context