ajustes para o usuário guest #387

Jailson Dias
1 parent cad76c55
Showing 7 changed files with 120 additions and 134 deletions Show diff stats
core/templates/guest.html
core/views.py
courses/templates/course/view.html
courses/templates/subject/index.html
courses/templates/topic/view.html
courses/views.py
links/views.py
 <!DOCTYPE html>
-{% load i18n custom_filters %}
-{% load static i18n %}
-{% load pagination %}
+{% load static i18n custom_filters %}
 <html>
 <head>
@@ -98,56 +96,33 @@
 				{% block content %}
                     <div class="col-md-12 cards-content">
-                        {% for category in categorys_courses  %}
-                            <div class="panel-group">
-                                <div class="panel panel-default">
-                                    <div class="panel-heading">
-                                        <h4 class="panel-title">
-                                            <a  class="category-course-link" data-toggle="collapse" href="#{{category.slug}}">{{category.name}}</a>
-                                        </h4>
-
-                                    </div>
-                                    <div id="{{category.slug}}" class="panel-collapse collapse">
-                                        {% for course in category.course_category.all %}
-                                            {%if course.public == True %}
-                                                {% include "course/course_card.html" %}
-                                            {% endif %}
-                                        {% endfor %}
-                                    </div>
-                                </div>
+                      {% for category in categorys_courses  %}
+                      <div class="panel-group course-card-group">
+                        <div class="panel panel-default">
+                          <div class="panel-heading">
+                            <div class="row">
+                              <div class="col-md-12">
+                                <h4 class="panel-title">
+                                  <a  class="category-course-link" data-toggle="collapse" href="#{{category.slug}}">{{category.name}}</a>
+                                </h4>
+                              </div>
                             </div>
-                        {% endfor %}
+                          </div>
+                          <div id="{{category.slug}}" class="panel-collapse collapse">
+                            {% for course in category.course_category %}
+                              {% include "course/course_card.html" %}
+                            {% endfor %}
+                          </div>
+                        </div>
+                      </div>
+                      {% endfor %}
                     </div>
-                    <div class="col-md-12">
-                  		<nav aria-label="Page navigation">
-                  			<ul class="pagination">
-                  				{% if page_obj.has_previous %}
-                  				    <li>
-                  				        <a href="?page={{ page_obj.previous_page_number }}"><span><<</span></a>
-                  				    </li>
-                  				{% endif %}
-                  			    {% for page_number in paginator.page_range %}
-                  					<li{% if page_obj.number == page_number %} class="active"{% endif %}>
-                  	    				<a href="?page={{ page_number }}">{{ page_number }}</a>
-                  					</li>
-                  				{% endfor %}
-                  				{% if page_obj.has_next %}
-                  				    <li>
-                  				        <a href="?page={{ page_obj.next_page_number }}"><span>>></span></a>
-                  				    </li>
-                  				{% endif %}
-                  			</ul>
-                  		</nav>
-                  	</div>
 				{% endblock %}
 			</div>
 		</div>
 	</div>
 	<script src="{% static 'js/main.js' %}"></script>
 	<script type="text/javascript" src="{% static 'js/topic_editation_presentation.js' %}"></script>
-	{% block script_file %}
-
-	{% endblock script_file %}
 </body>
 </html>
@@ -28,6 +28,8 @@ from .decorators import log_decorator, notification_decorator
 from users.models import User
 from courses.models import Course, CourseCategory
+from courses.views import course_category
+
 def index(request):
 	context = {
 		'subscribed_courses': 'testando'
@@ -106,23 +108,22 @@ class GuestView (ListView):
 	template_name = 'guest.html'
 	context_object_name = 'courses'
 	queryset = CourseCategory.objects.all()
-	paginate_by = 3
 	def get_context_data (self, **kwargs):
 		context = super(GuestView, self).get_context_data(**kwargs)
 		context['title'] = _("Guest")
-		queryset_list = CourseCategory.objects.all()
-
-		paginator = Paginator(queryset_list, 3)
-		page = self.request.GET.get('page')
-		try:
-			queryset_list = paginator.page(page)
-		except PageNotAnInteger:
-			queryset_list = paginator.page(1)
-		except EmptyPage:
-			queryset_list = paginator.page(paginator.num_pages)
-
-		context['categorys_courses'] = queryset_list
+		queryset_list = Course.objects.filter(public=True)
+
+		# paginator = Paginator(queryset_list, 3)
+		# page = self.request.GET.get('page')
+		# try:
+		# 	queryset_list = paginator.page(page)
+		# except PageNotAnInteger:
+		# 	queryset_list = paginator.page(1)
+		# except EmptyPage:
+		# 	queryset_list = paginator.page(paginator.num_pages)
+
+		context['categorys_courses'] = course_category(queryset_list)
 		return context
-{% extends 'course/index.html' %}
+{% extends extend|default:"course/index.html"%}
 {% load static i18n permission_tags custom_filters %}
 {% load django_bootstrap_breadcrumbs %}
@@ -66,12 +66,6 @@
     <div class="panel-group" id="topics" role="tablist" aria-multiselectable="true">
         {% for topic in topics %}
             {% include "topic/index.html" %}
-    {# {% professor_subject topic.subject user as topic_professor%}#}
-    {# {% if topic_professor %}#}
-      {# {% include "subject/form_view_teacher.html" %}#}
-    {# {% else %}#}
-      {# {% include "subject/form_view_student.html" %}#}
-    {# {% endif %}#}
         {% endfor %}
     </div>
@@ -15,7 +15,7 @@
       <h4>{% trans 'Material' %}</h4>
     </div>
     {% professor_subject topic.subject user as dropdown_topic %}
-    {% if dropdown_topic %} 
+    {% if dropdown_topic %}
     <div class="resource_inline">
       {# dropdown de create material #}
@@ -35,13 +35,14 @@
       </ul>
   </div>
+  {% if user.is_authenticated %}
   {# avaliações do topico #}
   <div class="col-xs-6 col-md-6">
     <div class="resource_inline">
       <h4>{% trans 'Activities' %}</h4>
     </div>
     {% professor_subject topic.subject user as dropdown_topic %}
-    {% if dropdown_topic %} 
+    {% if dropdown_topic %}
       <div class="resource_inline">
       {# dropdown de avaliações #}
@@ -63,4 +64,5 @@
         {% list_topic_exercise request topic %}
       </ul>
   </div>
+  {% endif %}
 </div>
@@ -7,7 +7,7 @@ from courses.models import Material
 from datetime import date, datetime
 from django.contrib import messages
 from django.contrib.auth.decorators import login_required
-from django.contrib.auth.mixins import LoginRequiredMixin
+from django.contrib.auth.mixins import LoginRequiredMixin,AccessMixin
 from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger
 from django.core.urlresolvers import reverse_lazy
 from django.db.models import Q
@@ -320,18 +320,24 @@ class DeleteCourseView(LoginRequiredMixin, HasRoleMixin, LogMixin, generic.Delet
         return reverse_lazy('course:manage')
-class CourseView(LoginRequiredMixin, LogMixin, NotificationMixin, generic.DetailView):
+class CourseView(AccessMixin, LogMixin, NotificationMixin, generic.DetailView):
     log_component = "courses"
     log_action = "viewed"
     log_resource = "course"
     log_context = {}
+
     login_url = reverse_lazy("core:home")
     redirect_field_name = 'next'
     model = Course
     context_object_name = 'course'
     template_name = 'course/view.html'
+    def dispatch(self, *args, **kwargs):
+        course = get_object_or_404(Course, slug = self.kwargs.get('slug'))
+        if(not self.request.user.is_authenticated and not course.public):
+            return self.handle_no_permission()
+        return super(CourseView, self).dispatch(*args, **kwargs)
     def get_context_data(self, **kwargs):
         subjects = None
@@ -339,16 +345,17 @@ class CourseView(LoginRequiredMixin, LogMixin, NotificationMixin, generic.Detail
         context = super(CourseView, self).get_context_data(**kwargs)
         course = get_object_or_404(Course, slug = self.kwargs.get('slug'))
-        self.log_context['course_id'] = course.id
-        self.log_context['course_name'] = course.name
-        self.log_context['course_slug'] = course.slug
-        self.log_context['course_category_id'] = course.category.id
-        self.log_context['course_category_name'] = course.category.name
-        self.log_context['timestamp_start'] = str(int(time.time()))
+        if (self.request.user.is_authenticated):
+            self.log_context['course_id'] = course.id
+            self.log_context['course_name'] = course.name
+            self.log_context['course_slug'] = course.slug
+            self.log_context['course_category_id'] = course.category.id
+            self.log_context['course_category_name'] = course.category.name
+            self.log_context['timestamp_start'] = str(int(time.time()))
-        super(CourseView, self).createLog(self.request.user, self.log_component, self.log_action, self.log_resource, self.log_context)
+            super(CourseView, self).createLog(self.request.user, self.log_component, self.log_action, self.log_resource, self.log_context)
-        self.request.session['log_id'] = Log.objects.latest('id').id
+            self.request.session['log_id'] = Log.objects.latest('id').id
         category_sub = self.kwargs.get('category', None)
@@ -356,7 +363,7 @@ class CourseView(LoginRequiredMixin, LogMixin, NotificationMixin, generic.Detail
             subjects = course.subjects.all()
         elif has_role(self.request.user,'professor'):
             subjects = course.subjects.filter(professors__in=[self.request.user])
-        elif has_role(self.request.user, 'student') or self.request.user is None:
+        elif has_role(self.request.user, 'student') or course.public:
             subjects = course.subjects.filter(visible=True)
         if not category_sub is None:
@@ -389,6 +396,10 @@ class CourseView(LoginRequiredMixin, LogMixin, NotificationMixin, generic.Detail
         context['courses'] = courses
         context['course'] = course
         context['title'] = course.name
+        if (self.request.user.is_authenticated):
+            context['extend'] = 'course/index.html'
+        else:
+            context['extend'] = 'guest.html'
         return context
@@ -558,7 +569,7 @@ class DeleteCatView(LoginRequiredMixin, HasRoleMixin, generic.DeleteView):
         messages.success(self.request, _('Category deleted successfully!'))
         return reverse_lazy('course:manage_cat')
-class SubjectsView(LoginRequiredMixin, LogMixin, generic.ListView):
+class SubjectsView(AccessMixin, LogMixin, generic.ListView):
     log_component = "course"
     log_resource = "subject"
     log_action = "viewed"
@@ -573,22 +584,23 @@ class SubjectsView(LoginRequiredMixin, LogMixin, generic.ListView):
     def dispatch(self, *args, **kwargs):
         subject = get_object_or_404(Subject, slug = self.kwargs.get('slug'))
-        if(not has_object_permission('view_subject', self.request.user, subject)):
+        if(not has_object_permission('view_subject', self.request.user, subject) and not subject.course.public):
             return self.handle_no_permission()
-        self.log_context['subject_id'] = subject.id
-        self.log_context['subject_name'] = subject.name
-        self.log_context['subject_slug'] = subject.slug
-        self.log_context['course_id'] = subject.course.id
-        self.log_context['course_name'] = subject.course.name
-        self.log_context['course_slug'] = subject.course.slug
-        self.log_context['course_category_id'] = subject.course.category.id
-        self.log_context['course_category_name'] = subject.course.category.name
-        self.log_context['timestamp_start'] = str(int(time.time()))
+        if (self.request.user.is_authenticated):
+            self.log_context['subject_id'] = subject.id
+            self.log_context['subject_name'] = subject.name
+            self.log_context['subject_slug'] = subject.slug
+            self.log_context['course_id'] = subject.course.id
+            self.log_context['course_name'] = subject.course.name
+            self.log_context['course_slug'] = subject.course.slug
+            self.log_context['course_category_id'] = subject.course.category.id
+            self.log_context['course_category_name'] = subject.course.category.name
+            self.log_context['timestamp_start'] = str(int(time.time()))
-        super(SubjectsView, self).createLog(self.request.user, self.log_component, self.log_action, self.log_resource, self.log_context)
+            super(SubjectsView, self).createLog(self.request.user, self.log_component, self.log_action, self.log_resource, self.log_context)
-        self.request.session['log_id'] = Log.objects.latest('id').id
+            self.request.session['log_id'] = Log.objects.latest('id').id
         return super(SubjectsView, self).dispatch(*args, **kwargs)
@@ -610,8 +622,14 @@ class SubjectsView(LoginRequiredMixin, LogMixin, generic.ListView):
         context['title'] = subject.name
         if has_role(self.request.user,'professor') or has_role(self.request.user,'system_admin'):
             context['files'] = TopicFile.objects.filter(professor__name = self.request.user.name)
-        else:
+        elif has_role(self.request.user,'student'):
             context['files'] = TopicFile.objects.filter(students__name = self.request.user.name)
+
+        if (self.request.user.is_authenticated):
+            context['extend'] = 'course/index.html'
+        else:
+            context['extend'] = 'guest.html'
+
         return context
@@ -633,7 +651,7 @@ class UploadMaterialView(LoginRequiredMixin, generic.edit.CreateView):
         return self.success_url
-class TopicsView(LoginRequiredMixin, LogMixin, generic.TemplateView):
+class TopicsView(AccessMixin,LogMixin, generic.TemplateView):
     log_component = "course"
     log_resource = "topic"
     log_action = "viewed"
@@ -647,7 +665,7 @@ class TopicsView(LoginRequiredMixin, LogMixin, generic.TemplateView):
     def dispatch(self, *args, **kwargs):
         topic = get_object_or_404(Topic, slug = self.kwargs.get('slug'))
-        if(not has_object_permission('view_topic', self.request.user, topic)):
+        if(not has_object_permission('view_topic', self.request.user, topic) and not topic.subject.course.public):
             return self.handle_no_permission()
         return super(TopicsView, self).dispatch(*args, **kwargs)
@@ -660,25 +678,23 @@ class TopicsView(LoginRequiredMixin, LogMixin, generic.TemplateView):
         context = super(TopicsView, self).get_context_data(**kwargs)
         context['topic'] = topic
-        if(not has_object_permission('view_topic', self.request.user, topic)):
-            return self.handle_no_permission()
-
-        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
-        self.log_context['course_id'] = topic.subject.course.id
-        self.log_context['course_name'] = topic.subject.course.name
-        self.log_context['course_slug'] = topic.subject.course.slug
-        self.log_context['course_category_id'] = topic.subject.course.category.id
-        self.log_context['course_category_name'] = topic.subject.course.category.name
-        self.log_context['timestamp_start'] = str(int(time.time()))
-
-        super(TopicsView, self).createLog(self.request.user, self.log_component, self.log_action, self.log_resource, self.log_context)
-
-        context['topic_log_id'] = Log.objects.latest('id').id
+        if (self.request.user.is_authenticated):
+            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
+            self.log_context['course_id'] = topic.subject.course.id
+            self.log_context['course_name'] = topic.subject.course.name
+            self.log_context['course_slug'] = topic.subject.course.slug
+            self.log_context['course_category_id'] = topic.subject.course.category.id
+            self.log_context['course_category_name'] = topic.subject.course.category.name
+            self.log_context['timestamp_start'] = str(int(time.time()))
+
+            super(TopicsView, self).createLog(self.request.user, self.log_component, self.log_action, self.log_resource, self.log_context)
+
+            context['topic_log_id'] = Log.objects.latest('id').id
         return context
@@ -220,38 +220,36 @@ class UpdateLink(LoginRequiredMixin, HasRoleMixin, LogMixin, generic.UpdateView)
         self.success_url = reverse_lazy('course:links:render_link', args = (self.object.slug, ))
         return self.success_url
-class ViewLink(LoginRequiredMixin, HasRoleMixin, LogMixin, generic.DetailView):
+class ViewLink(LogMixin, generic.DetailView):
     log_component = 'link'
     log_resource = 'link'
     log_action = 'viewed'
     log_context = {}
-
-    allowed_roles = ['professor', 'system_admin','student']
+    
     template_name = 'links/view_link.html'
-    success_url = reverse_lazy('course:links:render_link')
-    context_object_name = 'link'
     def get_context_data(self,**kwargs):
         context = {}
         link = Link.objects.get(slug = self.kwargs.get('slug'))
         context['link'] = link
-        self.log_context['link_id'] = link.id
-        self.log_context['link_name'] = link.name
-        self.log_context['topic_id'] = link.topic.id
-        self.log_context['topic_name'] = link.topic.name
-        self.log_context['topic_slug'] = link.topic.slug
-        self.log_context['subject_id'] = link.topic.subject.id
-        self.log_context['subject_name'] = link.topic.subject.name
-        self.log_context['subject_slug'] = link.topic.subject.slug
-        self.log_context['course_id'] = link.topic.subject.course.id
-        self.log_context['course_name'] = link.topic.subject.course.name
-        self.log_context['course_slug'] = link.topic.subject.course.slug
-        self.log_context['course_category_id'] = link.topic.subject.course.category.id
-        self.log_context['course_category_name'] = link.topic.subject.course.category.name
-        self.log_context['timestamp_start'] = str(int(time.time()))
-
-        super(ViewLink, self).createLog(self.request.user, self.log_component, self.log_action, self.log_resource, self.log_context)
+        if (self.request.user.is_authenticated):
+            self.log_context['link_id'] = link.id
+            self.log_context['link_name'] = link.name
+            self.log_context['topic_id'] = link.topic.id
+            self.log_context['topic_name'] = link.topic.name
+            self.log_context['topic_slug'] = link.topic.slug
+            self.log_context['subject_id'] = link.topic.subject.id
+            self.log_context['subject_name'] = link.topic.subject.name
+            self.log_context['subject_slug'] = link.topic.subject.slug
+            self.log_context['course_id'] = link.topic.subject.course.id
+            self.log_context['course_name'] = link.topic.subject.course.name
+            self.log_context['course_slug'] = link.topic.subject.course.slug
+            self.log_context['course_category_id'] = link.topic.subject.course.category.id
+            self.log_context['course_category_name'] = link.topic.subject.course.category.name
+            self.log_context['timestamp_start'] = str(int(time.time()))
+
+            super(ViewLink, self).createLog(self.request.user, self.log_component, self.log_action, self.log_resource, self.log_context)
         return context
1	<!DOCTYPE html>	1	<!DOCTYPE html>
2		2
3		3
4	-{% load i18n custom_filters %}
5	-{% load static i18n %}
6	-{% load pagination %}	4	+{% load static i18n custom_filters %}
7		5
8	<html>	6	<html>
9	<head>	7	<head>
	@@ -98,56 +96,33 @@		@@ -98,56 +96,33 @@
98	{% block content %}	96	{% block content %}
99		97
100	<div class="col-md-12 cards-content">	98	<div class="col-md-12 cards-content">
101	- {% for category in categorys_courses %}
102	- <div class="panel-group">
103	- <div class="panel panel-default">
104	- <div class="panel-heading">
105	- <h4 class="panel-title">
106	- <a class="category-course-link" data-toggle="collapse" href="#{{category.slug}}">{{category.name}}</a>
107	- </h4>
108	-
109	- </div>
110	- <div id="{{category.slug}}" class="panel-collapse collapse">
111	- {% for course in category.course_category.all %}
112	- {%if course.public == True %}
113	- {% include "course/course_card.html" %}
114	- {% endif %}
115	- {% endfor %}
116	- </div>
117	- </div>	99	+ {% for category in categorys_courses %}
		100	+ <div class="panel-group course-card-group">
		101	+ <div class="panel panel-default">
		102	+ <div class="panel-heading">
		103	+ <div class="row">
		104	+ <div class="col-md-12">
		105	+ <h4 class="panel-title">
		106	+ <a class="category-course-link" data-toggle="collapse" href="#{{category.slug}}">{{category.name}}</a>
		107	+ </h4>
		108	+ </div>
118	</div>	109	</div>
119	- {% endfor %}	110	+ </div>
		111	+ <div id="{{category.slug}}" class="panel-collapse collapse">
		112	+ {% for course in category.course_category %}
		113	+ {% include "course/course_card.html" %}
		114	+ {% endfor %}
		115	+ </div>
		116	+ </div>
		117	+ </div>
		118	+ {% endfor %}
120	</div>	119	</div>
121	- <div class="col-md-12">
122	- <nav aria-label="Page navigation">
123	- <ul class="pagination">
124	- {% if page_obj.has_previous %}
125	- <li>
126	- <a href="?page={{ page_obj.previous_page_number }}"><span><<</span></a>
127	- </li>
128	- {% endif %}
129	- {% for page_number in paginator.page_range %}
130	- <li{% if page_obj.number == page_number %} class="active"{% endif %}>
131	- <a href="?page={{ page_number }}">{{ page_number }}</a>
132	- </li>
133	- {% endfor %}
134	- {% if page_obj.has_next %}
135	- <li>
136	- <a href="?page={{ page_obj.next_page_number }}"><span>>></span></a>
137	- </li>
138	- {% endif %}
139	- </ul>
140	- </nav>
141	- </div>
142	{% endblock %}	120	{% endblock %}
143	</div>	121	</div>
144	</div>	122	</div>
145	</div>	123	</div>
146	<script src="{% static 'js/main.js' %}"></script>	124	<script src="{% static 'js/main.js' %}"></script>
147	<script type="text/javascript" src="{% static 'js/topic_editation_presentation.js' %}"></script>	125	<script type="text/javascript" src="{% static 'js/topic_editation_presentation.js' %}"></script>
148	- {% block script_file %}
149	-
150	- {% endblock script_file %}
151	</body>	126	</body>
152		127
153	</html>	128	</html>
1	-{% extends 'course/index.html' %}	1	+{% extends extend\|default:"course/index.html"%}
2		2
3	{% load static i18n permission_tags custom_filters %}	3	{% load static i18n permission_tags custom_filters %}
4	{% load django_bootstrap_breadcrumbs %}	4	{% load django_bootstrap_breadcrumbs %}
	@@ -66,12 +66,6 @@		@@ -66,12 +66,6 @@
66	<div class="panel-group" id="topics" role="tablist" aria-multiselectable="true">	66	<div class="panel-group" id="topics" role="tablist" aria-multiselectable="true">
67	{% for topic in topics %}	67	{% for topic in topics %}
68	{% include "topic/index.html" %}	68	{% include "topic/index.html" %}
69	- {# {% professor_subject topic.subject user as topic_professor%}#}
70	- {# {% if topic_professor %}#}
71	- {# {% include "subject/form_view_teacher.html" %}#}
72	- {# {% else %}#}
73	- {# {% include "subject/form_view_student.html" %}#}
74	- {# {% endif %}#}
75	{% endfor %}	69	{% endfor %}
76	</div>	70	</div>
77		71