Download as
Browse Code »

Commit a260d811e7b2cbdc2830810fc42f4f4f4a81ef27

Authored by fbormann
1 parent 43fbc10d
Exists in master and in 5 other branches amadeus_univasf, dev, image-crop, pdf_file_html, refactoring

just fixed some major UI issues

Showing 8 changed files with 27 additions and 64 deletions   Show diff stats
courses/context_processors.py
  Diff comments   View file @a260d81
... ... @@ -8,6 +8,9 @@ def courses(request):
8 8 if request.user.is_staff:
9 9 context['courses_list'] = Course.objects.all()
10 10 else:
11   - context['courses_list'] = Course.objects.filter(professors__in = [request.user])
  11 + #context['courses_list'] =
  12 + context['courses_list'] = Course.objects.all()
  13 +
  14 + #context['courses_list'] = Course.objects.filter(professors__in = [request.user])
12 15 return context
13 16 return context
... ...
courses/permissions.py
  Diff comments   View file @a260d81
... ... @@ -6,10 +6,10 @@ def view_topic(role, user, topic):
6 6 if (role == SystemAdmin):
7 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 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 13 return True
14 14  
15 15 return False
... ... @@ -29,10 +29,10 @@ def view_subject(role, user, subject):
29 29 if (role == SystemAdmin):
30 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 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 36 return True
37 37  
38 38 return False
... ...
courses/templates/course/course_card.html
  Diff comments   View file @a260d81
... ... @@ -35,21 +35,14 @@
35 35 <div class="panel-body">
36 36 <p><b>{% trans 'Course Name' %}: </b>{{course.name}}</p>
37 37 <p><b>{% trans 'Coordenator' %}: </b>{{course.coordenator}}</p>
38   - <p><b>{% trans 'Professor' %}: </b>{{course.professors.all.0}}</p>
  38 +
39 39 <p>
40 40 <b>{% trans 'Description' %}:</b>
41 41 <i>
42   - {{course.content | safe }}
  42 + {{course.description | safe }}
43 43 </i>
44 44 </p>
45   - <div class="row">
46   - <div class="col-xs-6 col-md-6 data_register_course">
47   - <p><b>{% trans 'Init register' %}: </b>{{course.init_register_date}}</p>
48   - </div>
49   - <div class="col-xs-6 col-md-6 data_register_course">
50   - <p><b>{% trans 'End register' %}: </b>{{course.end_register_date}}</p>
51   - </div>
52   - </div>
  45 +
53 46 </div>
54 47 </div>
55 48 </div>
... ...
courses/templates/course/index.html
  Diff comments   View file @a260d81
... ... @@ -52,9 +52,9 @@
52 52 </div>
53 53 <div id="{{category.slug}}" class="panel-collapse collapse">
54 54 {% for course in category.course_category %}
55   - {# {% if user in course.students.all or user in course.professors.all or user|has_role:'system_admin' %}#}
56   - {% include "course/course_card.html" %}
57   - {# {% endif %}#}
  55 +
  56 + {% include "course/course_card.html" %}
  57 +
58 58 {% endfor %}
59 59 </div>
60 60 </div>
... ...
courses/templates/course/view.html
  Diff comments   View file @a260d81
... ... @@ -48,21 +48,13 @@
48 48 </div>
49 49 <div class="panel-body">
50 50 <p><b>{% trans 'Coordinator' %}: </b>{{course.coordenator}}</p>
51   - <p><b>{% trans 'Teacher' %}: </b>{{course.professors.all.0}}</p>
52 51 <p>
53 52 <b>{% trans 'Description' %}:</b>
54 53 <i>
55   - {{ course.objectivies |safe }}
  54 + {{ course.description |safe }}
56 55 </i>
57 56 </p>
58   - <div class="row">
59   - <div class="col-xs-6 col-md-6 data_register_course">
60   - <p><b>{% trans 'Begin of Course Date' %}: </b>{{course.init_date}}</p>
61   - </div>
62   - <div class="col-xs-6 col-md-6 data_register_course">
63   - <p><b>{% trans 'End of Course Date' %}: </b>{{course.end_date}}</p>
64   - </div>
65   - </div>
  57 +
66 58 </div>
67 59 </div>
68 60  
... ...
courses/templatetags/course_value_field.py
  Diff comments   View file @a260d81
... ... @@ -11,28 +11,12 @@ def value_field(course, field):
11 11 value = ""
12 12 if field == 'name':
13 13 value = course.name
14   - elif field == 'objectivies':
15   - value = course.objectivies
16 14 elif field == 'content':
17 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 16 elif field == 'coordenator':
29 17 value = course.coordenator
30 18 elif field == 'category':
31 19 value = course.category
32   - elif field == 'professors':
33   - value = course.professors.all()
34   - elif field == 'students':
35   - value = course.students.all()
36 20 elif field == 'public':
37 21 value = course.public
38 22  
... ...
courses/templatetags/custom_filters.py
  Diff comments   View file @a260d81
... ... @@ -8,9 +8,8 @@ def hide_subscribe_view_btn(user, subject):
8 8 if not user is None:
9 9 if user.is_authenticated:
10 10 if has_role(user, 'student') and not user.is_staff:
11   - if user in subject.course.students.all():
12   - if not user in subject.students.all():
13   - return True
  11 + if user in subject.students.all():
  12 + return True
14 13 else:
15 14 return True
16 15  
... ... @@ -21,7 +20,7 @@ def show_subject_subscribe(user, subject):
21 20 if not user is None:
22 21 if user.is_authenticated:
23 22 if has_role(user, 'student') and not user.is_staff:
24   - if not user in subject.students.all() and user in subject.course.students.all() and subject.show_subscribe:
  23 + if not user in subject.students.all() and subject.show_subscribe:
25 24 return True
26 25  
27 26 return False
... ...
courses/views.py
  Diff comments   View file @a260d81
... ... @@ -91,13 +91,9 @@ class IndexView(LoginRequiredMixin, NotificationMixin, generic.ListView):
91 91 list_courses = None
92 92 if has_role(self.request.user,'system_admin'):
93 93 list_courses = self.get_queryset().order_by('name')
94   - # categorys_courses = CourseCategory.objects.all()
95   - elif has_role(self.request.user,'professor'):
96   - list_courses = self.get_queryset().filter(professors__in = [self.request.user])
97   - # categorys_courses = CourseCategory.objects.filter(course_category__professors__name = self.request.user.name).distinct()
98   - elif has_role(self.request.user, 'student'):
99   - list_courses = self.get_queryset().filter(students__in = [self.request.user])
100   -
  94 + else:
  95 + list_courses = self.get_queryset().all()
  96 +
101 97 context['categorys_courses'] = course_category(list_courses)
102 98 return context
103 99  
... ... @@ -361,10 +357,6 @@ class CourseView(LogMixin, NotificationMixin, generic.DetailView):
361 357  
362 358 if has_role(self.request.user,'system_admin'):
363 359 courses = Course.objects.all()
364   - elif has_role(self.request.user,'professor'):
365   - courses = self.request.user.courses_professors.all()
366   - elif has_role(self.request.user, 'student'):
367   - courses = self.request.user.courses_student.all()
368 360 else:
369 361 courses = Course.objects.filter(public = True)
370 362  
... ... @@ -674,7 +666,7 @@ class CreateTopicView(LoginRequiredMixin, HasRoleMixin, LogMixin, NotificationMi
674 666 action = super(CreateTopicView, self).createorRetrieveAction("create Topic")
675 667 super(CreateTopicView, self).createNotification("Topic "+ self.object.name + " was created",
676 668 resource_name=self.object.name, resource_link= reverse('course:view_topic',args=[self.object.slug]),
677   - actor=self.request.user, users = self.object.subject.course.students.all() )
  669 + actor=self.request.user, users = self.object.subject.students.all() )
678 670  
679 671 self.log_context['topic_id'] = self.object.id
680 672 self.log_context['topic_name'] = self.object.name
... ... @@ -778,7 +770,7 @@ class CreateSubjectView(LoginRequiredMixin, HasRoleMixin, LogMixin, Notification
778 770 self.object.professors.add(self.request.user)
779 771 if self.object.visible:
780 772 super(CreateSubjectView, self).createNotification( " created subject " + self.object.name, resource_name=self.object.name,
781   - resource_slug = self.object.slug, actor=self.request.user, users= self.object.course.students.all(),
  773 + resource_slug = self.object.slug, actor=self.request.user,
782 774 resource_link = reverse('course:view_subject', args=[self.object.slug]))
783 775  
784 776 self.log_context['subject_id'] = self.object.id
... ... @@ -891,7 +883,7 @@ class DeleteSubjectView(LoginRequiredMixin, HasRoleMixin, LogMixin, generic.Dele
891 883 def subscribe_subject(request, slug):
892 884 subject = get_object_or_404(Subject, slug = slug)
893 885  
894   - if request.user in subject.course.students.all():
  886 + if request.user not in subject.students.all():
895 887 subject.students.add(request.user)
896 888  
897 889 if request.user in subject.students.all():
... ... @@ -1018,7 +1010,7 @@ class ReplicateTopicView (LoginRequiredMixin, HasRoleMixin, LogMixin, Notificati
1018 1010 action = super(ReplicateTopicView, self).createorRetrieveAction("create Topic")
1019 1011 super(ReplicateTopicView, self).createNotification("Topic "+ self.object.name + " was created",
1020 1012 resource_name=self.object.name, resource_link= reverse('course:view_topic',args=[self.object.slug]),
1021   - actor=self.request.user, users = self.object.subject.course.students.all() )
  1013 + actor=self.request.user, users = self.object.subject.students.all() )
1022 1014  
1023 1015 self.log_context['topic_id'] = self.object.id
1024 1016 self.log_context['topic_name'] = self.object.name
... ... @@ -1072,7 +1064,7 @@ class ReplicateSubjectView(LoginRequiredMixin, HasRoleMixin, LogMixin, Notificat
1072 1064 self.object.professors.add(self.request.user)
1073 1065 if self.object.visible:
1074 1066 super(ReplicateSubjectView, self).createNotification( " created subject " + self.object.name, resource_name=self.object.name,
1075   - resource_slug = self.object.slug, actor=self.request.user, users= self.object.course.students.all(),
  1067 + resource_slug = self.object.slug, actor=self.request.user, users= self.object.students.all(),
1076 1068 resource_link = reverse('course:view_subject', args=[self.object.slug]))
1077 1069  
1078 1070 self.log_context['subject_id'] = self.object.id
... ...