/cof/ → /gestioCOF/ && /gestioncof/ → /cof/
|
@ -8,7 +8,7 @@ import random
|
||||||
from django.utils import timezone
|
from django.utils import timezone
|
||||||
from django.contrib.auth.models import User
|
from django.contrib.auth.models import User
|
||||||
|
|
||||||
from gestioncof.management.base import MyBaseCommand
|
from cof.management.base import MyBaseCommand
|
||||||
from bda.models import Tirage, Spectacle, Salle, Participant, ChoixSpectacle
|
from bda.models import Tirage, Spectacle, Salle, Participant, ChoixSpectacle
|
||||||
from bda.views import do_tirage
|
from bda.views import do_tirage
|
||||||
|
|
||||||
|
|
|
@ -14,7 +14,7 @@ User = get_user_model()
|
||||||
|
|
||||||
|
|
||||||
class SpectacleReventeTests(TestCase):
|
class SpectacleReventeTests(TestCase):
|
||||||
fixtures = ['gestioncof/management/data/custommail.json']
|
fixtures = ['cof/management/data/custommail.json']
|
||||||
|
|
||||||
def setUp(self):
|
def setUp(self):
|
||||||
now = timezone.now()
|
now = timezone.now()
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
from django.conf.urls import url
|
from django.conf.urls import url
|
||||||
from gestioncof.decorators import buro_required
|
from cof.decorators import buro_required
|
||||||
from bda.views import SpectacleListView
|
from bda.views import SpectacleListView
|
||||||
from bda import views
|
from bda import views
|
||||||
|
|
||||||
|
|
|
@ -20,7 +20,7 @@ from django.core.urlresolvers import reverse
|
||||||
from django.conf import settings
|
from django.conf import settings
|
||||||
from django.utils import timezone, formats
|
from django.utils import timezone, formats
|
||||||
from django.views.generic.list import ListView
|
from django.views.generic.list import ListView
|
||||||
from gestioncof.decorators import cof_required, buro_required
|
from cof.decorators import cof_required, buro_required
|
||||||
from bda.models import (
|
from bda.models import (
|
||||||
Spectacle, Participant, ChoixSpectacle, Attribution, Tirage,
|
Spectacle, Participant, ChoixSpectacle, Attribution, Tirage,
|
||||||
SpectacleRevente, Salle, CategorieSpectacle
|
SpectacleRevente, Salle, CategorieSpectacle
|
||||||
|
|
|
@ -0,0 +1 @@
|
||||||
|
default_app_config = 'cof.apps.CofConfig'
|
|
@ -1,10 +1,10 @@
|
||||||
from django import forms
|
from django import forms
|
||||||
from django.contrib import admin
|
from django.contrib import admin
|
||||||
from django.utils.translation import ugettext_lazy as _
|
from django.utils.translation import ugettext_lazy as _
|
||||||
from gestioncof.models import SurveyQuestionAnswer, SurveyQuestion, \
|
from cof.models import SurveyQuestionAnswer, SurveyQuestion, \
|
||||||
CofProfile, EventOption, EventOptionChoice, Event, Club, \
|
CofProfile, EventOption, EventOptionChoice, Event, Club, \
|
||||||
Survey, EventCommentField, EventRegistration
|
Survey, EventCommentField, EventRegistration
|
||||||
from gestioncof.petits_cours_models import PetitCoursDemande, \
|
from cof.petits_cours_models import PetitCoursDemande, \
|
||||||
PetitCoursSubject, PetitCoursAbility, PetitCoursAttribution, \
|
PetitCoursSubject, PetitCoursAbility, PetitCoursAttribution, \
|
||||||
PetitCoursAttributionCounter
|
PetitCoursAttributionCounter
|
||||||
from django.contrib.auth.models import User, Group, Permission
|
from django.contrib.auth.models import User, Group, Permission
|
||||||
|
@ -189,7 +189,7 @@ class UserProfileAdmin(UserAdmin):
|
||||||
# Si le groupe COF n'était pas déjà dans la bdd
|
# Si le groupe COF n'était pas déjà dans la bdd
|
||||||
# On lui assigne les bonnes permissions
|
# On lui assigne les bonnes permissions
|
||||||
perms = Permission.objects.filter(
|
perms = Permission.objects.filter(
|
||||||
Q(content_type__app_label='gestioncof')
|
Q(content_type__app_label='cof')
|
||||||
| Q(content_type__app_label='bda')
|
| Q(content_type__app_label='bda')
|
||||||
| (Q(content_type__app_label='auth')
|
| (Q(content_type__app_label='auth')
|
||||||
& Q(content_type__model='user')))
|
& Q(content_type__model='user')))
|
|
@ -1,8 +1,8 @@
|
||||||
from django.apps import AppConfig
|
from django.apps import AppConfig
|
||||||
|
|
||||||
|
|
||||||
class GestioncofConfig(AppConfig):
|
class CofConfig(AppConfig):
|
||||||
name = 'gestioncof'
|
name = 'cof'
|
||||||
verbose_name = "Gestion des adhérents du COF"
|
verbose_name = "Gestion des adhérents du COF"
|
||||||
|
|
||||||
def ready(self):
|
def ready(self):
|
||||||
|
@ -11,5 +11,5 @@ class GestioncofConfig(AppConfig):
|
||||||
|
|
||||||
def register_config(self):
|
def register_config(self):
|
||||||
import djconfig
|
import djconfig
|
||||||
from .forms import GestioncofConfigForm
|
from .forms import CofConfigForm
|
||||||
djconfig.register(GestioncofConfigForm)
|
djconfig.register(CofConfigForm)
|
|
@ -6,8 +6,8 @@ from django.db.models import Q
|
||||||
from django.contrib.auth.models import User
|
from django.contrib.auth.models import User
|
||||||
from django.conf import settings
|
from django.conf import settings
|
||||||
|
|
||||||
from gestioncof.models import CofProfile
|
from cof.models import CofProfile
|
||||||
from gestioncof.decorators import buro_required
|
from cof.decorators import buro_required
|
||||||
|
|
||||||
|
|
||||||
class Clipper(object):
|
class Clipper(object):
|
|
@ -6,7 +6,7 @@
|
||||||
"survey_open": true,
|
"survey_open": true,
|
||||||
"title": "Sort du barde"
|
"title": "Sort du barde"
|
||||||
},
|
},
|
||||||
"model": "gestioncof.survey",
|
"model": "cof.survey",
|
||||||
"pk": 1
|
"pk": 1
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -15,7 +15,7 @@
|
||||||
"survey": 1,
|
"survey": 1,
|
||||||
"multi_answers": true
|
"multi_answers": true
|
||||||
},
|
},
|
||||||
"model": "gestioncof.surveyquestion",
|
"model": "cof.surveyquestion",
|
||||||
"pk": 1
|
"pk": 1
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -24,7 +24,7 @@
|
||||||
"survey": 1,
|
"survey": 1,
|
||||||
"multi_answers": false
|
"multi_answers": false
|
||||||
},
|
},
|
||||||
"model": "gestioncof.surveyquestion",
|
"model": "cof.surveyquestion",
|
||||||
"pk": 2
|
"pk": 2
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -32,7 +32,7 @@
|
||||||
"answer": "On l'ernestise",
|
"answer": "On l'ernestise",
|
||||||
"survey_question": 1
|
"survey_question": 1
|
||||||
},
|
},
|
||||||
"model": "gestioncof.surveyquestionanswer",
|
"model": "cof.surveyquestionanswer",
|
||||||
"pk": 1
|
"pk": 1
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -40,7 +40,7 @@
|
||||||
"answer": "On ligote",
|
"answer": "On ligote",
|
||||||
"survey_question": 1
|
"survey_question": 1
|
||||||
},
|
},
|
||||||
"model": "gestioncof.surveyquestionanswer",
|
"model": "cof.surveyquestionanswer",
|
||||||
"pk": 2
|
"pk": 2
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -48,7 +48,7 @@
|
||||||
"answer": "On le prive de banquet",
|
"answer": "On le prive de banquet",
|
||||||
"survey_question": 1
|
"survey_question": 1
|
||||||
},
|
},
|
||||||
"model": "gestioncof.surveyquestionanswer",
|
"model": "cof.surveyquestionanswer",
|
||||||
"pk": 3
|
"pk": 3
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -56,7 +56,7 @@
|
||||||
"answer": "Oui",
|
"answer": "Oui",
|
||||||
"survey_question": 2
|
"survey_question": 2
|
||||||
},
|
},
|
||||||
"model": "gestioncof.surveyquestionanswer",
|
"model": "cof.surveyquestionanswer",
|
||||||
"pk": 4
|
"pk": 4
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -64,7 +64,7 @@
|
||||||
"answer": "Non",
|
"answer": "Non",
|
||||||
"survey_question": 2
|
"survey_question": 2
|
||||||
},
|
},
|
||||||
"model": "gestioncof.surveyquestionanswer",
|
"model": "cof.surveyquestionanswer",
|
||||||
"pk": 5
|
"pk": 5
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -78,7 +78,7 @@
|
||||||
"registration_open": true,
|
"registration_open": true,
|
||||||
"start_date": "2016-09-09T00:00:00Z"
|
"start_date": "2016-09-09T00:00:00Z"
|
||||||
},
|
},
|
||||||
"model": "gestioncof.event",
|
"model": "cof.event",
|
||||||
"pk": 1
|
"pk": 1
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -88,7 +88,7 @@
|
||||||
"fieldtype": "text",
|
"fieldtype": "text",
|
||||||
"name": "Commentaires"
|
"name": "Commentaires"
|
||||||
},
|
},
|
||||||
"model": "gestioncof.eventcommentfield",
|
"model": "cof.eventcommentfield",
|
||||||
"pk": 1
|
"pk": 1
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -97,7 +97,7 @@
|
||||||
"event": 1,
|
"event": 1,
|
||||||
"name": "Potion magique"
|
"name": "Potion magique"
|
||||||
},
|
},
|
||||||
"model": "gestioncof.eventoption",
|
"model": "cof.eventoption",
|
||||||
"pk": 1
|
"pk": 1
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -105,7 +105,7 @@
|
||||||
"event_option": 1,
|
"event_option": 1,
|
||||||
"value": "Je suis alergique"
|
"value": "Je suis alergique"
|
||||||
},
|
},
|
||||||
"model": "gestioncof.eventoptionchoice",
|
"model": "cof.eventoptionchoice",
|
||||||
"pk": 1
|
"pk": 1
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -113,7 +113,7 @@
|
||||||
"event_option": 1,
|
"event_option": 1,
|
||||||
"value": "J'en veux"
|
"value": "J'en veux"
|
||||||
},
|
},
|
||||||
"model": "gestioncof.eventoptionchoice",
|
"model": "cof.eventoptionchoice",
|
||||||
"pk": 2
|
"pk": 2
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -121,35 +121,35 @@
|
||||||
"event_option": 1,
|
"event_option": 1,
|
||||||
"value": "Je suis tomb\u00e9 dans la marmite quand j'\u00e9tais petit"
|
"value": "Je suis tomb\u00e9 dans la marmite quand j'\u00e9tais petit"
|
||||||
},
|
},
|
||||||
"model": "gestioncof.eventoptionchoice",
|
"model": "cof.eventoptionchoice",
|
||||||
"pk": 3
|
"pk": 3
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"fields": {
|
"fields": {
|
||||||
"name": "Bagarre"
|
"name": "Bagarre"
|
||||||
},
|
},
|
||||||
"model": "gestioncof.petitcourssubject",
|
"model": "cof.petitcourssubject",
|
||||||
"pk": 1
|
"pk": 1
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"fields": {
|
"fields": {
|
||||||
"name": "Lancer de menhir"
|
"name": "Lancer de menhir"
|
||||||
},
|
},
|
||||||
"model": "gestioncof.petitcourssubject",
|
"model": "cof.petitcourssubject",
|
||||||
"pk": 2
|
"pk": 2
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"fields": {
|
"fields": {
|
||||||
"name": "Pr\u00e9paration de potions"
|
"name": "Pr\u00e9paration de potions"
|
||||||
},
|
},
|
||||||
"model": "gestioncof.petitcourssubject",
|
"model": "cof.petitcourssubject",
|
||||||
"pk": 3
|
"pk": 3
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"fields": {
|
"fields": {
|
||||||
"name": "Chant"
|
"name": "Chant"
|
||||||
},
|
},
|
||||||
"model": "gestioncof.petitcourssubject",
|
"model": "cof.petitcourssubject",
|
||||||
"pk": 4
|
"pk": 4
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -171,7 +171,7 @@
|
||||||
"email": "jules.cesar@polytechnique.edu",
|
"email": "jules.cesar@polytechnique.edu",
|
||||||
"processed": null
|
"processed": null
|
||||||
},
|
},
|
||||||
"model": "gestioncof.petitcoursdemande",
|
"model": "cof.petitcoursdemande",
|
||||||
"pk": 1
|
"pk": 1
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -193,7 +193,7 @@
|
||||||
"email": "jules.cesar@polytechnique.edu",
|
"email": "jules.cesar@polytechnique.edu",
|
||||||
"processed": null
|
"processed": null
|
||||||
},
|
},
|
||||||
"model": "gestioncof.petitcoursdemande",
|
"model": "cof.petitcoursdemande",
|
||||||
"pk": 2
|
"pk": 2
|
||||||
}
|
}
|
||||||
]
|
]
|
|
@ -6,9 +6,9 @@ from django.forms.formsets import BaseFormSet, formset_factory
|
||||||
|
|
||||||
from djconfig.forms import ConfigForm
|
from djconfig.forms import ConfigForm
|
||||||
|
|
||||||
from gestioncof.models import CofProfile, EventCommentValue, \
|
from cof.models import CofProfile, EventCommentValue, \
|
||||||
CalendarSubscription, Club
|
CalendarSubscription, Club
|
||||||
from gestioncof.widgets import TriStateCheckbox
|
from cof.widgets import TriStateCheckbox
|
||||||
|
|
||||||
from bda.models import Spectacle
|
from bda.models import Spectacle
|
||||||
|
|
||||||
|
@ -386,7 +386,7 @@ class ClubsForm(forms.Form):
|
||||||
# TODO: move this to the `gestion` app once the supportBDS branch is merged
|
# TODO: move this to the `gestion` app once the supportBDS branch is merged
|
||||||
# ---
|
# ---
|
||||||
|
|
||||||
class GestioncofConfigForm(ConfigForm):
|
class CofConfigForm(ConfigForm):
|
||||||
gestion_banner = forms.CharField(
|
gestion_banner = forms.CharField(
|
||||||
label=_("Announcements banner"),
|
label=_("Announcements banner"),
|
||||||
help_text=_("An empty banner disables annoucements"),
|
help_text=_("An empty banner disables annoucements"),
|
|
@ -13,8 +13,8 @@ import random
|
||||||
from django.contrib.auth.models import User
|
from django.contrib.auth.models import User
|
||||||
from django.core.management import call_command
|
from django.core.management import call_command
|
||||||
|
|
||||||
from gestioncof.management.base import MyBaseCommand
|
from cof.management.base import MyBaseCommand
|
||||||
from gestioncof.petits_cours_models import (
|
from cof.petits_cours_models import (
|
||||||
PetitCoursAbility, PetitCoursSubject, LEVELS_CHOICES,
|
PetitCoursAbility, PetitCoursSubject, LEVELS_CHOICES,
|
||||||
PetitCoursAttributionCounter
|
PetitCoursAttributionCounter
|
||||||
)
|
)
|
|
@ -12,7 +12,7 @@ from django.contrib.contenttypes.models import ContentType
|
||||||
|
|
||||||
class Command(BaseCommand):
|
class Command(BaseCommand):
|
||||||
help = ("Va chercher les données mails de GestioCOF stocké au format json "
|
help = ("Va chercher les données mails de GestioCOF stocké au format json "
|
||||||
"dans /gestioncof/management/data/custommails.json. Le format des "
|
"dans /cof/management/data/custommails.json. Le format des "
|
||||||
"données est celui donné par la commande :"
|
"données est celui donné par la commande :"
|
||||||
" `python manage.py dumpdata custommail --natural-foreign` "
|
" `python manage.py dumpdata custommail --natural-foreign` "
|
||||||
"La bonne façon de mettre à jour ce fichier est donc de le "
|
"La bonne façon de mettre à jour ce fichier est donc de le "
|
|
@ -66,7 +66,7 @@
|
||||||
"fields": {
|
"fields": {
|
||||||
"kind": "model",
|
"kind": "model",
|
||||||
"content_type": [
|
"content_type": [
|
||||||
"gestioncof",
|
"cof",
|
||||||
"petitcoursdemande"
|
"petitcoursdemande"
|
||||||
],
|
],
|
||||||
"inner1": null,
|
"inner1": null,
|
||||||
|
@ -129,7 +129,7 @@
|
||||||
"fields": {
|
"fields": {
|
||||||
"kind": "model",
|
"kind": "model",
|
||||||
"content_type": [
|
"content_type": [
|
||||||
"gestioncof",
|
"cof",
|
||||||
"petitcourssubject"
|
"petitcourssubject"
|
||||||
],
|
],
|
||||||
"inner1": null,
|
"inner1": null,
|
|
@ -91,7 +91,7 @@ class Migration(migrations.Migration):
|
||||||
('name', models.CharField(max_length=200, verbose_name=b'Champ')),
|
('name', models.CharField(max_length=200, verbose_name=b'Champ')),
|
||||||
('fieldtype', models.CharField(default=b'text', max_length=10, verbose_name=b'Type', choices=[(b'text', 'Texte long'), (b'char', 'Texte court')])),
|
('fieldtype', models.CharField(default=b'text', max_length=10, verbose_name=b'Type', choices=[(b'text', 'Texte long'), (b'char', 'Texte court')])),
|
||||||
('default', models.TextField(verbose_name=b'Valeur par d\xc3\xa9faut', blank=True)),
|
('default', models.TextField(verbose_name=b'Valeur par d\xc3\xa9faut', blank=True)),
|
||||||
('event', models.ForeignKey(related_name='commentfields', to='gestioncof.Event', on_delete=models.CASCADE)),
|
('event', models.ForeignKey(related_name='commentfields', to='cof.Event', on_delete=models.CASCADE)),
|
||||||
],
|
],
|
||||||
options={
|
options={
|
||||||
'verbose_name': 'Champ',
|
'verbose_name': 'Champ',
|
||||||
|
@ -102,7 +102,7 @@ class Migration(migrations.Migration):
|
||||||
fields=[
|
fields=[
|
||||||
('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
|
('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
|
||||||
('content', models.TextField(null=True, verbose_name=b'Contenu', blank=True)),
|
('content', models.TextField(null=True, verbose_name=b'Contenu', blank=True)),
|
||||||
('commentfield', models.ForeignKey(related_name='values', to='gestioncof.EventCommentField', on_delete=models.CASCADE)),
|
('commentfield', models.ForeignKey(related_name='values', to='cof.EventCommentField', on_delete=models.CASCADE)),
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
migrations.CreateModel(
|
migrations.CreateModel(
|
||||||
|
@ -111,7 +111,7 @@ class Migration(migrations.Migration):
|
||||||
('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
|
('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
|
||||||
('name', models.CharField(max_length=200, verbose_name=b'Option')),
|
('name', models.CharField(max_length=200, verbose_name=b'Option')),
|
||||||
('multi_choices', models.BooleanField(default=False, verbose_name=b'Choix multiples')),
|
('multi_choices', models.BooleanField(default=False, verbose_name=b'Choix multiples')),
|
||||||
('event', models.ForeignKey(related_name='options', to='gestioncof.Event', on_delete=models.CASCADE)),
|
('event', models.ForeignKey(related_name='options', to='cof.Event', on_delete=models.CASCADE)),
|
||||||
],
|
],
|
||||||
options={
|
options={
|
||||||
'verbose_name': 'Option',
|
'verbose_name': 'Option',
|
||||||
|
@ -122,7 +122,7 @@ class Migration(migrations.Migration):
|
||||||
fields=[
|
fields=[
|
||||||
('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
|
('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
|
||||||
('value', models.CharField(max_length=200, verbose_name=b'Valeur')),
|
('value', models.CharField(max_length=200, verbose_name=b'Valeur')),
|
||||||
('event_option', models.ForeignKey(related_name='choices', to='gestioncof.EventOption', on_delete=models.CASCADE)),
|
('event_option', models.ForeignKey(related_name='choices', to='cof.EventOption', on_delete=models.CASCADE)),
|
||||||
],
|
],
|
||||||
options={
|
options={
|
||||||
'verbose_name': 'Choix',
|
'verbose_name': 'Choix',
|
||||||
|
@ -133,9 +133,9 @@ class Migration(migrations.Migration):
|
||||||
fields=[
|
fields=[
|
||||||
('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
|
('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
|
||||||
('paid', models.BooleanField(default=False, verbose_name=b'A pay\xc3\xa9')),
|
('paid', models.BooleanField(default=False, verbose_name=b'A pay\xc3\xa9')),
|
||||||
('event', models.ForeignKey(to='gestioncof.Event', on_delete=models.CASCADE)),
|
('event', models.ForeignKey(to='cof.Event', on_delete=models.CASCADE)),
|
||||||
('filledcomments', models.ManyToManyField(to='gestioncof.EventCommentField', through='gestioncof.EventCommentValue')),
|
('filledcomments', models.ManyToManyField(to='cof.EventCommentField', through='cof.EventCommentValue')),
|
||||||
('options', models.ManyToManyField(to='gestioncof.EventOptionChoice')),
|
('options', models.ManyToManyField(to='cof.EventOptionChoice')),
|
||||||
('user', models.ForeignKey(to=settings.AUTH_USER_MODEL, on_delete=models.CASCADE)),
|
('user', models.ForeignKey(to=settings.AUTH_USER_MODEL, on_delete=models.CASCADE)),
|
||||||
],
|
],
|
||||||
options={
|
options={
|
||||||
|
@ -205,7 +205,7 @@ class Migration(migrations.Migration):
|
||||||
fields=[
|
fields=[
|
||||||
('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
|
('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
|
||||||
('name', models.CharField(max_length=30, verbose_name='Mati\xe8re')),
|
('name', models.CharField(max_length=30, verbose_name='Mati\xe8re')),
|
||||||
('users', models.ManyToManyField(related_name='petits_cours_matieres', through='gestioncof.PetitCoursAbility', to=settings.AUTH_USER_MODEL)),
|
('users', models.ManyToManyField(related_name='petits_cours_matieres', through='cof.PetitCoursAbility', to=settings.AUTH_USER_MODEL)),
|
||||||
],
|
],
|
||||||
options={
|
options={
|
||||||
'verbose_name': 'Mati\xe8re de petits cours',
|
'verbose_name': 'Mati\xe8re de petits cours',
|
||||||
|
@ -240,7 +240,7 @@ class Migration(migrations.Migration):
|
||||||
('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
|
('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
|
||||||
('question', models.CharField(max_length=200, verbose_name=b'Question')),
|
('question', models.CharField(max_length=200, verbose_name=b'Question')),
|
||||||
('multi_answers', models.BooleanField(default=False, verbose_name=b'Choix multiples')),
|
('multi_answers', models.BooleanField(default=False, verbose_name=b'Choix multiples')),
|
||||||
('survey', models.ForeignKey(related_name='questions', to='gestioncof.Survey', on_delete=models.CASCADE)),
|
('survey', models.ForeignKey(related_name='questions', to='cof.Survey', on_delete=models.CASCADE)),
|
||||||
],
|
],
|
||||||
options={
|
options={
|
||||||
'verbose_name': 'Question',
|
'verbose_name': 'Question',
|
||||||
|
@ -251,7 +251,7 @@ class Migration(migrations.Migration):
|
||||||
fields=[
|
fields=[
|
||||||
('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
|
('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
|
||||||
('answer', models.CharField(max_length=200, verbose_name=b'R\xc3\xa9ponse')),
|
('answer', models.CharField(max_length=200, verbose_name=b'R\xc3\xa9ponse')),
|
||||||
('survey_question', models.ForeignKey(related_name='answers', to='gestioncof.SurveyQuestion', on_delete=models.CASCADE)),
|
('survey_question', models.ForeignKey(related_name='answers', to='cof.SurveyQuestion', on_delete=models.CASCADE)),
|
||||||
],
|
],
|
||||||
options={
|
options={
|
||||||
'verbose_name': 'R\xe9ponse',
|
'verbose_name': 'R\xe9ponse',
|
||||||
|
@ -260,12 +260,12 @@ class Migration(migrations.Migration):
|
||||||
migrations.AddField(
|
migrations.AddField(
|
||||||
model_name='surveyanswer',
|
model_name='surveyanswer',
|
||||||
name='answers',
|
name='answers',
|
||||||
field=models.ManyToManyField(related_name='selected_by', to='gestioncof.SurveyQuestionAnswer'),
|
field=models.ManyToManyField(related_name='selected_by', to='cof.SurveyQuestionAnswer'),
|
||||||
),
|
),
|
||||||
migrations.AddField(
|
migrations.AddField(
|
||||||
model_name='surveyanswer',
|
model_name='surveyanswer',
|
||||||
name='survey',
|
name='survey',
|
||||||
field=models.ForeignKey(to='gestioncof.Survey', on_delete=models.CASCADE),
|
field=models.ForeignKey(to='cof.Survey', on_delete=models.CASCADE),
|
||||||
),
|
),
|
||||||
migrations.AddField(
|
migrations.AddField(
|
||||||
model_name='surveyanswer',
|
model_name='surveyanswer',
|
||||||
|
@ -275,7 +275,7 @@ class Migration(migrations.Migration):
|
||||||
migrations.AddField(
|
migrations.AddField(
|
||||||
model_name='petitcoursdemande',
|
model_name='petitcoursdemande',
|
||||||
name='matieres',
|
name='matieres',
|
||||||
field=models.ManyToManyField(related_name='demandes', verbose_name='Mati\xe8res', to='gestioncof.PetitCoursSubject'),
|
field=models.ManyToManyField(related_name='demandes', verbose_name='Mati\xe8res', to='cof.PetitCoursSubject'),
|
||||||
),
|
),
|
||||||
migrations.AddField(
|
migrations.AddField(
|
||||||
model_name='petitcoursdemande',
|
model_name='petitcoursdemande',
|
||||||
|
@ -285,7 +285,7 @@ class Migration(migrations.Migration):
|
||||||
migrations.AddField(
|
migrations.AddField(
|
||||||
model_name='petitcoursattributioncounter',
|
model_name='petitcoursattributioncounter',
|
||||||
name='matiere',
|
name='matiere',
|
||||||
field=models.ForeignKey(verbose_name='Matiere', to='gestioncof.PetitCoursSubject', on_delete=models.CASCADE),
|
field=models.ForeignKey(verbose_name='Matiere', to='cof.PetitCoursSubject', on_delete=models.CASCADE),
|
||||||
),
|
),
|
||||||
migrations.AddField(
|
migrations.AddField(
|
||||||
model_name='petitcoursattributioncounter',
|
model_name='petitcoursattributioncounter',
|
||||||
|
@ -295,12 +295,12 @@ class Migration(migrations.Migration):
|
||||||
migrations.AddField(
|
migrations.AddField(
|
||||||
model_name='petitcoursattribution',
|
model_name='petitcoursattribution',
|
||||||
name='demande',
|
name='demande',
|
||||||
field=models.ForeignKey(verbose_name='Demande', to='gestioncof.PetitCoursDemande', on_delete=models.CASCADE),
|
field=models.ForeignKey(verbose_name='Demande', to='cof.PetitCoursDemande', on_delete=models.CASCADE),
|
||||||
),
|
),
|
||||||
migrations.AddField(
|
migrations.AddField(
|
||||||
model_name='petitcoursattribution',
|
model_name='petitcoursattribution',
|
||||||
name='matiere',
|
name='matiere',
|
||||||
field=models.ForeignKey(verbose_name='Mati\xe8re', to='gestioncof.PetitCoursSubject', on_delete=models.CASCADE),
|
field=models.ForeignKey(verbose_name='Mati\xe8re', to='cof.PetitCoursSubject', on_delete=models.CASCADE),
|
||||||
),
|
),
|
||||||
migrations.AddField(
|
migrations.AddField(
|
||||||
model_name='petitcoursattribution',
|
model_name='petitcoursattribution',
|
||||||
|
@ -310,7 +310,7 @@ class Migration(migrations.Migration):
|
||||||
migrations.AddField(
|
migrations.AddField(
|
||||||
model_name='petitcoursability',
|
model_name='petitcoursability',
|
||||||
name='matiere',
|
name='matiere',
|
||||||
field=models.ForeignKey(verbose_name='Mati\xe8re', to='gestioncof.PetitCoursSubject', on_delete=models.CASCADE),
|
field=models.ForeignKey(verbose_name='Mati\xe8re', to='cof.PetitCoursSubject', on_delete=models.CASCADE),
|
||||||
),
|
),
|
||||||
migrations.AddField(
|
migrations.AddField(
|
||||||
model_name='petitcoursability',
|
model_name='petitcoursability',
|
||||||
|
@ -320,7 +320,7 @@ class Migration(migrations.Migration):
|
||||||
migrations.AddField(
|
migrations.AddField(
|
||||||
model_name='eventcommentvalue',
|
model_name='eventcommentvalue',
|
||||||
name='registration',
|
name='registration',
|
||||||
field=models.ForeignKey(related_name='comments', to='gestioncof.EventRegistration', on_delete=models.CASCADE),
|
field=models.ForeignKey(related_name='comments', to='cof.EventRegistration', on_delete=models.CASCADE),
|
||||||
),
|
),
|
||||||
migrations.AlterUniqueTogether(
|
migrations.AlterUniqueTogether(
|
||||||
name='surveyanswer',
|
name='surveyanswer',
|
|
@ -7,7 +7,7 @@ from django.db import migrations, models
|
||||||
class Migration(migrations.Migration):
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
dependencies = [
|
dependencies = [
|
||||||
('gestioncof', '0001_initial'),
|
('cof', '0001_initial'),
|
||||||
]
|
]
|
||||||
|
|
||||||
operations = [
|
operations = [
|
|
@ -7,7 +7,7 @@ from django.db import migrations, models
|
||||||
class Migration(migrations.Migration):
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
dependencies = [
|
dependencies = [
|
||||||
('gestioncof', '0002_enable_unprocessed_demandes'),
|
('cof', '0002_enable_unprocessed_demandes'),
|
||||||
]
|
]
|
||||||
|
|
||||||
operations = [
|
operations = [
|
|
@ -5,7 +5,7 @@ from django.db import migrations
|
||||||
|
|
||||||
|
|
||||||
def create_mail(apps, schema_editor):
|
def create_mail(apps, schema_editor):
|
||||||
CustomMail = apps.get_model("gestioncof", "CustomMail")
|
CustomMail = apps.get_model("cof", "CustomMail")
|
||||||
db_alias = schema_editor.connection.alias
|
db_alias = schema_editor.connection.alias
|
||||||
if CustomMail.objects.filter(shortname="bienvenue").count() == 0:
|
if CustomMail.objects.filter(shortname="bienvenue").count() == 0:
|
||||||
CustomMail.objects.using(db_alias).bulk_create([
|
CustomMail.objects.using(db_alias).bulk_create([
|
||||||
|
@ -24,7 +24,7 @@ def create_mail(apps, schema_editor):
|
||||||
class Migration(migrations.Migration):
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
dependencies = [
|
dependencies = [
|
||||||
('gestioncof', '0003_event_image'),
|
('cof', '0003_event_image'),
|
||||||
]
|
]
|
||||||
|
|
||||||
operations = [
|
operations = [
|
|
@ -7,7 +7,7 @@ from django.db import migrations, models
|
||||||
class Migration(migrations.Migration):
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
dependencies = [
|
dependencies = [
|
||||||
('gestioncof', '0004_registration_mail'),
|
('cof', '0004_registration_mail'),
|
||||||
]
|
]
|
||||||
|
|
||||||
operations = [
|
operations = [
|
|
@ -10,7 +10,7 @@ class Migration(migrations.Migration):
|
||||||
dependencies = [
|
dependencies = [
|
||||||
('bda', '0004_mails-rappel'),
|
('bda', '0004_mails-rappel'),
|
||||||
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
|
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
|
||||||
('gestioncof', '0005_encoding'),
|
('cof', '0005_encoding'),
|
||||||
]
|
]
|
||||||
|
|
||||||
operations = [
|
operations = [
|
|
@ -8,7 +8,7 @@ from django.conf import settings
|
||||||
class Migration(migrations.Migration):
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
dependencies = [
|
dependencies = [
|
||||||
('gestioncof', '0006_add_calendar'),
|
('cof', '0006_add_calendar'),
|
||||||
]
|
]
|
||||||
|
|
||||||
operations = [
|
operations = [
|
|
@ -5,14 +5,14 @@ from django.db import models, migrations
|
||||||
|
|
||||||
|
|
||||||
def forwards(apps, schema_editor):
|
def forwards(apps, schema_editor):
|
||||||
Profile = apps.get_model("gestioncof", "CofProfile")
|
Profile = apps.get_model("cof", "CofProfile")
|
||||||
Profile.objects.update(comments="")
|
Profile.objects.update(comments="")
|
||||||
|
|
||||||
|
|
||||||
class Migration(migrations.Migration):
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
dependencies = [
|
dependencies = [
|
||||||
('gestioncof', '0007_alter_club'),
|
('cof', '0007_alter_club'),
|
||||||
]
|
]
|
||||||
|
|
||||||
operations = [
|
operations = [
|
|
@ -7,7 +7,7 @@ from django.db import migrations, models
|
||||||
class Migration(migrations.Migration):
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
dependencies = [
|
dependencies = [
|
||||||
('gestioncof', '0008_py3'),
|
('cof', '0008_py3'),
|
||||||
]
|
]
|
||||||
|
|
||||||
operations = [
|
operations = [
|
|
@ -6,7 +6,7 @@ from django.db import migrations
|
||||||
class Migration(migrations.Migration):
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
dependencies = [
|
dependencies = [
|
||||||
('gestioncof', '0009_delete_clipper'),
|
('cof', '0009_delete_clipper'),
|
||||||
]
|
]
|
||||||
|
|
||||||
operations = [
|
operations = [
|
|
@ -7,7 +7,7 @@ from django.db import migrations, models
|
||||||
class Migration(migrations.Migration):
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
dependencies = [
|
dependencies = [
|
||||||
('gestioncof', '0010_delete_custommail'),
|
('cof', '0010_delete_custommail'),
|
||||||
]
|
]
|
||||||
|
|
||||||
operations = [
|
operations = [
|
|
@ -7,7 +7,7 @@ from django.db import migrations
|
||||||
class Migration(migrations.Migration):
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
dependencies = [
|
dependencies = [
|
||||||
('gestioncof', '0010_delete_custommail'),
|
('cof', '0010_delete_custommail'),
|
||||||
]
|
]
|
||||||
|
|
||||||
operations = [
|
operations = [
|
|
@ -7,8 +7,8 @@ from django.db import migrations, models
|
||||||
class Migration(migrations.Migration):
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
dependencies = [
|
dependencies = [
|
||||||
('gestioncof', '0011_remove_cofprofile_num'),
|
('cof', '0011_remove_cofprofile_num'),
|
||||||
('gestioncof', '0011_longer_clippers'),
|
('cof', '0011_longer_clippers'),
|
||||||
]
|
]
|
||||||
|
|
||||||
operations = [
|
operations = [
|
|
@ -7,7 +7,7 @@ from django.db import migrations, models
|
||||||
class Migration(migrations.Migration):
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
dependencies = [
|
dependencies = [
|
||||||
('gestioncof', '0012_merge'),
|
('cof', '0012_merge'),
|
||||||
]
|
]
|
||||||
|
|
||||||
operations = [
|
operations = [
|
|
@ -8,7 +8,7 @@ from django.db import migrations, models
|
||||||
class Migration(migrations.Migration):
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
dependencies = [
|
dependencies = [
|
||||||
('gestioncof', '0013_pei'),
|
('cof', '0013_pei'),
|
||||||
]
|
]
|
||||||
|
|
||||||
operations = [
|
operations = [
|
|
@ -4,7 +4,7 @@ from django.contrib.auth.models import User
|
||||||
from django.utils.translation import ugettext_lazy as _
|
from django.utils.translation import ugettext_lazy as _
|
||||||
from django.db.models.signals import post_save, post_delete
|
from django.db.models.signals import post_save, post_delete
|
||||||
|
|
||||||
from gestioncof.petits_cours_models import choices_length
|
from cof.petits_cours_models import choices_length
|
||||||
|
|
||||||
from bda.models import Spectacle
|
from bda.models import Spectacle
|
||||||
|
|
|
@ -5,7 +5,7 @@ from django.forms import ModelForm
|
||||||
from django.forms.models import inlineformset_factory, BaseInlineFormSet
|
from django.forms.models import inlineformset_factory, BaseInlineFormSet
|
||||||
from django.contrib.auth.models import User
|
from django.contrib.auth.models import User
|
||||||
|
|
||||||
from gestioncof.petits_cours_models import PetitCoursDemande, PetitCoursAbility
|
from cof.petits_cours_models import PetitCoursDemande, PetitCoursAbility
|
||||||
|
|
||||||
|
|
||||||
class BaseMatieresFormSet(BaseInlineFormSet):
|
class BaseMatieresFormSet(BaseInlineFormSet):
|
|
@ -12,13 +12,13 @@ from django.contrib import messages
|
||||||
from django.db import transaction
|
from django.db import transaction
|
||||||
from django.utils import timezone
|
from django.utils import timezone
|
||||||
|
|
||||||
from gestioncof.models import CofProfile
|
from cof.models import CofProfile
|
||||||
from gestioncof.petits_cours_models import (
|
from cof.petits_cours_models import (
|
||||||
PetitCoursDemande, PetitCoursAttribution, PetitCoursAttributionCounter,
|
PetitCoursDemande, PetitCoursAttribution, PetitCoursAttributionCounter,
|
||||||
PetitCoursAbility
|
PetitCoursAbility
|
||||||
)
|
)
|
||||||
from gestioncof.petits_cours_forms import DemandeForm, MatieresFormSet
|
from cof.petits_cours_forms import DemandeForm, MatieresFormSet
|
||||||
from gestioncof.decorators import buro_required
|
from cof.decorators import buro_required
|
||||||
|
|
||||||
|
|
||||||
class DemandeListView(ListView):
|
class DemandeListView(ListView):
|
||||||
|
@ -38,7 +38,7 @@ class DemandeDetailView(DetailView):
|
||||||
.prefetch_related('petitcoursattribution_set',
|
.prefetch_related('petitcoursattribution_set',
|
||||||
'matieres')
|
'matieres')
|
||||||
)
|
)
|
||||||
template_name = "gestioncof/details_demande_petit_cours.html"
|
template_name = "cof/details_demande_petit_cours.html"
|
||||||
context_object_name = "demande"
|
context_object_name = "demande"
|
||||||
|
|
||||||
def get_context_data(self, **kwargs):
|
def get_context_data(self, **kwargs):
|
||||||
|
@ -109,7 +109,7 @@ def _finalize_traitement(request, demande, proposals, proposed_for,
|
||||||
if errors is not None:
|
if errors is not None:
|
||||||
for error in errors:
|
for error in errors:
|
||||||
messages.error(request, error)
|
messages.error(request, error)
|
||||||
return render(request, "gestioncof/traitement_demande_petit_cours.html",
|
return render(request, "cof/traitement_demande_petit_cours.html",
|
||||||
{"demande": demande,
|
{"demande": demande,
|
||||||
"unsatisfied": unsatisfied,
|
"unsatisfied": unsatisfied,
|
||||||
"proposals": proposals,
|
"proposals": proposals,
|
||||||
|
@ -219,7 +219,7 @@ def _traitement_other(request, demande, redo):
|
||||||
proposals = proposals.items()
|
proposals = proposals.items()
|
||||||
proposed_for = proposed_for.items()
|
proposed_for = proposed_for.items()
|
||||||
return render(request,
|
return render(request,
|
||||||
"gestioncof/traitement_demande_petit_cours_autre_niveau.html",
|
"cof/traitement_demande_petit_cours_autre_niveau.html",
|
||||||
{"demande": demande,
|
{"demande": demande,
|
||||||
"unsatisfied": unsatisfied,
|
"unsatisfied": unsatisfied,
|
||||||
"proposals": proposals,
|
"proposals": proposals,
|
||||||
|
@ -288,7 +288,7 @@ def _traitement_post(request, demande):
|
||||||
demande.processed = timezone.now()
|
demande.processed = timezone.now()
|
||||||
demande.save()
|
demande.save()
|
||||||
return render(request,
|
return render(request,
|
||||||
"gestioncof/traitement_demande_petit_cours_success.html",
|
"cof/traitement_demande_petit_cours_success.html",
|
||||||
{"demande": demande,
|
{"demande": demande,
|
||||||
"redo": redo,
|
"redo": redo,
|
||||||
})
|
})
|
1
cof/settings/secret.py
Symbolic link
|
@ -0,0 +1 @@
|
||||||
|
secret_example.py
|
|
@ -3,7 +3,7 @@ from django.contrib.sites.models import Site
|
||||||
|
|
||||||
from django_cas_ng.backends import CASBackend
|
from django_cas_ng.backends import CASBackend
|
||||||
|
|
||||||
from gestioncof.models import CofProfile
|
from cof.models import CofProfile
|
||||||
|
|
||||||
|
|
||||||
class COFCASBackend(CASBackend):
|
class COFCASBackend(CASBackend):
|
Before Width: | Height: | Size: 382 KiB After Width: | Height: | Size: 382 KiB |
Before Width: | Height: | Size: 106 KiB After Width: | Height: | Size: 106 KiB |
Before Width: | Height: | Size: 438 B After Width: | Height: | Size: 438 B |
Before Width: | Height: | Size: 663 B After Width: | Height: | Size: 663 B |
Before Width: | Height: | Size: 378 B After Width: | Height: | Size: 378 B |