Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Political Memory
memopol
Commits
064e585f
Commit
064e585f
authored
Apr 22, 2016
by
Nicolas Joyard
Browse files
Francedata: use end_date when available
parent
dcb7caee
Changes
4
Hide whitespace changes
Inline
Side-by-side
representatives/contrib/francedata/import_representatives.py
View file @
064e585f
...
...
@@ -25,7 +25,10 @@ representative_pre_import = django.dispatch.Signal(
def
_get_mdef_item
(
mdef
,
item
,
json
,
default
=
None
):
if
item
in
mdef
:
return
mdef
[
item
]
%
json
try
:
return
mdef
[
item
]
%
json
except
:
return
default
if
'%s_path'
%
item
in
mdef
:
return
_get_path
(
json
,
mdef
[
'%s_path'
%
item
])
...
...
representatives/contrib/francedata/tests/representatives_expected.json
View file @
064e585f
...
...
@@ -557,6 +557,7 @@
"representative"
:
2
,
"link"
:
""
,
"begin_date"
:
"2004-09-26"
,
"end_date"
:
"2012-01-01"
,
"constituency"
:
2
},
"model"
:
"representatives.mandate"
,
...
...
@@ -570,6 +571,7 @@
"representative"
:
2
,
"link"
:
""
,
"begin_date"
:
"2004-09-26"
,
"end_date"
:
"2012-01-01"
,
"constituency"
:
2
},
"model"
:
"representatives.mandate"
,
...
...
@@ -583,6 +585,7 @@
"representative"
:
2
,
"link"
:
""
,
"begin_date"
:
"2004-09-26"
,
"end_date"
:
"2012-01-01"
,
"constituency"
:
2
},
"model"
:
"representatives.mandate"
,
...
...
@@ -596,6 +599,7 @@
"representative"
:
2
,
"link"
:
""
,
"begin_date"
:
"2004-09-26"
,
"end_date"
:
"2012-01-01"
,
"constituency"
:
2
},
"model"
:
"representatives.mandate"
,
...
...
@@ -609,6 +613,7 @@
"representative"
:
2
,
"link"
:
""
,
"begin_date"
:
"2004-09-26"
,
"end_date"
:
"2012-01-01"
,
"constituency"
:
2
},
"model"
:
"representatives.mandate"
,
...
...
@@ -622,6 +627,7 @@
"representative"
:
2
,
"link"
:
""
,
"begin_date"
:
"2004-09-26"
,
"end_date"
:
"2012-01-01"
,
"constituency"
:
2
},
"model"
:
"representatives.mandate"
,
...
...
representatives/contrib/francedata/tests/representatives_input.json
View file @
064e585f
...
...
@@ -184,6 +184,7 @@
},
{
"mandat_debut"
:
"2004-09-26"
,
"mandat_fin"
:
"2012-01-01"
,
"twitter"
:
"dassouline"
,
"profession"
:
"Professeur d'histoire-géographie"
,
"url_nossenateurs_api"
:
"http://www.nossenateurs.fr/david-assouline/json"
,
...
...
representatives/contrib/francedata/variants.py
View file @
064e585f
...
...
@@ -15,6 +15,7 @@ class DelegationHelper:
def
__call__
(
self
,
data
):
items
=
[]
start
=
data
[
'mandat_debut'
]
end
=
data
.
get
(
'mandat_fin'
,
None
)
if
self
.
committees
:
gdata
=
(
i
[
'responsabilite'
]
for
i
in
data
[
'responsabilites'
])
...
...
@@ -32,12 +33,17 @@ class DelegationHelper:
if
orga
in
self
.
equivs
:
orga
=
self
.
equivs
[
orga
]
item
s
.
append
(
{
item
=
{
'abbr'
:
self
.
abbrevs
[
orga
]
if
orga
in
self
.
abbrevs
else
''
,
'name'
:
orga
,
'role'
:
role
,
'start'
:
start
})
}
if
end
:
item
[
'end'
]
=
end
items
.
append
(
item
)
return
items
...
...
@@ -139,7 +145,8 @@ FranceDataVariants = {
"abbr"
:
"AN"
,
"name"
:
u
"Assemblée nationale"
,
"role"
:
u
"Député"
,
"start"
:
"%(mandat_debut)s"
"start"
:
"%(mandat_debut)s"
,
"end"
:
"%(mandat_fin)s"
},
{
"kind"
:
"group"
,
...
...
@@ -147,19 +154,22 @@ FranceDataVariants = {
"abbr"
:
"%(groupe_sigle)s"
,
"name_path"
:
"groupe/organisme"
,
"role_path"
:
"groupe/fonction"
,
"start"
:
"%(mandat_debut)s"
"start"
:
"%(mandat_debut)s"
,
"end"
:
"%(mandat_fin)s"
},
{
"kind"
:
"department"
,
"abbr"
:
"%(num_deptmt)s"
,
"name"
:
"%(nom_circo)s"
,
"start"
:
"%(mandat_debut)s"
"start"
:
"%(mandat_debut)s"
,
"end"
:
"%(mandat_fin)s"
},
{
"kind"
:
"district"
,
"abbr"
:
"%(num_deptmt)s-%(num_circo)s"
,
"name_fn"
:
_get_rep_district_name
,
"start"
:
"%(mandat_debut)s"
"start"
:
"%(mandat_debut)s"
,
"end"
:
"%(mandat_fin)s"
},
{
"kind"
:
"committee"
,
...
...
@@ -168,7 +178,8 @@ FranceDataVariants = {
"abbr"
:
"%(abbr)s"
,
"name"
:
"%(name)s"
,
"role"
:
"%(role)s"
,
"start"
:
"%(start)s"
"start"
:
"%(start)s"
,
"end"
:
"%(end)s"
},
{
"kind"
:
"delegation"
,
...
...
@@ -177,7 +188,8 @@ FranceDataVariants = {
"abbr"
:
"%(abbr)s"
,
"name"
:
"%(name)s"
,
"role"
:
"%(role)s"
,
"start"
:
"%(start)s"
"start"
:
"%(start)s"
,
"end"
:
"%(end)s"
}
]
},
...
...
@@ -199,7 +211,8 @@ FranceDataVariants = {
"abbr"
:
"SEN"
,
"name"
:
u
"Sénat"
,
"role"
:
u
"Sénateur"
,
"start"
:
"%(mandat_debut)s"
"start"
:
"%(mandat_debut)s"
,
"end"
:
"%(mandat_fin)s"
},
{
"kind"
:
"group"
,
...
...
@@ -207,19 +220,22 @@ FranceDataVariants = {
"abbr"
:
"%(groupe_sigle)s"
,
"name_path"
:
"groupe/organisme"
,
"role_path"
:
"groupe/fonction"
,
"start"
:
"%(mandat_debut)s"
"start"
:
"%(mandat_debut)s"
,
"end"
:
"%(mandat_fin)s"
},
{
"kind"
:
"department"
,
"abbr"
:
"%(num_deptmt)s"
,
"name"
:
"%(nom_circo)s"
,
"start"
:
"%(mandat_debut)s"
"start"
:
"%(mandat_debut)s"
,
"end"
:
"%(mandat_fin)s"
},
{
"kind"
:
"district"
,
"abbr"
:
"%(num_deptmt)s-%(num_circo)s"
,
"name_fn"
:
_get_rep_district_name
,
"start"
:
"%(mandat_debut)s"
"start"
:
"%(mandat_debut)s"
,
"end"
:
"%(mandat_fin)s"
},
{
"kind"
:
"committee"
,
...
...
@@ -228,7 +244,8 @@ FranceDataVariants = {
"abbr"
:
"%(abbr)s"
,
"name"
:
"%(name)s"
,
"role"
:
"%(role)s"
,
"start"
:
"%(start)s"
"start"
:
"%(start)s"
,
"end"
:
"%(end)s"
},
{
"kind"
:
"delegation"
,
...
...
@@ -237,7 +254,8 @@ FranceDataVariants = {
"abbr"
:
"%(abbr)s"
,
"name"
:
"%(name)s"
,
"role"
:
"%(role)s"
,
"start"
:
"%(start)s"
"start"
:
"%(start)s"
,
"end"
:
"%(end)s"
}
]
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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