From 3aa59e9b2d6e2bc9e125716bda695135a26810af Mon Sep 17 00:00:00 2001
From: Felipe Henrique de Almeida Bormann <fbormann@Felipes-MacBook-Air.local>
Date: Fri, 20 Jan 2017 17:07:46 -0300
Subject: [PATCH] search routine completed

---
 subjects/templates/subjects/list_search.html | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 subjects/urls.py                             |  3 ++-
 subjects/views.py                            | 55 ++++++++++++++++++++++++++++---------------------------
 3 files changed, 84 insertions(+), 28 deletions(-)
 create mode 100644 subjects/templates/subjects/list_search.html

diff --git a/subjects/templates/subjects/list_search.html b/subjects/templates/subjects/list_search.html
new file mode 100644
index 0000000..6af8830
--- /dev/null
+++ b/subjects/templates/subjects/list_search.html
@@ -0,0 +1,54 @@
+{% extends "subjects/list.html" %}
+
+{% load static i18n pagination %}
+{% load django_bootstrap_breadcrumbs subject_counter %}
+
+{% block content %}
+
+	 {% if messages %}
+        {% for message in messages %}
+            <script type="text/javascript">
+                {% if message.tags == "danger" %}
+                    alertify.error('{{message}}');
+                {% else %}
+                    alertify.success('{{message}}');
+                {% endif %}
+            </script>
+        {% endfor %}
+    {% endif %}
+
+    <div id="core-subjects-options-div">
+        <ul class="core-subjects-options">
+            {% if all %}
+                <a href="{% url 'subjects:search' %}?search= {{tags}} "><li >{% trans "My subjects" %} ({{ totals.my_subjects }})</li></a>
+                <a href="{% url 'subjects:search' 'all' %}?search={{tags}}" ><li class="active">{% trans "All subjects" %} ({{ totals.all_subjects }})</li></a>
+            {% else %}
+                <a href="{% url 'subjects:search' %}?search={{tags}}"><li class="active">{% trans "My subjects" %} ({{ totals.my_subjects }})</li></a>
+                <a href="{% url 'subjects:search' 'all' %}?search={{tags}}" ><li>{% trans "All subjects" %} ({{ totals.all_subjects }})</li></a>
+            {% endif %}
+            
+        </ul>
+    </div>
+
+    <div class="col-md-12 cards-content">
+		
+
+		{% if subjects|length > 0 %}
+	    	<div class="panel-group" id="subject-accordion" role="tablist" aria-multiselectable="true">
+				{% for subject in subjects %}
+					{% include "subjects/subject_card.html" with accordion_id="subject-accordion" %}
+				{% endfor %}
+				
+				{% pagination request paginator page_obj %}
+			</div>
+		{% else %}
+			<div class="text-center no-subjects">
+				<i class="fa fa-graduation-cap"></i>
+				<h4>{% trans 'You still do not posses any subject in our platform' %}</h4>
+			</div>
+		{% endif %}
+	</div>
+
+
+	
+{% endblock content %}
\ No newline at end of file
diff --git a/subjects/urls.py b/subjects/urls.py
index 4502626..6c2b593 100644
--- a/subjects/urls.py
+++ b/subjects/urls.py
@@ -5,7 +5,6 @@ urlpatterns = [
 	url(r'^home/$', views.HomeView.as_view(), name='home'),
 	url(r'^$', views.IndexView.as_view(), name='index'),
 	url(r'^category/(?P<slug>[\w_-]+)/$', views.IndexView.as_view(), name='cat_view'),
-	url(r'^(?P<option>[\w_-]+)/$', views.IndexView.as_view(), name='index'),
 	url(r'^create/(?P<slug>[\w_-]+)/$', views.SubjectCreateView.as_view(), name='create'),
 	url(r'^replicate/(?P<subject_slug>[\w_-]+)/$', views.SubjectCreateView.as_view(), name='replicate'),
 	url(r'^update/(?P<slug>[\w_-]+)/$', views.SubjectUpdateView.as_view(), name='update'),
@@ -13,4 +12,6 @@ urlpatterns = [
 	url(r'^view/(?P<slug>[\w_-]+)/$', views.SubjectDetailView.as_view(), name='view'),
 	url(r'^subscribe/(?P<slug>[\w_-]+)/$', views.SubjectSubscribeView.as_view(), name='subscribe'),
 	url(r'^search/$', views.SubjectSearchView.as_view(), name='search'),
+	url(r'^search/(?P<option>[\w_-]+)/$', views.SubjectSearchView.as_view(), name='search'),
+	url(r'^(?P<option>[\w_-]+)/$', views.IndexView.as_view(), name='index'),
 ]
\ No newline at end of file
diff --git a/subjects/views.py b/subjects/views.py
index 7e58a8d..fdb2c34 100644
--- a/subjects/views.py
+++ b/subjects/views.py
@@ -343,40 +343,41 @@ class SubjectSubscribeView(LoginRequiredMixin, TemplateView):
 
 class SubjectSearchView(LoginRequiredMixin, ListView):
     login_url = reverse_lazy("users:login")
-    template_name = 'subjects/list.html'
-    context_object_name = 'categories'
+    template_name = 'subjects/list_search.html'
+    context_object_name = 'subjects'
     paginate_by = 10
    
     def get_queryset(self):
-        if self.request.user.is_staff:
-            subjects = Subject.objects.all().order_by("name")
-        else:
-            pk = self.request.user.pk
-
-            subjects = Subject.objects.filter(Q(students__pk=pk) | Q(professor__pk=pk) | Q(category__coordinators__pk=pk)).distinct()
         
-        self.total = len(subjects)
-
+        tags = self.request.GET.get('search')
+        self.tags = tags
+        tags = tags.split(" ")
+       
+        subjects = Subject.objects.filter(tags__name__in=tags)
+        pk = self.request.user.pk
+        my_subjects = Subject.objects.filter(Q(students__pk=pk) | Q(professor__pk=pk) | Q(category__coordinators__pk=pk) & Q(tags__name__in=tags) ).distinct()
+        
+        self.totals = {'all_subjects': subjects.count(), 'my_subjects': my_subjects.count()}
+        if self.kwargs.get('option'):
+            subjects = my_subjects
         return subjects
-    def post(self, request, *args, **kwargs):
-        print("aqui")
-
-        return HttpResponse("T")
-
-    def get(self, request, *args, **kwargs):
-        print("get")
-        print(args)
-        print(kwargs)
-        return HttpResponse("t")
-
-
+   
     def get_context_data(self, **kwargs):
         context = super(SubjectSearchView, self).get_context_data(**kwargs)
-        print(kwargs)
-        print("teste")
-        tags = kwargs.get('tags').strip()
-        print(tags)
-
+        
+        context['tags'] = self.tags
         context['all'] = False
         context['title'] = _('My Subjects')
+
+        context['show_buttons'] = True #So it shows subscribe and access buttons
+        context['totals'] = self.totals
+        
+        if self.kwargs.get('option'):
+            context['all'] = True
+            context['title'] = _('All Subjects')
+
+        context['subjects_menu_active'] = 'subjects_menu_active'
+
         return context
+   
+
--
libgit2 0.21.2