Merge branch 'master' into Kerl/mails_rappel
This commit is contained in:
Martin Pépin
commit
a2701f6727
3 changed files with 119 additions and 42 deletions
37
bda/urls.py
Normal file
37
bda/urls.py
Normal file
|
|
@ -0,0 +1,37 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
|
||||
from django.conf.urls import include, url, patterns
|
||||
from bda import views
|
||||
from bda.views import SpectacleListView
|
||||
|
||||
urlpatterns = patterns('',
|
||||
url(r'inscription/(?P<tirage_id>\d+)$',
|
||||
'bda.views.inscription',
|
||||
name='bda-tirage-inscription'),
|
||||
url(r'places/(?P<tirage_id>\d+)$',
|
||||
'bda.views.places',
|
||||
name="bda-places-attribuees"),
|
||||
url(r'places/(?P<tirage_id>\d+)/places_bda.ics$',
|
||||
'bda.views.places_ics',
|
||||
name="bda-places-attribuees-ics"),
|
||||
url(r'revente/(?P<tirage_id>\d+)$',
|
||||
'bda.views.revente',
|
||||
name='bda-revente'),
|
||||
url(r'etat-places/(?P<tirage_id>\d+)$',
|
||||
'bda.views.etat_places',
|
||||
name='bda-etat-places'),
|
||||
url(r'tirage/(?P<tirage_id>\d+)$', 'bda.views.tirage'),
|
||||
url(r'spectacles/(?P<tirage_id>\d+)$',
|
||||
SpectacleListView.as_view() ,
|
||||
name ="bda-liste-spectacles"),
|
||||
url(r'spectacles/(?P<tirage_id>\d+)/(?P<spectacle_id>\d+)$',
|
||||
"bda.views.spectacle",
|
||||
name="bda-spectacle"),
|
||||
url(r'spectacles-ics/(?P<tirage_id>\d+)$',
|
||||
'bda.views.liste_spectacles_ics',
|
||||
name ="bda-liste-spectacles-ics"),
|
||||
url(r'spectacles/unpaid/(?P<tirage_id>\d+)$',
|
||||
"bda.views.unpaid",
|
||||
name="bda-unpaid"),
|
||||
url(r'mails-rappel/(?P<spectacle_id>\d+)$', "bda.views.send_rappel"),
|
||||
)
|
||||
82
cof/urls.py
82
cof/urls.py
|
|
@ -7,65 +7,63 @@ from django.contrib import admin
|
|||
admin.autodiscover()
|
||||
|
||||
from django.views.generic.base import TemplateView
|
||||
from bda.models import Spectacle
|
||||
from bda.views import SpectacleListView
|
||||
from gestioncof.petits_cours_views import DemandeListView
|
||||
|
||||
from gestioncof.urls import export_patterns, petitcours_patterns, \
|
||||
surveys_patterns, events_patterns
|
||||
|
||||
urlpatterns = patterns('',
|
||||
# Page d'accueil
|
||||
url(r'^$', 'gestioncof.views.home', name = 'home'),
|
||||
url(r'^cof/denied$', TemplateView.as_view(template_name = 'cof-denied.html'), name = "cof-denied"),
|
||||
url(r'^cas/login$', 'django_cas_ng.views.login', name = "cas_login_view"),
|
||||
# Le BdA
|
||||
url(r'^bda/', include('bda.urls')),
|
||||
# Les exports
|
||||
url(r'^export/', include(export_patterns)),
|
||||
# Les petits cours
|
||||
url(r'^petitcours/', include(petitcours_patterns)),
|
||||
# Les sondages
|
||||
url(r'^survey/', include(surveys_patterns)),
|
||||
# Evenements
|
||||
url(r'^event/', include(events_patterns)),
|
||||
# Authentification
|
||||
url(r'^cof/denied$', TemplateView.as_view(template_name='cof-denied.html'),
|
||||
name="cof-denied"),
|
||||
url(r'^cas/login$', 'django_cas_ng.views.login', name="cas_login_view"),
|
||||
url(r'^cas/logout$', 'django_cas_ng.views.logout'),
|
||||
url(r'^outsider/login$', 'gestioncof.views.login_ext'),
|
||||
url(r'^outsider/logout$', 'django.contrib.auth.views.logout', {'next_page': '/gestion/'}),
|
||||
url(r'^outsider/password-change$', 'django.contrib.auth.views.password_change'),
|
||||
url(r'^outsider/logout$', 'django.contrib.auth.views.logout',
|
||||
{'next_page': 'home'}),
|
||||
url(r'^login$', 'gestioncof.views.login'),
|
||||
url(r'^logout$', 'gestioncof.views.logout'),
|
||||
# Infos persos
|
||||
url(r'^profile$', 'gestioncof.views.profile'),
|
||||
url(r'^outsider/password-change$',
|
||||
'django.contrib.auth.views.password_change'),
|
||||
url(r'^outsider/password-change-done$',
|
||||
'django.contrib.auth.views.password_change_done',
|
||||
name='password_change_done'),
|
||||
url(r'^login$', 'gestioncof.views.login'),
|
||||
url(r'^logout$', 'gestioncof.views.logout'),
|
||||
url(r'^profile$', 'gestioncof.views.profile'),
|
||||
url(r'^export/members$', 'gestioncof.views.export_members'),
|
||||
url(r'^export/mega/avecremarques$', 'gestioncof.views.export_mega_remarksonly'),
|
||||
url(r'^export/mega/participants$', 'gestioncof.views.export_mega_participants'),
|
||||
url(r'^export/mega/orgas$', 'gestioncof.views.export_mega_orgas'),
|
||||
url(r'^export/mega/(?P<type>.+)$', 'gestioncof.views.export_mega_bytype'),
|
||||
url(r'^export/mega$', 'gestioncof.views.export_mega'),
|
||||
# Inscription d'un nouveau membre
|
||||
url(r'^registration$', 'gestioncof.views.registration'),
|
||||
url(r'^registration/clipper/(?P<login_clipper>[\w-]+)$', 'gestioncof.views.registration_form2', name = "clipper-registration"),
|
||||
url(r'^registration/user/(?P<username>.+)$', 'gestioncof.views.registration_form2', name = "user-registration"),
|
||||
url(r'^registration/empty$', 'gestioncof.views.registration_form2', name = "empty-registration"),
|
||||
url(r'^petitcours/inscription$', 'gestioncof.petits_cours_views.inscription', name = 'petits-cours-inscription'),
|
||||
url(r'^petitcours/demande$', 'gestioncof.petits_cours_views.demande', name = 'petits-cours-demande'),
|
||||
url(r'^petitcours/demande-raw$', 'gestioncof.petits_cours_views.demande_raw', name = 'petits-cours-demande-raw'),
|
||||
url(r'^petitcours/demandes$', DemandeListView.as_view(), name = 'petits-cours-demandes-list'),
|
||||
url(r'^petitcours/demandes/(?P<demande_id>\d+)$', 'gestioncof.petits_cours_views.details', name = 'petits-cours-demande-details'),
|
||||
url(r'^petitcours/demandes/(?P<demande_id>\d+)/traitement$', 'gestioncof.petits_cours_views.traitement', name = 'petits-cours-demande-traitement'),
|
||||
url(r'^petitcours/demandes/(?P<demande_id>\d+)/retraitement$', 'gestioncof.petits_cours_views.retraitement', name = 'petits-cours-demande-retraitement'),
|
||||
url(r'^bda/inscription/(?P<tirage_id>\d+)$', 'bda.views.inscription', name = 'bda-tirage-inscription'),
|
||||
url(r'^bda/places/(?P<tirage_id>\d+)$', 'bda.views.places', name = "bda-places-attribuees"),
|
||||
url(r'^bda/places/(?P<tirage_id>\d+)/places_bda.ics$', 'bda.views.places_ics', name = "bda-places-attribuees-ics"),
|
||||
url(r'^bda/revente/(?P<tirage_id>\d+)$', 'bda.views.revente', name = 'bda-revente'),
|
||||
url(r'^bda/etat-places/(?P<tirage_id>\d+)$', 'bda.views.etat_places', name = 'bda-etat-places'),
|
||||
url(r'^bda/tirage/(?P<tirage_id>\d+)$', 'bda.views.tirage'),
|
||||
url(r'^bda/spectacles/(?P<tirage_id>\d+)$', SpectacleListView.as_view() , name ="bda-liste-spectacles"),
|
||||
url(r'^bda/spectacles/(?P<tirage_id>\d+)/(?P<spectacle_id>\d+)$', "bda.views.spectacle", name = "bda-spectacle"),
|
||||
url(r'^bda/spectacles-ics/(?P<tirage_id>\d+)$', 'bda.views.liste_spectacles_ics', name ="bda-liste-spectacles-ics"),
|
||||
url(r'^bda/spectacles/unpaid/(?P<tirage_id>\d+)$', "bda.views.unpaid", name = "bda-unpaid"),
|
||||
url(r'bda/mails-rappel/(?P<spectacle_id>\d+)$', "bda.views.send_rappel"),
|
||||
url(r'^survey/(?P<survey_id>\d+)$', 'gestioncof.views.survey'),
|
||||
url(r'^event/(?P<event_id>\d+)$', 'gestioncof.views.event'),
|
||||
url(r'^survey/(?P<survey_id>\d+)/status$', 'gestioncof.views.survey_status'),
|
||||
url(r'^event/(?P<event_id>\d+)/status$', 'gestioncof.views.event_status'),
|
||||
url(r'^registration/clipper/(?P<login_clipper>[\w-]+)$',
|
||||
'gestioncof.views.registration_form2', name="clipper-registration"),
|
||||
url(r'^registration/user/(?P<username>.+)$',
|
||||
'gestioncof.views.registration_form2', name="user-registration"),
|
||||
url(r'^registration/empty$', 'gestioncof.views.registration_form2',
|
||||
name="empty-registration"),
|
||||
# Autocompletion
|
||||
url(r'^autocomplete/registration$', 'gestioncof.autocomplete.autocomplete'),
|
||||
url(r'^autocomplete/', include('autocomplete_light.urls')),
|
||||
# Interface admin
|
||||
url(r'^admin/doc/', include('django.contrib.admindocs.urls')),
|
||||
url(r'^admin/(?P<app_label>[\d\w]+)/(?P<model_name>[\d\w]+)/csv/', 'gestioncof.csv_views.admin_list_export', {'fields': ['username',]}),
|
||||
url(r'^admin/(?P<app_label>[\d\w]+)/(?P<model_name>[\d\w]+)/csv/',
|
||||
'gestioncof.csv_views.admin_list_export',
|
||||
{'fields': ['username',]}),
|
||||
url(r'^admin/', include(admin.site.urls)),
|
||||
url(r'^grappelli/', include('grappelli.urls')),
|
||||
# Liens utiles du COF et du BdA
|
||||
url(r'^utile_cof$', 'gestioncof.views.utile_cof'),
|
||||
url(r'^utile_bda$', 'gestioncof.views.utile_bda'),
|
||||
url(r'^utile_bda/bda_diff$', 'gestioncof.views.liste_bdadiff'),
|
||||
url(r'^utile_cof/diff_cof$', 'gestioncof.views.liste_diffcof'),
|
||||
url(r'^utile_bda/bda_revente$', 'gestioncof.views.liste_bdarevente'),
|
||||
)
|
||||
|
||||
|
|
|
|||
42
gestioncof/urls.py
Normal file
42
gestioncof/urls.py
Normal file
|
|
@ -0,0 +1,42 @@
|
|||
from django.conf.urls import url
|
||||
from gestioncof.petits_cours_views import DemandeListView
|
||||
|
||||
export_patterns = [
|
||||
url(r'members$', 'gestioncof.views.export_members'),
|
||||
url(r'mega/avecremarques$', 'gestioncof.views.export_mega_remarksonly'),
|
||||
url(r'mega/participants$', 'gestioncof.views.export_mega_participants'),
|
||||
url(r'mega/orgas$', 'gestioncof.views.export_mega_orgas'),
|
||||
url(r'mega/(?P<type>.+)$', 'gestioncof.views.export_mega_bytype'),
|
||||
url(r'mega$', 'gestioncof.views.export_mega'),
|
||||
]
|
||||
|
||||
petitcours_patterns = [
|
||||
url(r'inscription$', 'gestioncof.petits_cours_views.inscription',
|
||||
name='petits-cours-inscription'),
|
||||
url(r'demande$', 'gestioncof.petits_cours_views.demande',
|
||||
name='petits-cours-demande'),
|
||||
url(r'demande-raw$', 'gestioncof.petits_cours_views.demande_raw',
|
||||
name='petits-cours-demande-raw'),
|
||||
url(r'demandes$', DemandeListView.as_view(),
|
||||
name='petits-cours-demandes-list'),
|
||||
url(r'demandes/(?P<demande_id>\d+)$', 'gestioncof.petits_cours_views.details',
|
||||
name='petits-cours-demande-details'),
|
||||
url(r'demandes/(?P<demande_id>\d+)/traitement$',
|
||||
'gestioncof.petits_cours_views.traitement',
|
||||
name='petits-cours-demande-traitement'),
|
||||
url(r'demandes/(?P<demande_id>\d+)/retraitement$',
|
||||
'gestioncof.petits_cours_views.retraitement',
|
||||
name='petits-cours-demande-retraitement'),
|
||||
]
|
||||
|
||||
surveys_patterns = [
|
||||
url(r'^survey/(?P<survey_id>\d+)/status$', 'gestioncof.views.survey_status'),
|
||||
url(r'^survey/(?P<survey_id>\d+)$', 'gestioncof.views.survey'),
|
||||
]
|
||||
|
||||
events_patterns = [
|
||||
url(r'^event/(?P<event_id>\d+)$', 'gestioncof.views.event'),
|
||||
url(r'^event/(?P<event_id>\d+)/status$', 'gestioncof.views.event_status'),
|
||||
]
|
||||
|
||||
|
||||
Loading…
Reference in a new issue