From 0502a6148582a88eb26d40489aed28442714eb00 Mon Sep 17 00:00:00 2001 From: carlosp420 Date: Fri, 2 Sep 2016 15:45:50 -0500 Subject: [PATCH 01/59] added legislatura field to models --- proyectos_de_ley/pdl/models.py | 1 + 1 file changed, 1 insertion(+) diff --git a/proyectos_de_ley/pdl/models.py b/proyectos_de_ley/pdl/models.py index c27840d..8ec8b52 100644 --- a/proyectos_de_ley/pdl/models.py +++ b/proyectos_de_ley/pdl/models.py @@ -6,6 +6,7 @@ # Create your models here. class Proyecto(models.Model): codigo = models.CharField(max_length=20) + legislatura = models.IntegerField(max_length=4) # e.g. 2011, 2016 numero_proyecto = models.CharField(max_length=50) short_url = models.CharField(max_length=20) congresistas = models.TextField(blank=True) From 64c2f0754f15ed3659669e32ca900a180a1a98d5 Mon Sep 17 00:00:00 2001 From: carlosp420 Date: Fri, 2 Sep 2016 15:50:56 -0500 Subject: [PATCH 02/59] migrations --- .../migrations/0002_proyecto_legislatura.py | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 proyectos_de_ley/pdl/migrations/0002_proyecto_legislatura.py diff --git a/proyectos_de_ley/pdl/migrations/0002_proyecto_legislatura.py b/proyectos_de_ley/pdl/migrations/0002_proyecto_legislatura.py new file mode 100644 index 0000000..f73ae07 --- /dev/null +++ b/proyectos_de_ley/pdl/migrations/0002_proyecto_legislatura.py @@ -0,0 +1,21 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.4 on 2016-09-02 20:49 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('pdl', '0001_initial'), + ] + + operations = [ + migrations.AddField( + model_name='proyecto', + name='legislatura', + field=models.IntegerField(default=2011, max_length=4), + preserve_default=False, + ), + ] From 6fb639e8f830cdd52bd564afe184bfa0d6f80796 Mon Sep 17 00:00:00 2001 From: carlosp420 Date: Fri, 2 Sep 2016 23:56:47 -0500 Subject: [PATCH 03/59] sort projects by legislatura --- proyectos_de_ley/pdl/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/proyectos_de_ley/pdl/views.py b/proyectos_de_ley/pdl/views.py index 6244e82..38a94e8 100644 --- a/proyectos_de_ley/pdl/views.py +++ b/proyectos_de_ley/pdl/views.py @@ -14,7 +14,7 @@ def index(request): - all_items = Proyecto.objects.all().order_by('-codigo') + all_items = Proyecto.objects.all().order_by('-legislatura', '-codigo') obj = do_pagination(request, all_items) # sin fusionar From 15bd353d57a6db1efb6a1a69118f0951aad178fc Mon Sep 17 00:00:00 2001 From: carlosp420 Date: Sat, 3 Sep 2016 10:38:59 -0500 Subject: [PATCH 04/59] removed max length from integer field in model --- .../pdl/migrations/0003_auto_20160903_1537.py | 20 +++++++++++++++++++ proyectos_de_ley/pdl/models.py | 2 +- 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 proyectos_de_ley/pdl/migrations/0003_auto_20160903_1537.py diff --git a/proyectos_de_ley/pdl/migrations/0003_auto_20160903_1537.py b/proyectos_de_ley/pdl/migrations/0003_auto_20160903_1537.py new file mode 100644 index 0000000..6fd80a2 --- /dev/null +++ b/proyectos_de_ley/pdl/migrations/0003_auto_20160903_1537.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.4 on 2016-09-03 15:37 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('pdl', '0002_proyecto_legislatura'), + ] + + operations = [ + migrations.AlterField( + model_name='proyecto', + name='legislatura', + field=models.IntegerField(), + ), + ] diff --git a/proyectos_de_ley/pdl/models.py b/proyectos_de_ley/pdl/models.py index 8ec8b52..659ff1b 100644 --- a/proyectos_de_ley/pdl/models.py +++ b/proyectos_de_ley/pdl/models.py @@ -6,7 +6,7 @@ # Create your models here. class Proyecto(models.Model): codigo = models.CharField(max_length=20) - legislatura = models.IntegerField(max_length=4) # e.g. 2011, 2016 + legislatura = models.IntegerField() # e.g. 2011, 2016 numero_proyecto = models.CharField(max_length=50) short_url = models.CharField(max_length=20) congresistas = models.TextField(blank=True) From ed90feaa4ec40d3b59f3b223b099cbe8cb468520 Mon Sep 17 00:00:00 2001 From: carlosp420 Date: Sat, 3 Sep 2016 10:41:48 -0500 Subject: [PATCH 05/59] updated front page --- proyectos_de_ley/pdl/templates/pdl/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/proyectos_de_ley/pdl/templates/pdl/index.html b/proyectos_de_ley/pdl/templates/pdl/index.html index 6405724..a7f5e4a 100644 --- a/proyectos_de_ley/pdl/templates/pdl/index.html +++ b/proyectos_de_ley/pdl/templates/pdl/index.html @@ -10,7 +10,7 @@

Proyectos recientes

-

(Legislatura 2011—2016)

+

(Legislatura 2016—2021)

{% endif %} - {% if item.iniciativas_agrupadas|length > 1 %} + {% if item.iniciativas_agrupadas|length > 0 %}
Iniciativas agrupadas diff --git a/proyectos_de_ley/seguimientos/views.py b/proyectos_de_ley/seguimientos/views.py index 5c82905..e10890e 100644 --- a/proyectos_de_ley/seguimientos/views.py +++ b/proyectos_de_ley/seguimientos/views.py @@ -11,9 +11,10 @@ def index(request, short_url): short_url = re.sub("/seguimiento/", "", short_url) item = utils.get_proyecto_from_short_url(short_url) item.expediente_events = utils.get_events_from_expediente(item.id) - - # TODO: arreglar esto para cuanto tengamos proyectos de la legislatura 2016 - friendly_code = str(item.codigo) + '-2011' + friendly_code = "{}-{}".format( + item.codigo, + item.legislatura, + ) return render(request, "seguimientos/index.html", { "item": item, From e1e8fe3536fc9390d8ba20d8570e6902542984c4 Mon Sep 17 00:00:00 2001 From: carlosp420 Date: Sun, 4 Sep 2016 14:37:07 -0500 Subject: [PATCH 24/59] simple search: show only recent legislature --- proyectos_de_ley/pdl/search_indexes.py | 13 ++++- .../pdl/templates/pdl/listado.html | 44 ++++++++++++++++ .../pdl/templates/pdl/search.html | 16 +++++- .../search/indexes/pdl/proyecto_text.txt | 1 + proyectos_de_ley/pdl/urls.py | 8 ++- proyectos_de_ley/pdl/views.py | 50 ++++++++++++++++--- 6 files changed, 121 insertions(+), 11 deletions(-) create mode 100644 proyectos_de_ley/pdl/templates/pdl/listado.html diff --git a/proyectos_de_ley/pdl/search_indexes.py b/proyectos_de_ley/pdl/search_indexes.py index 391ec09..10e510e 100644 --- a/proyectos_de_ley/pdl/search_indexes.py +++ b/proyectos_de_ley/pdl/search_indexes.py @@ -7,6 +7,7 @@ class ProyectoIndex(indexes.SearchIndex, indexes.Indexable): text = indexes.CharField(document=True, use_template=True) codigo = indexes.CharField(model_attr='codigo', null=True) + legislatura = indexes.CharField(model_attr='legislatura', null=True) numero_proyecto = indexes.CharField(model_attr='numero_proyecto', null=True) short_url = indexes.CharField(model_attr='short_url', null=True) congresistas = indexes.EdgeNgramField(model_attr='congresistas', null=True) @@ -18,8 +19,16 @@ def get_model(self): return Proyecto def prepare_text(self, obj): - fields = [obj.codigo, obj.numero_proyecto, obj.short_url, obj.congresistas, - obj.titulo, obj.titulo_de_ley, obj.numero_de_ley] + fields = [ + obj.codigo, + str(obj.legislatura), + obj.numero_proyecto, + obj.short_url, + obj.congresistas, + obj.titulo, + obj.titulo_de_ley, + obj.numero_de_ley, + ] data = [i for i in fields if i is not None] original = ' '.join(data) slugified = slugify(original) diff --git a/proyectos_de_ley/pdl/templates/pdl/listado.html b/proyectos_de_ley/pdl/templates/pdl/listado.html new file mode 100644 index 0000000..7d0e456 --- /dev/null +++ b/proyectos_de_ley/pdl/templates/pdl/listado.html @@ -0,0 +1,44 @@ +{% extends "pdl/base.html" %} +{% load humanize %} + +{% block title %} +Proyectos de ley emitidos por el Congreso de la República del Perú | About +{% endblock %} + + +{% block content %} +
+ {% if not pretty_items and not items_previous_legislatures %} +

No se encontraron resultados.

+ {% else %} +

Resultados de búsqueda: {{ extra_result_msg }} {{ result_count|intcomma }}
+ Legislatura 2011 +

+ + {% if items_previous_legislatures %} +

+ Se encontraron proyectos en + + previas legislaturas + +

+ {% endif %} + + {% for i in pretty_items %} + {{ i|safe }} + {% endfor %} + {% endif %} +
+ + {% if last_page > 2 %} + {% include "pdl/pagination_search.html" %} + {% endif %} +{% endblock %} + + + +{% block highlight_keyword %} + +{% endblock %} diff --git a/proyectos_de_ley/pdl/templates/pdl/search.html b/proyectos_de_ley/pdl/templates/pdl/search.html index 233c44c..55c7544 100644 --- a/proyectos_de_ley/pdl/templates/pdl/search.html +++ b/proyectos_de_ley/pdl/templates/pdl/search.html @@ -8,10 +8,22 @@ {% block content %}
- {% if pretty_items|length < 1 %} + {% if not pretty_items and not items_previous_legislatures %}

No se encontraron resultados.

{% else %} -

Resultados de búsqueda: {{ extra_result_msg }} {{ result_count|intcomma }}

+

Resultados de búsqueda: {{ extra_result_msg }} {{ result_count|intcomma }}
+ Legislatura 2016 +

+ + {% if items_previous_legislatures %} +

+ Se encontraron proyectos en + + previas legislaturas + +

+ {% endif %} + {% for i in pretty_items %} {{ i|safe }} {% endfor %} diff --git a/proyectos_de_ley/pdl/templates/search/indexes/pdl/proyecto_text.txt b/proyectos_de_ley/pdl/templates/search/indexes/pdl/proyecto_text.txt index cb66e73..ec3a4b0 100644 --- a/proyectos_de_ley/pdl/templates/search/indexes/pdl/proyecto_text.txt +++ b/proyectos_de_ley/pdl/templates/search/indexes/pdl/proyecto_text.txt @@ -1,4 +1,5 @@ {{ object.codigo }} +{{ object.legislatura }} {{ object.numero_proyecto }} {{ object.short_url }} {{ object.fecha_presentacion }} diff --git a/proyectos_de_ley/pdl/urls.py b/proyectos_de_ley/pdl/urls.py index 62c0d4e..f044c27 100644 --- a/proyectos_de_ley/pdl/urls.py +++ b/proyectos_de_ley/pdl/urls.py @@ -1,6 +1,6 @@ from django.conf.urls import url -from .views import index, about, search, congresista, proyecto +from .views import index, about, search, congresista, proyecto, listado urlpatterns = [ @@ -8,6 +8,12 @@ url(r'^$', index, name='index'), url(r'^about/$', about, name='about'), url(r'^search/$', search, name='search'), + url( + r'^listado/', + #r'^listado/\?keywords=(?P.+)$', + listado, + name='listado', + ), url( r'^congresista/(?P.*)$', congresista, diff --git a/proyectos_de_ley/pdl/views.py b/proyectos_de_ley/pdl/views.py index 807e18c..3715ece 100644 --- a/proyectos_de_ley/pdl/views.py +++ b/proyectos_de_ley/pdl/views.py @@ -1,4 +1,5 @@ # -*- encoding: utf-8 -*- +import ast import re from django.shortcuts import render @@ -12,14 +13,15 @@ from pdl.forms import SimpleSearchForm from stats.models import Dispensed +LEGISLATURE = 2016 def index(request): - all_items = Proyecto.objects.filter(legislatura=2016).order_by('-codigo') + all_items = Proyecto.objects.filter(legislatura=LEGISLATURE).order_by('-codigo') obj = do_pagination(request, all_items) # sin fusionar numero_de_proyectos = len(all_items) - with_iniciativas = Proyecto.objects.filter(legislatura=2016).exclude( + with_iniciativas = Proyecto.objects.filter(legislatura=LEGISLATURE).exclude( iniciativas_agrupadas__isnull=True).exclude( iniciativas_agrupadas__exact='').count() without_iniciativas = numero_de_proyectos - with_iniciativas @@ -27,11 +29,11 @@ def index(request): # no son ley projects_empty_title = Proyecto.objects.filter( titulo_de_ley='', - legislatura=2016, + legislatura=LEGISLATURE, ).count() projects_null_title = Proyecto.objects.filter( titulo_de_ley__isnull=True, - legislatura=2016, + legislatura=LEGISLATURE, ).count() are_not_law = projects_empty_title + projects_null_title @@ -79,6 +81,31 @@ def about(request): return render(request, "pdl/about.html") +def listado(request): + keywords = ast.literal_eval( + request.GET.get('keywords', ''), + ) + project_codes = request.GET.get('list', '').split(",") + all_items = Proyecto.objects.filter( + codigo__in=project_codes, + ).exclude(legislatura=LEGISLATURE) # exclude projects in current legislature + obj = do_pagination(request, all_items, search=True, advanced_search=True) + + return render(request, "pdl/listado.html", { + "result_count": len(all_items), + "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'], + "keywords": keywords, + "query": "query", + "pagination_keyword": "query", + }) + + @csrf_exempt def search(request): if 'q' not in request.GET: @@ -90,13 +117,24 @@ def search(request): form = SimpleSearchForm(request.GET) all_items = form.search() - obj = do_pagination(request, all_items, search=True) + items_current_legislature = [ + i + for i in all_items + if i.legislatura == str(LEGISLATURE) + ] + items_previous_legislatures = [ + i.codigo + for i in all_items + if i.legislatura != str(LEGISLATURE) + ] + obj = do_pagination(request, items_current_legislature, search=True) keywords = clean_my_query(query) return render(request, "pdl/search.html", { - "result_count": len(all_items), + "result_count": len(items_current_legislature), "items": obj['items'], + "items_previous_legislatures": ",".join(items_previous_legislatures), "pretty_items": obj['pretty_items'], "first_half": obj['first_half'], "second_half": obj['second_half'], From 2c8e40e03ae1c8f7bf36b337eb3fc7467a8e96e9 Mon Sep 17 00:00:00 2001 From: carlosp420 Date: Sun, 4 Sep 2016 15:22:54 -0500 Subject: [PATCH 25/59] fixed showing projects from past and new legislature in advanced-search --- proyectos_de_ley/pdl/views.py | 18 ++- .../templates/search_advanced/index.html | 18 ++- proyectos_de_ley/search_advanced/views.py | 105 +++++++++++------- 3 files changed, 89 insertions(+), 52 deletions(-) diff --git a/proyectos_de_ley/pdl/views.py b/proyectos_de_ley/pdl/views.py index 3715ece..1c4b101 100644 --- a/proyectos_de_ley/pdl/views.py +++ b/proyectos_de_ley/pdl/views.py @@ -82,9 +82,17 @@ def about(request): def listado(request): - keywords = ast.literal_eval( - request.GET.get('keywords', ''), - ) + try: + keywords = ast.literal_eval( + request.GET.get('keywords', ''), + ) + except ValueError: + keywords = request.GET.get('keywords', '') + + if isinstance(keywords, list): + query = " ".join(keywords) + else: + query = " ".join([keywords]) project_codes = request.GET.get('list', '').split(",") all_items = Proyecto.objects.filter( codigo__in=project_codes, @@ -101,8 +109,8 @@ def listado(request): "last_page": obj['last_page'], "current": obj['current'], "keywords": keywords, - "query": "query", - "pagination_keyword": "query", + "query": query, + "pagination_keyword": query, }) 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 07aebe5..70fe0b4 100644 --- a/proyectos_de_ley/search_advanced/templates/search_advanced/index.html +++ b/proyectos_de_ley/search_advanced/templates/search_advanced/index.html @@ -20,7 +20,7 @@ {% block content %}
- {% if not items %} + {% if not items and not items_previous_legislatures %}

Búsqueda avanzada

@@ -38,7 +38,6 @@

{{ info_msg }}

{% endif %} -

Palabra clave

@@ -144,9 +143,20 @@

Por grupo parlamentario

-{% if items %} +{% if items or items_previous_legislatures %}
-

Resultados de búsqueda: {{ extra_result_msg }} {{ result_count|intcomma }}

+

Resultados de búsqueda: {{ extra_result_msg }} {{ result_count|intcomma }}
+ Legislatura 2016 +

+ + {% if items_previous_legislatures %} +

+ Se encontraron proyectos en + + previas legislaturas + +

+ {% endif %} {% if results == 'No se encontraron resultados.' %}

{{ results }}

diff --git a/proyectos_de_ley/search_advanced/views.py b/proyectos_de_ley/search_advanced/views.py index dd8b710..4304425 100644 --- a/proyectos_de_ley/search_advanced/views.py +++ b/proyectos_de_ley/search_advanced/views.py @@ -9,13 +9,14 @@ from pdl.models import Seguimientos from pdl.utils import do_pagination +LEGISLATURE = 2016 def index(request): if request.method == 'GET': form = SearchAdvancedForm(request.GET) if form.is_valid(): keywords = clean_keywords_for_combined_search(form.cleaned_data) - if len(keywords) > 0: + if keywords: return combined_search(keywords, form, request) # requests from stats view @@ -63,57 +64,36 @@ def clean_keywords_for_combined_search(cleaned_data): def combined_search(keywords, form, request): - msg = '' - queryset = Proyecto.objects.all().order_by('-codigo') - if 'query' in keywords: - query = keywords['query'] - msg = "Número de proyectos encontrados" - queryset = queryset.filter(titulo__icontains=keywords['query']) - else: - query = "" - - 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']) - - try: - congresista = request.GET['congresista'] - except KeyError: - 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']) - grupo_parlamentario = keywords['grupo_parlamentario'] - else: - grupo_parlamentario = "" - - if 'comision' in keywords: - comision = keywords['comision'] - msg = "Número de proyectos de comisión {}".format(keywords['comision']) - queryset = filter_by_comision(keywords, queryset) - else: - comision = "" - - if len(keywords) > 1: - msg = "Número de proyectos encontrados" - + print("########## keywords", keywords) + queryset1 = Proyecto.objects.filter(legislatura=LEGISLATURE).order_by('-codigo') + queryset2 = Proyecto.objects.all().order_by('-codigo').exclude(legislatura=LEGISLATURE) + comision, congresista, grupo_parlamentario, msg, query, queryset2 = filter_queryset( + keywords, + request, + queryset2, + ) + comision, congresista, grupo_parlamentario, msg, query, queryset1 = filter_queryset( + keywords, + request, + queryset1, + ) date_from, date_to = convert_to_iso_dates(keywords) - if queryset: - obj = do_pagination(request, queryset, search=True, advanced_search=True) + if queryset1 or queryset2: + if queryset2: + items_previous_legislatures = ",".join([i.codigo for i in queryset2]) + else: + items_previous_legislatures = "" + obj = do_pagination(request, queryset1, search=True, advanced_search=True) return render(request, "search_advanced/index.html", { "query": query, "comision": comision, "congresista": congresista, "grupo_parlamentario": grupo_parlamentario, + "items_previous_legislatures": items_previous_legislatures, "date_from": date_from, "date_to": date_to, - "result_count": len(queryset), + "result_count": len(queryset1), "extra_result_msg": msg, "items": obj['items'], "pretty_items": obj['pretty_items'], @@ -131,6 +111,45 @@ def combined_search(keywords, form, request): }) +def filter_queryset(keywords, request, queryset): + msg = "" + if 'query' in keywords: + query = keywords['query'] + msg = "Número de proyectos encontrados" + queryset = queryset.filter(titulo__icontains=keywords['query']) + print(len(queryset), queryset) + else: + query = "" + if 'date_to' in keywords 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']) + try: + congresista = request.GET['congresista'] + except KeyError: + 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']) + grupo_parlamentario = keywords['grupo_parlamentario'] + else: + grupo_parlamentario = "" + if 'comision' in keywords: + comision = keywords['comision'] + msg = "Número de proyectos de comisión {}".format(keywords['comision']) + queryset = filter_by_comision(keywords, queryset) + else: + comision = "" + return comision, congresista, grupo_parlamentario, msg, query, queryset + + def convert_to_iso_dates(keywords): try: date_from = datetime.datetime.strftime(keywords['date_from'], '%m/%d/%Y') From ae900aa5d4b2c080b142306595962a75f2943e4c Mon Sep 17 00:00:00 2001 From: carlosp420 Date: Sun, 4 Sep 2016 15:44:00 -0500 Subject: [PATCH 26/59] fixed tests for stats --- proyectos_de_ley/stats/tests/test_custom_commands.py | 4 ++-- proyectos_de_ley/stats/tests/test_views.py | 9 ++++++++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/proyectos_de_ley/stats/tests/test_custom_commands.py b/proyectos_de_ley/stats/tests/test_custom_commands.py index bd1c86e..eaaebcc 100644 --- a/proyectos_de_ley/stats/tests/test_custom_commands.py +++ b/proyectos_de_ley/stats/tests/test_custom_commands.py @@ -12,7 +12,7 @@ class TestCustomCommand(TestCase): def setUp(self): self.b = Proyecto(**{ 'codigo': '00586', - 'legislatura': 2011, + 'legislatura': 2016, 'numero_proyecto': '00586/2011-CR', 'fecha_presentacion': '2010-10-10', 'short_url': '4huj5x', @@ -22,7 +22,7 @@ def setUp(self): }) b1 = Proyecto(**{ 'codigo': '00001', - 'legislatura': 2011, + 'legislatura': 2016, 'numero_proyecto': '00001/2011-CR', 'fecha_presentacion': '2010-10-10', 'short_url': '4auj5a', diff --git a/proyectos_de_ley/stats/tests/test_views.py b/proyectos_de_ley/stats/tests/test_views.py index 7c3cde5..2a82a70 100644 --- a/proyectos_de_ley/stats/tests/test_views.py +++ b/proyectos_de_ley/stats/tests/test_views.py @@ -17,6 +17,13 @@ def setUp(self): 'fecha_presentacion': '2010-10-10', 'titulo_de_ley': 'Ley No 2261', }) + Proyecto.objects.create(**{ + 'numero_proyecto': '02764', + 'legislatura': 2016, + 'time_created': datetime.datetime.now(), + 'fecha_presentacion': '2010-10-10', + 'titulo_de_ley': 'Ley No 2261', + }) Dispensed.objects.create(**{ 'total_approved': 1444, 'total_dispensed': 864, @@ -36,7 +43,7 @@ def test_index(self): def test_dame_sin_tramitar(self): numero_de_proyectos = Proyecto.objects.all().count() - expected = (100.0, 1) + expected = (100.0, 2) result = views.dame_sin_tramitar(numero_de_proyectos) self.assertEqual(expected, result) From a53577af70329cd2e63d4278bf4175dd20405b94 Mon Sep 17 00:00:00 2001 From: carlosp420 Date: Sun, 4 Sep 2016 15:47:05 -0500 Subject: [PATCH 27/59] fixed test for advanced search --- proyectos_de_ley/pdl/tests/dummy_db.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/proyectos_de_ley/pdl/tests/dummy_db.json b/proyectos_de_ley/pdl/tests/dummy_db.json index 4c1dda7..54664f1 100644 --- a/proyectos_de_ley/pdl/tests/dummy_db.json +++ b/proyectos_de_ley/pdl/tests/dummy_db.json @@ -37,7 +37,7 @@ }, { "codigo": "03773", - "legislatura": 2011, + "legislatura": 2016, "congresistas": "Chihuan Ramos, Leyla Felicita; Schaefer Cuculiza, Karla Melissa; Bardalez Cochagne, Aldo Maximiliano; Reátegui Flores, Rolando; Cuculiza Torre, Luisa María; Kobashigawa Kobashigawa, Ramon; Salazar Miranda, Octavio Edilberto", "expediente": "http://www2.congreso.gob.pe/sicr/tradocestproc/Expvirt_2011.nsf/visbusqptramdoc/03773?opendocument", "fecha_presentacion": "2014-09-05", From 4d96f4524a65565f3cf5fb5e76d51a9248efd72c Mon Sep 17 00:00:00 2001 From: carlosp420 Date: Sun, 4 Sep 2016 15:49:53 -0500 Subject: [PATCH 28/59] fixed test for api --- proyectos_de_ley/api/tests/test_utils.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/proyectos_de_ley/api/tests/test_utils.py b/proyectos_de_ley/api/tests/test_utils.py index 8a23163..a28f2cf 100644 --- a/proyectos_de_ley/api/tests/test_utils.py +++ b/proyectos_de_ley/api/tests/test_utils.py @@ -16,7 +16,7 @@ def setUp(self): proyecto = Proyecto(**{ "numero_proyecto": "02764/2013-CR", "codigo": "02764", - 'legislatura': 2011, + 'legislatura': 2016, "short_url": "4zhube", "titulo": "Propone Ley Universitaria", "iniciativas_agrupadas": ['01790', '01800'], @@ -51,6 +51,7 @@ def test_prepare_json_for_d3(self): item = Object() item.numero_proyecto = "02764/2013-CR" item.codigo = "02764" + item.legislatura = 2016 item.titulo = "Propone Ley Universitaria" item.iniciativas_agrupadas = '{02764}' @@ -62,6 +63,7 @@ def test_prepare_json_for_d3_no_project(self): item = Object() item.numero_proyecto = "02764/2013-CR" item.codigo = "02764" + item.legislatura = 2016 item.titulo = "Propone Ley Universitaria" item.iniciativas_agrupadas = '{027640000}' From 056345218d0e18f78ebd02e8f5be9f9ab6595851 Mon Sep 17 00:00:00 2001 From: carlosp420 Date: Sun, 4 Sep 2016 15:54:36 -0500 Subject: [PATCH 29/59] added to history --- HISTORY.rst | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/HISTORY.rst b/HISTORY.rst index 6f4d3c4..13e59c6 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -1,6 +1,10 @@ History ======= +v2.2.0 (2016-09-xx +~~~~~~~~~~~~~~~~~~ +* agregar capacidad de soportar proyectos de Legislatura 2011 y 2016. + v2.1.1 (2015-10-29) ~~~~~~~~~~~~~~~~~~~ * script para hacer backups de base de datos From cd27b06889c9e6b9169731130eea7a3b109e3283 Mon Sep 17 00:00:00 2001 From: carlosp420 Date: Sun, 4 Sep 2016 15:55:58 -0500 Subject: [PATCH 30/59] added to history --- HISTORY.rst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/HISTORY.rst b/HISTORY.rst index 13e59c6..10934c0 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -3,7 +3,8 @@ History v2.2.0 (2016-09-xx ~~~~~~~~~~~~~~~~~~ -* agregar capacidad de soportar proyectos de Legislatura 2011 y 2016. +* agregada capacidad de soportar proyectos de Legislatura 2011 y 2016. +* agregada interface administrador en Django. v2.1.1 (2015-10-29) ~~~~~~~~~~~~~~~~~~~ From 70238473c39d79137d6e863417ceb885515ba77b Mon Sep 17 00:00:00 2001 From: carlosp420 Date: Sun, 4 Sep 2016 15:57:24 -0500 Subject: [PATCH 31/59] added to history --- HISTORY.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/HISTORY.rst b/HISTORY.rst index 10934c0..2a58bd0 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -5,6 +5,8 @@ v2.2.0 (2016-09-xx ~~~~~~~~~~~~~~~~~~ * agregada capacidad de soportar proyectos de Legislatura 2011 y 2016. * agregada interface administrador en Django. +* mostrar proyectos de actual legislatura y menor prominencia a proyectos de + legislaturas pasadas. v2.1.1 (2015-10-29) ~~~~~~~~~~~~~~~~~~~ From 25ba3e07dafa4c6fd1fed5a73997883578502d3a Mon Sep 17 00:00:00 2001 From: carlosp420 Date: Sun, 4 Sep 2016 16:13:44 -0500 Subject: [PATCH 32/59] fixed showing proyects from graphs in stats page --- proyectos_de_ley/search_advanced/views.py | 76 +++++++++++++++++------ 1 file changed, 58 insertions(+), 18 deletions(-) diff --git a/proyectos_de_ley/search_advanced/views.py b/proyectos_de_ley/search_advanced/views.py index 4304425..c980b32 100644 --- a/proyectos_de_ley/search_advanced/views.py +++ b/proyectos_de_ley/search_advanced/views.py @@ -45,7 +45,6 @@ def index(request): "form": form, }) else: - print(form.errors) return render(request, "search_advanced/index.html", { "form": form, }) @@ -64,7 +63,6 @@ def clean_keywords_for_combined_search(cleaned_data): def combined_search(keywords, form, request): - print("########## keywords", keywords) queryset1 = Proyecto.objects.filter(legislatura=LEGISLATURE).order_by('-codigo') queryset2 = Proyecto.objects.all().order_by('-codigo').exclude(legislatura=LEGISLATURE) comision, congresista, grupo_parlamentario, msg, query, queryset2 = filter_queryset( @@ -170,8 +168,14 @@ def filter_by_comision(keywords, queryset): def search_dispensados_todos(form, request): - total_dispensed = [i.proyecto for i in Seguimientos.objects.select_related('proyecto').filter( - evento__icontains='dispensado 2da')] + total_dispensed = [ + i.proyecto + for i in Seguimientos.objects.select_related('proyecto').filter( + evento__icontains='dispensado 2da', + ).filter( + proyecto__legislatura=LEGISLATURE, + ) + ] obj = do_pagination(request, total_dispensed, search=True, advanced_search=True) return render(request, "search_advanced/index.html", { @@ -191,8 +195,12 @@ def search_dispensados_todos(form, request): def search_total_leyes(form, request): are_law = Proyecto.objects.exclude( - titulo_de_ley__isnull=True).exclude( - titulo_de_ley__exact='') + titulo_de_ley__isnull=True, + ).exclude( + titulo_de_ley__exact='', + ).filter( + legislatura=LEGISLATURE, + ) obj = do_pagination(request, are_law, search=True, advanced_search=True) return render(request, "search_advanced/index.html", { @@ -211,8 +219,14 @@ def search_total_leyes(form, request): def search_exonerados_dictamen(form, request): - exonerado_de_dictamen = [i.proyecto for i in Seguimientos.objects.select_related('proyecto').filter( - evento__icontains='exoneración de dictamen').distinct()] + exonerado_de_dictamen = [ + i.proyecto + for i in Seguimientos.objects.select_related('proyecto').filter( + evento__icontains='exoneración de dictamen', + ).filter( + proyecto__legislatura=LEGISLATURE, + ).distinct() + ] exonerado_de_dictamen = list(set(exonerado_de_dictamen)) obj = do_pagination(request, exonerado_de_dictamen, search=True, advanced_search=True) @@ -232,8 +246,14 @@ def search_exonerados_dictamen(form, request): def search_total_aprobados(form, request): - total_approved = [i.proyecto for i in Seguimientos.objects.select_related('proyecto').filter( - Q(evento__icontains='promulgado') | Q(evento__icontains='publicado'))] + total_approved = [ + i.proyecto + for i in Seguimientos.objects.select_related('proyecto').filter( + Q(evento__icontains='promulgado') | Q(evento__icontains='publicado'), + ).filter( + proyecto__legislatura=LEGISLATURE, + ) + ] total_approved = list(set(total_approved)) obj = do_pagination(request, total_approved, search=True, advanced_search=True) @@ -253,8 +273,16 @@ def search_total_aprobados(form, request): def search_dispensados_acuerdo_pleno(form, request): - dispensed_by_plenary = [i.proyecto for i in Seguimientos.objects.select_related('proyecto').filter( - evento__icontains='dispensado 2da').filter(evento__icontains='pleno')] + dispensed_by_plenary = [ + i.proyecto + for i in Seguimientos.objects.select_related('proyecto').filter( + evento__icontains='dispensado 2da', + ).filter( + evento__icontains='pleno', + ).filter( + proyecto__legislatura=LEGISLATURE, + ) + ] obj = do_pagination(request, dispensed_by_plenary, search=True, advanced_search=True) return render(request, "search_advanced/index.html", { @@ -273,8 +301,14 @@ def search_dispensados_acuerdo_pleno(form, request): def search_dispensados_junta_portavoces(form, request): - dispensed_by_spokesmen = [i.proyecto for i in Seguimientos.objects.select_related('proyecto').filter( - evento__icontains='dispensado 2da').filter(evento__icontains='portavoces')] + dispensed_by_spokesmen = [ + i.proyecto + for i in Seguimientos.objects.select_related('proyecto').filter( + evento__icontains='dispensado 2da', + ).filter( + evento__icontains='portavoces', + ) + ] obj = do_pagination(request, dispensed_by_spokesmen, search=True, advanced_search=True) return render(request, "search_advanced/index.html", { @@ -293,10 +327,16 @@ def search_dispensados_junta_portavoces(form, request): def search_dispensados_otros(form, request): - otros_dispensados = [i.proyecto for i in Seguimientos.objects.select_related('proyecto').filter( - evento__icontains='dispensado 2da').exclude( - evento__icontains='pleno').exclude( - evento__icontains='portavoces')] + otros_dispensados = [ + i.proyecto + for i in Seguimientos.objects.select_related('proyecto').filter( + evento__icontains='dispensado 2da', + ).exclude( + evento__icontains='pleno', + ).exclude( + evento__icontains='portavoces', + ) + ] obj = do_pagination(request, otros_dispensados, search=True, advanced_search=True) return render(request, "search_advanced/index.html", { From 3527b53c7c8f730820fb973c6a74ca09ca5409f1 Mon Sep 17 00:00:00 2001 From: carlosp420 Date: Mon, 5 Sep 2016 00:41:51 -0500 Subject: [PATCH 33/59] fixed api for timeline --- proyectos_de_ley/api/views.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/proyectos_de_ley/api/views.py b/proyectos_de_ley/api/views.py index 21c0315..f23e8c9 100644 --- a/proyectos_de_ley/api/views.py +++ b/proyectos_de_ley/api/views.py @@ -475,9 +475,12 @@ def seguimientos_list(request, codigo): paramType: path required: true """ - codigo = re.sub('-[0-9]+', '', codigo) + codigo, legislatura = codigo.split("-") try: - proy = Proyecto.objects.get(numero_proyecto__startswith=codigo) + proy = Proyecto.objects.get( + codigo=codigo, + legislatura=legislatura, + ) except Proyecto.DoesNotExist: msg = {'error': 'proyecto no existe'} return HttpResponse(json.dumps(msg), content_type='application/json') From 2902b5701d5627dfca22a1f8ad17782aab9bf478 Mon Sep 17 00:00:00 2001 From: carlosp420 Date: Mon, 5 Sep 2016 00:50:17 -0500 Subject: [PATCH 34/59] for each congress person show only projects of recent legislature --- proyectos_de_ley/pdl/views.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/proyectos_de_ley/pdl/views.py b/proyectos_de_ley/pdl/views.py index 1c4b101..04aea96 100644 --- a/proyectos_de_ley/pdl/views.py +++ b/proyectos_de_ley/pdl/views.py @@ -170,7 +170,10 @@ def congresista(request, congresista_slug): congresista_name = find_slug_in_db(congresista_slug) if congresista_name is not None: all_items = Proyecto.objects.filter( - congresistas__icontains=congresista_name).order_by('-codigo') + congresistas__icontains=congresista_name, + ).filter( + legislatura=LEGISLATURE, + ).order_by('-codigo') obj = do_pagination(request, all_items) return render(request, "pdl/congresista.html", { "items": obj['items'], From 89b67b6ceb18bb764de18d36b1d8f8f20981d17c Mon Sep 17 00:00:00 2001 From: carlosp420 Date: Tue, 6 Sep 2016 14:39:25 -0500 Subject: [PATCH 35/59] use our own logo --- proyectos_de_ley/pdl/static/img/pdl2.png | Bin 6877 -> 9959 bytes proyectos_de_ley/pdl/templates/pdl/base.html | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/proyectos_de_ley/pdl/static/img/pdl2.png b/proyectos_de_ley/pdl/static/img/pdl2.png index 649fce4dfdb97ac09f1a6adc92ed2be66b224ffe..4554eac1546b9f717f434dbe405f3a8573027f85 100644 GIT binary patch delta 7384 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 delta 4278 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 EKM-Fe^Z)<= diff --git a/proyectos_de_ley/pdl/templates/pdl/base.html b/proyectos_de_ley/pdl/templates/pdl/base.html index dd9d6ec..d1de86c 100644 --- a/proyectos_de_ley/pdl/templates/pdl/base.html +++ b/proyectos_de_ley/pdl/templates/pdl/base.html @@ -95,7 +95,7 @@ Proyectos de Ley + width="300px" height="50px" src="{% static 'img/pdl2.png' %}" alt="Proyectos de Ley" />
From 6c83d8c4d818391e0a13feed181f2b7c828362c2 Mon Sep 17 00:00:00 2001 From: carlosp420 Date: Tue, 6 Sep 2016 15:24:35 -0500 Subject: [PATCH 36/59] fixed bug when searching for code search for code 198 should return results, not only when searching for 00198. --- proyectos_de_ley/pdl/views.py | 38 +++++++++++++++++++++++++++-------- 1 file changed, 30 insertions(+), 8 deletions(-) diff --git a/proyectos_de_ley/pdl/views.py b/proyectos_de_ley/pdl/views.py index 04aea96..79450ab 100644 --- a/proyectos_de_ley/pdl/views.py +++ b/proyectos_de_ley/pdl/views.py @@ -1,6 +1,7 @@ # -*- encoding: utf-8 -*- import ast import re +import copy from django.shortcuts import render from django.shortcuts import redirect @@ -118,12 +119,14 @@ def listado(request): def search(request): if 'q' not in request.GET: return redirect('/') + else: + query = request.GET['q'] + if query.strip() == '': + return redirect('/') + else: + query = fix_query(request) - query = request.GET['q'] - if query.strip() == '': - return redirect('/') - - form = SimpleSearchForm(request.GET) + form = SimpleSearchForm(query) all_items = form.search() items_current_legislature = [ i @@ -137,7 +140,7 @@ def search(request): ] obj = do_pagination(request, items_current_legislature, search=True) - keywords = clean_my_query(query) + keywords = clean_my_query(query['q']) return render(request, "pdl/search.html", { "result_count": len(items_current_legislature), @@ -150,11 +153,30 @@ def search(request): "last_page": obj['last_page'], "current": obj['current'], "keywords": keywords, - "query": query, - "pagination_keyword": query, + "query": query['q'], + "pagination_keyword": query['q'], }) +def fix_query(request): + r = copy.copy(request.GET) + query_parts = [] + for i in r['q'].split(" "): + try: + number = int(i) + except ValueError: + query_parts.append(i) + continue + + if number and len(i) < 5: + padded_number = i.zfill(5) + query_parts.append(padded_number) + else: + query_parts.append(i) + r['q'] = " ".join(query_parts) + return r + + def clean_my_query(query): keywords = re.sub('\s+', ' ', query) keywords = re.sub('\s+$', '', keywords) From 08247c16512093de5771cb6d59836ef95c3bd3a0 Mon Sep 17 00:00:00 2001 From: carlosp420 Date: Tue, 6 Sep 2016 19:14:10 -0500 Subject: [PATCH 37/59] allow certain elements in search results of previous legislatures --- proyectos_de_ley/pdl/views.py | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/proyectos_de_ley/pdl/views.py b/proyectos_de_ley/pdl/views.py index 79450ab..56f61b6 100644 --- a/proyectos_de_ley/pdl/views.py +++ b/proyectos_de_ley/pdl/views.py @@ -128,16 +128,14 @@ def search(request): form = SimpleSearchForm(query) all_items = form.search() - items_current_legislature = [ - i - for i in all_items - if i.legislatura == str(LEGISLATURE) - ] - items_previous_legislatures = [ - i.codigo - for i in all_items - if i.legislatura != str(LEGISLATURE) - ] + items_current_legislature = set() + items_previous_legislatures = set() + for i in all_items: + if i.legislatura == str(LEGISLATURE): + items_current_legislature.add(i) + else: + if len(items_previous_legislatures) < 8000: + items_previous_legislatures.add(i.codigo) obj = do_pagination(request, items_current_legislature, search=True) keywords = clean_my_query(query['q']) From 90e93d7a79f8fd1b00d0e1c4978df58f9a343382 Mon Sep 17 00:00:00 2001 From: carlosp420 Date: Tue, 6 Sep 2016 19:21:31 -0500 Subject: [PATCH 38/59] fixed number of items to add --- proyectos_de_ley/pdl/views.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/proyectos_de_ley/pdl/views.py b/proyectos_de_ley/pdl/views.py index 56f61b6..3dd8389 100644 --- a/proyectos_de_ley/pdl/views.py +++ b/proyectos_de_ley/pdl/views.py @@ -134,9 +134,10 @@ def search(request): if i.legislatura == str(LEGISLATURE): items_current_legislature.add(i) else: - if len(items_previous_legislatures) < 8000: + if len(items_previous_legislatures) < 1300: items_previous_legislatures.add(i.codigo) - obj = do_pagination(request, items_current_legislature, search=True) + print(len(items_previous_legislatures)) + obj = do_pagination(request, list(items_current_legislature), search=True) keywords = clean_my_query(query['q']) From a88492b480df2cca085b45a3e57d0a8d9a4aee74 Mon Sep 17 00:00:00 2001 From: carlosp420 Date: Tue, 6 Sep 2016 19:30:22 -0500 Subject: [PATCH 39/59] 666 --- proyectos_de_ley/pdl/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/proyectos_de_ley/pdl/views.py b/proyectos_de_ley/pdl/views.py index 3dd8389..a15e1f1 100644 --- a/proyectos_de_ley/pdl/views.py +++ b/proyectos_de_ley/pdl/views.py @@ -134,7 +134,7 @@ def search(request): if i.legislatura == str(LEGISLATURE): items_current_legislature.add(i) else: - if len(items_previous_legislatures) < 1300: + if len(items_previous_legislatures) < 666: items_previous_legislatures.add(i.codigo) print(len(items_previous_legislatures)) obj = do_pagination(request, list(items_current_legislature), search=True) From 95576df2dcc234972eb3fb72f1bd99aad46fdbf2 Mon Sep 17 00:00:00 2001 From: carlosp420 Date: Tue, 6 Sep 2016 19:40:56 -0500 Subject: [PATCH 40/59] show only up to 400 proyects --- proyectos_de_ley/pdl/templates/pdl/listado.html | 9 ++++++++- proyectos_de_ley/pdl/views.py | 3 +-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/proyectos_de_ley/pdl/templates/pdl/listado.html b/proyectos_de_ley/pdl/templates/pdl/listado.html index 7d0e456..7e7a9d8 100644 --- a/proyectos_de_ley/pdl/templates/pdl/listado.html +++ b/proyectos_de_ley/pdl/templates/pdl/listado.html @@ -11,7 +11,14 @@ {% if not pretty_items and not items_previous_legislatures %}

No se encontraron resultados.

{% else %} -

Resultados de búsqueda: {{ extra_result_msg }} {{ result_count|intcomma }}
+

Resultados de búsqueda: {{ extra_result_msg }} + {% if result_count > 300 %} + +{{ result_count|intcomma }} + {% else %} + {{ result_count|intcomma }} + {% endif %} + +
Legislatura 2011

diff --git a/proyectos_de_ley/pdl/views.py b/proyectos_de_ley/pdl/views.py index a15e1f1..7dce7bf 100644 --- a/proyectos_de_ley/pdl/views.py +++ b/proyectos_de_ley/pdl/views.py @@ -134,9 +134,8 @@ def search(request): if i.legislatura == str(LEGISLATURE): items_current_legislature.add(i) else: - if len(items_previous_legislatures) < 666: + if len(items_previous_legislatures) < 400: items_previous_legislatures.add(i.codigo) - print(len(items_previous_legislatures)) obj = do_pagination(request, list(items_current_legislature), search=True) keywords = clean_my_query(query['q']) From b533423a75932b47c049406d7c178853b65575b1 Mon Sep 17 00:00:00 2001 From: carlosp420 Date: Wed, 7 Sep 2016 02:25:02 -0500 Subject: [PATCH 41/59] search congress person by ascii name --- .../create_ascii_names_for_congress_person.py | 29 +++++++++++++++++++ .../migrations/0002_proyecto_legislatura.py | 21 -------------- .../pdl/migrations/0003_auto_20160903_1537.py | 20 ------------- proyectos_de_ley/pdl/models.py | 7 +++++ proyectos_de_ley/pdl/utils.py | 4 +-- proyectos_de_ley/pdl/views.py | 8 ++--- 6 files changed, 42 insertions(+), 47 deletions(-) create mode 100644 proyectos_de_ley/pdl/management/commands/create_ascii_names_for_congress_person.py delete mode 100644 proyectos_de_ley/pdl/migrations/0002_proyecto_legislatura.py delete mode 100644 proyectos_de_ley/pdl/migrations/0003_auto_20160903_1537.py diff --git a/proyectos_de_ley/pdl/management/commands/create_ascii_names_for_congress_person.py b/proyectos_de_ley/pdl/management/commands/create_ascii_names_for_congress_person.py new file mode 100644 index 0000000..3bbd7c0 --- /dev/null +++ b/proyectos_de_ley/pdl/management/commands/create_ascii_names_for_congress_person.py @@ -0,0 +1,29 @@ +""" +This command populates the database for Proyecto models which will include the +ascii form for names of Congress men and women. + +Run once a week. +""" +from django.core.management.base import BaseCommand + +from pdl.models import Proyecto +from pdl.management.commands.create_congress_person_slugs import convert_to_ascii + + +class Command(BaseCommand): + help = 'Creates ascii form for names of congress men and women names' + + def handle(self, *args, **options): + projects_to_process = Proyecto.objects.filter( + congresistas_ascii="", + ).exclude( + congresistas="", + ).exclude( + congresistas_ascii="", + ) + for p in projects_to_process: + ascii_name = convert_to_ascii( + p.congresistas, + ) + p.congresistas_ascii = ascii_name + p.save() diff --git a/proyectos_de_ley/pdl/migrations/0002_proyecto_legislatura.py b/proyectos_de_ley/pdl/migrations/0002_proyecto_legislatura.py deleted file mode 100644 index f73ae07..0000000 --- a/proyectos_de_ley/pdl/migrations/0002_proyecto_legislatura.py +++ /dev/null @@ -1,21 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.4 on 2016-09-02 20:49 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('pdl', '0001_initial'), - ] - - operations = [ - migrations.AddField( - model_name='proyecto', - name='legislatura', - field=models.IntegerField(default=2011, max_length=4), - preserve_default=False, - ), - ] diff --git a/proyectos_de_ley/pdl/migrations/0003_auto_20160903_1537.py b/proyectos_de_ley/pdl/migrations/0003_auto_20160903_1537.py deleted file mode 100644 index 6fd80a2..0000000 --- a/proyectos_de_ley/pdl/migrations/0003_auto_20160903_1537.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.4 on 2016-09-03 15:37 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('pdl', '0002_proyecto_legislatura'), - ] - - operations = [ - migrations.AlterField( - model_name='proyecto', - name='legislatura', - field=models.IntegerField(), - ), - ] diff --git a/proyectos_de_ley/pdl/models.py b/proyectos_de_ley/pdl/models.py index 18be58b..4fe517e 100644 --- a/proyectos_de_ley/pdl/models.py +++ b/proyectos_de_ley/pdl/models.py @@ -10,6 +10,13 @@ class Proyecto(models.Model): numero_proyecto = models.CharField(max_length=50) short_url = models.CharField(max_length=20) congresistas = models.TextField(blank=True) + congresistas_ascii = models.TextField( + blank=True, + help_text="Congress data is not 100% consistent in names and in some " + "projects the names come with full accents or sometimes " + "some are missing. It is better to compare them by using " + "the ascii form of their names." + ) # migrate from date as string fecha_presentacion = models.DateField(null=False) diff --git a/proyectos_de_ley/pdl/utils.py b/proyectos_de_ley/pdl/utils.py index 09c09ed..ce5e7b4 100644 --- a/proyectos_de_ley/pdl/utils.py +++ b/proyectos_de_ley/pdl/utils.py @@ -204,12 +204,12 @@ def do_pagination(request, all_items, search=False, advanced_search=None): def find_slug_in_db(congresista_slug): try: item = Slug.objects.get(slug=congresista_slug) - return item.nombre + return item.ascii except Slug.DoesNotExist: try: congresista_slug += '/' item = Slug.objects.get(slug=congresista_slug) - return item.nombre + return item.ascii except Slug.DoesNotExist: return None diff --git a/proyectos_de_ley/pdl/views.py b/proyectos_de_ley/pdl/views.py index 7dce7bf..e1e8843 100644 --- a/proyectos_de_ley/pdl/views.py +++ b/proyectos_de_ley/pdl/views.py @@ -187,10 +187,10 @@ def congresista(request, congresista_slug): if congresista_slug.strip() == '': return redirect('/') - congresista_name = find_slug_in_db(congresista_slug) - if congresista_name is not None: + congresista_ascii = find_slug_in_db(congresista_slug) + if congresista_ascii: all_items = Proyecto.objects.filter( - congresistas__icontains=congresista_name, + congresistas_ascii__contains=congresista_ascii, ).filter( legislatura=LEGISLATURE, ).order_by('-codigo') @@ -203,7 +203,7 @@ def congresista(request, congresista_slug): "first_page": obj['first_page'], "last_page": obj['last_page'], "current": obj['current'], - "congresista": congresista_name, + "congresista": congresista_ascii, "slug": congresista_slug.replace("/", ""), }) else: From 9fefafb9581a10d29d12a8eed955f4f5c1ce0687 Mon Sep 17 00:00:00 2001 From: carlosp420 Date: Wed, 7 Sep 2016 02:35:53 -0500 Subject: [PATCH 42/59] redone migrations --- .../migrations/0002_proyecto_legislatura.py | 21 +++++++++++++++++++ .../pdl/migrations/0003_auto_20160903_1537.py | 20 ++++++++++++++++++ .../0004_proyecto_congresistas_ascii.py | 20 ++++++++++++++++++ 3 files changed, 61 insertions(+) create mode 100644 proyectos_de_ley/pdl/migrations/0002_proyecto_legislatura.py create mode 100644 proyectos_de_ley/pdl/migrations/0003_auto_20160903_1537.py create mode 100644 proyectos_de_ley/pdl/migrations/0004_proyecto_congresistas_ascii.py diff --git a/proyectos_de_ley/pdl/migrations/0002_proyecto_legislatura.py b/proyectos_de_ley/pdl/migrations/0002_proyecto_legislatura.py new file mode 100644 index 0000000..f73ae07 --- /dev/null +++ b/proyectos_de_ley/pdl/migrations/0002_proyecto_legislatura.py @@ -0,0 +1,21 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.4 on 2016-09-02 20:49 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('pdl', '0001_initial'), + ] + + operations = [ + migrations.AddField( + model_name='proyecto', + name='legislatura', + field=models.IntegerField(default=2011, max_length=4), + preserve_default=False, + ), + ] diff --git a/proyectos_de_ley/pdl/migrations/0003_auto_20160903_1537.py b/proyectos_de_ley/pdl/migrations/0003_auto_20160903_1537.py new file mode 100644 index 0000000..6fd80a2 --- /dev/null +++ b/proyectos_de_ley/pdl/migrations/0003_auto_20160903_1537.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.4 on 2016-09-03 15:37 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('pdl', '0002_proyecto_legislatura'), + ] + + operations = [ + migrations.AlterField( + model_name='proyecto', + name='legislatura', + field=models.IntegerField(), + ), + ] diff --git a/proyectos_de_ley/pdl/migrations/0004_proyecto_congresistas_ascii.py b/proyectos_de_ley/pdl/migrations/0004_proyecto_congresistas_ascii.py new file mode 100644 index 0000000..7029575 --- /dev/null +++ b/proyectos_de_ley/pdl/migrations/0004_proyecto_congresistas_ascii.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.4 on 2016-09-07 07:35 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('pdl', '0003_auto_20160903_1537'), + ] + + operations = [ + migrations.AddField( + model_name='proyecto', + name='congresistas_ascii', + field=models.TextField(blank=True, help_text='Congress data is not 100% consistent in names and in some projects the names come with full accents or sometimes some are missing. It is better to compare them by using the ascii form of their names.'), + ), + ] From 7806e12f363401f1b3f7925e8763d9bde915694a Mon Sep 17 00:00:00 2001 From: carlosp420 Date: Wed, 7 Sep 2016 02:50:26 -0500 Subject: [PATCH 43/59] fixed bug --- .../commands/create_ascii_names_for_congress_person.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/proyectos_de_ley/pdl/management/commands/create_ascii_names_for_congress_person.py b/proyectos_de_ley/pdl/management/commands/create_ascii_names_for_congress_person.py index 3bbd7c0..f21a976 100644 --- a/proyectos_de_ley/pdl/management/commands/create_ascii_names_for_congress_person.py +++ b/proyectos_de_ley/pdl/management/commands/create_ascii_names_for_congress_person.py @@ -18,8 +18,6 @@ def handle(self, *args, **options): congresistas_ascii="", ).exclude( congresistas="", - ).exclude( - congresistas_ascii="", ) for p in projects_to_process: ascii_name = convert_to_ascii( From fa8716ef975e079494b1c1f026dde66cf39e1b0e Mon Sep 17 00:00:00 2001 From: carlosp420 Date: Wed, 7 Sep 2016 02:52:59 -0500 Subject: [PATCH 44/59] added to cronjobs to create names in ascii --- cronjobs.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/cronjobs.txt b/cronjobs.txt index eff0535..b43df35 100644 --- a/cronjobs.txt +++ b/cronjobs.txt @@ -6,3 +6,4 @@ 0 3 * * 5 scrapy crawl expediente >> scraping_expediente.log.txt 2>&1 0 6 * * * python proyectos_de_ley/manage.py update_index --age=24 --settings=proyectos_de_ley.settings.production >> updating_index.log.txt 2>&1 0 8 * * 1 python proyectos_de_ley/manage.py create_congress_person_slugs --settings=proyectos_de_ley.settings.production >> updating_slugs.log.txt 2>&1 +0 8 * * 2 python proyectos_de_ley/manage.py create_ascii_names_for_congress_person --settings=proyectos_de_ley.settings.production From b04b80c398f5ed350db7406144b174cc44038f88 Mon Sep 17 00:00:00 2001 From: carlosp420 Date: Wed, 7 Sep 2016 03:23:47 -0500 Subject: [PATCH 45/59] fixed aprobados in front page --- proyectos_de_ley/pdl/views.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/proyectos_de_ley/pdl/views.py b/proyectos_de_ley/pdl/views.py index e1e8843..197aa9d 100644 --- a/proyectos_de_ley/pdl/views.py +++ b/proyectos_de_ley/pdl/views.py @@ -38,12 +38,8 @@ def index(request): ).count() are_not_law = projects_empty_title + projects_null_title - # total aprobados - try: - res = Dispensed.objects.all()[0] - aprobados = res.total_approved - except IndexError: - aprobados = 0 + # total aprobados o sea total proyectos que generaron leyes + aprobados = len(all_items) - are_not_law return render(request, "pdl/index.html", { "items": obj['items'], From 94f24010ff2546b2fe2239c8080d44b468faf243 Mon Sep 17 00:00:00 2001 From: carlosp420 Date: Sun, 14 Aug 2016 10:45:12 -0500 Subject: [PATCH 46/59] upgrade requirements to Django 1.10 --- requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/base.txt b/requirements/base.txt index 47b3ca3..ffbe5c8 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -1,7 +1,7 @@ arrow==0.7.0 beautifulsoup4==4.4.1 bs4==0.0.1 -Django==1.9.4 +Django==1.10 git+git://github.com/django-haystack/django-haystack.git@f1ed18313777005dd77ed724ecbfb27c0b03cad8 django-import-export==0.5.0 django-rest-swagger==0.3.5 From 8653dbef065029c6569975d42f4e2c4ce0b7eee6 Mon Sep 17 00:00:00 2001 From: carlosp420 Date: Sun, 14 Aug 2016 11:18:02 -0500 Subject: [PATCH 47/59] using TEMPLATE settings now --- .../proyectos_de_ley/settings/base.py | 27 ++++++++++++------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/proyectos_de_ley/proyectos_de_ley/settings/base.py b/proyectos_de_ley/proyectos_de_ley/settings/base.py index 69312dc..48acc5f 100644 --- a/proyectos_de_ley/proyectos_de_ley/settings/base.py +++ b/proyectos_de_ley/proyectos_de_ley/settings/base.py @@ -11,8 +11,6 @@ # Build paths inside the project like this: os.path.join(BASE_DIR, ...) import os -from django.conf.global_settings import TEMPLATE_CONTEXT_PROCESSORS - BASE_DIR = os.path.dirname(os.path.dirname(__file__)) @@ -23,7 +21,7 @@ # Application definition -INSTALLED_APPS = ( +INSTALLED_APPS = [ 'django.contrib.admin', 'django.contrib.auth', 'django.contrib.contenttypes', @@ -44,7 +42,7 @@ 'stats', 'search_advanced', 'api', -) +] MIDDLEWARE_CLASSES = ( 'django.contrib.sessions.middleware.SessionMiddleware', @@ -83,13 +81,22 @@ # ENDLESS_PAGINATION_DEFAULT_CALLABLE_ARROWS = True # for pagination # ENDLESS_PAGINATION_PER_PAGE = 20 -TEMPLATE_CONTEXT_PROCESSORS += ( - 'django.core.context_processors.request', -) +TEMPLATES = [ + { + 'BACKEND': 'django.template.backends.django.DjangoTemplates', + 'DIRS': [], + 'APP_DIRS': True, + 'OPTIONS': { + 'context_processors': [ + 'django.core.context_processors.request', + ], + }, + } +] -TEMPLATE_DIRS = ( - 'pdl/templates/pdl', -) +# TEMPLATE_DIRS = ( +# 'pdl/templates/pdl', +# ) STATIC_URL = '/static/' STATICFILES_DIRS = ( From c3587ac2a79c38ab3e81ac3e94774a59a84fc199 Mon Sep 17 00:00:00 2001 From: carlosp420 Date: Wed, 7 Sep 2016 10:31:55 -0500 Subject: [PATCH 48/59] resolved conflicts --- requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/base.txt b/requirements/base.txt index ffbe5c8..954997d 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -4,7 +4,7 @@ bs4==0.0.1 Django==1.10 git+git://github.com/django-haystack/django-haystack.git@f1ed18313777005dd77ed724ecbfb27c0b03cad8 django-import-export==0.5.0 -django-rest-swagger==0.3.5 +django-rest-swagger==2.0.3 djangorestframework==3.3.3 djangorestframework-csv==1.4.1 elasticsearch==2.3.0 From 94206c6b11ce74201b337784064aaae75eb5e7e3 Mon Sep 17 00:00:00 2001 From: carlosp420 Date: Wed, 7 Sep 2016 10:34:11 -0500 Subject: [PATCH 49/59] resolved conflict rest framework swagger url --- proyectos_de_ley/api/urls.py | 2 +- proyectos_de_ley/stats/urls.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/proyectos_de_ley/api/urls.py b/proyectos_de_ley/api/urls.py index 007e789..773fc92 100644 --- a/proyectos_de_ley/api/urls.py +++ b/proyectos_de_ley/api/urls.py @@ -1,4 +1,4 @@ -from django.conf.urls import patterns, url +from django.conf.urls import url from . import views diff --git a/proyectos_de_ley/stats/urls.py b/proyectos_de_ley/stats/urls.py index 091f48c..0f3ef96 100644 --- a/proyectos_de_ley/stats/urls.py +++ b/proyectos_de_ley/stats/urls.py @@ -1,4 +1,4 @@ -from django.conf.urls import patterns, url +from django.conf.urls import url from . import views From 1b88e16b6b219ae97274f04852f79a9cdbe2b09d Mon Sep 17 00:00:00 2001 From: carlosp420 Date: Sun, 14 Aug 2016 11:50:15 -0500 Subject: [PATCH 50/59] removed context_processors.request --- proyectos_de_ley/proyectos_de_ley/settings/base.py | 1 - 1 file changed, 1 deletion(-) diff --git a/proyectos_de_ley/proyectos_de_ley/settings/base.py b/proyectos_de_ley/proyectos_de_ley/settings/base.py index 48acc5f..4c70f55 100644 --- a/proyectos_de_ley/proyectos_de_ley/settings/base.py +++ b/proyectos_de_ley/proyectos_de_ley/settings/base.py @@ -88,7 +88,6 @@ 'APP_DIRS': True, 'OPTIONS': { 'context_processors': [ - 'django.core.context_processors.request', ], }, } From 136a6fda9f0a88c7a8f267a11752ba6e53f1af84 Mon Sep 17 00:00:00 2001 From: carlosp420 Date: Sun, 14 Aug 2016 12:52:43 -0500 Subject: [PATCH 51/59] fixed template settings --- proyectos_de_ley/proyectos_de_ley/settings/base.py | 14 ++++++++------ .../proyectos_de_ley/settings/local.py | 2 +- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/proyectos_de_ley/proyectos_de_ley/settings/base.py b/proyectos_de_ley/proyectos_de_ley/settings/base.py index 4c70f55..e203be6 100644 --- a/proyectos_de_ley/proyectos_de_ley/settings/base.py +++ b/proyectos_de_ley/proyectos_de_ley/settings/base.py @@ -85,10 +85,17 @@ { 'BACKEND': 'django.template.backends.django.DjangoTemplates', 'DIRS': [], - 'APP_DIRS': True, 'OPTIONS': { 'context_processors': [ + 'django.template.context_processors.request', + 'django.contrib.auth.context_processors.auth', ], + # needed for building sitemaps + 'loaders': [ + 'django.template.loaders.filesystem.Loader', + 'django.template.loaders.app_directories.Loader', + ], + 'debug': False, }, } ] @@ -102,11 +109,6 @@ os.path.join(BASE_DIR, "..", "pdl", "static"), ) -# needed for building sitemaps -TEMPLATE_LOADERS = ( - 'django.template.loaders.filesystem.Loader', - 'django.template.loaders.app_directories.Loader', -) SITE_ID = 1 SECRET_KEY = "hola" diff --git a/proyectos_de_ley/proyectos_de_ley/settings/local.py b/proyectos_de_ley/proyectos_de_ley/settings/local.py index d36b3e2..4832bac 100644 --- a/proyectos_de_ley/proyectos_de_ley/settings/local.py +++ b/proyectos_de_ley/proyectos_de_ley/settings/local.py @@ -9,7 +9,7 @@ # SECURITY WARNING: don't run with debug turned on in production! DEBUG = True -TEMPLATE_DEBUG = True +TEMPLATES[0]['OPTIONS']['debug'] = DEBUG INSTALLED_APPS += ('debug_toolbar',) BASE_DIR = Path(__file__).absolute().ancestor(3) From 0e151ca80f2dc4c549056fd5aa23641360696963 Mon Sep 17 00:00:00 2001 From: carlosp420 Date: Wed, 7 Sep 2016 10:34:44 -0500 Subject: [PATCH 52/59] upgrade haystack --- requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/base.txt b/requirements/base.txt index 954997d..774358b 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -2,8 +2,8 @@ arrow==0.7.0 beautifulsoup4==4.4.1 bs4==0.0.1 Django==1.10 -git+git://github.com/django-haystack/django-haystack.git@f1ed18313777005dd77ed724ecbfb27c0b03cad8 django-import-export==0.5.0 +django-haystack==2.5.0 django-rest-swagger==2.0.3 djangorestframework==3.3.3 djangorestframework-csv==1.4.1 From a423defd59b59ad576349549753c9b3dc699f010 Mon Sep 17 00:00:00 2001 From: carlosp420 Date: Wed, 7 Sep 2016 10:42:24 -0500 Subject: [PATCH 53/59] upgrade to Django 1.10.1 --- requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/base.txt b/requirements/base.txt index 774358b..6e0b657 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -1,7 +1,7 @@ arrow==0.7.0 beautifulsoup4==4.4.1 bs4==0.0.1 -Django==1.10 +Django==1.10.1 django-import-export==0.5.0 django-haystack==2.5.0 django-rest-swagger==2.0.3 From 120e57a33f11f3edb3f63389a0a48cdaa57635cc Mon Sep 17 00:00:00 2001 From: carlosp420 Date: Wed, 7 Sep 2016 12:21:02 -0500 Subject: [PATCH 54/59] updated layout for new version of rest framework swagger --- proyectos_de_ley/pdl/templates/pdl/base.html | 83 ++---------------- proyectos_de_ley/pdl/templates/pdl/css.html | 32 +++++++ .../pdl/templates/pdl/navbar.html | 44 ++++++++++ .../pdl/rest_framework_swagger/index.html | 86 ------------------- .../proyectos_de_ley/settings/base.py | 2 +- .../rest_framework_swagger/index.html | 63 ++++++++++++++ 6 files changed, 148 insertions(+), 162 deletions(-) create mode 100644 proyectos_de_ley/pdl/templates/pdl/css.html create mode 100644 proyectos_de_ley/pdl/templates/pdl/navbar.html delete mode 100644 proyectos_de_ley/pdl/templates/pdl/rest_framework_swagger/index.html create mode 100644 proyectos_de_ley/templates/rest_framework_swagger/index.html diff --git a/proyectos_de_ley/pdl/templates/pdl/base.html b/proyectos_de_ley/pdl/templates/pdl/base.html index d1de86c..5a2b78f 100644 --- a/proyectos_de_ley/pdl/templates/pdl/base.html +++ b/proyectos_de_ley/pdl/templates/pdl/base.html @@ -43,90 +43,21 @@ {% block additional_head_javascript %} {% endblock %} - - {% load staticfiles %} - + {% include 'pdl/css.html' %} - - {% block additional_css %} - {% endblock %} + {% block additional_css %} + {% endblock %} + +
- - +{% include 'pdl/navbar.html' %} {% block content %} {% endblock content %} @@ -158,6 +89,8 @@ + {% block swagger_additional_javascript %} + {% endblock swagger_additional_javascript %} diff --git a/proyectos_de_ley/pdl/templates/pdl/css.html b/proyectos_de_ley/pdl/templates/pdl/css.html new file mode 100644 index 0000000..bc982b6 --- /dev/null +++ b/proyectos_de_ley/pdl/templates/pdl/css.html @@ -0,0 +1,32 @@ +{% load staticfiles %} + + + + + diff --git a/proyectos_de_ley/pdl/templates/pdl/navbar.html b/proyectos_de_ley/pdl/templates/pdl/navbar.html new file mode 100644 index 0000000..85c170a --- /dev/null +++ b/proyectos_de_ley/pdl/templates/pdl/navbar.html @@ -0,0 +1,44 @@ +{% load staticfiles %} + + \ No newline at end of file diff --git a/proyectos_de_ley/pdl/templates/pdl/rest_framework_swagger/index.html b/proyectos_de_ley/pdl/templates/pdl/rest_framework_swagger/index.html deleted file mode 100644 index 8330c19..0000000 --- a/proyectos_de_ley/pdl/templates/pdl/rest_framework_swagger/index.html +++ /dev/null @@ -1,86 +0,0 @@ -{% extends 'pdl/base.html' %} -{% load staticfiles %} - -{% block title %} -Proyectos de ley | Documentación del API -{% endblock title %} - -{% block additional_css %} - - - - - -{% endblock additional_css %} - - -{% block content %} -
-
-
-

Documentación del API de Proyectos de ley.

-

- Hacer click sobre "Expand Operations" para ver los parámetros que son necesarios - como input para obtener datos en formato JSON. -

-
-
-
-
-
-
-
-
-
- -{% endblock content %} - - -{% block additional_javascript %} - - - - - - - - - - - - - - -{% endblock additional_javascript %} - diff --git a/proyectos_de_ley/proyectos_de_ley/settings/base.py b/proyectos_de_ley/proyectos_de_ley/settings/base.py index e203be6..2120b05 100644 --- a/proyectos_de_ley/proyectos_de_ley/settings/base.py +++ b/proyectos_de_ley/proyectos_de_ley/settings/base.py @@ -84,7 +84,7 @@ TEMPLATES = [ { 'BACKEND': 'django.template.backends.django.DjangoTemplates', - 'DIRS': [], + 'DIRS': ['templates'], 'OPTIONS': { 'context_processors': [ 'django.template.context_processors.request', diff --git a/proyectos_de_ley/templates/rest_framework_swagger/index.html b/proyectos_de_ley/templates/rest_framework_swagger/index.html new file mode 100644 index 0000000..bfefd61 --- /dev/null +++ b/proyectos_de_ley/templates/rest_framework_swagger/index.html @@ -0,0 +1,63 @@ +{% load staticfiles %} + + + + + Proyectos de ley | Documentación del API + + + + + + + {% include 'pdl/css.html' %} + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + {% include 'pdl/navbar.html' %} + +
 
+
+ + + + + {% block extra_scripts %} + {# -- Add any additional custom JS scripts here -- #} + {% endblock %} + +
+ + From 1a7fb7ff4c30d3b34264ececc491b7d507502681 Mon Sep 17 00:00:00 2001 From: carlosp420 Date: Wed, 7 Sep 2016 13:13:30 -0500 Subject: [PATCH 55/59] fixed django rest framework for getting proyectos --- proyectos_de_ley/api/urls.py | 4 +-- proyectos_de_ley/api/views.py | 42 ++++++++++++++++++----- proyectos_de_ley/proyectos_de_ley/urls.py | 3 +- 3 files changed, 38 insertions(+), 11 deletions(-) diff --git a/proyectos_de_ley/api/urls.py b/proyectos_de_ley/api/urls.py index 773fc92..385ba65 100644 --- a/proyectos_de_ley/api/urls.py +++ b/proyectos_de_ley/api/urls.py @@ -5,8 +5,8 @@ urlpatterns = [ # '', - url(r'^proyecto.json/(?P[0-9]+\-[0-9]+)/$', views.proyecto), - url(r'^proyecto.csv/(?P[0-9]+\-[0-9]+)/$', views.proyecto_csv), + url(r'^proyecto.json/(?P[0-9]+\-?[0-9]+)/$', views.proyecto), + url(r'^proyecto.csv/(?P[0-9]+\-?[0-9]+)/$', views.proyecto_csv), url(r'^congresista.json/(?P.+)/$', views.congresista), url(r'^congresista.csv/(?P.+)/$', views.congresista_csv), diff --git a/proyectos_de_ley/api/views.py b/proyectos_de_ley/api/views.py index f23e8c9..d70b809 100644 --- a/proyectos_de_ley/api/views.py +++ b/proyectos_de_ley/api/views.py @@ -24,6 +24,18 @@ from .utils import get_projects_for_person from .utils import get_seguimientos_from_proyecto_id from .utils import prepare_json_for_d3 +from rest_framework.decorators import api_view, renderer_classes +from rest_framework import response, schemas +from rest_framework_swagger.renderers import OpenAPIRenderer, SwaggerUIRenderer + +LEGISLATURE = 2016 + +@api_view(['GET']) +@permission_classes((AllowAny, )) +@renderer_classes([OpenAPIRenderer, SwaggerUIRenderer]) +def schema_view(request): + generator = schemas.SchemaGenerator(title='Documentación del API de Proyectos de ley.') + return response.Response(generator.get_schema(request=request)) @api_view(['GET']) @@ -50,11 +62,18 @@ def proyecto(request, codigo): paramType: path required: true """ - # TODO: hay que agregar un campo a la tabla especificando si es legislatura 2011 o cual. - # luego corregir aquí el API - codigo = re.sub('-[0-9]+', '', codigo) + codigo = codigo.split("-") + if len(codigo) > 1: + legislatura = int(codigo[1]) + else: + legislatura = LEGISLATURE + codigo = codigo[0] + try: - proy = Proyecto.objects.get(numero_proyecto__startswith=codigo) + proy = Proyecto.objects.get( + codigo=codigo, + legislatura=legislatura, + ) except Proyecto.DoesNotExist: msg = {'error': 'proyecto no existe'} return HttpResponse(json.dumps(msg), content_type='application/json') @@ -82,10 +101,17 @@ def proyecto_csv(request, codigo): paramType: path required: true """ - # TODO: hay que agregar un campo a la tabla especificando si es legislatura 2011 o cual. - # luego corregir aquí el API - codigo = re.sub('-[0-9]+', '', codigo) - proyectos = Proyecto.objects.filter(numero_proyecto__startswith=codigo).values() + codigo = codigo.split("-") + if len(codigo) > 1: + legislatura = int(codigo[1]) + else: + legislatura = LEGISLATURE + codigo = codigo[0] + + proyectos = Proyecto.objects.filter( + codigo=codigo, + legislatura=legislatura, + ).values() if len(proyectos) < 1: msg = 'error,proyecto no existe' return HttpResponse(msg, content_type='text/csv') diff --git a/proyectos_de_ley/proyectos_de_ley/urls.py b/proyectos_de_ley/proyectos_de_ley/urls.py index 16b879c..667286c 100644 --- a/proyectos_de_ley/proyectos_de_ley/urls.py +++ b/proyectos_de_ley/proyectos_de_ley/urls.py @@ -5,6 +5,7 @@ from pdl.feeds import LatestEntriesFeed from pdl.sitemaps import ProyectoSitemap, CongresistaSitemap from seguimientos import views as seg_views +from api.views import schema_view sitemaps = { @@ -15,7 +16,7 @@ urlpatterns = [ # '', url(r'^admin/', include(admin.site.urls)), - url(r'^docs/', include('rest_framework_swagger.urls')), + url(r'^docs/', schema_view), url(r'^stats/', include('stats.urls', namespace='stats')), url(r'^', include('pdl.urls', namespace='pdl')), url(r'^p/', include('pdl.urls', namespace='pdl-proyecto')), From 5cbb8d4ca26bbcb73577707fa8821436659c86e6 Mon Sep 17 00:00:00 2001 From: carlosp420 Date: Wed, 7 Sep 2016 15:21:20 -0500 Subject: [PATCH 56/59] fixed all other api methods --- proyectos_de_ley/api/urls.py | 8 +-- proyectos_de_ley/api/utils.py | 20 ++++++-- proyectos_de_ley/api/views.py | 97 ++++++++++++++++++++++++----------- 3 files changed, 87 insertions(+), 38 deletions(-) diff --git a/proyectos_de_ley/api/urls.py b/proyectos_de_ley/api/urls.py index 385ba65..c161b85 100644 --- a/proyectos_de_ley/api/urls.py +++ b/proyectos_de_ley/api/urls.py @@ -20,9 +20,9 @@ url(r'^exonerados_2da_votacion.json/$', views.exonerados_2da_votacion), url(r'^exonerados_2da_votacion.csv/$', views.exonerados_2da_votacion_csv), - url(r'^seguimientos.json/(?P[0-9]+\-[0-9]+)/$', views.seguimientos_list), - url(r'^seguimientos.csv/(?P[0-9]+\-[0-9]+)/$', views.seguimientos_list_csv), + url(r'^seguimientos.json/(?P[0-9]+\-?[0-9]+)/$', views.seguimientos_list), + url(r'^seguimientos.csv/(?P[0-9]+\-?[0-9]+)/$', views.seguimientos_list_csv), - url(r'^iniciativas.json/(?P[0-9a-z]+\-[0-9]+)/$', views.iniciativa_list), - url(r'^iniciativas.csv/(?P[0-9a-z]+\-[0-9]+)/$', views.iniciativa_list_csv), + url(r'^iniciativas.json/(?P[0-9a-z]+\-?[0-9]+)/$', views.iniciativa_list), + url(r'^iniciativas.csv/(?P[0-9a-z]+\-?[0-9]+)/$', views.iniciativa_list_csv), ] diff --git a/proyectos_de_ley/api/utils.py b/proyectos_de_ley/api/utils.py index 4ab64fe..0912b4b 100644 --- a/proyectos_de_ley/api/utils.py +++ b/proyectos_de_ley/api/utils.py @@ -9,12 +9,19 @@ from pdl.models import Slug +LEGISLATURE = 2016 + def get_projects_for_person(names): projects_and_person = [] for name in names: queryset = Proyecto.objects.filter( - congresistas__icontains=name).order_by('-codigo') - projects_list = [str(i.codigo) + '-2011' for i in queryset] + congresistas__icontains=name, + legislatura=LEGISLATURE, + ).order_by('-codigo') + projects_list = [ + "{}-{}".format(i.codigo, LEGISLATURE) + for i in queryset + ] obj = {'nombre': name, 'proyectos': projects_list} projects_and_person.append(obj) return projects_and_person @@ -24,10 +31,15 @@ def get_projects_by_comission_for_person(comision, names): projects_and_person = [] for name in names: queryset = Proyecto.objects.filter( - congresistas__icontains=name).order_by('-codigo') + congresistas__icontains=name, + legislatura=LEGISLATURE, + ).order_by('-codigo') if comision != '': queryset = queryset.filter(nombre_comision__icontains=comision) - projects_list = [str(i.codigo) + '-2011' for i in queryset] + projects_list = [ + "{}-{}".format(i.codigo, LEGISLATURE) + for i in queryset + ] obj = {'nombre': name, 'proyectos': projects_list} projects_and_person.append(obj) return projects_and_person diff --git a/proyectos_de_ley/api/views.py b/proyectos_de_ley/api/views.py index d70b809..ae48278 100644 --- a/proyectos_de_ley/api/views.py +++ b/proyectos_de_ley/api/views.py @@ -62,12 +62,7 @@ def proyecto(request, codigo): paramType: path required: true """ - codigo = codigo.split("-") - if len(codigo) > 1: - legislatura = int(codigo[1]) - else: - legislatura = LEGISLATURE - codigo = codigo[0] + codigo, legislatura = split_code_input(codigo) try: proy = Proyecto.objects.get( @@ -101,12 +96,7 @@ def proyecto_csv(request, codigo): paramType: path required: true """ - codigo = codigo.split("-") - if len(codigo) > 1: - legislatura = int(codigo[1]) - else: - legislatura = LEGISLATURE - codigo = codigo[0] + codigo, legislatura = split_code_input(codigo) proyectos = Proyecto.objects.filter( codigo=codigo, @@ -320,9 +310,16 @@ def exonerados_dictamen(request): * """ - exonerado_de_dictamen = ['{}-2011'.format(i.proyecto.codigo) - for i in Seguimientos.objects.select_related('proyecto').filter( - evento__icontains='exoneración de dictamen').distinct()] + exonerado_de_dictamen = [ + '{}-{}'.format(i.proyecto.codigo, LEGISLATURE) + for i in Seguimientos.objects.select_related( + 'proyecto', + ).filter( + evento__icontains='exoneración de dictamen', + ).filter( + proyecto__legislatura=LEGISLATURE, + ).distinct() + ] exonerado_de_dictamen = list(set(exonerado_de_dictamen)) if len(exonerado_de_dictamen) > 0: @@ -347,9 +344,16 @@ def exonerados_dictamen_csv(request): * """ - exonerado_de_dictamen = ['{}-2011'.format(i.proyecto.codigo) - for i in Seguimientos.objects.select_related('proyecto').filter( - evento__icontains='exoneración de dictamen').distinct()] + exonerado_de_dictamen = [ + '{}-{}'.format(i.proyecto.codigo, LEGISLATURE) + for i in Seguimientos.objects.select_related( + 'proyecto', + ).filter( + evento__icontains='exoneración de dictamen', + ).filter( + proyecto__legislatura=LEGISLATURE, + ).distinct() + ] data = list(set(exonerado_de_dictamen)) if len(exonerado_de_dictamen) > 0: @@ -367,9 +371,16 @@ def exonerados_2da_votacion(request): Lista proyectos que han sido exonerados de 2da votación en el pleno. --- """ - total_dispensed = ["{}-2011".format(i.proyecto.codigo) - for i in Seguimientos.objects.select_related('proyecto').filter( - evento__icontains='dispensado 2da')] + total_dispensed = [ + "{}-{}".format(i.proyecto.codigo, LEGISLATURE) + for i in Seguimientos.objects.select_related( + 'proyecto', + ).filter( + evento__icontains='dispensado 2da', + ).filter( + proyecto__legislatura=LEGISLATURE, + ) + ] if len(total_dispensed) > 0: data = {'resultado': total_dispensed} @@ -388,9 +399,16 @@ def exonerados_2da_votacion_csv(request): Lista proyectos que han sido exonerados de 2da votación en el pleno. --- """ - data = ["{}-2011".format(i.proyecto.codigo) - for i in Seguimientos.objects.select_related('proyecto').filter( - evento__icontains='dispensado 2da')] + data = [ + "{}-{}".format(i.proyecto.codigo, LEGISLATURE) + for i in Seguimientos.objects.select_related( + 'proyecto', + ).filter( + evento__icontains='dispensado 2da', + ).filter( + proyecto__legislatura=LEGISLATURE, + ) + ] if len(data) > 0: if request.method == 'GET': @@ -423,7 +441,7 @@ def iniciativa_list(request, codigo): paramType: path required: true """ - codigo, legislatura = codigo.split("-") + codigo, legislatura = split_code_input(codigo) try: proy = Proyecto.objects.get( codigo=codigo, @@ -461,9 +479,12 @@ def iniciativa_list_csv(request, codigo): paramType: path required: true """ - codigo = re.sub('-[0-9]+', '', codigo) + codigo, legislatura = split_code_input(codigo) try: - proy = Proyecto.objects.get(numero_proyecto__startswith=codigo) + proy = Proyecto.objects.get( + codigo=codigo, + legislatura=legislatura, + ) except Proyecto.DoesNotExist: msg = 'error,proyecto no existe' return HttpResponse(msg, content_type='text/csv') @@ -501,7 +522,7 @@ def seguimientos_list(request, codigo): paramType: path required: true """ - codigo, legislatura = codigo.split("-") + codigo, legislatura = split_code_input(codigo) try: proy = Proyecto.objects.get( codigo=codigo, @@ -545,9 +566,12 @@ def seguimientos_list_csv(request, codigo): paramType: path required: true """ - codigo = re.sub('-[0-9]+', '', codigo) + codigo, legislatura = split_code_input(codigo) try: - proy = Proyecto.objects.get(numero_proyecto__startswith=codigo) + proy = Proyecto.objects.get( + codigo=codigo, + legislatura=legislatura, + ) except Proyecto.DoesNotExist: msg = 'error,proyecto no existe' return HttpResponse(msg, content_type='text/csv') @@ -570,3 +594,16 @@ def seguimientos_list_csv(request, codigo): if request.method == 'GET': return CSVResponse(data) + + +def split_code_input(codigo): + print(codigo) + codigo = codigo.split("-") + if len(codigo) > 1: + legislatura = int(codigo[1]) + else: + legislatura = LEGISLATURE + codigo = codigo[0] + return codigo, legislatura + + From e365de8ef51898bfa1f619e7c006a47261804844 Mon Sep 17 00:00:00 2001 From: carlosp420 Date: Wed, 7 Sep 2016 15:26:01 -0500 Subject: [PATCH 57/59] upgrade reqs --- requirements/base.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements/base.txt b/requirements/base.txt index 6e0b657..9b0ccb6 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -4,8 +4,8 @@ bs4==0.0.1 Django==1.10.1 django-import-export==0.5.0 django-haystack==2.5.0 -django-rest-swagger==2.0.3 -djangorestframework==3.3.3 +django-rest-swagger==2.0.5 +djangorestframework==3.4.1 djangorestframework-csv==1.4.1 elasticsearch==2.3.0 Markdown==2.6.6 From 885db0be8750eae92c31deaab8aa41dc99333bca Mon Sep 17 00:00:00 2001 From: carlosp420 Date: Wed, 7 Sep 2016 15:34:05 -0500 Subject: [PATCH 58/59] fixed tests for api --- proyectos_de_ley/api/tests/tests.py | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/proyectos_de_ley/api/tests/tests.py b/proyectos_de_ley/api/tests/tests.py index 50c4be2..425252e 100644 --- a/proyectos_de_ley/api/tests/tests.py +++ b/proyectos_de_ley/api/tests/tests.py @@ -13,7 +13,7 @@ def setUp(self): self.maxDiff = None dummy = { "codigo": "03774", - 'legislatura': 2011, + 'legislatura': 2016, "congresistas": "Dammert Ego Aguirre, Manuel Enrique Ernesto; Lescano Ancieta, Yonhy; Merino De Lama, Manuel; Guevara Amasifuen, Mesias Antonio; Mavila Leon, Rosa Delsa; Mendoza Frisch, Veronika Fanny", "expediente": "http://www2.congreso.gob.pe/sicr/tradocestproc/Expvirt_2011.nsf/visbusqptramdoc/03774?opendocument", "fecha_presentacion": "2014-09-05", @@ -40,25 +40,25 @@ def setUp(self): self.c = Client() def test_getting_proyecto(self): - response = self.c.get('/api/proyecto.json/03774-2011/') + response = self.c.get('/api/proyecto.json/03774-2016/') result = json.loads(response.content.decode('utf-8')) expected = "03774" self.assertEqual(expected, result['codigo']) def test_getting_proyecto_csv(self): - response = self.c.get('/api/proyecto.csv/03774-2011/') + response = self.c.get('/api/proyecto.csv/03774-2016/') result = response.content.decode('utf-8') expected = "03774" self.assertTrue(expected in result) def test_getting_proyecto_missing(self): - response = self.c.get('/api/proyecto.json/037740-2011/') + response = self.c.get('/api/proyecto.json/037740-2016/') result = response.content.decode('utf-8') expected = '{"error": "proyecto no existe"}' self.assertEqual(expected, result) def test_getting_proyecto_missing_csv(self): - response = self.c.get('/api/proyecto.csv/037740-2011/') + response = self.c.get('/api/proyecto.csv/037740-2016/') result = response.content.decode('utf-8') expected = 'error,proyecto no existe' self.assertEqual(expected, result) @@ -78,13 +78,13 @@ def test_getting_projects_of_person_csv(self): def test_getting_projects_of_person_and_comission(self): response = self.c.get('/api/congresista_y_comision.json/Dammert Ego/economia/') result = json.loads(response.content.decode('utf-8')) - expected = ['03774-2011'] + expected = ['03774-2016'] self.assertEqual(expected, result['resultado'][0]['proyectos']) def test_getting_projects_of_person_and_comission_csv(self): response = self.c.get('/api/congresista_y_comision.csv/Dammert Ego/economia/') result = response.content.decode('utf-8') - expected = '03774-2011' + expected = '03774-2016' self.assertTrue(expected in result) def test_getting_projects_of_person_and_comission_csv_missing(self): @@ -135,7 +135,7 @@ def test_exonerados_dictamen(self): fecha='2010-10-10').save() response = self.c.get('/api/exonerados_dictamen.json/') result = json.loads(response.content.decode('utf-8')) - expected = {'resultado': ['03774-2011']} + expected = {'resultado': ['03774-2016']} self.assertEqual(expected, result) def test_exonerados_dictamen_csv(self): @@ -144,7 +144,7 @@ def test_exonerados_dictamen_csv(self): fecha='2010-10-10').save() response = self.c.get('/api/exonerados_dictamen.csv/') result = response.content.decode('utf-8') - expected = '03774-2011' + expected = '03774-2016' self.assertTrue(expected in result) def test_exonerados_dictamen_csv_empty(self): @@ -171,7 +171,7 @@ def test_exonerados_2da_votacion(self): fecha='2010-10-10').save() response = self.c.get('/api/exonerados_2da_votacion.json/') result = json.loads(response.content.decode('utf-8')) - expected = {'resultado': ['03774-2011']} + expected = {'resultado': ['03774-2016']} self.assertEqual(expected, result) def test_exonerados_2da_votacion_csv(self): @@ -180,5 +180,5 @@ def test_exonerados_2da_votacion_csv(self): fecha='2010-10-10').save() response = self.c.get('/api/exonerados_2da_votacion.csv/') result = response.content.decode('utf-8') - expected = '03774-2011' + expected = '03774-2016' self.assertTrue(expected in result) From b74dd069686cc479a4290541a571cb07309698c2 Mon Sep 17 00:00:00 2001 From: carlosp420 Date: Wed, 7 Sep 2016 15:59:11 -0500 Subject: [PATCH 59/59] history and new version --- HISTORY.rst | 14 ++++++++++++-- proyectos_de_ley/pdl/templates/pdl/base.html | 4 ++-- setup.py | 6 +++--- 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/HISTORY.rst b/HISTORY.rst index 2a58bd0..2247a71 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -1,12 +1,22 @@ History ======= -v2.2.0 (2016-09-xx -~~~~~~~~~~~~~~~~~~ +v2.2.0 (2016-09-07) +~~~~~~~~~~~~~~~~~~~ * agregada capacidad de soportar proyectos de Legislatura 2011 y 2016. * agregada interface administrador en Django. * mostrar proyectos de actual legislatura y menor prominencia a proyectos de legislaturas pasadas. +* actualización de spiders. +* actualización de dependencias: Django, rest_framework, rest_framework_swagger. +* actualización de layout de docs en API. +* bug fixed: número de proyectos aprovados en front-page +* bug fixed: búsqueda de proyecto "209" resultará en búsqueda de proyecto 00209-2016. +* bug fixed: ya no se muestra código 404 en el API. +* bug fixed: logo de Hiperderecho está hosteado en nuestro server. +* bug fixed: lista de proyectos de legislatura pasada ya no genera error 500. +* bug fixed: modificación de modelos para casos en que congresistas tengan nombres + con y sin tildes. Cualquier variación mostrará proyectos de cada congresista. v2.1.1 (2015-10-29) ~~~~~~~~~~~~~~~~~~~ diff --git a/proyectos_de_ley/pdl/templates/pdl/base.html b/proyectos_de_ley/pdl/templates/pdl/base.html index 5a2b78f..80c0401 100644 --- a/proyectos_de_ley/pdl/templates/pdl/base.html +++ b/proyectos_de_ley/pdl/templates/pdl/base.html @@ -76,8 +76,8 @@ - Desarrollado por AniversarioPerú - v2.1.1 + Desarrollado por Carlos Peña + v2.2.0
diff --git a/setup.py b/setup.py index 38ea834..3d937fc 100644 --- a/setup.py +++ b/setup.py @@ -4,13 +4,13 @@ except ImportError: from distutils.core import setup -version = '2.1.1' +version = '2.2.0' setup( name='proyectos_de_ley', version=version, - author='Aniversario Peru', - author_email='aniversarioperu1@gmail.com', + author='Carlos Peña', + author_email='mycalesis@gmail.com', packages=[ 'proyectos_de_ley', ],