From 986e7f371d636760f92aa47663193903a75c3a50 Mon Sep 17 00:00:00 2001
From: aniversarioperu <aniversarioperu1@gmail.com>
Date: Mon, 13 Jul 2015 12:12:00 +0300
Subject: [PATCH 1/6] por bancada en forms

---
 proyectos_de_ley/search_advanced/forms.py     | 25 +++++++++++++------
 .../templates/search_advanced/index.html      | 11 ++++++++
 2 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/proyectos_de_ley/search_advanced/forms.py b/proyectos_de_ley/search_advanced/forms.py
index 16eed16..f3120c8 100644
--- a/proyectos_de_ley/search_advanced/forms.py
+++ b/proyectos_de_ley/search_advanced/forms.py
@@ -2,6 +2,7 @@
 
 from django import forms
 
+from pdl.models import Proyecto
 from pdl.models import Slug
 
 
@@ -56,6 +57,23 @@ class SearchAdvancedForm(forms.Form):
             ('Vivienda', 'Vivienda'),
         ]
     )
+    congresista = forms.ModelChoiceField(
+        Slug.objects.all().order_by('nombre'),
+        label='Búsqueda por author de proyecto de ley.',
+        required=False,
+        empty_label='--Escoger nombre--',
+        widget=forms.Select(attrs={'class': 'form-control'}),
+    )
+    grupo_parlamentario = forms.ModelChoiceField(
+        Proyecto.objects.filter(
+            grupo_parlamentario__isnull=False).exclude(
+            grupo_parlamentario='').values_list(
+            'grupo_parlamentario', flat=True).order_by('grupo_parlamentario').distinct(),
+        label='Búsqueda por grupo parlamentario.',
+        required=False,
+        empty_label='--Escoger bancada--',
+        widget=forms.Select(attrs={'class': 'form-control'}),
+    )
     dispensados_2da_votacion = forms.ChoiceField(
         widget=forms.Select(attrs={'class': 'form-control'}),
         label='Dispensados 2da votación',
@@ -80,10 +98,3 @@ class SearchAdvancedForm(forms.Form):
             ('Exonerados de dictamen', 'Exonerados de dictamen'),
         ]
     )
-    congresista = forms.ModelChoiceField(
-        Slug.objects.all().order_by('nombre'),
-        label='Búsqueda por author de proyecto de ley.',
-        required=False,
-        empty_label='--Escoger nombre--',
-        widget=forms.Select(attrs={'class': 'form-control'}),
-    )
diff --git a/proyectos_de_ley/search_advanced/templates/search_advanced/index.html b/proyectos_de_ley/search_advanced/templates/search_advanced/index.html
index e1f1ac6..4a38a4d 100644
--- a/proyectos_de_ley/search_advanced/templates/search_advanced/index.html
+++ b/proyectos_de_ley/search_advanced/templates/search_advanced/index.html
@@ -91,6 +91,17 @@ <h4>Por congresista</h4>
   </div><!-- row -->
 
 
+  <div class="row">
+    <div class="col-lg-3 col-md-4 col-sm-3">
+      <h4>Por grupo parlamentario</h4>
+    </div>
+
+    <div class="col-lg-9 col-md-7 col-xs-6">
+      {{ form.grupo_parlamentario }} 
+    </div><!-- col -->
+  </div><!-- row -->
+
+
   <div class="row">
     <div class="col-lg-3 col-md-4 col-sm-3 col-sm-offset-3">
       <div class="form-group">

From 413790d072a93cd130295c3e7b9fe815ec2d1056 Mon Sep 17 00:00:00 2001
From: aniversarioperu <aniversarioperu1@gmail.com>
Date: Mon, 13 Jul 2015 14:11:12 +0300
Subject: [PATCH 2/6] fixed view

---
 proyectos_de_ley/search_advanced/forms.py | 17 +++++++++------
 proyectos_de_ley/search_advanced/views.py | 25 +++++++++++++++++++++++
 2 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/proyectos_de_ley/search_advanced/forms.py b/proyectos_de_ley/search_advanced/forms.py
index f3120c8..0118696 100644
--- a/proyectos_de_ley/search_advanced/forms.py
+++ b/proyectos_de_ley/search_advanced/forms.py
@@ -64,16 +64,21 @@ class SearchAdvancedForm(forms.Form):
         empty_label='--Escoger nombre--',
         widget=forms.Select(attrs={'class': 'form-control'}),
     )
-    grupo_parlamentario = forms.ModelChoiceField(
-        Proyecto.objects.filter(
-            grupo_parlamentario__isnull=False).exclude(
-            grupo_parlamentario='').values_list(
-            'grupo_parlamentario', flat=True).order_by('grupo_parlamentario').distinct(),
+
+    tmp = Proyecto.objects.filter(
+        grupo_parlamentario__isnull=False).exclude(
+        grupo_parlamentario='').values_list(
+        'grupo_parlamentario', flat=True).order_by('grupo_parlamentario').distinct()
+    choices = [('--Escoger bancada--', '--Escoger bancada--',)]
+    for i in tmp:
+        choices.append((i, i,))
+    grupo_parlamentario = forms.ChoiceField(
+        choices=choices,
         label='Búsqueda por grupo parlamentario.',
         required=False,
-        empty_label='--Escoger bancada--',
         widget=forms.Select(attrs={'class': 'form-control'}),
     )
+
     dispensados_2da_votacion = forms.ChoiceField(
         widget=forms.Select(attrs={'class': 'form-control'}),
         label='Dispensados 2da votación',
diff --git a/proyectos_de_ley/search_advanced/views.py b/proyectos_de_ley/search_advanced/views.py
index fb18e1f..63b21ed 100644
--- a/proyectos_de_ley/search_advanced/views.py
+++ b/proyectos_de_ley/search_advanced/views.py
@@ -24,6 +24,11 @@ def index(request):
                 name = form.cleaned_data['congresista']
                 return search_by_congresista(form, request, name)
 
+            if form.cleaned_data['grupo_parlamentario'].strip() != '' \
+                    and form.cleaned_data['grupo_parlamentario'] is not None:
+                name = form.cleaned_data['grupo_parlamentario']
+                return search_by_grupo_parlamentario(form, request, name)
+
             # requests from stats view
             if form.cleaned_data['dictamen'] == 'NÚMERO TOTAL DE LEYES':
                 return search_total_leyes(form, request)
@@ -50,6 +55,7 @@ def index(request):
                 "form": form,
             })
         else:
+            print(form.errors)
             return render(request, "search_advanced/index.html", {
                 "form": form,
             })
@@ -268,3 +274,22 @@ def search_by_congresista(form, request, name):
         "form": form,
         "comision": obj['comision'],
     })
+
+
+def search_by_grupo_parlamentario(form, request, name):
+    projects = Proyecto.objects.filter(grupo_parlamentario=name).order_by('-codigo')
+
+    obj = do_pagination(request, projects, search=True, advanced_search=True)
+    return render(request, "search_advanced/index.html", {
+        "result_count": len(projects),
+        "extra_result_msg": "Proyectos de la bancada {}".format(name),
+        "items": obj['items'],
+        "pretty_items": obj['pretty_items'],
+        "first_half": obj['first_half'],
+        "second_half": obj['second_half'],
+        "first_page": obj['first_page'],
+        "last_page": obj['last_page'],
+        "current": obj['current'],
+        "form": form,
+        "comision": obj['comision'],
+    })

From d0b025dac50668800a37ff959c1902f9dd1bfe03 Mon Sep 17 00:00:00 2001
From: aniversarioperu <aniversarioperu1@gmail.com>
Date: Mon, 13 Jul 2015 15:34:21 +0300
Subject: [PATCH 3/6] busqueda por congresista y bancada, fixes #23

---
 a.html                                    | 314 ++++++++++++++++++++++
 proyectos_de_ley/search_advanced/views.py |   1 -
 2 files changed, 314 insertions(+), 1 deletion(-)
 create mode 100644 a.html

diff --git a/a.html b/a.html
new file mode 100644
index 0000000..ac5d1be
--- /dev/null
+++ b/a.html
@@ -0,0 +1,314 @@
+<!--
+
+Webapplication creada por AniversarioPeru
+
+webpage: http://aniversarioperu.me
+twitter: @aniversarioperu
+email: aniversarioperu1@gmail.com
+
+
+rss icon by: http://glyphicons.com/
+-->
+<!DOCTYPE html>
+<html lang="es">
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta name="description" content="Proyectos de ley emitidos por el Congreso de la República del Perú">
+    <meta name="author" content="AniversarioPeru">
+
+    <title>
+        Proyecto de ley | Búsqueda avanzada
+</title>
+
+    <link rel="alternate" type="application/rss+xml"
+          title="Proyectos de Ley &raquo; RSS feed" href="/rss.xml" />
+
+    <!-- Custom styles for this template -->
+
+    <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
+    <!--[if lt IE 9]>
+      <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
+      <script src="https://oss.maxcdn.com/libs/respond.js/1.3.0/respond.min.js"></script>
+    <![endif]-->
+    <script>
+     (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+     (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+     m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+     })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+
+     ga('create', 'UA-2840507-20', 'proyectosdeley.pe');
+     ga('send', 'pageview');
+
+   </script>
+  
+
+
+  <!-- Bootstrap core CSS -->
+  <link href="http://netdna.bootstrapcdn.com/bootswatch/3.2.0/spacelab/bootstrap.min.css" rel="stylesheet">
+  
+  <link rel="stylesheet" href="/static/css/pdl.css">
+  <link rel="shortcut icon" href="/static/img/favicon.ico">
+
+
+  <style type="text/css">
+    body, html {
+      height: 100%;
+    }
+
+    .highlight { background-color: yellow }
+    .navbar .divider-vertical {
+    min-height: 50px;
+    margin: 0 9px;
+    border-right: 1px solid #ffffff;
+    border-left: 1px solid #f2f2f2;
+    }
+
+    #wrap {
+      min-height: 100%;
+      height: auto;
+      /* Negative indent footer by its height */
+      margin: 0 auto -93px;
+      /* Pad bottom by footer height */
+      padding: 0px 0 81px;
+    }
+
+    #footer {
+      padding-top: 12px;
+      height: 81px;
+    }
+  </style>
+    
+
+<link type="text/css" href="/static/css/jquery-ui.min.css" rel="stylesheet" />
+<link type="text/css" href="/static/css/jquery-ui.structure.min.css" rel="stylesheet" />
+<link type="text/css" href="/static/css/jquery-ui.theme.min.css" rel="stylesheet" />
+
+
+</head>
+<body>
+<div id="wrap">
+
+    <!-- Static navbar -->
+    <div class="navbar navbar-default navbar-static-top" role="navigation">
+      <div class="container">
+        <div class="navbar-header">
+          <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
+            <span class="sr-only">Toggle navigation</span>
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+          </button>
+          <a style="padding: 0px 0px 0px 15px" class="navbar-brand" href="/"><img
+              width="300px" height="50px" src="http://www.hiperderecho.org/wp-content/uploads/2015/01/pdl2.png" alt="Proyectos de Ley" /></a>
+        </div>
+
+        <div class="navbar-collapse collapse">
+          <ul class="nav navbar-nav">
+            <li id="index"><a href="/about">Sobre esta página</a></li>
+            <!-- <li><a href="#about">About</a></li>
+            <li><a href="#contact">Contact</a></li>
+            -->
+            <li class="divider-vertical"></li>
+            <li><a title="RSS feed" href="/rss.xml"><img alt="RSS feed" width="24px" height="24px" src="/static/img/g_rss.png"/></a></li>
+            <li><a title="Estadísticas" href="/stats/"><img alt="Estadísticas" width="26px" height="25px" src="/static/img/g_statistics.png"/></a>
+            </li>
+          </ul>
+          <form action="/search/"
+                method="get" class="navbar-form navbar-right" role="search">
+              <div class="form-group">
+                  <input style="width:240px;" type="text" id="query" name="q"
+                         class="form-control"
+                         autofocus="autofocus"
+                         value=""
+                         placeholder="Palabra clave, n&uacute;mero o autor">
+              </div>
+              <button type="submit" class="btn btn-info" id="search_button">
+                  <span class="glyphicon glyphicon-search"></span>
+                  Buscar
+              </button>
+            &nbsp;<small><a href="/search-advanced/">Búsqueda Avanzada</a></small>
+          </form>
+        </div><!--/.nav-collapse -->
+      </div>
+    </div>
+
+
+<div class="container">
+  
+  <div class="row">
+    <div class="col-xs-12">
+      <h1 style="padding-bottom:30px;" class="text-center">Búsqueda avanzada</h1>
+    </div>
+  </div>
+
+
+<form method="get" action="/search-advanced/" class="form-inline" role="form">
+  <div class="row">
+    <div class="col-lg-3 col-md-4 col-sm-3">
+      <h4>Por fecha de presentación</h4>
+    </div>
+    <div class="col-lg-9 col-md-7 col-xs-6">
+        
+
+        
+          <div class="form-group">
+        
+
+          <label class="sr-only" for="id_date_from">Fecha inicio:</label>
+          <input class="datepicker form-control" id="id_date_from" name="date_from" placeholder="Fecha inicio" type="text" />
+
+          
+        </div>
+
+
+        
+          <div class="form-group">
+        
+
+          <label class="sr-only" for="id_date_to">Fecha fin:</label>
+          <input class="datepicker form-control" id="id_date_to" name="date_to" placeholder="Fecha fin" type="text" />
+
+          
+        </div>
+
+    </div><!-- col -->
+  </div><!-- row -->
+
+
+  <div class="row">
+    <div class="col-lg-3 col-md-4 col-sm-3">
+      <h4>Por comisiones</h4>
+    </div>
+
+    <div class="col-lg-9 col-md-7 col-xs-6">
+      <select class="form-control" id="id_comision" name="comision">
+<option value="---">---</option>
+<option value="Agraria">Agraria</option>
+<option value="Ciencia">Ciencia</option>
+<option value="Comercio Exterior">Comercio Exterior</option>
+<option value="Constitución">Constitución</option>
+<option value="Cultura">Cultura</option>
+<option value="Defensa del Consumidor">Defensa del Consumidor</option>
+<option value="Defensa Nacional">Defensa Nacional</option>
+<option value="Descentralización">Descentralización</option>
+<option value="Economía">Economía</option>
+<option value="Educación">Educación</option>
+<option value="Energía">Energía</option>
+<option value="Fiscalización">Fiscalización</option>
+<option value="Inclusión Social">Inclusión Social</option>
+<option value="Inteligencia">Inteligencia</option>
+<option value="Justicia">Justicia</option>
+<option value="Mujer">Mujer</option>
+<option value="Presupuesto">Presupuesto</option>
+<option value="Producción Micro">Producción Micro</option>
+<option value="Pueblos Andinos">Pueblos Andinos</option>
+<option value="Relaciones Exteriores">Relaciones Exteriores</option>
+<option value="Salud">Salud</option>
+<option value="Trabajo">Trabajo</option>
+<option value="Transportes">Transportes</option>
+<option value="Vivienda">Vivienda</option>
+</select> 
+    </div><!-- col -->
+  </div><!-- row -->
+
+
+  <div class="row">
+    <div class="col-lg-3 col-md-4 col-sm-3">
+      <h4>Por congresista</h4>
+    </div>
+
+    <div class="col-lg-9 col-md-7 col-xs-6">
+      <select class="form-control" id="id_congresista" name="congresista">
+<option value="">--Escoger nombre--</option>
+</select> 
+    </div><!-- col -->
+  </div><!-- row -->
+
+
+  <div class="row">
+    <div class="col-lg-3 col-md-4 col-sm-3">
+      <h4>Por grupo parlamentario</h4>
+    </div>
+
+    <div class="col-lg-9 col-md-7 col-xs-6">
+      <select class="form-control" id="id_grupo_parlamentario" name="grupo_parlamentario">
+<option value="--Escoger bancada--">--Escoger bancada--</option>
+</select> 
+    </div><!-- col -->
+  </div><!-- row -->
+
+
+  <div class="row">
+    <div class="col-lg-3 col-md-4 col-sm-3 col-sm-offset-3">
+      <div class="form-group">
+        <br />
+        <button type="submit" class="btn btn-info" id="search_button">
+          <span class="glyphicon glyphicon-search"></span>
+          Buscar
+        </button>
+      </div>
+    </div><!-- col -->
+  </div><!-- row -->
+
+
+
+</form>
+
+  
+
+</div>
+
+
+
+    
+
+
+
+</div><!-- wrap -->
+
+<div id="footer">
+  <div class="container">
+    <hr>
+
+    <small class="pull-right">
+      Un proyecto de:
+      <a href="http://www.hiperderecho.org"><img height="30px" width="180px" src="/static/img/hiperderecho.png" /></a>
+      <a href="http://respeto.pe"><img height="21px" width="69px" src="/static/img/respeto2.png" /></a>
+    </small>
+
+    <small class="pull-left">
+      Desarrollado por <a href="http://aniversarioperu.me/cv/">AniversarioPerú</a>
+      <a href="https://github.com/proyectosdeley/proyectos_de_ley">v2.0.1</a>
+    </small>
+
+    <br />
+    <br />
+  </div>
+</div>
+
+
+<!-- Bootstrap core JavaScript
+    ================================================== -->
+    <!-- Placed at the end of the document so the pages load faster -->
+    <script src="/static/js/jquery-1.10.2.min.js"></script>
+    <script src="/static/js/bootstrap.min.js"></script>
+    <script src="/static/js/highlighter.js"></script>
+    <script src="/static/js/pagination.js"></script>
+    
+
+<script src="/static/js/jquery-ui.min.js"></script>
+
+<script>
+  $(document).ready(function() {
+    $('.datepicker').datepicker();
+  });
+</script>
+
+
+    
+
+
+</body>
+</html>
diff --git a/proyectos_de_ley/search_advanced/views.py b/proyectos_de_ley/search_advanced/views.py
index 63b21ed..365cc8d 100644
--- a/proyectos_de_ley/search_advanced/views.py
+++ b/proyectos_de_ley/search_advanced/views.py
@@ -13,7 +13,6 @@ def index(request):
     if request.method == 'GET':
         form = forms.SearchAdvancedForm(request.GET)
         if form.is_valid():
-            print(form.cleaned_data)
             if form.cleaned_data['date_from'] is not None:
                 return search_by_date(form, request)
 

From 7fe6b6e7c36c538870210d39d306b52f940d4d5b Mon Sep 17 00:00:00 2001
From: aniversarioperu <aniversarioperu1@gmail.com>
Date: Mon, 13 Jul 2015 16:17:40 +0300
Subject: [PATCH 4/6] usar busqueda combinada

---
 proyectos_de_ley/search_advanced/views.py | 73 ++++++++++++++++++-----
 1 file changed, 59 insertions(+), 14 deletions(-)

diff --git a/proyectos_de_ley/search_advanced/views.py b/proyectos_de_ley/search_advanced/views.py
index 365cc8d..7a29986 100644
--- a/proyectos_de_ley/search_advanced/views.py
+++ b/proyectos_de_ley/search_advanced/views.py
@@ -13,20 +13,9 @@ def index(request):
     if request.method == 'GET':
         form = forms.SearchAdvancedForm(request.GET)
         if form.is_valid():
-            if form.cleaned_data['date_from'] is not None:
-                return search_by_date(form, request)
-
-            if form.cleaned_data['comision'].strip() != '' and form.cleaned_data['comision'] != '---':
-                return search_by_comission(form, request)
-
-            if form.cleaned_data['congresista'] is not None:
-                name = form.cleaned_data['congresista']
-                return search_by_congresista(form, request, name)
-
-            if form.cleaned_data['grupo_parlamentario'].strip() != '' \
-                    and form.cleaned_data['grupo_parlamentario'] is not None:
-                name = form.cleaned_data['grupo_parlamentario']
-                return search_by_grupo_parlamentario(form, request, name)
+            keywords = clean_keywords_for_combined_search(form.cleaned_data)
+            if len(keywords) > 0:
+                return combined_search(keywords, form, request)
 
             # requests from stats view
             if form.cleaned_data['dictamen'] == 'NÚMERO TOTAL DE LEYES':
@@ -60,6 +49,62 @@ def index(request):
             })
 
 
+def clean_keywords_for_combined_search(cleaned_data):
+    keywords = {}
+    for k, v in cleaned_data.items():
+        if v != '' and v is not None:
+            if v in ['---', '--Escoger bancada--']:
+                continue
+            if k in ['dispensados_2da_votacion', 'dictamen']:
+                continue
+            keywords[k] = v
+    return keywords
+
+
+def combined_search(keywords, form, request):
+    print(keywords)
+    queryset = Proyecto.objects.all().order_by('-codigo')
+    if 'date_to' and 'date_from' in keywords:
+        queryset = queryset.filter(fecha_presentacion__range=(keywords['date_from'], keywords['date_to']))
+    if 'congresista' in keywords:
+        queryset = queryset.filter(congresistas__icontains=keywords['congresista'])
+    if 'grupo_parlamentario' in keywords:
+        queryset = queryset.filter(grupo_parlamentario=keywords['grupo_parlamentario'])
+    if 'comision' in keywords:
+        queryset = filter_by_comision(keywords, queryset)
+
+    obj = do_pagination(request, queryset, search=True, advanced_search=True)
+    return render(request, "search_advanced/index.html", {
+        "items": obj['items'],
+        "pretty_items": obj['pretty_items'],
+        "first_half": obj['first_half'],
+        "second_half": obj['second_half'],
+        "first_page": obj['first_page'],
+        "last_page": obj['last_page'],
+        "current": obj['current'],
+        "form": form,
+    })
+
+
+def filter_by_comision(keywords, queryset):
+    comision = keywords['comision']
+    if comision.lower() == 'ciencia':
+        comision = 'Ciencia'
+    seguimientos_queryset = Seguimientos.objects.order_by('-proyecto_id')
+    proyectos = queryset.order_by('-codigo')
+    proyects_found = []
+    this_proyecto_id = ''
+    for i in seguimientos_queryset:
+        if i.proyecto_id != this_proyecto_id:
+            if comision in i.evento:
+                for proyecto in proyectos:
+                    if i.proyecto_id == proyecto.id:
+                        proyects_found.append(proyecto)
+                        continue
+        this_proyecto_id = i.proyecto_id
+    return proyects_found
+
+
 def search_by_date(form, request):
     date_from = form.cleaned_data['date_from']
     date_to = form.cleaned_data['date_to']

From 1a30405c9100f14a0ffab5864cb71a9ae1f153fe Mon Sep 17 00:00:00 2001
From: aniversarioperu <aniversarioperu1@gmail.com>
Date: Mon, 13 Jul 2015 16:23:45 +0300
Subject: [PATCH 5/6] reportar numero de proyectos encontrados y mensaje

---
 proyectos_de_ley/search_advanced/views.py | 98 +++--------------------
 1 file changed, 9 insertions(+), 89 deletions(-)

diff --git a/proyectos_de_ley/search_advanced/views.py b/proyectos_de_ley/search_advanced/views.py
index 7a29986..2f5a1cd 100644
--- a/proyectos_de_ley/search_advanced/views.py
+++ b/proyectos_de_ley/search_advanced/views.py
@@ -65,16 +65,25 @@ def combined_search(keywords, form, request):
     print(keywords)
     queryset = Proyecto.objects.all().order_by('-codigo')
     if 'date_to' and 'date_from' in keywords:
+        msg = "Número de proyectos entre fecha indicada"
         queryset = queryset.filter(fecha_presentacion__range=(keywords['date_from'], keywords['date_to']))
     if 'congresista' in keywords:
+        msg = "Número de proyectos de congresista {}".format(keywords['congresista'])
         queryset = queryset.filter(congresistas__icontains=keywords['congresista'])
     if 'grupo_parlamentario' in keywords:
+        msg = "Número de proyectos de bancada {}".format(keywords['grupo_parlamentario'])
         queryset = queryset.filter(grupo_parlamentario=keywords['grupo_parlamentario'])
     if 'comision' in keywords:
+        msg = "Número de proyectos de comisión {}".format(keywords['comision'])
         queryset = filter_by_comision(keywords, queryset)
 
+    if len(keywords) > 1:
+        msg = "Número de proyectos encontrados"
+
     obj = do_pagination(request, queryset, search=True, advanced_search=True)
     return render(request, "search_advanced/index.html", {
+        "result_count": len(queryset),
+        "extra_result_msg": msg,
         "items": obj['items'],
         "pretty_items": obj['pretty_items'],
         "first_half": obj['first_half'],
@@ -105,57 +114,6 @@ def filter_by_comision(keywords, queryset):
     return proyects_found
 
 
-def search_by_date(form, request):
-    date_from = form.cleaned_data['date_from']
-    date_to = form.cleaned_data['date_to']
-    queryset = Proyecto.objects.filter(
-        fecha_presentacion__range=(date_from, date_to)).order_by('-codigo')
-    obj = do_pagination(request, queryset, search=True, advanced_search=True)
-    return render(request, "search_advanced/index.html", {
-        "items": obj['items'],
-        "pretty_items": obj['pretty_items'],
-        "first_half": obj['first_half'],
-        "second_half": obj['second_half'],
-        "first_page": obj['first_page'],
-        "last_page": obj['last_page'],
-        "current": obj['current'],
-        "form": form,
-        "date_from": convert_date_to_string(date_from),
-        "date_to": convert_date_to_string(date_to),
-    })
-
-
-def search_by_comission(form, request):
-    comision = form.cleaned_data['comision']
-    if comision.lower() == 'ciencia':
-        comision = 'Ciencia'
-    queryset = Seguimientos.objects.order_by('-proyecto_id')
-    proyectos = Proyecto.objects.order_by('-codigo')
-    proyects_found = []
-    this_proyecto_id = ''
-    for i in queryset:
-        if i.proyecto_id != this_proyecto_id:
-            if comision in i.evento:
-                for proyecto in proyectos:
-                    if i.proyecto_id == proyecto.id:
-                        proyects_found.append(proyecto)
-                        continue
-        this_proyecto_id = i.proyecto_id
-    obj = do_pagination(request, proyects_found, search=True,
-                        advanced_search=True)
-    return render(request, "search_advanced/index.html", {
-        "items": obj['items'],
-        "pretty_items": obj['pretty_items'],
-        "first_half": obj['first_half'],
-        "second_half": obj['second_half'],
-        "first_page": obj['first_page'],
-        "last_page": obj['last_page'],
-        "current": obj['current'],
-        "form": form,
-        "comision": obj['comision'],
-    })
-
-
 def search_dispensados_todos(form, request):
     total_dispensed = [i.proyecto for i in Seguimientos.objects.select_related('proyecto').filter(
                        evento__icontains='dispensado 2da')]
@@ -299,41 +257,3 @@ def search_dispensados_otros(form, request):
         "form": form,
         "comision": obj['comision'],
     })
-
-
-def search_by_congresista(form, request, name):
-    projects = Proyecto.objects.filter(congresistas__icontains=name).order_by('-codigo')
-
-    obj = do_pagination(request, projects, search=True, advanced_search=True)
-    return render(request, "search_advanced/index.html", {
-        "result_count": len(projects),
-        "extra_result_msg": "Proyectos de congresista {}".format(name),
-        "items": obj['items'],
-        "pretty_items": obj['pretty_items'],
-        "first_half": obj['first_half'],
-        "second_half": obj['second_half'],
-        "first_page": obj['first_page'],
-        "last_page": obj['last_page'],
-        "current": obj['current'],
-        "form": form,
-        "comision": obj['comision'],
-    })
-
-
-def search_by_grupo_parlamentario(form, request, name):
-    projects = Proyecto.objects.filter(grupo_parlamentario=name).order_by('-codigo')
-
-    obj = do_pagination(request, projects, search=True, advanced_search=True)
-    return render(request, "search_advanced/index.html", {
-        "result_count": len(projects),
-        "extra_result_msg": "Proyectos de la bancada {}".format(name),
-        "items": obj['items'],
-        "pretty_items": obj['pretty_items'],
-        "first_half": obj['first_half'],
-        "second_half": obj['second_half'],
-        "first_page": obj['first_page'],
-        "last_page": obj['last_page'],
-        "current": obj['current'],
-        "form": form,
-        "comision": obj['comision'],
-    })

From 8b5b09c86af56172ca8fa0c1b9964674fc20c824 Mon Sep 17 00:00:00 2001
From: aniversarioperu <aniversarioperu1@gmail.com>
Date: Mon, 13 Jul 2015 16:52:05 +0300
Subject: [PATCH 6/6] fixed view to accomdate error when no results found

---
 .../templates/search_advanced/index.html      | 13 +++++++-
 proyectos_de_ley/search_advanced/views.py     | 33 +++++++++++--------
 2 files changed, 32 insertions(+), 14 deletions(-)

diff --git a/proyectos_de_ley/search_advanced/templates/search_advanced/index.html b/proyectos_de_ley/search_advanced/templates/search_advanced/index.html
index 4a38a4d..c29ee76 100644
--- a/proyectos_de_ley/search_advanced/templates/search_advanced/index.html
+++ b/proyectos_de_ley/search_advanced/templates/search_advanced/index.html
@@ -29,11 +29,22 @@ <h1 style="padding-bottom:30px;" class="text-center">Búsqueda avanzada</h1>
 
 
 <form method="get" action="/search-advanced/" class="form-inline" role="form">
+
+  {% if info_msg %}
+    <div class="row">
+      <div class="col-lg-10 col-md-11 col-xs-12">
+          <h3 class="bg-danger" style="padding: 10px;">{{ info_msg }}</h3>
+      </div><!-- col -->
+    </div><!-- row -->
+  {% endif %}
+
+
   <div class="row">
     <div class="col-lg-3 col-md-4 col-sm-3">
       <h4>Por fecha de presentación</h4>
     </div>
-    <div class="col-lg-9 col-md-7 col-xs-6">
+
+    <div class="col-lg-4 col-md-4 col-xs-6">
         {{ form.non_field_errors }}
 
         {% if form.date_from.errors %}
diff --git a/proyectos_de_ley/search_advanced/views.py b/proyectos_de_ley/search_advanced/views.py
index 2f5a1cd..489b32b 100644
--- a/proyectos_de_ley/search_advanced/views.py
+++ b/proyectos_de_ley/search_advanced/views.py
@@ -63,6 +63,7 @@ def clean_keywords_for_combined_search(cleaned_data):
 
 def combined_search(keywords, form, request):
     print(keywords)
+    msg = ''
     queryset = Proyecto.objects.all().order_by('-codigo')
     if 'date_to' and 'date_from' in keywords:
         msg = "Número de proyectos entre fecha indicada"
@@ -80,19 +81,25 @@ def combined_search(keywords, form, request):
     if len(keywords) > 1:
         msg = "Número de proyectos encontrados"
 
-    obj = do_pagination(request, queryset, search=True, advanced_search=True)
-    return render(request, "search_advanced/index.html", {
-        "result_count": len(queryset),
-        "extra_result_msg": msg,
-        "items": obj['items'],
-        "pretty_items": obj['pretty_items'],
-        "first_half": obj['first_half'],
-        "second_half": obj['second_half'],
-        "first_page": obj['first_page'],
-        "last_page": obj['last_page'],
-        "current": obj['current'],
-        "form": form,
-    })
+    if len(queryset) > 0:
+        obj = do_pagination(request, queryset, search=True, advanced_search=True)
+        return render(request, "search_advanced/index.html", {
+            "result_count": len(queryset),
+            "extra_result_msg": msg,
+            "items": obj['items'],
+            "pretty_items": obj['pretty_items'],
+            "first_half": obj['first_half'],
+            "second_half": obj['second_half'],
+            "first_page": obj['first_page'],
+            "last_page": obj['last_page'],
+            "current": obj['current'],
+            "form": form,
+        })
+    else:
+        return render(request, "search_advanced/index.html", {
+            "form": form,
+            "info_msg": 'No se encontraron resultados para esa combinación de términos de búsqueda',
+        })
 
 
 def filter_by_comision(keywords, queryset):