Skip to content

GitLab

M
memopol
Commit b6432187 authored by Nicolas Joyard's avatar Nicolas Joyard
Browse files
Options

Add theme list and detail pages

parent 772b90c5
Hide whitespace changes
Inline Side-by-side
Showing with 1521 additions and 1 deletion
memopol/filters.py
View file @ b6432187
......@@ -11,6 +11,7 @@ from django_filters import FilterSet, MethodFilter, ModelChoiceFilter
from representatives.models import Chamber, Group, Representative
from representatives_votes.models import Dossier
from memopol_themes.models import Theme
def rep_chamber_filter(qs, value):
......@@ -77,3 +78,19 @@ class DossierFilter(FilterSet):
return qs.filter(Q(title__icontains=value) |
Q(reference__icontains=value))
class ThemeFilter(FilterSet):
search = MethodFilter(action='search_filter')
class Meta:
model = Theme
fields = ['search']
def search_filter(self, qs, value):
if len(value) == 0:
return qs
return qs.filter(Q(name__icontains=value) |
Q(description__icontains=value))
memopol/fixtures/smaller_sample.json
View file @ b6432187
......@@ -23200,5 +23200,32 @@
},
"model": "representatives_recommendations.recommendation",
"pk": 47
},
{
"fields": {
"description": "The Anti-Counterfeiting Trade agreement is a really bad thing, we would like to kill it with fire.",
"positions": [
],
"proposals": [
5744, 5745, 5746
],
"dossiers": [
28147
],
"slug": "acta",
"name": "acta"
},
"model": "memopol_themes.theme",
"pk": 1
},
{
"fields": {
"theme": 1,
"datetime": "2008-01-01",
"link": "http://www.laquadrature.net",
"title": "Press release on ACTA from La Quadrature du Net"
},
"model": "memopol_themes.themelink",
"pk": 1
}
]
memopol/tests/response_fixtures/DossiersTest.test_dossier_detail.content
View file @ b6432187
......@@ -65,6 +65,11 @@
Committees
</a>
</li>
<li>
<a href='/theme/'>
Themes
</a>
</li>
<li>
<a href='/votes/dossier/'>
Dossiers
......
memopol/tests/response_fixtures/DossiersTest.test_dossier_list.content
View file @ b6432187
......@@ -69,6 +69,11 @@
Committees
</a>
</li>
<li>
<a href='/theme/'>
Themes
</a>
</li>
<li>
<a href='/votes/dossier/'>
Dossiers
......
memopol/tests/response_fixtures/DossiersTest.test_dossier_search.content
View file @ b6432187
......@@ -69,6 +69,11 @@
Committees
</a>
</li>
<li>
<a href='/theme/'>
Themes
</a>
</li>
<li>
<a href='/votes/dossier/'>
Dossiers
......
memopol/tests/response_fixtures/DossiersTest.test_dossier_search_noresults.content
View file @ b6432187
......@@ -69,6 +69,11 @@
Committees
</a>
</li>
<li>
<a href='/theme/'>
Themes
</a>
</li>
<li>
<a href='/votes/dossier/'>
Dossiers
......
memopol/tests/response_fixtures/DossiersTest.test_dossier_sorting.content
View file @ b6432187
......@@ -69,6 +69,11 @@
Committees
</a>
</li>
<li>
<a href='/theme/'>
Themes
</a>
</li>
<li>
<a href='/votes/dossier/'>
Dossiers
......
memopol/tests/response_fixtures/GroupListTest.test_active_committees.content
View file @ b6432187
......@@ -65,6 +65,11 @@
Committees
</a>
</li>
<li>
<a href='/theme/'>
Themes
</a>
</li>
<li>
<a href='/votes/dossier/'>
Dossiers
......
memopol/tests/response_fixtures/GroupListTest.test_active_delegations.content
View file @ b6432187
......@@ -65,6 +65,11 @@
Committees
</a>
</li>
<li>
<a href='/theme/'>
Themes
</a>
</li>
<li>
<a href='/votes/dossier/'>
Dossiers
......
memopol/tests/response_fixtures/GroupListTest.test_active_parties.content
View file @ b6432187
......@@ -65,6 +65,11 @@
Committees
</a>
</li>
<li>
<a href='/theme/'>
Themes
</a>
</li>
<li>
<a href='/votes/dossier/'>
Dossiers
......
memopol/tests/response_fixtures/GroupListTest.test_all_committees.content
View file @ b6432187
......@@ -65,6 +65,11 @@
Committees
</a>
</li>
<li>
<a href='/theme/'>
Themes
</a>
</li>
<li>
<a href='/votes/dossier/'>
Dossiers
......
memopol/tests/response_fixtures/GroupListTest.test_all_delegations.content
View file @ b6432187
......@@ -65,6 +65,11 @@
Committees
</a>
</li>
<li>
<a href='/theme/'>
Themes
</a>
</li>
<li>
<a href='/votes/dossier/'>
Dossiers
......
memopol/tests/response_fixtures/GroupListTest.test_all_parties.content
View file @ b6432187
......@@ -65,6 +65,11 @@
Committees
</a>
</li>
<li>
<a href='/theme/'>
Themes
</a>
</li>
<li>
<a href='/votes/dossier/'>
Dossiers
......
memopol/tests/response_fixtures/GroupListTest.test_chambers.content
View file @ b6432187
......@@ -65,6 +65,11 @@
Committees
</a>
</li>
<li>
<a href='/theme/'>
Themes
</a>
</li>
<li>
<a href='/votes/dossier/'>
Dossiers
......
memopol/tests/response_fixtures/GroupListTest.test_country.content
View file @ b6432187
......@@ -65,6 +65,11 @@
Committees
</a>
</li>
<li>
<a href='/theme/'>
Themes
</a>
</li>
<li>
<a href='/votes/dossier/'>
Dossiers
......
memopol/tests/response_fixtures/RepresentativeListTest.test_filter_chamber.content
View file @ b6432187
......@@ -74,6 +74,11 @@
Committees
</a>
</li>
<li>
<a href='/theme/'>
Themes
</a>
</li>
<li>
<a href='/votes/dossier/'>
Dossiers
......
memopol/tests/response_fixtures/RepresentativeListTest.test_filter_country.content
View file @ b6432187
......@@ -74,6 +74,11 @@
Committees
</a>
</li>
<li>
<a href='/theme/'>
Themes
</a>
</li>
<li>
<a href='/votes/dossier/'>
Dossiers
......
memopol/tests/response_fixtures/RepresentativeListTest.test_filter_group.content
View file @ b6432187
......@@ -74,6 +74,11 @@
Committees
</a>
</li>
<li>
<a href='/theme/'>
Themes
</a>
</li>
<li>
<a href='/votes/dossier/'>
Dossiers
......
memopol/tests/response_fixtures/RepresentativeListTest.test_filter_multiple.content
View file @ b6432187
......@@ -74,6 +74,11 @@
Committees
</a>
</li>
<li>
<a href='/theme/'>
Themes
</a>
</li>
<li>
<a href='/votes/dossier/'>
Dossiers
......
memopol/tests/response_fixtures/RepresentativeListTest.test_filter_notfound.content
View file @ b6432187
......@@ -74,6 +74,11 @@
Committees
</a>
</li>
<li>
<a href='/theme/'>
Themes
</a>
</li>
<li>
<a href='/votes/dossier/'>
Dossiers
......
memopol/tests/response_fixtures/RepresentativeListTest.test_filter_search.content
View file @ b6432187
......@@ -74,6 +74,11 @@
Committees
</a>
</li>
<li>
<a href='/theme/'>
Themes
</a>
</li>
<li>
<a href='/votes/dossier/'>
Dossiers
......
memopol/tests/response_fixtures/RepresentativeListTest.test_page1_paginateby12_active_displaylist.content
View file @ b6432187
......@@ -74,6 +74,11 @@
Committees
</a>
</li>
<li>
<a href='/theme/'>
Themes
</a>
</li>
<li>
<a href='/votes/dossier/'>
Dossiers
......
memopol/tests/response_fixtures/RepresentativeListTest.test_page1_paginateby12_all_displaylist.content
View file @ b6432187
......@@ -74,6 +74,11 @@
Committees
</a>
</li>
<li>
<a href='/theme/'>
Themes
</a>
</li>
<li>
<a href='/votes/dossier/'>
Dossiers
......
memopol/tests/response_fixtures/RepresentativeListTest.test_page1_paginateby12_displaylist_searchjoly.content
View file @ b6432187
......@@ -74,6 +74,11 @@
Committees
</a>
</li>
<li>
<a href='/theme/'>
Themes
</a>
</li>
<li>
<a href='/votes/dossier/'>
Dossiers
......
memopol/tests/response_fixtures/RepresentativeListTest.test_page1_paginateby24_active_displaygrid.content
View file @ b6432187
......@@ -74,6 +74,11 @@
Committees
</a>
</li>
<li>
<a href='/theme/'>
Themes
</a>
</li>
<li>
<a href='/votes/dossier/'>
Dossiers
......
memopol/tests/response_fixtures/RepresentativeListTest.test_page1_paginateby24_all_displaygrid.content
View file @ b6432187
......@@ -74,6 +74,11 @@
Committees
</a>
</li>
<li>
<a href='/theme/'>
Themes
</a>
</li>
<li>
<a href='/votes/dossier/'>
Dossiers
......
memopol/tests/response_fixtures/RepresentativeListTest.test_page2_paginateby12_displaylist.content
View file @ b6432187
......@@ -74,6 +74,11 @@
Committees
</a>
</li>
<li>
<a href='/theme/'>
Themes
</a>
</li>
<li>
<a href='/votes/dossier/'>
Dossiers
......
memopol/tests/response_fixtures/RepresentativeListTest.test_page2_paginateby24_displaylist.content
View file @ b6432187
......@@ -74,6 +74,11 @@
Committees
</a>
</li>
<li>
<a href='/theme/'>
Themes
</a>
</li>
<li>
<a href='/votes/dossier/'>
Dossiers
......
memopol/tests/response_fixtures/RepresentativeListTest.test_sorting.content
View file @ b6432187
......@@ -74,6 +74,11 @@
Committees
</a>
</li>
<li>
<a href='/theme/'>
Themes
</a>
</li>
<li>
<a href='/votes/dossier/'>
Dossiers
......
memopol/tests/response_fixtures/ThemesTest.test_theme_detail.content 0 → 100644
View file @ b6432187
<!DOCTYPE html>
<html class="no-js" lang="en"> <!--<![endif]-->
<head>
<meta charset="utf-8" />
<link rel="icon" type="image/png" href="/static/collected/img/favicon.ico" />
<!-- Set the viewport width to device width for mobile -->
<meta name="viewport" content="width=device-width" />
<title>Home - Political Memory</title>
<link rel="stylesheet" href="/static/collected/libs/bootstrap/dist/css/bootstrap.min.css" type="text/css" /><link rel="stylesheet" href="/static/collected/libs/fontawesome/css/font-awesome.min.css" type="text/css" /><link rel="stylesheet" href="/static/collected/libs/flag-icon-css/css/flag-icon.min.css" type="text/css" /><link rel="stylesheet" href="/static/collected/CACHE/css/base.586b8f5e9bff.css" type="text/css" />
<script type="text/javascript" src="/static/collected/libs/jquery/dist/jquery.js"></script>
<script type="text/javascript" src="/static/collected/libs/bootstrap/dist/js/bootstrap.js"></script>
</head>
<body >
<!-- -load memopol_tags cache -->
<div id='header' class='container-fluid'>
<a id='logo' href='/'>
<img src='/static/collected/images/logo.png' />
</a>
<h1>
<a id='header_banner' href='/'>
Political Memory
</a>
</h1>
<p class='organization'>
</p>
</div>
<div id='nav' class='container-fluid'>
<ul class='nav'>
<li>
<a href='/legislature/representative/'>
Representatives
</a>
</li>
<li>
<a href='/legislature/group/country/'>
Countries
</a>
</li>
<li>
<a href='/legislature/group/chamber/'>
Chambers
</a>
</li>
<li>
<a href='/legislature/group/group/'>
Parties
</a>
</li>
<li>
<a href='/legislature/group/delegation/'>
Delegations
</a>
</li>
<li>
<a href='/legislature/group/committee/'>
Committees
</a>
</li>
<li>
<a href='/theme/'>
Themes
</a>
</li>
<li>
<a href='/votes/dossier/'>
Dossiers
</a>
</li>
</ul>
</div>
<div class="container-fluid main-container">
<h1>acta</h1>
<h2>
Description
</h2>
<p class='description'>
The Anti-Counterfeiting Trade agreement is a really bad thing, we would like to kill it with fire.
</p>
<h2>
Links
</h2>
<table class='table'>
<tr>
<td>
<a class='external' href='http://www.laquadrature.net' target='_blank'>
Press release on ACTA from La Quadrature du Net
</a>
</td>
<td>
Jan. 1, 2008
</td>
</tr>
</table>
<h2>
Dossiers
</h2>
<table class='table'>
<tr>
<th>
Chambers
</th>
<th>
Dossier
</th>
<th>
Reference
</th>
</tr>
<tr>
<td>
<span class="chamber-icon" style="background-image: url(/static/collected/images/chamber-ep.png)" title="European Parliament"></span>
</td>
<td>
<a href='/votes/dossier/28147/'>
Resolution on the Anti-Counterfeiting Trade Agreement (ACTA)
</a>
</td>
<td>2010/2935(RSP)</td>
</tr>
</table>
<h2>
Proposals
</h2>
<table class='table'>
<tr>
<th>
Chambers
</th>
<th>
Dossier
</th>
<th>
Reference
</th>
<th>
Proposal
</th>
<th>
Title
</th>
<th>
Recommendation
</th>
<th>
Status
</th>
<th><i aria-label="for" class="fa fa-thumbs-up vote_positive" title="for" ></i></th>
<th><i aria-label="against" class="fa fa-thumbs-down vote_negative" title="against" ></i></th>