Download as
Browse Code »

Commit f0122ea85f561b9d482fec398976ca2433f7f862

Authored by Matheus Lins
1 parent db3dd285
Exists in master and in 5 other branches amadeus_univasf, dev, image-crop, pdf_file_html, refactoring

doing same filter from teacher's courses template

Showing 2 changed files with 107 additions and 47 deletions   Show diff stats
courses/templates/course/index.html
  Diff comments   View file @f0122ea
@@ -65,8 +65,13 @@ @@ -65,8 +65,13 @@
65 </div> 65 </div>
66 <div class="col-md-12"> 66 <div class="col-md-12">
67 {% if user|has_role:'professor, system_admin' %} 67 {% if user|has_role:'professor, system_admin' %}
  68 + <div class="btn-group btn-group-justified btn-group-raised">
  69 + <a href="?category=all" class="btn btn-raised btn-info">Todos</a>
  70 + {% for category_course in categorys_courses_professor %}
  71 + <a href="?category={{category_course.name}}" class="btn btn-raised btn-primary">{{category_course.name}}</a>
  72 + {% endfor %}
  73 + </div>
68 {% else%} 74 {% else%}
69 -  
70 <div class="btn-group btn-group-justified btn-group-raised"> 75 <div class="btn-group btn-group-justified btn-group-raised">
71 <a href="?category=all" class="btn btn-raised btn-info">Todos</a> 76 <a href="?category=all" class="btn btn-raised btn-info">Todos</a>
72 {% for category_course in categorys_courses %} 77 {% for category_course in categorys_courses %}
@@ -80,55 +85,109 @@ @@ -80,55 +85,109 @@
80 {% if user|has_role:'professor, system_admin' %} 85 {% if user|has_role:'professor, system_admin' %}
81 <div class="col-md-12"> 86 <div class="col-md-12">
82 {% if courses|length > 0 %} 87 {% if courses|length > 0 %}
83 - {% for course in courses_teacher %}  
84 - <!-- Put your content here! -->  
85 - <div class="panel-group ui-accordion ui-widget ui-helper-reset ui-sortable" id="accordion" role="tablist" aria-multiselectable="false">  
86 - <div class="group">  
87 - <div class="panel panel-info">  
88 - <div class="panel-heading" role="tab">  
89 - <div class="row">  
90 - <div class="col-xs-9 col-md-9 titleTopic">  
91 - <a role="button" data-toggle="collapse" data-parent="#accordion" href=".collapseOne" aria-expanded="false" aria-controls="collapseOne" class="collapsed">  
92 - <h4 style="color:white">{{course.name}}</h4>  
93 - </a>  
94 - </div>  
95 - <div class="col-xs-4 col-md-3" id="divMoreActions">  
96 - <div class="btn-group">  
97 - <button type="button" class="btn btn-default btn-sm eye" data-toggle="tooltip" data-placement="bottom" title="Visible">  
98 - <i class="fa fa-eye fa-2x" aria-hidden="true"></i>  
99 - </button> 88 + {% if request.GET.category == 'all' or none or request.GET.category == '' %}
  89 + {% for course in courses_teacher %}
  90 + <!-- Put your content here! -->
  91 + <div class="panel-group ui-accordion ui-widget ui-helper-reset ui-sortable" id="accordion" role="tablist" aria-multiselectable="false">
  92 + <div class="group">
  93 + <div class="panel panel-info">
  94 + <div class="panel-heading" role="tab">
  95 + <div class="row">
  96 + <div class="col-xs-9 col-md-9 titleTopic">
  97 + <a role="button" data-toggle="collapse" data-parent="#accordion" href=".collapseOne" aria-expanded="false" aria-controls="collapseOne" class="collapsed">
  98 + <h4 style="color:white">{{course.name}}</h4>
  99 + </a>
  100 + </div>
  101 + <div class="col-xs-4 col-md-3" id="divMoreActions">
  102 + <div class="btn-group">
  103 + <button type="button" class="btn btn-default btn-sm eye" data-toggle="tooltip" data-placement="bottom" title="Visible">
  104 + <i class="fa fa-eye fa-2x" aria-hidden="true"></i>
  105 + </button>
100 106
101 - </div>  
102 - <div class="btn-group">  
103 - <button class="btn btn-default btn-sm dropdown-toggle" type="button" id="moreActions" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">  
104 - <i class="fa fa-ellipsis-v fa-2x" aria-hidden="true"></i>  
105 - </button>  
106 - <ul class="dropdown-menu" aria-labelledby="moreActions">  
107 - <li><a href="javascript:void(0)" data-toggle="modal" data-target="#myModal4"><i class="fa fa-files-o fa-fw" aria-hidden="true"></i>&nbsp; Replicate</a></li>  
108 - <li><a href="javascript:void(0)" data-toggle="modal" data-target="#removeCourse"><i class="fa fa-trash fa-fw" aria-hidden="true"></i>&nbsp; Remove</a></li>  
109 - </ul>  
110 - </div>  
111 - </div>  
112 - </div>  
113 - </div>  
114 - <div class="panel-collapse collapseOne collapse in" role="tabpanel" aria-labelledby="headingOne" aria-expanded="true" aria-hidden="false" tabindex="0">  
115 - <div class="panel-body">  
116 - <p><b>Course Name: </b>{{course.name}}</p>  
117 - <p><b>Duration (in semesters): </b>09</p>  
118 - <p><b>Coordinator: </b>{{course.professors}}</p>  
119 - <p>  
120 - <b>Description:</b>  
121 - <i>  
122 - {{course.description}}  
123 - </i>  
124 - </p>  
125 - <a href="{% url 'course:view' course.slug %}" class="btn btn-raised btn-default center-block">{% trans 'View Course' %}<div class="ripple-container"></div></a>  
126 - </div>  
127 - </div> 107 + </div>
  108 + <div class="btn-group">
  109 + <button class="btn btn-default btn-sm dropdown-toggle" type="button" id="moreActions" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
  110 + <i class="fa fa-ellipsis-v fa-2x" aria-hidden="true"></i>
  111 + </button>
  112 + <ul class="dropdown-menu" aria-labelledby="moreActions">
  113 + <li><a href="javascript:void(0)" data-toggle="modal" data-target="#myModal4"><i class="fa fa-files-o fa-fw" aria-hidden="true"></i>&nbsp; Replicate</a></li>
  114 + <li><a href="javascript:void(0)" data-toggle="modal" data-target="#removeCourse"><i class="fa fa-trash fa-fw" aria-hidden="true"></i>&nbsp; Remove</a></li>
  115 + </ul>
  116 + </div>
  117 + </div>
  118 + </div>
  119 + </div>
  120 + <div class="panel-collapse collapseOne collapse in" role="tabpanel" aria-labelledby="headingOne" aria-expanded="true" aria-hidden="false" tabindex="0">
  121 + <div class="panel-body">
  122 + <p><b>Course Name: </b>{{course.name}}</p>
  123 + <p><b>Duration (in semesters): </b>09</p>
  124 + <p><b>Coordinator: </b>{{course.professors}}</p>
  125 + <p>
  126 + <b>Description:</b>
  127 + <i>
  128 + {{course.description}}
  129 + </i>
  130 + </p>
  131 + <a href="{% url 'course:view' course.slug %}" class="btn btn-raised btn-default center-block">{% trans 'View Course' %}<div class="ripple-container"></div></a>
  132 + </div>
  133 + </div>
  134 + </div>
128 </div> 135 </div>
129 </div> 136 </div>
130 - </div>  
131 - {% endfor %} 137 + {% endfor %}
  138 + {% else %}
  139 + {% for course in courses_teacher %}
  140 + {% if course.category.name == request.GET.category %}
  141 + <!-- Put your content here! -->
  142 + <div class="panel-group ui-accordion ui-widget ui-helper-reset ui-sortable" id="accordion" role="tablist" aria-multiselectable="false">
  143 + <div class="group">
  144 + <div class="panel panel-info">
  145 + <div class="panel-heading" role="tab">
  146 + <div class="row">
  147 + <div class="col-xs-9 col-md-9 titleTopic">
  148 + <a role="button" data-toggle="collapse" data-parent="#accordion" href=".collapseOne" aria-expanded="false" aria-controls="collapseOne" class="collapsed">
  149 + <h4 style="color:white">{{course.name}}</h4>
  150 + </a>
  151 + </div>
  152 + <div class="col-xs-4 col-md-3" id="divMoreActions">
  153 + <div class="btn-group">
  154 + <button type="button" class="btn btn-default btn-sm eye" data-toggle="tooltip" data-placement="bottom" title="Visible">
  155 + <i class="fa fa-eye fa-2x" aria-hidden="true"></i>
  156 + </button>
  157 +
  158 + </div>
  159 + <div class="btn-group">
  160 + <button class="btn btn-default btn-sm dropdown-toggle" type="button" id="moreActions" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
  161 + <i class="fa fa-ellipsis-v fa-2x" aria-hidden="true"></i>
  162 + </button>
  163 + <ul class="dropdown-menu" aria-labelledby="moreActions">
  164 + <li><a href="javascript:void(0)" data-toggle="modal" data-target="#myModal4"><i class="fa fa-files-o fa-fw" aria-hidden="true"></i>&nbsp; Replicate</a></li>
  165 + <li><a href="javascript:void(0)" data-toggle="modal" data-target="#removeCourse"><i class="fa fa-trash fa-fw" aria-hidden="true"></i>&nbsp; Remove</a></li>
  166 + </ul>
  167 + </div>
  168 + </div>
  169 + </div>
  170 + </div>
  171 + <div class="panel-collapse collapseOne collapse in" role="tabpanel" aria-labelledby="headingOne" aria-expanded="true" aria-hidden="false" tabindex="0">
  172 + <div class="panel-body">
  173 + <p><b>Course Name: </b>{{course.name}}</p>
  174 + <p><b>Duration (in semesters): </b>09</p>
  175 + <p><b>Coordinator: </b>{{course.professors}}</p>
  176 + <p>
  177 + <b>Description:</b>
  178 + <i>
  179 + {{course.description}}
  180 + </i>
  181 + </p>
  182 + <a href="{% url 'course:view' course.slug %}" class="btn btn-raised btn-default center-block">{% trans 'View Course' %}<div class="ripple-container"></div></a>
  183 + </div>
  184 + </div>
  185 + </div>
  186 + </div>
  187 + </div>
  188 + {% endif %}
  189 + {% endfor %}
  190 + {% endif %}
132 {% else %} 191 {% else %}
133 {% trans 'No courses found' %} 192 {% trans 'No courses found' %}
134 {% endif %} 193 {% endif %}
courses/views.py
  Diff comments   View file @f0122ea
@@ -33,6 +33,7 @@ class IndexView(LoginRequiredMixin, NotificationMixin, generic.ListView): @@ -33,6 +33,7 @@ class IndexView(LoginRequiredMixin, NotificationMixin, generic.ListView):
33 context['courses_teacher'] = Course.objects.filter(professors__name = self.request.user.name) 33 context['courses_teacher'] = Course.objects.filter(professors__name = self.request.user.name)
34 context['courses_student'] = Course.objects.filter(students__name = self.request.user.name) 34 context['courses_student'] = Course.objects.filter(students__name = self.request.user.name)
35 context['categorys_courses'] = CourseCategory.objects.filter(course_category__students__name = self.request.user.name).distinct() 35 context['categorys_courses'] = CourseCategory.objects.filter(course_category__students__name = self.request.user.name).distinct()
  36 + context['categorys_courses_professor'] = CourseCategory.objects.filter(course_category__professors__name = self.request.user.name).distinct()
36 courses_category = Course.objects.filter(category__name = self.request.GET.get('category')) 37 courses_category = Course.objects.filter(category__name = self.request.GET.get('category'))
37 context['courses_category'] = courses_category 38 context['courses_category'] = courses_category
38 none = None 39 none = None