search bar #189

Matheus Lins
2 parents 090c0fef 4f3b88fa
Showing 8 changed files with 42 additions and 39 deletions Show diff stats
amadeus/settings.py
amadeus/uploads/ciencia-da-computacao/teorica/tipfef/Apresentacao_da_Cadidatura_a_Marketing_-_Matheus_Lins.pptx
amadeus/uploads/ciencia-da-computacao/teorica/tipfef/Cartao_Outubro.pdf
courses/templates/course/index.html
courses/templates/course/view.html
courses/templates/subject/form_view_teacher.html
courses/templates/subject/index.html
courses/views.py
@@ -30,8 +30,6 @@ SECRET_KEY = &#39;$=8)c!5)iha85a&amp;8q4+kv1pyg0yl7_xe_x^z=2cn_1d7r0hny4&#39;
 # SECURITY WARNING: don't run with debug turned on in production!
 DEBUG = False
-ALLOWED_HOSTS = []
-
 # Application definition
@@ -165,7 +163,7 @@ SECURE_PROXY_SSL_HEADER = (&#39;HTTP_X_FORWARDED_PROTO&#39;,&#39;https&#39;)
 ALLOWED_HOSTS = ['*']
 # Files
-MEDIA_ROOT = os.path.join(os.path.dirname(BASE_DIR), 'uploads')
+MEDIA_ROOT = os.path.join(PROJECT_ROOT, 'uploads')
 MEDIA_URL = '/uploads/'
@@ -74,10 +74,10 @@
     <form id="searchform" action="{% url 'course:manage' %}" method="get" accept-charset="utf-8">
         <div class="input-group">
           <div class="form-group is-empty">
-          <input type="search" class="form-control" placeholder="Search Courses" name="q" id="searchbox"></div>
+          <input type="text" class="form-control" placeholder="Search Courses" name="q"></div>
             <span class="input-group-btn input-group-sm">
-              <button type="button" class="btn btn-fab btn-fab-mini">
-                <i class="material-icons">search</i>
+              <button type="submit" class="btn btn-fab btn-fab-mini">
+                <i class="material-icons">{% trans 'Search' %}</i>
               </button>
             </span>
         </div>
@@ -88,16 +88,14 @@
 </fieldset>
     <div class="col-md-12 cards-content">
         {% if courses|length > 0 %}
-            {% if request.GET.category == 'all' or none or request.GET.category == '' %}
+            {% if request.GET.category == '' or aparece or request.GET.q == '' %}
                 {% for course in list_courses %}
                     {% include "course/course_card.html" %}
                 {% endfor %}
-            {% else %}
-                {% for course in courses_category %}
-                    {% if course.category.name == request.GET.category %}
-                        <!-- Put your content here! -->
-                        {% include "course/course_card.html" %}
-                    {% endif %}
+            {% endif %}
+            {% if request.GET.category or request.GET.q %}
+                {% for course in courses %}
+                    {% include "course/course_card.html" %}
                 {% endfor %}
             {% endif %}
         {% else %}
@@ -76,7 +76,6 @@
       </div>
     </div>
     <div class="panel-body">
-      <p><b>{% trans 'Course Name' %}: </b>{{ course.name }}</p>
       <p><b>{% trans 'Coordinator' %}: </b>{% for professor in course.professors.all %}{% if not forloop.first %},{% endif %}
               {{professor}}{% if forloop.last %}.{% endif %}{% endfor %}</p>
       <p>
@@ -135,8 +135,8 @@
         </div>
         <div class="form-group">
           <div class="col-md-10">
-            <button type="button" class="btn btn-raised btn-default edit_card_end">Cancel</button>
-            <button type="submit" class="btn btn-raised btn-primary edit_card_end">Submit</button>
+            <button type="button" class="btn btn-raised btn-default edit_card_end">{% trans 'Cancel' %}</button>
+            <button type="submit" class="btn btn-raised btn-primary edit_card_end">{% trans 'Submit' %}</button>
           </div>
         </div>
       </div><!--EndEditation-->
@@ -198,13 +198,13 @@
             </div>
           </div>
           <div class="form-group is-empty">
-          <label for="number" class="col-md-2 control-label">Height</label>
+          <label for="number" class="col-md-2 control-label">{% trans 'Height' %}</label>
             <div class="col-md-4">
               <input type="number" class="form-control" id="inputNumber" placeholder="Heiht">
             </div>
           </div>
           <div class="form-group is-empty">
-          <label for="number" class="col-md-2 control-label">Weight</label>
+          <label for="number" class="col-md-2 control-label">{% trans 'Weight' %}</label>
             <div class="col-md-4">
               <input type="number" class="form-control" id="inputNumber" placeholder="Weight">
             </div>
@@ -70,7 +70,8 @@
        </div>
       </div>
       <div class="panel-body">
-          <p><b>{% trans "Professor" %}:</b> {{subject.professors}}</p>
+          <p><b>{% trans "Professor" %}:</b> {% for professor in subject.professors.all %}{% if not forloop.first %},{% endif %}
+              {{professor}}{% if forloop.last %}.{% endif %}{% endfor %}</p>
           <p>
             <b>{% trans "Description" %}:</b>
               {{subject.description|linebreaks}}
@@ -9,6 +9,8 @@ from django.core.urlresolvers import reverse_lazy
 from django.utils.translation import ugettext_lazy as _
 from rolepermissions.verifications import has_role
 from django.db.models import Q
+import operator
+from functools import reduce
 from rolepermissions.verifications import has_object_permission
 from django.http import HttpResponseRedirect, JsonResponse
@@ -31,6 +33,29 @@ class IndexView(LoginRequiredMixin, NotificationMixin, generic.ListView):
 	template_name = 'course/index.html'
 	context_object_name = 'courses'
 	paginate_by = 5
+	aparece = True
+
+
+	def get_queryset(self):
+		result = super(IndexView, self).get_queryset()
+
+		course_search = self.request.GET.get('q', None)
+		category_search = self.request.GET.get('category', None)
+		if course_search:
+			self.aparece = False
+			query_list = course_search.split()
+			result = result.filter(
+			reduce(operator.and_,
+				(Q(name__icontains=q) for q in query_list))
+			)
+		if category_search:
+			self.aparece = False
+			query_list = category_search.split()
+			result = result.filter(
+			reduce(operator.and_,
+				(Q(category__name=category) for category in query_list))
+			)
+		return result
 	def get_context_data(self, **kwargs):
 		context = super(IndexView, self).get_context_data(**kwargs)
@@ -46,13 +71,6 @@ class IndexView(LoginRequiredMixin, NotificationMixin, generic.ListView):
 			list_courses = Course.objects.filter(Q(students = True)|Q(students__name = self.request.user.name)).order_by('name')
 			categorys_courses = CourseCategory.objects.filter(course_category__students__name = self.request.user.name).distinct()
-		courses_category = Course.objects.filter(category__name = self.request.GET.get('category'))
-		none = None
-		q = self.request.GET.get('category', None)
-		if q is  None:
-			none = True
-		context['none'] = none
-
 		paginator = Paginator(list_courses, self.paginate_by)
 		page = self.request.GET.get('page')
@@ -63,23 +81,12 @@ class IndexView(LoginRequiredMixin, NotificationMixin, generic.ListView):
 		except EmptyPage:
 		    list_courses = paginator.page(paginator.num_pages)
-		context['courses_category'] = courses_category
 		context['list_courses'] = list_courses
 		context['categorys_courses'] = categorys_courses
+		context['aparece'] = self.aparece
 		return context
-
-	def get_queryset(self):
-		try:
-		    name = self.kwargs['q']
-		except:
-		    name = ''
-		if (name != ''):
-		    object_list = Course.objects.filter(name__icontains = name)
-		else:
-		    object_list = Course.objects.all()
-		return object_list
-
+		
 class CreateCourseView(LoginRequiredMixin, HasRoleMixin, NotificationMixin,generic.edit.CreateView):
 	allowed_roles = ['professor', 'system_admin']