Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
memopol
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Porkepix
memopol
Commits
0fbbe035
Commit
0fbbe035
authored
Oct 09, 2016
by
okhin
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of git.laquadrature.net:political-memory/political_memory
parents
6262a916
e1211920
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
144 additions
and
0 deletions
+144
-0
src/memopol/tests/test_chart_data.py
src/memopol/tests/test_chart_data.py
+58
-0
src/memopol/urls.py
src/memopol/urls.py
+17
-0
src/memopol/views/charts.py
src/memopol/views/charts.py
+69
-0
No files found.
src/memopol/tests/test_chart_data.py
0 → 100644
View file @
0fbbe035
import
json
from
.base
import
BaseTest
class
ChartViewsTest
(
BaseTest
):
def
test_theme_score
(
self
):
url
=
'/charts/data/theme-scores/1/'
data
=
json
.
loads
(
self
.
client
.
get
(
url
).
content
)
expected
=
{
"theme"
:
"Etat d'urgence"
,
"scores"
:
[
-
305.0
,
-
305.0
,
-
265.0
,
-
235.0
,
-
220.0
,
-
215.0
,
-
205.0
,
-
205.0
,
-
195.0
,
-
195.0
,
-
190.0
,
-
185.0
,
-
135.0
,
-
115.0
,
-
110.0
,
-
105.0
,
-
100.0
,
-
100.0
,
-
100.0
,
-
90.0
,
-
90.0
,
-
90.0
,
-
90.0
,
-
55.0
,
-
25.0
,
-
5.0
,
0.0
,
0.0
,
0.0
,
0.0
,
0.0
,
0.0
,
0.0
,
0.0
,
0.0
,
0.0
,
0.0
,
0.0
,
0.0
,
0.0
,
0.0
,
0.0
,
0.0
,
0.0
,
0.0
,
0.0
,
0.0
,
0.0
,
0.0
,
0.0
,
0.0
,
0.0
,
0.0
,
0.0
,
0.0
,
0.0
,
0.0
,
0.0
,
35.0
]
}
assert
data
==
expected
def
test_chamber_score
(
self
):
url
=
'/charts/data/chamber-scores/1/'
data
=
json
.
loads
(
self
.
client
.
get
(
url
).
content
)
expected
=
{
"chamber"
:
"European Parliament"
,
"scores"
:
[
-
1312.0
,
-
1216.0
,
-
1216.0
,
-
1216.0
,
-
1216.0
,
-
1216.0
,
-
1216.0
,
-
1208.0
,
-
1200.0
,
0.0
,
0.0
,
0.0
,
0.0
,
0.0
,
0.0
,
0.0
,
0.0
,
0.0
,
0.0
,
0.0
,
0.0
,
0.0
,
0.0
,
0.0
,
1208.0
,
1224.0
,
1468.0
,
1468.0
,
1480.0
]
}
assert
data
==
expected
def
test_theme_score_queries
(
self
):
url
=
'/charts/data/theme-scores/1/'
# First query to set session variables
self
.
client
.
get
(
url
)
with
self
.
assertNumQueries
(
2
):
# 1 query for the theme
# 1 query for theme scores
self
.
client
.
get
(
url
)
def
test_chamber_score_queries
(
self
):
url
=
'/charts/data/chamber-scores/1/'
# First query to set session variables
self
.
client
.
get
(
url
)
with
self
.
assertNumQueries
(
2
):
# 1 query for the chamber
# 1 query for chamber scores
self
.
client
.
get
(
url
)
src/memopol/urls.py
View file @
0fbbe035
...
...
@@ -9,6 +9,9 @@ from views.autocomplete import (
ProposalAutocomplete
,
RepresentativeAutocomplete
,
)
from
views.charts
import
ThemeScoresJSONView
,
ChamberScoresJSONView
from
views.dossier_detail_base
import
DossierDetailBase
from
views.dossier_detail_recommendations
import
DossierDetailRecommendations
from
views.dossier_detail_proposals
import
DossierDetailProposals
...
...
@@ -184,6 +187,20 @@ urlpatterns = [
name
=
'redirect-group-representative-list'
),
# Chart data URLs
url
(
r
'^charts/data/theme-scores/(?P<theme>\d+)/$'
,
ThemeScoresJSONView
.
as_view
(),
name
=
'charts-data-theme-scores'
),
url
(
r
'^charts/data/chamber-scores/(?P<chamber>\d+)/$'
,
ChamberScoresJSONView
.
as_view
(),
name
=
'charts-data-chamber-scores'
),
# Testing URLs
url
(
...
...
src/memopol/views/charts.py
0 → 100644
View file @
0fbbe035
import
datetime
import
json
from
django.db.models
import
Q
from
django.http
import
HttpResponse
,
HttpResponseNotFound
from
django.views
import
generic
from
representatives.models
import
Chamber
,
Representative
from
memopol_themes.models
import
Theme
from
memopol_scores.models
import
ThemeScore
class
ThemeScoresJSONView
(
generic
.
View
):
"""
Returns JSON with all score points for a given theme as follows:
{
"theme": "<theme_name>",
"scores": [-99, -98, -98, ... 100, 102, 102, 102]
}
"""
def
get
(
self
,
request
,
*
args
,
**
kwargs
):
try
:
theme
=
Theme
.
objects
.
get
(
id
=
kwargs
[
'theme'
])
except
Theme
.
DoesNotExist
:
return
HttpResponseNotFound
()
data
=
{
"theme"
:
theme
.
name
,
"scores"
:
[
ts
[
'score'
]
for
ts
in
ThemeScore
.
objects
.
filter
(
theme
=
theme
).
order_by
(
'score'
)
.
values
(
'score'
)]
}
return
HttpResponse
(
json
.
dumps
(
data
),
content_type
=
'application/json'
)
class
ChamberScoresJSONView
(
generic
.
View
):
"""
Returns JSON with all score points for a given chamber as follows:
{
"chamber": "<chamber_name>",
"scores": [-99, -98, -98, ... 100, 102, 102, 102]
}
"""
def
get
(
self
,
request
,
*
args
,
**
kwargs
):
try
:
chamber
=
Chamber
.
objects
.
get
(
id
=
kwargs
[
'chamber'
])
except
Chamber
.
DoesNotExist
:
return
HttpResponseNotFound
()
today
=
datetime
.
date
.
today
()
meps
=
Representative
.
objects
.
filter
(
Q
(
mandates__end_date__gte
=
today
)
|
Q
(
mandates__end_date__isnull
=
True
),
mandates__group__chamber
=
chamber
).
select_related
(
'representative_score'
)
\
.
order_by
(
'representative_score__score'
)
\
.
distinct
()
data
=
{
"chamber"
:
chamber
.
name
,
"scores"
:
[
r
.
representative_score
.
score
for
r
in
meps
]
}
return
HttpResponse
(
json
.
dumps
(
data
),
content_type
=
'application/json'
)
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment