entrouvert
/
combo-plugin-gnm
17
0
Fork 0
Code Issues Pull Requests Releases Activity

move producers and collectivities to settings (#26774)

This commit is contained in:
Frédéric Péters 2018-10-02 10:23:43 +02:00
parent 3cb9c801e0
commit c6866209a4
2 changed files with 77 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
combo_plugin_gnm/templatetags/gnm.py
View File

@ -394,79 +394,6 @@ def get_tile_picture_size(page):
return '300x300'
PRODUCER_LABELS = {
'atmo': u'ATMO Auvergne Rhône-Alpes',
'rnsa': u'RNSA',
'onlymoov': u'ONLY MOOV',
'tcl': u'TCL',
'toodego': u'Toodego',
'velov': u"Velo'v",
}
COLLECTIVITY_LABELS = {
"albigny-sur-saone": u"Albigny-sur-Saône",
"bron": u"Bron",
"cailloux-sur-fontaines": u"Cailloux-sur-Fontaines",
"caluire-et-cuire": u"Caluire-et-Cuire",
"champagne-au-mont-d-or": u"Champagne-au-Mont-d'Or",
"charbonnieres-les-bains": u"Charbonnières-les-Bains",
"charly": u"Charly",
"chassieu": u"Chassieu",
"collonges-au-mont-d-or": u"Collonges-au-Mont-d'Or",
"corbas": u"Corbas",
"couzon-au-mont-d-or": u"Couzon-au-Mont-d'Or",
"craponne": u"Craponne",
"curis-au-mont-d-or": u"Curis-au-Mont-d'Or",
"dardilly": u"Dardilly",
"decines-charpieu": u"Décines-Charpieu",
"ecully": u"Ecully",
"feyzin": u"Feyzin",
"fleurieu-sur-saone": u"Fleurieu-sur-Saône",
"fontaines-saint-martin": u"Fontaines-Saint-Martin",
"fontaines-sur-saone": u"Fontaines-sur-Saône",
"francheville": u"Francheville",
"genay": u"Genay",
"givors": u"Givors",
"grigny": u"Grigny",
"irigny": u"Irigny",
"jonage": u"Jonage",
"la-mulatiere": u"La Mulatière",
"la-tour-de-salvagny": u"La Tour de Salvagny",
"limonest": u"Limonest",
"lissieu": u"Lissieu",
"lyon": u"Lyon",
"marcy-l-etoile": u"Marcy-l'Étoile",
"meyzieu": u"Meyzieu",
"mions": u"Mions",
"montanay": u"Montanay",
"neuville-sur-saone": u"Neuville-sur-Saône",
"oullins": u"Oullins",
"pierre-benite": u"Pierre-Bénite",
"poleymieux-au-mont-d-or": u"Poleymieux-au-Mont-d'Or",
"quincieux": u"Quincieux",
"rillieux-la-pape": u"Rillieux-la-Pape",
"rochetaillee-sur-saone": u"Rochetaillée-sur-Saône",
"saint-cyr-au-mont-d-or": u"Saint-Cyr-au-Mont-d'Or",
"saint-didier-au-mont-d-or": u"Saint-Didier-au-Mont-d'Or",
"saint-fons": u"Saint-Fons",
"saint-genis-laval": u"Saint-Genis-Laval",
"saint-genis-les-ollieres": u"Saint-Genis-les-Ollières",
"saint-germain-au-mont-d-or": u"Saint-Germain-au-Mont-d'Or",
"saint-priest": u"Saint-Priest",
"sainte-foy-les-lyon": u"Sainte-Foy-les-Lyon",
"sathonay-camp": u"Sathonay-Camp",
"sathonay-village": u"Sathonay-Village",
"solaize": u"Solaize",
"st-romain-au-mont-d-or": u"Saint-Romain-au-Mont-d'Or",
"tassin-la-demi-lune": u"Tassin-la-Demi-Lune",
"vaulx-en-velin": u"Vaulx-en-Velin",
"venissieux": u"Venissieux",
"vernaison": u"Vernaison",
"villeurbanne": u"Villeurbanne",
}
PRODUCER_LABELS.update(COLLECTIVITY_LABELS)
@register.filter
def as_producer(slug):
if isinstance(slug, dict):
@ -507,8 +434,8 @@ def as_producer(slug):
elif settings.KNOWN_SERVICES['hobo'].get('_interco_hobo-%s' % producer):
return {'slug': producer,
'label': settings.KNOWN_SERVICES['hobo'].get('_interco_hobo-%s' % producer, {'title': ''})['title']}
elif producer in PRODUCER_LABELS:
return {'slug': producer, 'label': PRODUCER_LABELS[producer]}
elif producer in settings.PRODUCER_LABELS:
return {'slug': producer, 'label': settings.PRODUCER_LABELS[producer]}
else:
return {'slug': 'toodego', 'label': 'Toodego'}
@ -720,7 +647,7 @@ def get_goto_cell(page, request):
@register.assignment_tag
def get_collectivity_slugs():
return COLLECTIVITY_LABELS.keys()
return settings.COLLECTIVITY_LABELS.keys()
@register.filter
def indice_values(indices):

88
debian/50gnm.py vendored
View File

@ -344,21 +344,81 @@ COMBO_ASSET_SLOTS = {
},
}
producers = [
('atmo', 'Atmo'),
('grandlyon', 'Grand Lyon'),
('rnsa', 'RNSA'),
('tcl', 'TCL'),
('toodego', 'Toodego'),
('velov', "Velo'v"),
# collectivities
('bron', 'Bron'),
('dardilly', 'Dardilly'),
('oullins', 'Oullins'),
('vaulx-en-velin', 'Vaulx-en-Velin'),
]
PRODUCER_LABELS = {
'atmo': u'ATMO Auvergne Rhône-Alpes',
'rnsa': u'RNSA',
'onlymoov': u'ONLY MOOV',
'tcl': u'TCL',
'toodego': u'Toodego',
'velov': u"Velo'v",
'grandlyon': u'Grand Lyon',
}
for producer, producer_label in producers:
COLLECTIVITY_LABELS = {
"albigny-sur-saone": u"Albigny-sur-Saône",
"bron": u"Bron",
"cailloux-sur-fontaines": u"Cailloux-sur-Fontaines",
"caluire-et-cuire": u"Caluire-et-Cuire",
"champagne-au-mont-d-or": u"Champagne-au-Mont-d'Or",
"charbonnieres-les-bains": u"Charbonnières-les-Bains",
"charly": u"Charly",
"chassieu": u"Chassieu",
"collonges-au-mont-d-or": u"Collonges-au-Mont-d'Or",
"corbas": u"Corbas",
"couzon-au-mont-d-or": u"Couzon-au-Mont-d'Or",
"craponne": u"Craponne",
"curis-au-mont-d-or": u"Curis-au-Mont-d'Or",
"dardilly": u"Dardilly",
"decines-charpieu": u"Décines-Charpieu",
"ecully": u"Ecully",
"feyzin": u"Feyzin",
"fleurieu-sur-saone": u"Fleurieu-sur-Saône",
"fontaines-saint-martin": u"Fontaines-Saint-Martin",
"fontaines-sur-saone": u"Fontaines-sur-Saône",
"francheville": u"Francheville",
"genay": u"Genay",
"givors": u"Givors",
"grigny": u"Grigny",
"irigny": u"Irigny",
"jonage": u"Jonage",
"la-mulatiere": u"La Mulatière",
"la-tour-de-salvagny": u"La Tour de Salvagny",
"limonest": u"Limonest",
"lissieu": u"Lissieu",
"lyon": u"Lyon",
"marcy-l-etoile": u"Marcy-l'Étoile",
"meyzieu": u"Meyzieu",
"mions": u"Mions",
"montanay": u"Montanay",
"neuville-sur-saone": u"Neuville-sur-Saône",
"oullins": u"Oullins",
"pierre-benite": u"Pierre-Bénite",
"poleymieux-au-mont-d-or": u"Poleymieux-au-Mont-d'Or",
"quincieux": u"Quincieux",
"rillieux-la-pape": u"Rillieux-la-Pape",
"rochetaillee-sur-saone": u"Rochetaillée-sur-Saône",
"saint-cyr-au-mont-d-or": u"Saint-Cyr-au-Mont-d'Or",
"saint-didier-au-mont-d-or": u"Saint-Didier-au-Mont-d'Or",
"saint-fons": u"Saint-Fons",
"saint-genis-laval": u"Saint-Genis-Laval",
"saint-genis-les-ollieres": u"Saint-Genis-les-Ollières",
"saint-germain-au-mont-d-or": u"Saint-Germain-au-Mont-d'Or",
"saint-priest": u"Saint-Priest",
"sainte-foy-les-lyon": u"Sainte-Foy-les-Lyon",
"sathonay-camp": u"Sathonay-Camp",
"sathonay-village": u"Sathonay-Village",
"solaize": u"Solaize",
"st-romain-au-mont-d-or": u"Saint-Romain-au-Mont-d'Or",
"tassin-la-demi-lune": u"Tassin-la-Demi-Lune",
"vaulx-en-velin": u"Vaulx-en-Velin",
"venissieux": u"Venissieux",
"vernaison": u"Vernaison",
"villeurbanne": u"Villeurbanne",
}
PRODUCER_LABELS.update(COLLECTIVITY_LABELS)
for producer, producer_label in PRODUCER_LABELS.items():
COMBO_ASSET_SLOTS['logo:%s' % producer] = {
'label': u'Logo %s' % producer_label
}