just fixed some major UI issues

fbormann
1 parent 43fbc10d
Showing 8 changed files with 27 additions and 64 deletions Show diff stats
courses/context_processors.py
courses/permissions.py
courses/templates/course/course_card.html
courses/templates/course/index.html
courses/templates/course/view.html
courses/templatetags/course_value_field.py
courses/templatetags/custom_filters.py
courses/views.py
@@ -8,6 +8,9 @@ def courses(request):
 			if request.user.is_staff:
 				context['courses_list'] = Course.objects.all()
 			else:
-				context['courses_list'] = Course.objects.filter(professors__in = [request.user])
+				#context['courses_list'] = 
+				context['courses_list'] = Course.objects.all()
+
+				#context['courses_list'] = Course.objects.filter(professors__in = [request.user])
 			return context
 	return context
@@ -6,10 +6,10 @@ def view_topic(role, user, topic):
     if (role == SystemAdmin):
         return True
-    if (user in topic.subject.course.professors.all() and user in topic.subject.professors.all()):
+    if user in topic.subject.professors.all():
         return True
-    if (user in topic.subject.course.students.all() and user in topic.subject.students.all()):
+    if  user in topic.subject.students.all():
         return True
     return False
@@ -29,10 +29,10 @@ def view_subject(role, user, subject):
     if (role == SystemAdmin):
         return True
-    if (user in subject.course.professors.all() and user in subject.professors.all()):
+    if user in subject.professors.all():
         return True
-    if (user in subject.course.students.all() and user in subject.students.all()):
+    if user in subject.students.all():
         return True
     return False
@@ -35,21 +35,14 @@
           <div class="panel-body">
             <p><b>{% trans 'Course Name' %}: </b>{{course.name}}</p>
             <p><b>{% trans 'Coordenator' %}: </b>{{course.coordenator}}</p>
-            <p><b>{% trans 'Professor' %}: </b>{{course.professors.all.0}}</p>
+           
             <p>
               <b>{% trans 'Description' %}:</b>
               <i>
-                {{course.content | safe }}
+                {{course.description | safe }}
               </i>
             </p>
-            <div class="row">
-              <div class="col-xs-6 col-md-6 data_register_course">
-                <p><b>{% trans 'Init register' %}: </b>{{course.init_register_date}}</p>
-              </div>
-              <div class="col-xs-6 col-md-6 data_register_course">
-                <p><b>{% trans 'End register' %}: </b>{{course.end_register_date}}</p>
-              </div>
-            </div>
+            
           </div>
         </div>
     </div>
@@ -52,9 +52,9 @@
                     </div>
                     <div id="{{category.slug}}" class="panel-collapse collapse">
                         {% for course in category.course_category %}
-                            {# {% if user in course.students.all or user in course.professors.all or user|has_role:'system_admin' %}#}
-                                 {% include "course/course_card.html" %}
-                            {# {% endif %}#}
+                            
+                            {% include "course/course_card.html" %}
+                        
                         {% endfor %}
                     </div>
                 </div>
@@ -48,21 +48,13 @@
     </div>
     <div class="panel-body">
       <p><b>{% trans 'Coordinator' %}: </b>{{course.coordenator}}</p>
-      <p><b>{% trans 'Teacher' %}: </b>{{course.professors.all.0}}</p>
       <p>
         <b>{% trans 'Description' %}:</b>
         <i>
-          {{ course.objectivies |safe }}
+          {{ course.description |safe }}
         </i>
       </p>
-      <div class="row">
-              <div class="col-xs-6 col-md-6 data_register_course">
-                <p><b>{% trans 'Begin of Course Date' %}: </b>{{course.init_date}}</p>
-              </div>
-              <div class="col-xs-6 col-md-6 data_register_course">
-                <p><b>{% trans 'End of Course Date' %}: </b>{{course.end_date}}</p>
-              </div>
-            </div>
+     
     </div>
   </div>
@@ -11,28 +11,12 @@ def value_field(course, field):
     value = ""
     if field == 'name':
         value = course.name
-    elif field == 'objectivies':
-        value = course.objectivies
     elif field == 'content':
         value = course.content
-    elif field == 'max_students':
-        value = course.max_students
-    elif field == 'init_register_date':
-        value = course.init_register_date
-    elif field == 'end_register_date':
-        value = course.end_register_date
-    elif field == 'init_date':
-        value = course.init_date
-    elif field == 'end_date':
-        value = course.end_date
     elif field == 'coordenator':
         value = course.coordenator
     elif field == 'category':
         value = course.category
-    elif field == 'professors':
-        value = course.professors.all()
-    elif field == 'students':
-        value = course.students.all()
     elif field == 'public':
         value = course.public
@@ -8,9 +8,8 @@ def hide_subscribe_view_btn(user, subject):
 	if not user is None:
 		if user.is_authenticated:
 			if has_role(user, 'student') and not user.is_staff:
-				if user in subject.course.students.all():
-					if not user in subject.students.all():
-						return True
+				if user in subject.students.all():
+					return True
 				else:
 					return True
@@ -21,7 +20,7 @@ def show_subject_subscribe(user, subject):
 	if not user is None:
 		if user.is_authenticated:
 			if has_role(user, 'student') and not user.is_staff:
-				if not user in subject.students.all() and user in subject.course.students.all() and subject.show_subscribe:
+				if not user in subject.students.all() and subject.show_subscribe:
 					return  True
 	return False
@@ -91,13 +91,9 @@ class IndexView(LoginRequiredMixin, NotificationMixin, generic.ListView):
         list_courses = None
         if has_role(self.request.user,'system_admin'):
             list_courses = self.get_queryset().order_by('name')
-            # categorys_courses = CourseCategory.objects.all()
-        elif has_role(self.request.user,'professor'):
-            list_courses = self.get_queryset().filter(professors__in = [self.request.user])
-            # categorys_courses = CourseCategory.objects.filter(course_category__professors__name = self.request.user.name).distinct()
-        elif has_role(self.request.user, 'student'):
-            list_courses = self.get_queryset().filter(students__in = [self.request.user])
-
+        else:
+            list_courses = self.get_queryset().all()
+    
         context['categorys_courses'] = course_category(list_courses)
         return context
@@ -361,10 +357,6 @@ class CourseView(LogMixin, NotificationMixin, generic.DetailView):
         if has_role(self.request.user,'system_admin'):
             courses = Course.objects.all()
-        elif has_role(self.request.user,'professor'):
-            courses = self.request.user.courses_professors.all()
-        elif has_role(self.request.user, 'student'):
-            courses = self.request.user.courses_student.all()
         else:
             courses = Course.objects.filter(public = True)
@@ -674,7 +666,7 @@ class CreateTopicView(LoginRequiredMixin, HasRoleMixin, LogMixin, NotificationMi
         action = super(CreateTopicView, self).createorRetrieveAction("create Topic")
         super(CreateTopicView, self).createNotification("Topic "+ self.object.name + " was created",
             resource_name=self.object.name, resource_link= reverse('course:view_topic',args=[self.object.slug]),
-             actor=self.request.user, users = self.object.subject.course.students.all() )
+             actor=self.request.user, users = self.object.subject.students.all() )
         self.log_context['topic_id'] = self.object.id
         self.log_context['topic_name'] = self.object.name
@@ -778,7 +770,7 @@ class CreateSubjectView(LoginRequiredMixin, HasRoleMixin, LogMixin, Notification
         self.object.professors.add(self.request.user)
         if self.object.visible:
             super(CreateSubjectView, self).createNotification( " created subject " + self.object.name, resource_name=self.object.name,
-             resource_slug = self.object.slug, actor=self.request.user, users= self.object.course.students.all(),
+             resource_slug = self.object.slug, actor=self.request.user,
              resource_link = reverse('course:view_subject', args=[self.object.slug]))
         self.log_context['subject_id'] = self.object.id
@@ -891,7 +883,7 @@ class DeleteSubjectView(LoginRequiredMixin, HasRoleMixin, LogMixin, generic.Dele
 def subscribe_subject(request, slug):
     subject = get_object_or_404(Subject, slug = slug)
-    if request.user in subject.course.students.all():
+    if request.user not in subject.students.all():
         subject.students.add(request.user)
         if request.user in subject.students.all():
@@ -1018,7 +1010,7 @@ class ReplicateTopicView (LoginRequiredMixin, HasRoleMixin, LogMixin, Notificati
         action = super(ReplicateTopicView, self).createorRetrieveAction("create Topic")
         super(ReplicateTopicView, self).createNotification("Topic "+ self.object.name + " was created",
             resource_name=self.object.name, resource_link= reverse('course:view_topic',args=[self.object.slug]),
-             actor=self.request.user, users = self.object.subject.course.students.all() )
+             actor=self.request.user, users = self.object.subject.students.all() )
         self.log_context['topic_id'] = self.object.id
         self.log_context['topic_name'] = self.object.name
@@ -1072,7 +1064,7 @@ class ReplicateSubjectView(LoginRequiredMixin, HasRoleMixin, LogMixin, Notificat
         self.object.professors.add(self.request.user)
         if self.object.visible:
             super(ReplicateSubjectView, self).createNotification( " created subject " + self.object.name, resource_name=self.object.name,
-             resource_slug = self.object.slug, actor=self.request.user, users= self.object.course.students.all(),
+             resource_slug = self.object.slug, actor=self.request.user, users= self.object.students.all(),
              resource_link = reverse('course:view_subject', args=[self.object.slug]))
         self.log_context['subject_id'] = self.object.id
	@@ -6,10 +6,10 @@ def view_topic(role, user, topic):		@@ -6,10 +6,10 @@ def view_topic(role, user, topic):
6	if (role == SystemAdmin):	6	if (role == SystemAdmin):
7	return True	7	return True
8		8
9	- if (user in topic.subject.course.professors.all() and user in topic.subject.professors.all()):	9	+ if user in topic.subject.professors.all():
10	return True	10	return True
11		11
12	- if (user in topic.subject.course.students.all() and user in topic.subject.students.all()):	12	+ if user in topic.subject.students.all():
13	return True	13	return True
14		14
15	return False	15	return False
	@@ -29,10 +29,10 @@ def view_subject(role, user, subject):		@@ -29,10 +29,10 @@ def view_subject(role, user, subject):
29	if (role == SystemAdmin):	29	if (role == SystemAdmin):
30	return True	30	return True
31		31
32	- if (user in subject.course.professors.all() and user in subject.professors.all()):	32	+ if user in subject.professors.all():
33	return True	33	return True
34		34
35	- if (user in subject.course.students.all() and user in subject.students.all()):	35	+ if user in subject.students.all():
36	return True	36	return True
37		37
38	return False	38	return False
	@@ -11,28 +11,12 @@ def value_field(course, field):		@@ -11,28 +11,12 @@ def value_field(course, field):
11	value = ""	11	value = ""
12	if field == 'name':	12	if field == 'name':
13	value = course.name	13	value = course.name
14	- elif field == 'objectivies':
15	- value = course.objectivies
16	elif field == 'content':	14	elif field == 'content':
17	value = course.content	15	value = course.content
18	- elif field == 'max_students':
19	- value = course.max_students
20	- elif field == 'init_register_date':
21	- value = course.init_register_date
22	- elif field == 'end_register_date':
23	- value = course.end_register_date
24	- elif field == 'init_date':
25	- value = course.init_date
26	- elif field == 'end_date':
27	- value = course.end_date
28	elif field == 'coordenator':	16	elif field == 'coordenator':
29	value = course.coordenator	17	value = course.coordenator
30	elif field == 'category':	18	elif field == 'category':
31	value = course.category	19	value = course.category
32	- elif field == 'professors':
33	- value = course.professors.all()
34	- elif field == 'students':
35	- value = course.students.all()
36	elif field == 'public':	20	elif field == 'public':
37	value = course.public	21	value = course.public
38		22