Add theme list and detail pages

b6432187 · Nicolas Joyard · 772b90c5 · b6432187 · b6432187 · b6432187
Commit b6432187 authored Aug 06, 2016 by Nicolas Joyard
47 changed files
--- a/memopol/filters.py
+++ b/memopol/filters.py
@@ -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))
--- a/memopol/fixtures/smaller_sample.json
+++ b/memopol/fixtures/smaller_sample.json
@@ -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
 }
 ]
--- a/memopol/tests/response_fixtures/DossiersTest.test_dossier_detail.content
+++ b/memopol/tests/response_fixtures/DossiersTest.test_dossier_detail.content
@@ -65,6 +65,11 @@
        Committees
      </a>
    </li>
+    <li>
+      <a href='/theme/'>
+        Themes
+      </a>
+    </li>
    <li>
      <a href='/votes/dossier/'>
        Dossiers

--- a/memopol/tests/response_fixtures/DossiersTest.test_dossier_list.content
+++ b/memopol/tests/response_fixtures/DossiersTest.test_dossier_list.content
@@ -69,6 +69,11 @@
        Committees
      </a>
    </li>
+    <li>
+      <a href='/theme/'>
+        Themes
+      </a>
+    </li>
    <li>
      <a href='/votes/dossier/'>
        Dossiers

--- a/memopol/tests/response_fixtures/DossiersTest.test_dossier_search.content
+++ b/memopol/tests/response_fixtures/DossiersTest.test_dossier_search.content
@@ -69,6 +69,11 @@
        Committees
      </a>
    </li>
+    <li>
+      <a href='/theme/'>
+        Themes
+      </a>
+    </li>
    <li>
      <a href='/votes/dossier/'>
        Dossiers

--- a/memopol/tests/response_fixtures/DossiersTest.test_dossier_search_noresults.content
+++ b/memopol/tests/response_fixtures/DossiersTest.test_dossier_search_noresults.content
@@ -69,6 +69,11 @@
        Committees
      </a>
    </li>
+    <li>
+      <a href='/theme/'>
+        Themes
+      </a>
+    </li>
    <li>
      <a href='/votes/dossier/'>
        Dossiers

--- a/memopol/tests/response_fixtures/DossiersTest.test_dossier_sorting.content
+++ b/memopol/tests/response_fixtures/DossiersTest.test_dossier_sorting.content
@@ -69,6 +69,11 @@
        Committees
      </a>
    </li>
+    <li>
+      <a href='/theme/'>
+        Themes
+      </a>
+    </li>
    <li>
      <a href='/votes/dossier/'>
        Dossiers

--- a/memopol/tests/response_fixtures/GroupListTest.test_active_committees.content
+++ b/memopol/tests/response_fixtures/GroupListTest.test_active_committees.content
@@ -65,6 +65,11 @@
        Committees
      </a>
    </li>
+    <li>
+      <a href='/theme/'>
+        Themes
+      </a>
+    </li>
    <li>
      <a href='/votes/dossier/'>
        Dossiers

--- a/memopol/tests/response_fixtures/GroupListTest.test_active_delegations.content
+++ b/memopol/tests/response_fixtures/GroupListTest.test_active_delegations.content
@@ -65,6 +65,11 @@
        Committees
      </a>
    </li>
+    <li>
+      <a href='/theme/'>
+        Themes
+      </a>
+    </li>
    <li>
      <a href='/votes/dossier/'>
        Dossiers

--- a/memopol/tests/response_fixtures/GroupListTest.test_active_parties.content
+++ b/memopol/tests/response_fixtures/GroupListTest.test_active_parties.content
@@ -65,6 +65,11 @@
        Committees
      </a>
    </li>
+    <li>
+      <a href='/theme/'>
+        Themes
+      </a>
+    </li>
    <li>
      <a href='/votes/dossier/'>
        Dossiers

--- a/memopol/tests/response_fixtures/GroupListTest.test_all_committees.content
+++ b/memopol/tests/response_fixtures/GroupListTest.test_all_committees.content
@@ -65,6 +65,11 @@
        Committees
      </a>
    </li>
+    <li>
+      <a href='/theme/'>
+        Themes
+      </a>
+    </li>
    <li>
      <a href='/votes/dossier/'>
        Dossiers

--- a/memopol/tests/response_fixtures/GroupListTest.test_all_delegations.content
+++ b/memopol/tests/response_fixtures/GroupListTest.test_all_delegations.content
@@ -65,6 +65,11 @@
        Committees
      </a>
    </li>
+    <li>
+      <a href='/theme/'>
+        Themes
+      </a>
+    </li>
    <li>
      <a href='/votes/dossier/'>
        Dossiers

--- a/memopol/tests/response_fixtures/GroupListTest.test_all_parties.content
+++ b/memopol/tests/response_fixtures/GroupListTest.test_all_parties.content
@@ -65,6 +65,11 @@
        Committees
      </a>
    </li>
+    <li>
+      <a href='/theme/'>
+        Themes
+      </a>
+    </li>
    <li>
      <a href='/votes/dossier/'>
        Dossiers

--- a/memopol/tests/response_fixtures/GroupListTest.test_chambers.content
+++ b/memopol/tests/response_fixtures/GroupListTest.test_chambers.content
@@ -65,6 +65,11 @@
        Committees
      </a>
    </li>
+    <li>
+      <a href='/theme/'>
+        Themes
+      </a>
+    </li>
    <li>
      <a href='/votes/dossier/'>
        Dossiers

--- a/memopol/tests/response_fixtures/GroupListTest.test_country.content
+++ b/memopol/tests/response_fixtures/GroupListTest.test_country.content
@@ -65,6 +65,11 @@
        Committees
      </a>
    </li>
+    <li>
+      <a href='/theme/'>
+        Themes
+      </a>
+    </li>
    <li>
      <a href='/votes/dossier/'>
        Dossiers

--- a/memopol/tests/response_fixtures/RepresentativeListTest.test_filter_chamber.content
+++ b/memopol/tests/response_fixtures/RepresentativeListTest.test_filter_chamber.content
@@ -74,6 +74,11 @@
        Committees
      </a>
    </li>
+    <li>
+      <a href='/theme/'>
+        Themes
+      </a>
+    </li>
    <li>
      <a href='/votes/dossier/'>
        Dossiers

--- a/memopol/tests/response_fixtures/RepresentativeListTest.test_filter_country.content
+++ b/memopol/tests/response_fixtures/RepresentativeListTest.test_filter_country.content
@@ -74,6 +74,11 @@
        Committees
      </a>
    </li>
+    <li>
+      <a href='/theme/'>
+        Themes
+      </a>
+    </li>
    <li>
      <a href='/votes/dossier/'>
        Dossiers

--- a/memopol/tests/response_fixtures/RepresentativeListTest.test_filter_group.content
+++ b/memopol/tests/response_fixtures/RepresentativeListTest.test_filter_group.content
@@ -74,6 +74,11 @@
        Committees
      </a>
    </li>
+    <li>
+      <a href='/theme/'>
+        Themes
+      </a>
+    </li>
    <li>
      <a href='/votes/dossier/'>
        Dossiers

--- a/memopol/tests/response_fixtures/RepresentativeListTest.test_filter_multiple.content
+++ b/memopol/tests/response_fixtures/RepresentativeListTest.test_filter_multiple.content
@@ -74,6 +74,11 @@
        Committees
      </a>
    </li>
+    <li>
+      <a href='/theme/'>
+        Themes
+      </a>
+    </li>
    <li>
      <a href='/votes/dossier/'>
        Dossiers

--- a/memopol/tests/response_fixtures/RepresentativeListTest.test_filter_notfound.content
+++ b/memopol/tests/response_fixtures/RepresentativeListTest.test_filter_notfound.content
@@ -74,6 +74,11 @@
        Committees
      </a>
    </li>
+    <li>
+      <a href='/theme/'>
+        Themes
+      </a>
+    </li>
    <li>
      <a href='/votes/dossier/'>
        Dossiers

--- a/memopol/tests/response_fixtures/RepresentativeListTest.test_filter_search.content
+++ b/memopol/tests/response_fixtures/RepresentativeListTest.test_filter_search.content
@@ -74,6 +74,11 @@
        Committees
      </a>
    </li>
+    <li>
+      <a href='/theme/'>
+        Themes
+      </a>
+    </li>
    <li>
      <a href='/votes/dossier/'>
        Dossiers

--- a/memopol/tests/response_fixtures/RepresentativeListTest.test_page1_paginateby12_active_displaylist.content
+++ b/memopol/tests/response_fixtures/RepresentativeListTest.test_page1_paginateby12_active_displaylist.content
@@ -74,6 +74,11 @@
        Committees
      </a>
    </li>
+    <li>
+      <a href='/theme/'>
+        Themes
+      </a>
+    </li>
    <li>
      <a href='/votes/dossier/'>
        Dossiers

--- a/memopol/tests/response_fixtures/RepresentativeListTest.test_page1_paginateby12_all_displaylist.content
+++ b/memopol/tests/response_fixtures/RepresentativeListTest.test_page1_paginateby12_all_displaylist.content
@@ -74,6 +74,11 @@
        Committees
      </a>
    </li>
+    <li>
+      <a href='/theme/'>
+        Themes
+      </a>
+    </li>
    <li>
      <a href='/votes/dossier/'>
        Dossiers

--- a/memopol/tests/response_fixtures/RepresentativeListTest.test_page1_paginateby12_displaylist_searchjoly.content
+++ b/memopol/tests/response_fixtures/RepresentativeListTest.test_page1_paginateby12_displaylist_searchjoly.content
@@ -74,6 +74,11 @@
        Committees
      </a>
    </li>
+    <li>
+      <a href='/theme/'>
+        Themes
+      </a>
+    </li>
    <li>
      <a href='/votes/dossier/'>
        Dossiers

--- a/memopol/tests/response_fixtures/RepresentativeListTest.test_page1_paginateby24_active_displaygrid.content
+++ b/memopol/tests/response_fixtures/RepresentativeListTest.test_page1_paginateby24_active_displaygrid.content
@@ -74,6 +74,11 @@
        Committees
      </a>
    </li>
+    <li>
+      <a href='/theme/'>
+        Themes
+      </a>
+    </li>
    <li>
      <a href='/votes/dossier/'>
        Dossiers

--- a/memopol/tests/response_fixtures/RepresentativeListTest.test_page1_paginateby24_all_displaygrid.content
+++ b/memopol/tests/response_fixtures/RepresentativeListTest.test_page1_paginateby24_all_displaygrid.content
@@ -74,6 +74,11 @@
        Committees
      </a>
    </li>
+    <li>
+      <a href='/theme/'>
+        Themes
+      </a>
+    </li>
    <li>
      <a href='/votes/dossier/'>
        Dossiers

--- a/memopol/tests/response_fixtures/RepresentativeListTest.test_page2_paginateby12_displaylist.content
+++ b/memopol/tests/response_fixtures/RepresentativeListTest.test_page2_paginateby12_displaylist.content
@@ -74,6 +74,11 @@
        Committees
      </a>
    </li>
+    <li>
+      <a href='/theme/'>
+        Themes
+      </a>
+    </li>
    <li>
      <a href='/votes/dossier/'>
        Dossiers

--- a/memopol/tests/response_fixtures/RepresentativeListTest.test_page2_paginateby24_displaylist.content
+++ b/memopol/tests/response_fixtures/RepresentativeListTest.test_page2_paginateby24_displaylist.content
@@ -74,6 +74,11 @@
        Committees
      </a>
    </li>
+    <li>
+      <a href='/theme/'>
+        Themes
+      </a>
+    </li>
    <li>
      <a href='/votes/dossier/'>
        Dossiers

--- a/memopol/tests/response_fixtures/RepresentativeListTest.test_sorting.content
+++ b/memopol/tests/response_fixtures/RepresentativeListTest.test_sorting.content
@@ -74,6 +74,11 @@
        Committees
      </a>
    </li>
+    <li>
+      <a href='/theme/'>
+        Themes
+      </a>
+    </li>
    <li>
      <a href='/votes/dossier/'>
        Dossiers

--- a/memopol/tests/response_fixtures/ThemesTest.test_theme_detail.content
+++ b/memopol/tests/response_fixtures/ThemesTest.test_theme_detail.content
+<!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>
+      <th><i             aria-label="abstain"             class="fa fa-circle-o vote_abstain"             title="abstain"             ></i></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>
+
+        <td>
+          RC-B7-0617/2010 - Accord commercial anti-contrefaçon (ACAC) - Considérant X
+          <br />
+          <small>
+            B7-0617/2010
+
+          </small>
+        </td>
+        
+
+          <td>Stop acta !</td>
+          <td><i             aria-label="for"             class="fa fa-thumbs-up vote_positive"             title="for"             ></i></td>
+
+        
+
+        <td>adopted</td>
+        <td>329</td>
+        <td>249</td>
+        <td>75</td>
+
+
+      </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>
+
+        <td>
+          RC-B7-0617/2010 - Accord commercial anti-contrefaçon (ACAC) - Considérant CC
+          <br />
+          <small>
+            B7-0617/2010
+
+          </small>
+        </td>
+        
+
+          <td>Stop acta !</td>
+          <td><i             aria-label="for"             class="fa fa-thumbs-up vote_positive"             title="for"             ></i></td>
+
+        
+
+        <td>adopted</td>
+        <td>315</td>
+        <td>312</td>
+        <td>14</td>
+
+
+      </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>
+
+        <td>
+          RC-B7-0617/2010 - Accord commercial anti-contrefaçon (ACAC) - Résolution
+          <br />
+          <small>