DGNum/experiENS
6
0
Fork 0
Code Issues 11 Pull requests 1 Projects Releases Packages Wiki Activity Actions

Reformatage #29

Closed
thubrecht wants to merge 19 commits from thubrecht/python3 into master
pull from: thubrecht/python3
merge into: DGNum:master
Conversation 2 Commits 19 Files changed 52 +3481 -1628
52 changed files with 3481 additions and 1628 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -9,7 +9,7 @@ Il est visible sur https://www.eleves.ens.fr/experiens/
Clonez le dépôt. Installez les pré-requis : Clonez le dépôt. Installez les pré-requis :
sudo apt-get install libxlst-dev python3.4-dev sudo apt-get install libxlst-dev libsals2-dev libxml2-dev libldap2-dev libssl-dev
On a besoin de SpatiaLite pour une base de données GIS. Essayez On a besoin de SpatiaLite pour une base de données GIS. Essayez

19
avisstage/admin.py
View file

@ -1,34 +1,47 @@
import authens.models as authmod
from django.contrib import admin from django.contrib import admin
from django.contrib.auth.admin import UserAdmin from django.contrib.auth.admin import UserAdmin
from django.contrib.auth.models import User from django.contrib.auth.models import User
from avisstage.models import * from avisstage.models import *
class NormalienInline(admin.StackedInline): class NormalienInline(admin.StackedInline):
model = Normalien model = Normalien
inline_classes = ("collapse open",) inline_classes = ("collapse open",)
class UserAdmin(UserAdmin): class UserAdmin(UserAdmin):
inlines = (NormalienInline, ) inlines = (NormalienInline,)
class AvisLieuInline(admin.StackedInline): class AvisLieuInline(admin.StackedInline):
model = AvisLieu model = AvisLieu
inline_classes = ("collapse open",) inline_classes = ("collapse open",)
extra = 0 extra = 0
class AvisStageInline(admin.StackedInline): class AvisStageInline(admin.StackedInline):
model = AvisStage model = AvisStage
inline_classes = ("collapse open",) inline_classes = ("collapse open",)
extra = 0 extra = 0
class StageAdmin(admin.ModelAdmin): class StageAdmin(admin.ModelAdmin):
inlines = (AvisLieuInline, AvisStageInline) inlines = (AvisLieuInline, AvisStageInline)
class StageMatiereAdmin(admin.ModelAdmin): class StageMatiereAdmin(admin.ModelAdmin):
model = StageMatiere model = StageMatiere
prepopulated_fields = {"slug": ('nom',)} prepopulated_fields = {"slug": ("nom",)}
admin.site.unregister(User) admin.site.unregister(User)
admin.site.register(User, UserAdmin) admin.site.register(User, UserAdmin)
admin.site.register(Lieu) admin.site.register(Lieu)
admin.site.register(StageMatiere, StageMatiereAdmin) admin.site.register(StageMatiere, StageMatiereAdmin)
admin.site.register(Stage, StageAdmin) admin.site.register(Stage, StageAdmin)
admin.site.register(authmod.CASAccount)
admin.site.register(authmod.OldCASAccount)

57
avisstage/allauth_adapter.py
View file

@ -1,57 +0,0 @@
from allauth.account.adapter import DefaultAccountAdapter
from allauth.socialaccount.models import SocialAccount
from allauth_ens.adapter import LongTermClipperAccountAdapter, get_ldap_infos
class AccountAdapter(DefaultAccountAdapter):
def is_open_for_signup(self, request):
return False
class SocialAccountAdapter(LongTermClipperAccountAdapter):
def is_open_for_signup(self, request, sociallogin):
# sociallogin.account is a SocialAccount instance.
# See https://github.com/pennersr/django-allauth/blob/master/allauth/socialaccount/models.py
if sociallogin.account.provider == 'clipper':
return True
# It returns AccountAdapter.is_open_for_signup().
# See https://github.com/pennersr/django-allauth/blob/master/allauth/socialaccount/adapter.py
return super().is_open_for_signup(request, sociallogin)
# TODO : HOTFIX pour un bug d'allauth_ens
# On remplace la déduplication des comptes faites avec "entrance_year"
# par une déduplication sur le nom d'utilisateur
# (Copié de allauth_ens)
def pre_social_login(self, request, sociallogin):
if sociallogin.account.provider != "clipper":
return super(LongTermClipperAccountAdapter,
self).pre_social_login(request, sociallogin)
clipper_uid = sociallogin.account.uid
try:
old_conn = SocialAccount.objects.get(provider='clipper_inactive',
uid=clipper_uid)
except SocialAccount.DoesNotExist:
return
ldap_data = get_ldap_infos(clipper_uid)
sociallogin._ldap_data = ldap_data
if ldap_data is None or 'entrance_year' not in ldap_data:
raise ValueError("No entrance year in LDAP data")
old_conn_username = old_conn.user.username
# HOTFIX ICI
if self.get_username(clipper_uid, ldap_data) != old_conn_username:
email = ldap_data.get('email', get_clipper_email(clipper_uid))
remove_email(old_conn.user, email)
return
old_conn.provider = 'clipper'
old_conn.save()
sociallogin.lookup()

77
avisstage/api.py
View file

@ -1,32 +1,32 @@
# coding: utf-8
from tastypie.resources import ModelResource
from tastypie.authentication import SessionAuthentication
from tastypie import fields, utils from tastypie import fields, utils
from tastypie.authentication import SessionAuthentication
from tastypie.resources import ModelResource
from django.contrib.gis import geos from django.contrib.gis import geos
from django.urls import reverse from django.urls import reverse
from .models import Lieu, Stage, Normalien, StageMatiere from .models import Lieu, Normalien, Stage, StageMatiere
from .utils import approximate_distance from .utils import approximate_distance
class EnScolariteAuthentication(SessionAuthentication): class EnScolariteAuthentication(SessionAuthentication):
def is_authenticated(self, request, **kwargs): def is_authenticated(self, request, **kwargs):
if super().is_authenticated(request, **kwargs): if super().is_authenticated(request, **kwargs):
return request.user.profil.en_scolarite return request.user.profil.en_scolarite
return False return False
# API principale pour les lieux # API principale pour les lieux
class LieuResource(ModelResource): class LieuResource(ModelResource):
#stages = fields.ToManyField("avisstage.api.StageResource", # stages = fields.ToManyField("avisstage.api.StageResource",
# "stages", use_in="detail", full=True) # "stages", use_in="detail", full=True)
class Meta: class Meta:
queryset = Lieu.objects.all() queryset = Lieu.objects.all()
resource_name = "lieu" resource_name = "lieu"
fields = ["nom", "ville", "pays", "coord", "type_lieu", "id"] fields = ["nom", "ville", "pays", "coord", "type_lieu", "id"]
#login_required # login_required
authentication = SessionAuthentication() authentication = SessionAuthentication()
# Filtres personnalisés # Filtres personnalisés
@ -37,43 +37,44 @@ class LieuResource(ModelResource):
# Trouver les lieux à proximités d'un point donné # Trouver les lieux à proximités d'un point donné
if "lng" in filters and "lat" in filters: if "lng" in filters and "lat" in filters:
lat = float(filters['lat']) lat = float(filters["lat"])
lng = float(filters['lng']) lng = float(filters["lng"])
pt = geos.Point((lng,lat), srid=4326) pt = geos.Point((lng, lat), srid=4326)
self.reference_point = pt self.reference_point = pt
orm_filters['coord__distance_lte'] = (pt, 10000) orm_filters["coord__distance_lte"] = (pt, 10000)
# Filtrer les lieux qui ont déjà des stages # Filtrer les lieux qui ont déjà des stages
if "has_stage" in filters: if "has_stage" in filters:
orm_filters['stages__public'] = True orm_filters["stages__public"] = True
return orm_filters return orm_filters
# Custom apply filters pour ajouter le "distinct" # Custom apply filters pour ajouter le "distinct"
def apply_filters(self, request, applicable_filters): def apply_filters(self, request, applicable_filters):
return self.get_object_list(request).filter(**applicable_filters).distinct() return self.get_object_list(request).filter(**applicable_filters).distinct()
# Ajout d'informations # Ajout d'informations
def dehydrate(self, bundle): def dehydrate(self, bundle):
bundle = super(LieuResource, self).dehydrate(bundle) bundle = super(LieuResource, self).dehydrate(bundle)
obj = bundle.obj obj = bundle.obj
bundle.data['coord'] = {'lat': float(obj.coord.y), bundle.data["coord"] = {"lat": float(obj.coord.y), "lng": float(obj.coord.x)}
'lng': float(obj.coord.x)}
# Distance au point recherché # Distance au point recherché
if "lat" in bundle.request.GET and "lng" in bundle.request.GET: if "lat" in bundle.request.GET and "lng" in bundle.request.GET:
bundle.data['distance'] = approximate_distance( bundle.data["distance"] = approximate_distance(
self.reference_point, bundle.obj.coord) self.reference_point, bundle.obj.coord
)
# Autres infos utiles # Autres infos utiles
bundle.data["pays_nom"] = obj.get_pays_display() bundle.data["pays_nom"] = obj.get_pays_display()
bundle.data["type_lieu_nom"] = obj.type_lieu_fancy bundle.data["type_lieu_nom"] = obj.type_lieu_fancy
# TODO use annotate? # TODO use annotate?
bundle.data["num_stages"] = obj.stages.filter(public=True).count() bundle.data["num_stages"] = obj.stages.filter(public=True).count()
return bundle return bundle
# API sur un stage # API sur un stage
class StageResource(ModelResource): class StageResource(ModelResource):
class Meta: class Meta:
@ -81,7 +82,7 @@ class StageResource(ModelResource):
resource_name = "stage" resource_name = "stage"
fields = ["sujet", "date_debut", "date_fin", "matieres", "id"] fields = ["sujet", "date_debut", "date_fin", "matieres", "id"]
#login_required # login_required
authentication = EnScolariteAuthentication() authentication = EnScolariteAuthentication()
# Filtres personnalisés # Filtres personnalisés
@ -92,9 +93,9 @@ class StageResource(ModelResource):
# Récupération des stages à un lieu donné # Récupération des stages à un lieu donné
if "lieux" in filters: if "lieux" in filters:
flieux = map(int, filters['lieux'].split(',')) flieux = map(int, filters["lieux"].split(","))
orm_filters['lieux__id__in'] = flieux orm_filters["lieux__id__in"] = flieux
return orm_filters return orm_filters
# Informations à ajouter # Informations à ajouter
@ -103,23 +104,27 @@ class StageResource(ModelResource):
obj = bundle.obj obj = bundle.obj
# Affichage des manytomany en condensé # Affichage des manytomany en condensé
bundle.data['auteur'] = obj.auteur.nom bundle.data["auteur"] = obj.auteur.nom
bundle.data['thematiques'] = list(obj.thematiques.all().values_list("name", flat=True)) bundle.data["thematiques"] = list(
bundle.data['matieres'] = list(obj.matieres.all().values_list("nom", flat=True)) obj.thematiques.all().values_list("name", flat=True)
)
bundle.data["matieres"] = list(obj.matieres.all().values_list("nom", flat=True))
# Adresse de la fiche de stage # Adresse de la fiche de stage
bundle.data['url'] = reverse("avisstage:stage", kwargs={"pk": obj.id}); bundle.data["url"] = reverse("avisstage:stage", kwargs={"pk": obj.id})
return bundle return bundle
# Auteurs des fiches (TODO supprimer ?) # Auteurs des fiches (TODO supprimer ?)
class AuteurResource(ModelResource): class AuteurResource(ModelResource):
stages = fields.ToManyField("avisstage.api.StageResource", stages = fields.ToManyField(
"stages", use_in="detail") "avisstage.api.StageResource", "stages", use_in="detail"
)
class Meta: class Meta:
queryset = Normalien.objects.all() queryset = Normalien.objects.all()
resource_name = "profil" resource_name = "profil"
fields = ["id", "nom", "stages"] fields = ["id", "nom", "stages"]
#login_required # login_required
authentication = EnScolariteAuthentication() authentication = EnScolariteAuthentication()

4
avisstage/apps.py
View file

@ -1,7 +1,5 @@
from __future__ import unicode_literals
from django.apps import AppConfig from django.apps import AppConfig
class AvisstageConfig(AppConfig): class AvisstageConfig(AppConfig):
name = 'avisstage' name = "avisstage"

4
avisstage/decorators.py
View file

@ -1,7 +1,8 @@
from functools import wraps from functools import wraps
from django.urls import reverse
from django.shortcuts import redirect from django.shortcuts import redirect
from django.urls import reverse
def en_scolarite_required(view_func): def en_scolarite_required(view_func):
@wraps(view_func) @wraps(view_func)
@ -9,4 +10,5 @@ def en_scolarite_required(view_func):
if request.user.profil.en_scolarite: if request.user.profil.en_scolarite:
return view_func(request, *args, **kwargs) return view_func(request, *args, **kwargs)
return redirect(reverse("avisstage:403-archicubes")) return redirect(reverse("avisstage:403-archicubes"))
return _wrapped_view return _wrapped_view

73
avisstage/documents.py
View file

@ -1,52 +1,61 @@
from django_elasticsearch_dsl import DocType, Index, fields from django_elasticsearch_dsl import DocType, Index, fields
from elasticsearch_dsl import analyzer, token_filter, tokenizer from elasticsearch_dsl import analyzer, token_filter, tokenizer
from .models import Stage, AvisStage, AvisLieu from .models import AvisLieu, AvisStage, Stage
from .statics import PAYS_OPTIONS from .statics import PAYS_OPTIONS
PAYS_DICT = dict(PAYS_OPTIONS) PAYS_DICT = dict(PAYS_OPTIONS)
stage = Index('stages') stage = Index("stages")
stage.settings( stage.settings(number_of_shards=1, number_of_replicas=0)
number_of_shards=1,
number_of_replicas=0
)
text_analyzer = analyzer( text_analyzer = analyzer(
'default', "default",
tokenizer="standard", tokenizer="standard",
filter=['lowercase', 'standard', 'asciifolding', filter=[
token_filter("frstop", type="stop", stopwords="_french_"), "lowercase",
token_filter("frsnow", type="snowball", language="French")]) "standard",
"asciifolding",
token_filter("frstop", type="stop", stopwords="_french_"),
token_filter("frsnow", type="snowball", language="French"),
],
)
stage.analyzer(text_analyzer) stage.analyzer(text_analyzer)
@stage.doc_type @stage.doc_type
class StageDocument(DocType): class StageDocument(DocType):
lieux = fields.ObjectField(properties={ lieux = fields.ObjectField(
'nom': fields.StringField(), properties={
'ville': fields.StringField(), "nom": fields.StringField(),
'pays': fields.StringField(), "ville": fields.StringField(),
}) "pays": fields.StringField(),
auteur = fields.ObjectField(properties={ }
'nom': fields.StringField(), )
}) auteur = fields.ObjectField(
properties={
"nom": fields.StringField(),
}
)
thematiques = fields.StringField() thematiques = fields.StringField()
matieres = fields.StringField() matieres = fields.StringField()
class Meta: class Meta:
model = Stage model = Stage
fields = [ fields = [
'sujet', "sujet",
'encadrants', "encadrants",
'type_stage', "type_stage",
'niveau_scol', "niveau_scol",
'structure', "structure",
'date_debut', "date_debut",
'date_fin' "date_fin",
] ]
def prepare_thematiques(self, instance): def prepare_thematiques(self, instance):
return ", ".join(instance.thematiques.all().values_list("name", flat=True)).lower() return ", ".join(
instance.thematiques.all().values_list("name", flat=True)
).lower()
def prepare_matieres(self, instance): def prepare_matieres(self, instance):
return ", ".join(instance.matieres.all().values_list("nom", flat=True)).lower() return ", ".join(instance.matieres.all().values_list("nom", flat=True)).lower()
@ -65,11 +74,11 @@ class StageDocument(DocType):
def prepare_sujet(self, instance): def prepare_sujet(self, instance):
return instance.sujet.lower() return instance.sujet.lower()
# Hook pour l'affichage des noms de pays # Hook pour l'affichage des noms de pays
def prepare(self, instance): def prepare(self, instance):
data = super(StageDocument, self).prepare(instance) data = super(StageDocument, self).prepare(instance)
for lieu in data['lieux']: for lieu in data["lieux"]:
lieu['pays'] = PAYS_DICT[lieu['pays']].lower() lieu["pays"] = PAYS_DICT[lieu["pays"]].lower()
return data return data

179
avisstage/forms.py
View file

@ -1,46 +1,69 @@
# coding: utf-8 import re
import unicodedata
from simple_email_confirmation.models import EmailAddress
from django import forms from django import forms
from django.contrib.auth.forms import PasswordResetForm
from django.utils import timezone from django.utils import timezone
import re from .models import AvisLieu, AvisStage, Lieu, Normalien, Stage, User
from .models import Normalien, Stage, Lieu, AvisLieu, AvisStage
from .widgets import LatLonField from .widgets import LatLonField
# Sur-classe utile # Sur-classe utile
class HTMLTrimmerForm(forms.ModelForm): class HTMLTrimmerForm(forms.ModelForm):
def clean(self): def clean(self):
# Suppression des espaces blanc avant et après le texte pour les champs html # Suppression des espaces blanc avant et après le texte pour les champs html
leading_white = re.compile(r"^( \t\n)*(<p>(&nbsp;|[ \n\t]|<br[ /]*>)*</p>( \t\n)*)+?", re.IGNORECASE) leading_white = re.compile(
trailing_white = re.compile(r"(( \t\n)*<p>(&nbsp;|[ \n\t]|<br[ /]*>)*</p>)+?( \t\n)*$", re.IGNORECASE) r"^( \t\n)*(<p>(&nbsp;|[ \n\t]|<br[ /]*>)*</p>( \t\n)*)+?", re.IGNORECASE
)
trailing_white = re.compile(
r"(( \t\n)*<p>(&nbsp;|[ \n\t]|<br[ /]*>)*</p>)+?( \t\n)*$", re.IGNORECASE
)
cleaned_data = super(HTMLTrimmerForm, self).clean() cleaned_data = super(HTMLTrimmerForm, self).clean()
for (fname, fval) in cleaned_data.items(): for (fname, fval) in cleaned_data.items():
# Heuristique : les champs commençant par "avis_" sont des champs html # Heuristique : les champs commençant par "avis_" sont des champs html
if fname[:5] == "avis_": if fname[:5] == "avis_":
cleaned_data[fname] = leading_white.sub("", trailing_white.sub("", fval)) cleaned_data[fname] = leading_white.sub(
"", trailing_white.sub("", fval)
)
return cleaned_data return cleaned_data
# Infos sur un stage # Infos sur un stage
class StageForm(forms.ModelForm): class StageForm(forms.ModelForm):
date_widget = forms.DateInput(attrs={"class":"datepicker", date_widget = forms.DateInput(
"placeholder":"JJ/MM/AAAA"}) attrs={"class": "datepicker", "placeholder": "JJ/MM/AAAA"}
date_debut = forms.DateField(label=u"Date de début", )
input_formats=["%d/%m/%Y"], widget=date_widget) date_debut = forms.DateField(
date_fin = forms.DateField(label=u"Date de fin", label="Date de début", input_formats=["%d/%m/%Y"], widget=date_widget
input_formats=["%d/%m/%Y"], widget=date_widget) )
date_fin = forms.DateField(
label="Date de fin", input_formats=["%d/%m/%Y"], widget=date_widget
)
class Meta: class Meta:
model = Stage model = Stage
fields = ['sujet', 'date_debut', 'date_fin', 'type_stage', 'niveau_scol', 'thematiques', 'matieres', 'structure', 'encadrants'] fields = [
"sujet",
"date_debut",
"date_fin",
"type_stage",
"niveau_scol",
"thematiques",
"matieres",
"structure",
"encadrants",
]
help_texts = { help_texts = {
"thematiques": u"Mettez une virgule pour valider votre thématique si la suggestion ne correspond pas ou si elle n'existe pas encore", "thematiques": "Mettez une virgule pour valider votre thématique si la suggestion ne correspond pas ou si elle n'existe pas encore",
"structure": u"Nom de l'équipe, du laboratoire, de la startup... (si le lieu ne suffit pas)" "structure": "Nom de l'équipe, du laboratoire, de la startup... (si le lieu ne suffit pas)",
} }
labels = { labels = {
"date_debut": u"Date de début", "date_debut": "Date de début",
} }
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
@ -48,62 +71,128 @@ class StageForm(forms.ModelForm):
if "request" in kwargs: if "request" in kwargs:
self.request = kwargs.pop("request") self.request = kwargs.pop("request")
super(StageForm, self).__init__(*args, **kwargs) super(StageForm, self).__init__(*args, **kwargs)
def save(self, commit=True): def save(self, commit=True):
# Lors de la création : attribution à l'utilisateur connecté # Lors de la création : attribution à l'utilisateur connecté
if self.instance.id is None and hasattr(self, 'request'): if self.instance.id is None and hasattr(self, "request"):
self.instance.auteur = self.request.user.profil self.instance.auteur = self.request.user.profil
# Date de modification # Date de modification
self.instance.date_maj = timezone.now() self.instance.date_maj = timezone.now()
self.instance.update_stats(False) self.instance.update_stats(False)
stage = super(StageForm, self).save(commit=commit) stage = super(StageForm, self).save(commit=commit)
return stage return stage
# Sous-formulaire des avis sur le stage # Sous-formulaire des avis sur le stage
class AvisStageForm(HTMLTrimmerForm): class AvisStageForm(HTMLTrimmerForm):
class Meta: class Meta:
model = AvisStage model = AvisStage
fields = ['chapo', 'avis_sujet', 'avis_ambiance', 'avis_admin', 'avis_prestage', 'les_plus', 'les_moins'] fields = [
"chapo",
"avis_sujet",
"avis_ambiance",
"avis_admin",
"avis_prestage",
"les_plus",
"les_moins",
]
help_texts = { help_texts = {
"chapo": u"\"Trop long, pas lu\" : une accroche résumant ce que vous avez pensé de ce séjour", "chapo": '"Trop long, pas lu" : une accroche résumant ce que vous avez pensé de ce séjour',
"avis_ambiance": u"Avez-vous passé un bon moment à ce travail ? Étiez-vous assez guidé⋅e ? Aviez-vous un bon contact avec vos encadrant⋅e⋅s ? Y avait-il une bonne ambiance dans l'équipe ?", "avis_ambiance": "Avez-vous passé un bon moment à ce travail ? Étiez-vous assez guidé⋅e ? Aviez-vous un bon contact avec vos encadrant⋅e⋅s ? Y avait-il une bonne ambiance dans l'équipe ?",
"avis_sujet": u"Quelle était votre mission ? Qu'en avez-vous retiré ? Le travail correspondait-il à vos attentes ? Était-ce à votre niveau, trop dur, trop facile ?", "avis_sujet": "Quelle était votre mission ? Qu'en avez-vous retiré ? Le travail correspondait-il à vos attentes ? Était-ce à votre niveau, trop dur, trop facile ?",
"avis_admin": u"Avez-vous commencé votre travail à la date prévue ? Était-ce compliqué d'obtenir les documents nécessaires (visa, contrats, etc) ? L'administration de l'établissement vous a-t-elle aidé⋅e ? Étiez-vous rémunéré⋅e ?", "avis_admin": "Avez-vous commencé votre travail à la date prévue ? Était-ce compliqué d'obtenir les documents nécessaires (visa, contrats, etc) ? L'administration de l'établissement vous a-t-elle aidé⋅e ? Étiez-vous rémunéré⋅e ?",
"avis_prestage": u"Comment avez-vous trouvé où aller pour cette expérience ? À quel moment avez-vous commencé à chercher ? Avez-vous eu des entretiens pour obtenir votre place ? Avez-vous eu d'autres pistes, pourquoi avez-vous choisi cette option ?", "avis_prestage": "Comment avez-vous trouvé où aller pour cette expérience ? À quel moment avez-vous commencé à chercher ? Avez-vous eu des entretiens pour obtenir votre place ? Avez-vous eu d'autres pistes, pourquoi avez-vous choisi cette option ?",
"les_plus": u"Les principaux points positifs de cette expérience", "les_plus": "Les principaux points positifs de cette expérience",
"les_moins": u"Ce qui aurait pu être mieux", "les_moins": "Ce qui aurait pu être mieux",
} }
class AvisLieuForm(HTMLTrimmerForm): class AvisLieuForm(HTMLTrimmerForm):
class Meta: class Meta:
model = AvisLieu model = AvisLieu
fields = ['lieu', 'chapo', 'avis_lieustage', 'avis_pratique', 'avis_tourisme', 'les_plus', 'les_moins'] fields = [
"lieu",
"chapo",
"avis_lieustage",
"avis_pratique",
"avis_tourisme",
"les_plus",
"les_moins",
]
help_texts = { help_texts = {
"chapo": u"\"Trop long, pas lu\" : une accroche résumant ce que vous avez pensé de cet endroit", "chapo": '"Trop long, pas lu" : une accroche résumant ce que vous avez pensé de cet endroit',
"avis_lieustage": u"Qu'avez-vous pensé des lieux où vous travailliez ? Les bâtiments étaient-ils modernes ? Était-il agréable d'y travailler ?", "avis_lieustage": "Qu'avez-vous pensé des lieux où vous travailliez ? Les bâtiments étaient-ils modernes ? Était-il agréable d'y travailler ?",
"avis_pratique": u"Avez-vous eu du mal à trouver un logement ? Y-a-t-il des choses que vous avez apprises sur place qu'il vous aurait été utile de savoir avant de partir ?", "avis_pratique": "Avez-vous eu du mal à trouver un logement ? Y-a-t-il des choses que vous avez apprises sur place qu'il vous aurait été utile de savoir avant de partir ?",
"avis_tourisme": u"Y-a-t-il des lieux à visiter dans cette zone ? Avez-vous pratiqué des activités sportives ? Est-il facile de faire des rencontres ?", "avis_tourisme": "Y-a-t-il des lieux à visiter dans cette zone ? Avez-vous pratiqué des activités sportives ? Est-il facile de faire des rencontres ?",
"les_plus": u"Les meilleures raisons de partir à cet endroit", "les_plus": "Les meilleures raisons de partir à cet endroit",
"les_moins": u"Ce qui vous a gêné ou manqué là-bas", "les_moins": "Ce qui vous a gêné ou manqué là-bas",
}
widgets = {
"lieu": forms.HiddenInput(attrs={"class":"lieu-hidden"})
} }
widgets = {"lieu": forms.HiddenInput(attrs={"class": "lieu-hidden"})}
# Création d'un nouveau lieu # Création d'un nouveau lieu
class LieuForm(forms.ModelForm): class LieuForm(forms.ModelForm):
coord = LatLonField() coord = LatLonField()
id = forms.IntegerField(widget=forms.widgets.HiddenInput(), required=False) id = forms.IntegerField(widget=forms.widgets.HiddenInput(), required=False)
class Meta: class Meta:
model = Lieu model = Lieu
fields = ['id', 'nom', 'type_lieu', 'ville', 'pays', 'coord'] fields = ["id", "nom", "type_lieu", "ville", "pays", "coord"]
# Widget de feedback # Widget de feedback
class FeedbackForm(forms.Form): class FeedbackForm(forms.Form):
objet = forms.CharField(label="Objet", required=True) objet = forms.CharField(label="Objet", required=True)
message = forms.CharField(label="Message", required=True, widget=forms.widgets.Textarea()) message = forms.CharField(
label="Message", required=True, widget=forms.widgets.Textarea()
)
# Nouvelle adresse mail
class AdresseEmailForm(forms.Form):
def __init__(self, _user, **kwargs):
self._user = _user
super().__init__(**kwargs)
email = forms.EmailField(
widget=forms.widgets.EmailInput(attrs={"placeholder": "Nouvelle adresse"})
)
def clean_email(self):
email = self.cleaned_data["email"]
if EmailAddress.objects.filter(user=self._user, email=email).exists():
raise forms.ValidationError("Cette adresse est déjà associée à ce compte")
return email
def _unicode_ci_compare(s1, s2):
"""
Perform case-insensitive comparison of two identifiers, using the
recommended algorithm from Unicode Technical Report 36, section
2.11.2(B)(2).
"""
return (
unicodedata.normalize("NFKC", s1).casefold()
== unicodedata.normalize("NFKC", s2).casefold()
)
# (Ré)initialisation du mot de passe
class ReinitMdpForm(PasswordResetForm):
def get_users(self, email):
"""Override default method to allow unusable passwords"""
email_field_name = User.get_email_field_name()
active_users = User._default_manager.filter(
**{
"%s__iexact" % email_field_name: email,
"is_active": True,
}
)
return (
u
for u in active_users
if _unicode_ci_compare(email, getattr(u, email_field_name))
)

55
avisstage/management/commands/nettoie_lieux.py
View file

@ -1,43 +1,60 @@
#coding: utf-8
from django.core.management.base import BaseCommand, CommandError from django.core.management.base import BaseCommand, CommandError
from django.db.models import Count from django.db.models import Count
from avisstage.models import Stage, Lieu
from avisstage.models import Lieu, Stage
class Command(BaseCommand): class Command(BaseCommand):
help = 'Nettoie les stages à plusieurs lieux identiques' help = "Nettoie les stages à plusieurs lieux identiques"
def add_arguments(self, parser): def add_arguments(self, parser):
parser.add_argument('min_lieu', nargs='?', default=0, type=int) parser.add_argument("min_lieu", nargs="?", default=0, type=int)
parser.add_argument( parser.add_argument(
'--apply', "--apply",
action='store_true', action="store_true",
default=False, default=False,
help='Applies the modifications', help="Applies the modifications",
) )
def handle(self, *args, **options): def handle(self, *args, **options):
rundb = False rundb = False
if options.get('apply', False): if options.get("apply", False):
rundb = True rundb = True
else: else:
print(u"Les modifications ne seront pas appliquées") print("Les modifications ne seront pas appliquées")
min_lieu = options.get('min_lieu', 0)
for lieu in Lieu.objects.filter(id__gte=min_lieu).order_by('-id'): min_lieu = options.get("min_lieu", 0)
lproches = Lieu.objects.filter(id__lt=lieu.id, coord__distance_lte=(lieu.coord, 5))
for lieu in Lieu.objects.filter(id__gte=min_lieu).order_by("-id"):
lproches = Lieu.objects.filter(
id__lt=lieu.id, coord__distance_lte=(lieu.coord, 5)
)
if len(lproches) == 0: if len(lproches) == 0:
continue continue
print(u"Doublons possibles pour %s (id=%d, %d avis) :" % (lieu, lieu.id, lieu.avislieu_set.count())) print(
"Doublons possibles pour %s (id=%d, %d avis) :"
% (lieu, lieu.id, lieu.avislieu_set.count())
)
for plieu in lproches: for plieu in lproches:
pprint = u" > %s (id=%d, %d avis)" % (plieu, plieu.id, plieu.avislieu_set.count()) pprint = " > %s (id=%d, %d avis)" % (
if plieu.nom == lieu.nom and plieu.ville == lieu.ville and plieu.type_lieu == lieu.type_lieu: plieu,
print(u"%s %s" % (pprint, self.style.SUCCESS(u'-> Suppression'))) plieu.id,
plieu.avislieu_set.count(),
)
if (
plieu.nom == lieu.nom
and plieu.ville == lieu.ville
and plieu.type_lieu == lieu.type_lieu
):
print("%s %s" % (pprint, self.style.SUCCESS("-> Suppression")))
if rundb: if rundb:
for avis in plieu.avislieu_set.all(): for avis in plieu.avislieu_set.all():
avis.lieu = lieu avis.lieu = lieu
avis.save() avis.save()
plieu.delete() plieu.delete()
else: else:
print(u"%s %s" % (pprint, self.style.WARNING(u'-> À supprimer manuellement'))) print(
self.stdout.write(self.style.SUCCESS(u'Nettoyage des lieux effectué')) "%s %s"
% (pprint, self.style.WARNING("-> À supprimer manuellement"))
)
self.stdout.write(self.style.SUCCESS("Nettoyage des lieux effectué"))

46
avisstage/management/commands/nettoie_stages.py
View file

@ -1,18 +1,19 @@
#coding: utf-8
from django.core.management.base import BaseCommand, CommandError from django.core.management.base import BaseCommand, CommandError
from django.db.models import Count from django.db.models import Count
from avisstage.models import Stage, Lieu
from avisstage.models import Lieu, Stage
class Command(BaseCommand): class Command(BaseCommand):
help = 'Nettoie les stages à plusieurs lieux identiques' help = "Nettoie les stages à plusieurs lieux identiques"
def add_arguments(self, parser): def add_arguments(self, parser):
parser.add_argument('min_stage', nargs='?', default=0, type=int) parser.add_argument("min_stage", nargs="?", default=0, type=int)
parser.add_argument( parser.add_argument(
'--apply', "--apply",
action='store_true', action="store_true",
default=False, default=False,
help='Applies the modifications', help="Applies the modifications",
) )
def handle(self, *args, **options): def handle(self, *args, **options):
@ -27,15 +28,16 @@ class Command(BaseCommand):
return length return length
rundb = False rundb = False
if options.get('apply', False): if options.get("apply", False):
rundb = True rundb = True
else: else:
print(u"Les modifications ne seront pas appliquées") print("Les modifications ne seront pas appliquées")
min_stage = options.get('min_stage', 0)
for stage in Stage.objects.annotate(c=Count("lieux"))\ min_stage = options.get("min_stage", 0)
.filter(c__gte=2, id__gte=min_stage):
for stage in Stage.objects.annotate(c=Count("lieux")).filter(
c__gte=2, id__gte=min_stage
):
lieuset = {} lieuset = {}
todel = [] todel = []
problems = [] problems = []
@ -52,15 +54,19 @@ class Command(BaseCommand):
problems += [(avis, alen), lieuset[aid]] problems += [(avis, alen), lieuset[aid]]
lieuset[aid] = (avis, alen) lieuset[aid] = (avis, alen)
if len(todel) > 0: if len(todel) > 0:
print(u"Doublons détectés dans %s" % (stage,)) print("Doublons détectés dans %s" % (stage,))
for avis, alen in todel: for avis, alen in todel:
print(u" > Suppression de l'avis sur %s de %d mots" % \ print(
(avis.lieu, alen)) " > Suppression de l'avis sur %s de %d mots" % (avis.lieu, alen)
)
if rundb: if rundb:
avis.delete() avis.delete()
if len(problems) > 0: if len(problems) > 0:
self.stdout.write(self.style.WARNING(u"Réparation impossible de %s (id=%d)" % (stage, stage.id))) self.stdout.write(
self.style.WARNING(
"Réparation impossible de %s (id=%d)" % (stage, stage.id)
)
)
for avis, alen in problems: for avis, alen in problems:
print(u" > Avis sur %s de %d mots" % \ print(" > Avis sur %s de %d mots" % (avis.lieu, alen))
(avis.lieu, alen)) self.stdout.write(self.style.SUCCESS("Nettoyage des stages effectué"))
self.stdout.write(self.style.SUCCESS(u'Nettoyage des stages effectué'))

37
avisstage/management/commands/supprime_lieu.py
View file

@ -1,35 +1,42 @@
#coding: utf-8
from django.core.management.base import BaseCommand, CommandError from django.core.management.base import BaseCommand, CommandError
from django.db.models import Count from django.db.models import Count
from avisstage.models import Stage, Lieu
from avisstage.models import Lieu, Stage
class Command(BaseCommand): class Command(BaseCommand):
help = 'Nettoie les stages à plusieurs lieux identiques' help = "Nettoie les stages à plusieurs lieux identiques"
def add_arguments(self, parser): def add_arguments(self, parser):
parser.add_argument('del_lieu', type=int, help='Lieu à supprimer') parser.add_argument("del_lieu", type=int, help="Lieu à supprimer")
parser.add_argument('repl_lieu', type=int, help='Lieu le remplaçant') parser.add_argument("repl_lieu", type=int, help="Lieu le remplaçant")
parser.add_argument( parser.add_argument(
'--apply', "--apply",
action='store_true', action="store_true",
default=False, default=False,
help='Applies the modifications', help="Applies the modifications",
) )
def handle(self, *args, **options): def handle(self, *args, **options):
rundb = False rundb = False
if options.get('apply', False): if options.get("apply", False):
rundb = True rundb = True
else: else:
print(u"Les modifications ne seront pas appliquées") print("Les modifications ne seront pas appliquées")
plieu = Lieu.objects.get(id=options['del_lieu']) plieu = Lieu.objects.get(id=options["del_lieu"])
lieu = Lieu.objects.get(id=options['repl_lieu']) lieu = Lieu.objects.get(id=options["repl_lieu"])
print(u"Suppression de %s (id=%d, %d avis)" % (plieu, plieu.id, plieu.avislieu_set.count())) print(
print(u"Remplacement par %s (id=%d, %d avis)" % (lieu, lieu.id, lieu.avislieu_set.count())) "Suppression de %s (id=%d, %d avis)"
% (plieu, plieu.id, plieu.avislieu_set.count())
)
print(
"Remplacement par %s (id=%d, %d avis)"
% (lieu, lieu.id, lieu.avislieu_set.count())
)
if rundb: if rundb:
for avis in plieu.avislieu_set.all(): for avis in plieu.avislieu_set.all():
avis.lieu = lieu avis.lieu = lieu
avis.save() avis.save()
plieu.delete() plieu.delete()
self.stdout.write(self.style.SUCCESS(u'Terminé')) self.stdout.write(self.style.SUCCESS("Terminé"))

18
avisstage/management/commands/termine_scolarite.py Normal file
View file

@ -0,0 +1,18 @@
from datetime import timedelta
from django.core.management.base import BaseCommand, CommandError
from django.utils import timezone
from avisstage.models import Normalien
class Command(BaseCommand):
help = 'Réinitialise les statuts "en scolarité" de tout le monde'
def add_arguments(self, parser):
return
def handle(self, *args, **options):
old_conn = timezone.now() - timedelta(days=365)
Normalien.objects.all().update(last_cas_connect=t)
self.stdout.write(self.style.SUCCESS("Terminé"))

699
avisstage/migrations/0001_initial.py
View file

File diff suppressed because one or more lines are too long

31
avisstage/migrations/0002_auto_20171002_2243.py
View file

@ -1,31 +1,36 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.11.2 on 2017-10-02 20:43 # Generated by Django 1.11.2 on 2017-10-02 20:43
from __future__ import unicode_literals
import tinymce.models
from django.db import migrations, models from django.db import migrations, models
import tinymce.models
class Migration(migrations.Migration): class Migration(migrations.Migration):
dependencies = [ dependencies = [
('avisstage', '0001_initial'), ("avisstage", "0001_initial"),
] ]
operations = [ operations = [
migrations.AddField( migrations.AddField(
model_name='avisstage', model_name="avisstage",
name='avis_prestage', name="avis_prestage",
field=tinymce.models.HTMLField(blank=True, default='', verbose_name='Avant le stage'), field=tinymce.models.HTMLField(
blank=True, default="", verbose_name="Avant le stage"
),
), ),
migrations.AddField( migrations.AddField(
model_name='stage', model_name="stage",
name='len_avis_lieux', name="len_avis_lieux",
field=models.IntegerField(default=0, verbose_name='Longueur des avis de lieu'), field=models.IntegerField(
default=0, verbose_name="Longueur des avis de lieu"
),
), ),
migrations.AddField( migrations.AddField(
model_name='stage', model_name="stage",
name='len_avis_stage', name="len_avis_stage",
field=models.IntegerField(default=0, verbose_name='Longueur des avis de stage'), field=models.IntegerField(
default=0, verbose_name="Longueur des avis de stage"
),
), ),
] ]

357
avisstage/migrations/0003_auto_20210117_1208.py Normal file
View file

@ -0,0 +1,357 @@
# Generated by Django 2.2.17 on 2021-01-17 11:08
import django.db.models.deletion
from django.conf import settings
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
("avisstage", "0002_auto_20171002_2243"),
]
operations = [
migrations.AlterField(
model_name="lieu",
name="pays",
field=models.CharField(
choices=[
("AF", "Afghanistan"),
("AL", "Albanie"),
("AQ", "Antarctique"),
("DZ", "Algérie"),
("AS", "Samoa Américaines"),
("AD", "Andorre"),
("AO", "Angola"),
("AG", "Antigua-et-Barbuda"),
("AZ", "Azerbaïdjan"),
("AR", "Argentine"),
("AU", "Australie"),
("AT", "Autriche"),
("BS", "Bahamas"),
("BH", "Bahreïn"),
("BD", "Bangladesh"),
("AM", "Arménie"),
("BB", "Barbade"),
("BE", "Belgique"),
("BM", "Bermudes"),
("BT", "Bhoutan"),
("BO", "Bolivie"),
("BA", "Bosnie-Herzégovine"),
("BW", "Botswana"),
("BV", "Île Bouvet"),
("BR", "Brésil"),
("BZ", "Belize"),
("IO", "Territoire Britannique de l'Océan Indien"),
("SB", "Îles Salomon"),
("VG", "Îles Vierges Britanniques"),
("BN", "Brunéi Darussalam"),
("BG", "Bulgarie"),
("MM", "Myanmar"),
("BI", "Burundi"),
("BY", "Bélarus"),
("KH", "Cambodge"),
("CM", "Cameroun"),
("CA", "Canada"),
("CV", "Cap-vert"),
("KY", "Îles Caïmanes"),
("CF", "République Centrafricaine"),
("LK", "Sri Lanka"),
("TD", "Tchad"),
("CL", "Chili"),
("CN", "Chine"),
("TW", "Taïwan"),
("CX", "Île Christmas"),
("CC", "Îles Cocos (Keeling)"),
("CO", "Colombie"),
("KM", "Comores"),
("YT", "Mayotte"),
("CG", "République du Congo"),
("CD", "République Démocratique du Congo"),
("CK", "Îles Cook"),
("CR", "Costa Rica"),
("HR", "Croatie"),
("CU", "Cuba"),
("CY", "Chypre"),
("CZ", "République Tchèque"),
("BJ", "Bénin"),
("DK", "Danemark"),
("DM", "Dominique"),
("DO", "République Dominicaine"),
("EC", "Équateur"),
("SV", "El Salvador"),
("GQ", "Guinée Équatoriale"),
("ET", "Éthiopie"),
("ER", "Érythrée"),
("EE", "Estonie"),
("FO", "Îles Féroé"),
("FK", "Îles (malvinas) Falkland"),
("GS", "Géorgie du Sud et les Îles Sandwich du Sud"),
("FJ", "Fidji"),
("FI", "Finlande"),
("AX", "Îles Åland"),
("FR", "France"),
("GF", "Guyane Française"),
("PF", "Polynésie Française"),
("TF", "Terres Australes Françaises"),
("DJ", "Djibouti"),
("GA", "Gabon"),
("GE", "Géorgie"),
("GM", "Gambie"),
("PS", "Territoire Palestinien Occupé"),
("DE", "Allemagne"),
("GH", "Ghana"),
("GI", "Gibraltar"),
("KI", "Kiribati"),
("GR", "Grèce"),
("GL", "Groenland"),
("GD", "Grenade"),
("GP", "Guadeloupe"),
("GU", "Guam"),
("GT", "Guatemala"),
("GN", "Guinée"),
("GY", "Guyana"),
("HT", "Haïti"),
("HM", "Îles Heard et Mcdonald"),
("VA", "Saint-Siège (état de la Cité du Vatican)"),
("HN", "Honduras"),
("HK", "Hong-Kong"),
("HU", "Hongrie"),
("IS", "Islande"),
("IN", "Inde"),
("ID", "Indonésie"),
("IR", "République Islamique d'Iran"),
("IQ", "Iraq"),
("IE", "Irlande"),
("IL", "Israël"),
("IT", "Italie"),
("CI", "Côte d'Ivoire"),
("JM", "Jamaïque"),
("JP", "Japon"),
("KZ", "Kazakhstan"),
("JO", "Jordanie"),
("KE", "Kenya"),
("KP", "République Populaire Démocratique de Corée"),
("KR", "République de Corée"),
("KW", "Koweït"),
("KG", "Kirghizistan"),
("LA", "République Démocratique Populaire Lao"),
("LB", "Liban"),
("LS", "Lesotho"),
("LV", "Lettonie"),
("LR", "Libéria"),
("LY", "Jamahiriya Arabe Libyenne"),
("LI", "Liechtenstein"),
("LT", "Lituanie"),
("LU", "Luxembourg"),
("MO", "Macao"),
("MG", "Madagascar"),
("MW", "Malawi"),
("MY", "Malaisie"),
("MV", "Maldives"),
("ML", "Mali"),
("MT", "Malte"),
("MQ", "Martinique"),
("MR", "Mauritanie"),
("MU", "Maurice"),
("MX", "Mexique"),
("MC", "Monaco"),
("MN", "Mongolie"),
("MD", "République de Moldova"),
("MS", "Montserrat"),
("MA", "Maroc"),
("MZ", "Mozambique"),
("OM", "Oman"),
("NA", "Namibie"),
("NR", "Nauru"),
("NP", "Népal"),
("NL", "Pays-Bas"),
("AN", "Antilles Néerlandaises"),
("AW", "Aruba"),
("NC", "Nouvelle-Calédonie"),
("VU", "Vanuatu"),
("NZ", "Nouvelle-Zélande"),
("NI", "Nicaragua"),
("NE", "Niger"),
("NG", "Nigéria"),
("NU", "Niué"),
("NF", "Île Norfolk"),
("NO", "Norvège"),
("MP", "Îles Mariannes du Nord"),
("UM", "Îles Mineures Éloignées des États-Unis"),
("FM", "États Fédérés de Micronésie"),
("MH", "Îles Marshall"),
("PW", "Palaos"),
("PK", "Pakistan"),
("PA", "Panama"),
("PG", "Papouasie-Nouvelle-Guinée"),
("PY", "Paraguay"),
("PE", "Pérou"),
("PH", "Philippines"),
("PN", "Pitcairn"),
("PL", "Pologne"),
("PT", "Portugal"),
("GW", "Guinée-Bissau"),
("TL", "Timor-Leste"),
("PR", "Porto Rico"),
("QA", "Qatar"),
("RE", "Réunion"),
("RO", "Roumanie"),
("RU", "Fédération de Russie"),
("RW", "Rwanda"),
("SH", "Sainte-Hélène"),
("KN", "Saint-Kitts-et-Nevis"),
("AI", "Anguilla"),
("LC", "Sainte-Lucie"),
("PM", "Saint-Pierre-et-Miquelon"),
("VC", "Saint-Vincent-et-les Grenadines"),
("SM", "Saint-Marin"),
("ST", "Sao Tomé-et-Principe"),
("SA", "Arabie Saoudite"),
("SN", "Sénégal"),
("SC", "Seychelles"),
("SL", "Sierra Leone"),
("SG", "Singapour"),
("SK", "Slovaquie"),
("VN", "Viet Nam"),
("SI", "Slovénie"),
("SO", "Somalie"),
("ZA", "Afrique du Sud"),
("ZW", "Zimbabwe"),
("ES", "Espagne"),
("EH", "Sahara Occidental"),
("SD", "Soudan"),
("SR", "Suriname"),
("SJ", "Svalbard etÎle Jan Mayen"),
("SZ", "Swaziland"),
("SE", "Suède"),
("CH", "Suisse"),
("SY", "République Arabe Syrienne"),
("TJ", "Tadjikistan"),
("TH", "Thaïlande"),
("TG", "Togo"),
("TK", "Tokelau"),
("TO", "Tonga"),
("TT", "Trinité-et-Tobago"),
("AE", "Émirats Arabes Unis"),
("TN", "Tunisie"),
("TR", "Turquie"),
("TM", "Turkménistan"),
("TC", "Îles Turks et Caïques"),
("TV", "Tuvalu"),
("UG", "Ouganda"),
("UA", "Ukraine"),
("MK", "L'ex-République Yougoslave de Macédoine"),
("EG", "Égypte"),
("GB", "Royaume-Uni"),
("IM", "Île de Man"),
("TZ", "République-Unie de Tanzanie"),
("US", "États-Unis"),
("VI", "Îles Vierges des États-Unis"),
("BF", "Burkina Faso"),
("UY", "Uruguay"),
("UZ", "Ouzbékistan"),
("VE", "Venezuela"),
("WF", "Wallis et Futuna"),
("WS", "Samoa"),
("YE", "Yémen"),
("CS", "Serbie-et-Monténégro"),
("ZM", "Zambie"),
],
max_length=2,
verbose_name="Pays",
),
),
migrations.AlterField(
model_name="lieu",
name="type_lieu",
field=models.CharField(
choices=[
("universite", "Université"),
("entreprise", "Entreprise"),
("centrerecherche", "Centre de recherche"),
("administration", "Administration"),
("autre", "Autre"),
],
default="universite",
max_length=15,
verbose_name="Type de structure d'accueil",
),
),
migrations.AlterField(
model_name="normalien",
name="user",
field=models.OneToOneField(
null=True,
on_delete=django.db.models.deletion.SET_NULL,
related_name="profil",
to=settings.AUTH_USER_MODEL,
),
),
migrations.AlterField(
model_name="stage",
name="auteur",
field=models.ForeignKey(
null=True,
on_delete=django.db.models.deletion.SET_NULL,
related_name="stages",
to="avisstage.Normalien",
),
),
migrations.AlterField(
model_name="stage",
name="niveau_scol",
field=models.CharField(
blank=True,
choices=[
("L3", "Licence 3"),
("M1", "Master 1"),
("M2", "Master 2"),
("DOC", "Pré-doctorat"),
("CST", "Césure"),
("BLA", "Année blanche"),
("VAC", "Vacances scolaires"),
("MIT", "Mi-temps en parallèle des études"),
("", "Autre"),
],
default="",
max_length=3,
verbose_name="Année de scolarité",
),
),
migrations.AlterField(
model_name="stage",
name="type_stage",
field=models.CharField(
choices=[
(
"Recherche :",
(
("recherche", "Stage académique"),
("recherche_autre", "Stage non-académique"),
("sejour_dri", "Séjour de recherche DRI"),
),
),
(
"Stage sans visée de recherche :",
(
("pro", "Stage en entreprise"),
("admin", "Stage en admin./ONG/orga. internationale"),
),
),
(
"Enseignement :",
(
("lectorat", "Lectorat DRI"),
("autre_teach", "Autre expérience d'enseignement"),
),
),
("autre", "Autre"),
],
default="stage",
max_length=31,
verbose_name="Type",
),
),
]

107
avisstage/migrations/0004_allauth_to_authens.py Normal file
View file

@ -0,0 +1,107 @@
from django.apps import apps as global_apps
from django.db import migrations
from django.utils import timezone
def forwards(apps, schema_editor):
User = apps.get_model("auth", "User")
try:
CASAccount = apps.get_model("authens", "CASAccount")
except LookupError:
return
try:
SocialAccount = apps.get_model("socialaccount", "SocialAccount")
OldEmailAddress = apps.get_model("account", "EmailAddress")
except LookupError:
# Allauth not installed
# Simply create CAS accounts for every profile
# This procedure is not meant to be fast
from authens.shortcuts import fetch_cas_account
def migrate_user(user):
ldap_info = fetch_cas_account(user.username)
if ldap_info:
entrance_year = ldap_info["entrance_year"]
CASAccount.objects.create(
user=user, cas_login=user.username, entrance_year=entrance_year
)
for user in User.objects.all():
migrate_user(user)
return
NewEmailAddress = apps.get_model("simple_email_confirmation", "EmailAddress")
from simple_email_confirmation.models import EmailAddressManager
# Transfer from allauth to authens
# Assumes usernames have the format <clipper>@<promo>
# Assumes no clashing clipper accounts have ever been found
oldusers = User.objects.all().prefetch_related(
"emailaddress_set", "socialaccount_set"
)
is_ens_mail = lambda mail: (
mail is not None and (mail.endswith("ens.fr") or mail.endswith("ens.psl.eu"))
)
new_conns = []
new_mails = []
for user in oldusers:
# Move EmailAddress to new model
addresses = user.emailaddress_set.all()
for addr in addresses:
newaddr = NewEmailAddress(
user=user,
email=addr.email,
set_at=timezone.now(),
confirmed_at=(timezone.now() if addr.verified else None),
key=EmailAddressManager().generate_key(),
)
if addr.primary and user.email != addr.email:
print("Adresse principale inconsistante", user.email, addr.email)
new_mails.append(newaddr)
# Create new CASAccount connexion
saccounts = user.socialaccount_set.all()
if not saccounts:
continue
if len(saccounts) > 1:
print(saccounts)
saccount = saccounts[0]
clipper = saccount.uid
if "@" not in user.username:
print(user.username)
continue
entrance_year = saccount.extra_data.get(
"entrance_year", user.username.split("@")[1]
)
try:
entrance_year = 2000 + int(entrance_year)
except ValueError:
print(entrance_year)
continue
new_conns.append(
CASAccount(user=user, cas_login=clipper, entrance_year=int(entrance_year))
)
NewEmailAddress.objects.bulk_create(new_mails)
CASAccount.objects.bulk_create(new_conns)
class Migration(migrations.Migration):
operations = [
migrations.RunPython(forwards, migrations.RunPython.noop),
]
dependencies = [
("avisstage", "0003_auto_20210117_1208"),
("authens", "0002_old_cas_account"),
]
if global_apps.is_installed("allauth"):
dependencies.append(("socialaccount", "0003_extra_data_default_dict"))
if global_apps.is_installed("simple_email_confirmation"):
dependencies.append(("simple_email_confirmation", "0001_initial"))

18
avisstage/migrations/0005_normalien_en_scolarite.py Normal file
View file

@ -0,0 +1,18 @@
# Generated by Django 2.2.17 on 2021-01-17 20:46
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
("avisstage", "0004_allauth_to_authens"),
]
operations = [
migrations.AddField(
model_name="normalien",
name="en_scolarite",
field=models.BooleanField(blank=True, default=False),
),
]

37
avisstage/migrations/0006_auto_20210131_1954.py Normal file
View file

@ -0,0 +1,37 @@
# Generated by Django 2.2.17 on 2021-01-31 18:54
from django.db import migrations, models
import avisstage.models
class Migration(migrations.Migration):
dependencies = [
("avisstage", "0005_normalien_en_scolarite"),
]
operations = [
migrations.RemoveField(
model_name="normalien",
name="en_scolarite",
),
migrations.RemoveField(
model_name="normalien",
name="mail",
),
migrations.AddField(
model_name="normalien",
name="last_cas_login",
field=models.DateField(default=avisstage.models._default_cas_login),
),
migrations.AlterField(
model_name="normalien",
name="contactez_moi",
field=models.BooleanField(
default=True,
help_text="Affiche votre adresse e-mail principale sur votre profil public",
verbose_name="Inviter les visiteurs à me contacter",
),
),
]

335
avisstage/models.py
View file

@ -1,130 +1,157 @@
# coding: utf-8 from datetime import timedelta
from __future__ import unicode_literals from authens.models import CASAccount
from authens.signals import post_cas_connect
from taggit_autosuggest.managers import TaggableManager
from tinymce.models import HTMLField as RichTextField
from allauth.account.models import EmailAddress
from allauth.socialaccount.models import SocialAccount
from django.db import models
from django.db.models.signals import post_save
from django.contrib.auth.models import User from django.contrib.auth.models import User
from django.contrib.gis.db import models as geomodels from django.contrib.gis.db import models as geomodels
from django.template.defaultfilters import slugify from django.db import models
from django.db.models.signals import post_save
from django.forms.widgets import DateInput from django.forms.widgets import DateInput
from django.template.defaultfilters import slugify
from django.urls import reverse from django.urls import reverse
from django.utils import timezone from django.utils import timezone
from django.utils.functional import cached_property from django.utils.functional import cached_property
from django.utils.html import strip_tags from django.utils.html import strip_tags
from taggit_autosuggest.managers import TaggableManager from .statics import (
from tinymce.models import HTMLField as RichTextField DEPARTEMENTS_DEFAUT,
NIVEAU_SCOL_DICT,
NIVEAU_SCOL_OPTIONS,
PAYS_OPTIONS,
TYPE_LIEU_DICT,
TYPE_LIEU_OPTIONS,
TYPE_STAGE_DICT,
TYPE_STAGE_OPTIONS,
)
from .utils import choices_length, is_email_ens
from .utils import choices_length
from .statics import DEPARTEMENTS_DEFAUT, PAYS_OPTIONS, TYPE_LIEU_OPTIONS, TYPE_STAGE_OPTIONS, TYPE_LIEU_DICT, TYPE_STAGE_DICT, NIVEAU_SCOL_OPTIONS, NIVEAU_SCOL_DICT
import ldap def _default_cas_login():
return (timezone.now() - timedelta(days=365)).date()
# #
# Profil Normalien (extension du modèle User) # Profil Normalien (extension du modèle User)
# #
class Normalien(models.Model): class Normalien(models.Model):
user = models.OneToOneField(User, related_name="profil") user = models.OneToOneField(
User, related_name="profil", on_delete=models.SET_NULL, null=True
)
# Infos spécifiques # Infos spécifiques
nom = models.CharField(u"Nom complet", max_length=255, blank=True) nom = models.CharField("Nom complet", max_length=255, blank=True)
promotion = models.CharField(u"Promotion", max_length=40, blank=True) promotion = models.CharField("Promotion", max_length=40, blank=True)
mail = models.EmailField(u"Adresse e-mail permanente", contactez_moi = models.BooleanField(
max_length=200, blank=True) "Inviter les visiteurs à me contacter",
contactez_moi = models.BooleanField(u"Inviter les visiteurs à me contacter", default=True,
default=True) help_text="Affiche votre adresse e-mail principale sur votre profil public",
bio = models.TextField(u"À propos de moi", blank=True, default=""); )
bio = models.TextField("À propos de moi", blank=True, default="")
last_cas_login = models.DateField(default=_default_cas_login)
class Meta: class Meta:
verbose_name = u"Profil élève" verbose_name = "Profil élève"
verbose_name_plural = u"Profils élèves" verbose_name_plural = "Profils élèves"
def __str__(self): def __str__(self):
return u"%s (%s)" % (self.nom, self.user.username) return "%s (%s)" % (self.nom, self.user.username)
# Liste des stages publiés # Liste des stages publiés
def stages_publics(self): def stages_publics(self):
return self.stages.filter(public=True).order_by('-date_debut') return self.stages.filter(public=True).order_by("-date_debut")
@cached_property
def en_scolarite(self):
return SocialAccount.objects.filter(user_id=self.user_id,
provider="clipper").exists()
def has_nonENS_email(self): def has_nonENS_email(self):
a = EmailAddress.objects.filter(user_id=self.user_id, return (
verified=True) \ self.user.email_address_set.exclude(confirmed_at__isnull=True)
.exclude(email__endswith="ens.fr") .exclude(email__endswith="ens.fr")
return a.exists() .exclude(email__endswith="ens.psl.eu")
.exists()
)
def nom_complet(self):
if self.nom.strip():
return self.nom
return self.user.username
@property
def en_scolarite(self):
return self.last_cas_login > (timezone.now() - timedelta(days=60)).date()
@property @property
def preferred_email(self): def preferred_email(self):
a = EmailAddress.objects.filter(user_id=self.user_id, return self.user.email
verified=True) \
.exclude(email__endswith="ens.fr")\
.order_by('-primary')
if len(a) == 0:
a = EmailAddress.objects.filter(user_id=self.user_id,
verified=True) \
.order_by('-primary')
if len(a) == 0:
return ""
else:
return a[0].email
# Hook à la création d'un nouvel utilisateur : récupération de ses infos par LDAP
def create_user_profile(sender, instance, created, **kwargs): # Hook à la création d'un nouvel utilisateur : information de base
def create_basic_user_profile(sender, instance, created, **kwargs):
if created: if created:
profil, created = Normalien.objects.get_or_create(user=instance) profil, created = Normalien.objects.get_or_create(user=instance)
try:
saccount = SocialAccount.objects.get(user=instance,
provider="clipper")
except SocialAccount.DoesNotExist:
profil.save()
return
edata = saccount.extra_data.get("ldap", {})
dep = ""
if "department_code" in edata:
dep = dict(DEPARTEMENTS_DEFAUT).get(
edata["department_code"].lower(), '')
profil.promotion = "%s %s" % (dep, edata["entrance_year"])
profil.nom = edata.get("name", "")
profil.save()
post_save.connect(create_user_profile, sender=User) if not created and profil.promotion != "":
return
if "@" in instance.username:
profil.promotion = instance.username.split("@")[1]
profil.save()
post_save.connect(create_basic_user_profile, sender=User)
# Hook d'authENS : information du CAS
def handle_cas_connection(sender, instance, created, cas_login, attributes, **kwargs):
profil, created = Normalien.objects.get_or_create(user=instance)
profil.last_cas_login = timezone.now().date()
if not created:
profil.save()
return
dirs = attributes.get("homeDirectory", "").split("/")
if len(dirs) < 4:
print("HomeDirectory invalide", dirs)
return
year = dirs[2]
departement = dirs[3]
dep = dict(DEPARTEMENTS_DEFAUT).get(departement.lower(), "")
profil.promotion = "%s %s" % (dep, year)
profil.nom = attributes.get("name", "")
profil.save()
post_cas_connect.connect(handle_cas_connection, sender=User)
# #
# Lieu de stage # Lieu de stage
# #
class Lieu(models.Model): class Lieu(models.Model):
# Général # Général
nom = models.CharField(u"Nom de l'institution d'accueil", nom = models.CharField("Nom de l'institution d'accueil", max_length=250)
max_length=250) type_lieu = models.CharField(
type_lieu = models.CharField(u"Type de structure d'accueil", "Type de structure d'accueil",
default="universite", default="universite",
choices=TYPE_LIEU_OPTIONS, choices=TYPE_LIEU_OPTIONS,
max_length=choices_length(TYPE_LIEU_OPTIONS)) max_length=choices_length(TYPE_LIEU_OPTIONS),
)
# Infos géographiques # Infos géographiques
ville = models.CharField(u"Ville", ville = models.CharField("Ville", max_length=200)
max_length=200) pays = models.CharField(
pays = models.CharField(u"Pays", "Pays", choices=PAYS_OPTIONS, max_length=choices_length(PAYS_OPTIONS)
choices=PAYS_OPTIONS, )
max_length=choices_length(PAYS_OPTIONS))
# Coordonnées # Coordonnées
objects = geomodels.GeoManager() # Requis par GeoDjango # objects = geomodels.GeoManager() # Requis par GeoDjango
coord = geomodels.PointField(u"Coordonnées", coord = geomodels.PointField("Coordonnées", geography=True, srid=4326)
geography=True,
srid = 4326)
# Type du lieu en plus joli # Type du lieu en plus joli
@property @property
@ -136,20 +163,22 @@ class Lieu(models.Model):
return TYPE_LIEU_DICT.get(self.type_lieu, ("lieu", False))[1] return TYPE_LIEU_DICT.get(self.type_lieu, ("lieu", False))[1]
def __str__(self): def __str__(self):
return u"%s (%s)" % (self.nom, self.ville) return "%s (%s)" % (self.nom, self.ville)
class Meta: class Meta:
verbose_name = "Lieu" verbose_name = "Lieu"
verbose_name_plural = "Lieux" verbose_name_plural = "Lieux"
# #
# Matières des stages # Matières des stages
# #
class StageMatiere(models.Model): class StageMatiere(models.Model):
nom = models.CharField(u"Nom", max_length=30) nom = models.CharField("Nom", max_length=30)
slug = models.SlugField() slug = models.SlugField()
class Meta: class Meta:
verbose_name = "Matière des stages" verbose_name = "Matière des stages"
verbose_name_plural = "Matières des stages" verbose_name_plural = "Matières des stages"
@ -157,48 +186,59 @@ class StageMatiere(models.Model):
def __str__(self): def __str__(self):
return self.nom return self.nom
# #
# Un stage # Un stage
# #
class Stage(models.Model): class Stage(models.Model):
# Misc # Misc
auteur = models.ForeignKey(Normalien, related_name="stages") auteur = models.ForeignKey(
public = models.BooleanField(u"Visible publiquement", default=False) Normalien, related_name="stages", on_delete=models.SET_NULL, null=True
date_creation = models.DateTimeField(u"Créé le", default=timezone.now) )
date_maj = models.DateTimeField(u"Mis à jour le", default=timezone.now) public = models.BooleanField("Visible publiquement", default=False)
len_avis_stage = models.IntegerField(u"Longueur des avis de stage", default=0) date_creation = models.DateTimeField("Créé le", default=timezone.now)
len_avis_lieux = models.IntegerField(u"Longueur des avis de lieu", default=0) date_maj = models.DateTimeField("Mis à jour le", default=timezone.now)
len_avis_stage = models.IntegerField("Longueur des avis de stage", default=0)
len_avis_lieux = models.IntegerField("Longueur des avis de lieu", default=0)
# Caractéristiques du stage # Caractéristiques du stage
sujet = models.CharField(u"Sujet", max_length=500) sujet = models.CharField("Sujet", max_length=500)
date_debut = models.DateField(u"Date de début", null=True) date_debut = models.DateField("Date de début", null=True)
date_fin = models.DateField(u"Date de fin", null=True) date_fin = models.DateField("Date de fin", null=True)
type_stage = models.CharField(u"Type", type_stage = models.CharField(
default="stage", "Type",
choices=TYPE_STAGE_OPTIONS, default="stage",
max_length=choices_length(TYPE_STAGE_OPTIONS)) choices=TYPE_STAGE_OPTIONS,
niveau_scol = models.CharField(u"Année de scolarité", max_length=choices_length(TYPE_STAGE_OPTIONS),
default="", )
choices=NIVEAU_SCOL_OPTIONS, niveau_scol = models.CharField(
max_length=choices_length(NIVEAU_SCOL_OPTIONS), "Année de scolarité",
blank=True) default="",
choices=NIVEAU_SCOL_OPTIONS,
max_length=choices_length(NIVEAU_SCOL_OPTIONS),
blank=True,
)
thematiques = TaggableManager(u"Thématiques", blank=True) thematiques = TaggableManager("Thématiques", blank=True)
matieres = models.ManyToManyField(StageMatiere, verbose_name=u"Matière(s)", related_name="stages") matieres = models.ManyToManyField(
encadrants = models.CharField(u"Encadrant⋅e⋅s", max_length=500, blank=True) StageMatiere, verbose_name="Matière(s)", related_name="stages"
structure = models.CharField(u"Structure d'accueil", max_length=500, blank=True) )
encadrants = models.CharField("Encadrant⋅e⋅s", max_length=500, blank=True)
structure = models.CharField("Structure d'accueil", max_length=500, blank=True)
# Avis # Avis
lieux = models.ManyToManyField(Lieu, related_name="stages", lieux = models.ManyToManyField(
through="AvisLieu", blank=True) Lieu, related_name="stages", through="AvisLieu", blank=True
)
# Affichage des avis ordonnés # Affichage des avis ordonnés
@property @property
def avis_lieux(self): def avis_lieux(self):
return self.avislieu_set.order_by('order') return self.avislieu_set.order_by("order")
# Shortcut pour affichage rapide # Shortcut pour affichage rapide
@property @property
@ -212,6 +252,7 @@ class Stage(models.Model):
@property @property
def type_stage_fancy(self): def type_stage_fancy(self):
return TYPE_STAGE_DICT.get(self.type_stage, ("stage", False))[0] return TYPE_STAGE_DICT.get(self.type_stage, ("stage", False))[0]
@property @property
def type_stage_fem(self): def type_stage_fem(self):
return TYPE_STAGE_DICT.get(self.type_stage, ("stage", False))[1] return TYPE_STAGE_DICT.get(self.type_stage, ("stage", False))[1]
@ -227,10 +268,10 @@ class Stage(models.Model):
return self.lieux.all() return self.lieux.all()
def get_absolute_url(self): def get_absolute_url(self):
return reverse('avisstage:stage', self) return reverse("avisstage:stage", self)
def __str__(self): def __str__(self):
return u"%s (par %s)" % (self.sujet, self.auteur.user.username) return "%s (par %s)" % (self.sujet, self.auteur.user.username)
def update_stats(self, save=True): def update_stats(self, save=True):
def get_len(obj): def get_len(obj):
@ -242,70 +283,80 @@ class Stage(models.Model):
length += len(obj.les_plus.split()) length += len(obj.les_plus.split())
length += len(obj.les_moins.split()) length += len(obj.les_moins.split())
return length return length
if self.avis_stage: if self.avis_stage:
self.len_avis_stage = get_len(self.avis_stage) self.len_avis_stage = get_len(self.avis_stage)
self.len_avis_lieux = 0 self.len_avis_lieux = 0
for avis in self.avislieu_set.all(): for avis in self.avislieu_set.all():
self.len_avis_lieux += get_len(avis) self.len_avis_lieux += get_len(avis)
if save: if save:
self.save() self.save()
class Meta: class Meta:
verbose_name = "Stage" verbose_name = "Stage"
# #
# Les avis # Les avis
# #
class AvisStage(models.Model): class AvisStage(models.Model):
stage = models.OneToOneField(Stage, related_name="avis_stage") stage = models.OneToOneField(
Stage, related_name="avis_stage", on_delete=models.CASCADE
)
chapo = models.TextField(u"En quelques mots", blank=True) chapo = models.TextField("En quelques mots", blank=True)
avis_ambiance = RichTextField(u"L'ambiance de travail", blank=True) avis_ambiance = RichTextField("L'ambiance de travail", blank=True)
avis_sujet = RichTextField(u"La mission", blank=True) avis_sujet = RichTextField("La mission", blank=True)
avis_admin = RichTextField(u"Formalités et administration", blank=True) avis_admin = RichTextField("Formalités et administration", blank=True)
avis_prestage = RichTextField(u"Avant le stage", blank=True, default="") avis_prestage = RichTextField("Avant le stage", blank=True, default="")
les_plus = models.TextField(u"Les plus de cette expérience", blank=True) les_plus = models.TextField("Les plus de cette expérience", blank=True)
les_moins = models.TextField(u"Les moins de cette expérience", blank=True) les_moins = models.TextField("Les moins de cette expérience", blank=True)
def __str__(self): def __str__(self):
return u"Avis sur {%s} par %s" % (self.stage.sujet, self.stage.auteur.user.username) return "Avis sur {%s} par %s" % (
self.stage.sujet,
self.stage.auteur.user.username,
)
# Liste des champs d'avis, couplés à leur nom (pour l'affichage) # Liste des champs d'avis, couplés à leur nom (pour l'affichage)
@property @property
def avis_all(self): def avis_all(self):
fields = ['avis_sujet', 'avis_ambiance', 'avis_admin', 'avis_prestage'] fields = ["avis_sujet", "avis_ambiance", "avis_admin", "avis_prestage"]
return [(AvisStage._meta.get_field(field).verbose_name, return [
getattr(self, field, '')) for field in fields] (AvisStage._meta.get_field(field).verbose_name, getattr(self, field, ""))
for field in fields
]
class AvisLieu(models.Model): class AvisLieu(models.Model):
stage = models.ForeignKey(Stage) stage = models.ForeignKey(Stage, on_delete=models.CASCADE)
lieu = models.ForeignKey(Lieu) lieu = models.ForeignKey(Lieu, on_delete=models.CASCADE)
order = models.IntegerField("Ordre", default=0) order = models.IntegerField("Ordre", default=0)
chapo = models.TextField(u"En quelques mots", blank=True) chapo = models.TextField("En quelques mots", blank=True)
avis_lieustage = RichTextField(u"Les lieux de travail", blank=True) avis_lieustage = RichTextField("Les lieux de travail", blank=True)
avis_pratique = RichTextField(u"S'installer - conseils pratiques", avis_pratique = RichTextField("S'installer - conseils pratiques", blank=True)
blank=True) avis_tourisme = RichTextField("Dans les parages", blank=True)
avis_tourisme = RichTextField(u"Dans les parages", blank=True)
les_plus = models.TextField(u"Les plus du lieu", blank=True) les_plus = models.TextField("Les plus du lieu", blank=True)
les_moins = models.TextField(u"Les moins du lieu", blank=True) les_moins = models.TextField("Les moins du lieu", blank=True)
class Meta: class Meta:
verbose_name = "Avis sur un lieu de stage" verbose_name = "Avis sur un lieu de stage"
verbose_name_plural = "Avis sur un lieu de stage" verbose_name_plural = "Avis sur un lieu de stage"
def __str__(self): def __str__(self):
return u"Avis sur {%s} par %s" % (self.lieu.nom, self.stage.auteur.user_id) return "Avis sur {%s} par %s" % (self.lieu.nom, self.stage.auteur.user_id)
# Liste des champs d'avis, couplés à leur nom (pour l'affichage) # Liste des champs d'avis, couplés à leur nom (pour l'affichage)
@property @property
def avis_all(self): def avis_all(self):
fields = ['avis_lieustage', 'avis_pratique', 'avis_tourisme'] fields = ["avis_lieustage", "avis_pratique", "avis_tourisme"]
return [(AvisLieu._meta.get_field(field).verbose_name, return [
getattr(self, field, '')) for field in fields] (AvisLieu._meta.get_field(field).verbose_name, getattr(self, field, ""))
for field in fields
]

4
avisstage/sass/_responsive.scss
View file

@ -177,14 +177,14 @@
display: block; display: block;
text-align: left; text-align: left;
font-size: 0.95em; font-size: 0.95em;
color: $compl * 0.8; color: darken($compl, 20%);
margin-top: 0; margin-top: 0;
width: auto; width: auto;
} }
.help_text { .help_text {
text-align: right; text-align: right;
color: $fond * 0.4; color: darken($fond, 60%);
} }
.input { .input {

58
avisstage/sass/screen.scss
View file

@ -46,7 +46,7 @@ em, i {
a { a {
font-weight: bold; font-weight: bold;
color: $compl * 0.9; color: darken($compl, 10%);
text-decoration: none; text-decoration: none;
} }
@ -107,7 +107,7 @@ header {
color: lighten($fond, 40%); color: lighten($fond, 40%);
&:hover { &:hover {
background: $barre * 0.6; background: darken($barre, 40%);
} }
} }
} }
@ -181,7 +181,6 @@ p.warning {
li { li {
display: table; display: table;
width: 100%; width: 100%;
//border: 1px solid $fond * 1.3;
background: #fff; background: #fff;
margin: 12px; margin: 12px;
@ -363,6 +362,57 @@ section.profil {
} }
} }
section.two-cols {
display: flex;
display: flexbox;
align-items: center;
& > * {
flex: 1;
width: 50%;
margin: 10px;
}
}
ul.mes-emails {
li {
display: flex;
background: #fff;
margin: 5px;
padding: 10px;
min-height: 70px;
justify-content: space-between;
align-items: center;
flex-wrap: wrap;
& > * {
flex: 1;
text-align: center;
}
.adresse {
text-align: left;
font-weight: bold;
}
.confirmee {
width: 20px;
}
.supprimer {
flex: 0.7;
}
form {
display: flex;
align-items: center;
justify-content: space-around;
.field {
flex: 1;
}
}
}
}
// //
// //
// Détail d'un stage // Détail d'un stage
@ -432,7 +482,7 @@ input[type="submit"], .btn {
font: $textfontsize $textfont; font: $textfontsize $textfont;
background-color: $fond; background-color: $fond;
color: #fff; color: #fff;
border: 1px solid $fond * 0.7; border: 1px solid darken($fond, 30%);
border-radius: 5px; border-radius: 5px;
padding: 8px 12px; padding: 8px 12px;
display: inline-block; display: inline-block;

343
avisstage/static/css/screen.css
View file

File diff suppressed because it is too large Load diff

4
avisstage/static/js/select_lieu.js
View file

@ -63,10 +63,10 @@ function SelectLieuWidget(STATIC_ROOT, API_LIEU, MAPBOX_API_KEY, target, callbac
// Affiche la carte // Affiche la carte
map = L.map(map_el[0]).setView([48.8422411,2.3430553], 15); map = L.map(map_el[0]).setView([48.8422411,2.3430553], 15);
var layer = L.tileLayer('https://api.tiles.mapbox.com/v4/{id}/{z}/{x}/{y}.png?access_token={accessToken}', { var layer = L.tileLayer('https://api.mapbox.com/styles/v1/{id}/tiles/{z}/{x}/{y}?access_token={accessToken}', {
attribution: 'Map data &copy; <a href="https://www.openstreetmap.org/">OpenStreetMap</a> contributors, <a href="https://creativecommons.org/licenses/by-sa/2.0/">CC-BY-SA</a>, Imagery © <a href="https://www.mapbox.com/">Mapbox</a>', attribution: 'Map data &copy; <a href="https://www.openstreetmap.org/">OpenStreetMap</a> contributors, <a href="https://creativecommons.org/licenses/by-sa/2.0/">CC-BY-SA</a>, Imagery © <a href="https://www.mapbox.com/">Mapbox</a>',
maxZoom: 18, maxZoom: 18,
id: 'mapbox.streets', id: 'mapbox/streets-v11',
accessToken: MAPBOX_API_KEY accessToken: MAPBOX_API_KEY
}); });
map.addLayer(layer); map.addLayer(layer);

613
avisstage/statics.py
View file

@ -1,330 +1,337 @@
# coding: utf-8
DEPARTEMENTS_DEFAUT = ( DEPARTEMENTS_DEFAUT = (
('phy', u'Physique'), ("phy", "Physique"),
('maths', u'Maths'), ("maths", "Maths"),
('bio', u'Biologie'), ("bio", "Biologie"),
('chimie', u'Chimie'), ("chimie", "Chimie"),
('geol', u'Géosciences'), ("geol", "Géosciences"),
('dec', u'DEC'), ("dec", "DEC"),
('info', u'Informatique'), ("info", "Informatique"),
('litt', u'Littéraire'), ("litt", "Littéraire"),
('guests', u'Pensionnaires étrangers'), ("guests", "Pensionnaires étrangers"),
('pei', u'PEI'), ("pei", "PEI"),
) )
TYPE_STAGE_OPTIONS = ( TYPE_STAGE_OPTIONS = (
(u'Recherche :', ( (
('recherche', u"Stage académique"), "Recherche :",
('recherche_autre', u"Stage non-académique"), (
('sejour_dri', u"Séjour de recherche DRI"), ("recherche", "Stage académique"),
)), ("recherche_autre", "Stage non-académique"),
(u'Stage sans visée de recherche :', ( ("sejour_dri", "Séjour de recherche DRI"),
('pro', u"Stage en entreprise"), ),
('admin', u"Stage en admin./ONG/orga. internationale"), ),
)), (
(u'Enseignement :', ( "Stage sans visée de recherche :",
('lectorat', u"Lectorat DRI"), (
('autre_teach', u"Autre expérience d'enseignement"), ("pro", "Stage en entreprise"),
)), ("admin", "Stage en admin./ONG/orga. internationale"),
('autre', u"Autre"), ),
),
(
"Enseignement :",
(
("lectorat", "Lectorat DRI"),
("autre_teach", "Autre expérience d'enseignement"),
),
),
("autre", "Autre"),
) )
# Dictionnaire des type de stage (et de leur genre, True=féminin) # Dictionnaire des type de stage (et de leur genre, True=féminin)
TYPE_STAGE_DICT = { TYPE_STAGE_DICT = {
'recherche': (u"stage de recherche académique", False), "recherche": ("stage de recherche académique", False),
'recherche_autre': (u"stage de recherche non-académique", False), "recherche_autre": ("stage de recherche non-académique", False),
'sejour_dri': (u"séjour de recherche DRI", False), "sejour_dri": ("séjour de recherche DRI", False),
'pro': (u"stage en entreprise sans visée de recherche", False), "pro": ("stage en entreprise sans visée de recherche", False),
'admin': (u"stage en administration, ONG ou organisation internationale", False), "admin": ("stage en administration, ONG ou organisation internationale", False),
'lectorat': (u"lectorat DRI", False), "lectorat": ("lectorat DRI", False),
'autre_teach': (u"expérience de recherche", True), "autre_teach": ("expérience de recherche", True),
'autre': (u"expérience", True), "autre": ("expérience", True),
} }
TYPE_LIEU_OPTIONS = ( TYPE_LIEU_OPTIONS = (
('universite', u"Université"), ("universite", "Université"),
('entreprise', u"Entreprise"), ("entreprise", "Entreprise"),
('centrerecherche', u"Centre de recherche"), ("centrerecherche", "Centre de recherche"),
('administration', u"Administration"), ("administration", "Administration"),
('autre', u"Autre"), ("autre", "Autre"),
) )
# Place du stage dans le cursus # Place du stage dans le cursus
NIVEAU_SCOL_OPTIONS = ( NIVEAU_SCOL_OPTIONS = (
('L3', u"Licence 3"), ("L3", "Licence 3"),
('M1', u"Master 1"), ("M1", "Master 1"),
('M2', u"Master 2"), ("M2", "Master 2"),
('DOC', u"Pré-doctorat"), ("DOC", "Pré-doctorat"),
('CST', u"Césure"), ("CST", "Césure"),
('BLA', u"Année blanche"), ("BLA", "Année blanche"),
('VAC', u"Vacances scolaires"), ("VAC", "Vacances scolaires"),
('MIT', u"Mi-temps en parallèle des études"), ("MIT", "Mi-temps en parallèle des études"),
('', u"Autre"), ("", "Autre"),
) )
NIVEAU_SCOL_DICT = { NIVEAU_SCOL_DICT = {
"L3": u"pendant sa troisième année de Licence", "L3": "pendant sa troisième année de Licence",
"M1": u"pendant sa première année de Master", "M1": "pendant sa première année de Master",
"M2": u"pendant sa deuxième année de Master", "M2": "pendant sa deuxième année de Master",
"DOC": u"pendant son année de pré-doctorat", "DOC": "pendant son année de pré-doctorat",
"CST": u"pendant une année de césure", "CST": "pendant une année de césure",
"BLA": u"pendant une année blanche", "BLA": "pendant une année blanche",
"VAC": u"pendant des vacances scolaires", "VAC": "pendant des vacances scolaires",
"MIT": u"à mi-temps en parallèle des études", "MIT": "à mi-temps en parallèle des études",
} }
# Dictionnaire des noms de lieux (et de leur genre, True=féminin) # Dictionnaire des noms de lieux (et de leur genre, True=féminin)
TYPE_LIEU_DICT = { TYPE_LIEU_DICT = {
'universite': (u"université", True), "universite": ("université", True),
'entreprise': (u"entreprise", True), "entreprise": ("entreprise", True),
'centrerecherche': (u"centre de recherche", False), "centrerecherche": ("centre de recherche", False),
'administration': (u"administration", True), "administration": ("administration", True),
'autre': (u"lieu", False), "autre": ("lieu", False),
} }
PAYS_OPTIONS = ( PAYS_OPTIONS = (
("AF", u"Afghanistan"), ("AF", "Afghanistan"),
("AL", u"Albanie"), ("AL", "Albanie"),
("AQ", u"Antarctique"), ("AQ", "Antarctique"),
("DZ", u"Algérie"), ("DZ", "Algérie"),
("AS", u"Samoa Américaines"), ("AS", "Samoa Américaines"),
("AD", u"Andorre"), ("AD", "Andorre"),
("AO", u"Angola"), ("AO", "Angola"),
("AG", u"Antigua-et-Barbuda"), ("AG", "Antigua-et-Barbuda"),
("AZ", u"Azerbaïdjan"), ("AZ", "Azerbaïdjan"),
("AR", u"Argentine"), ("AR", "Argentine"),
("AU", u"Australie"), ("AU", "Australie"),
("AT", u"Autriche"), ("AT", "Autriche"),
("BS", u"Bahamas"), ("BS", "Bahamas"),
("BH", u"Bahreïn"), ("BH", "Bahreïn"),
("BD", u"Bangladesh"), ("BD", "Bangladesh"),
("AM", u"Arménie"), ("AM", "Arménie"),
("BB", u"Barbade"), ("BB", "Barbade"),
("BE", u"Belgique"), ("BE", "Belgique"),
("BM", u"Bermudes"), ("BM", "Bermudes"),
("BT", u"Bhoutan"), ("BT", "Bhoutan"),
("BO", u"Bolivie"), ("BO", "Bolivie"),
("BA", u"Bosnie-Herzégovine"), ("BA", "Bosnie-Herzégovine"),
("BW", u"Botswana"), ("BW", "Botswana"),
("BV", u"Île Bouvet"), ("BV", "Île Bouvet"),
("BR", u"Brésil"), ("BR", "Brésil"),
("BZ", u"Belize"), ("BZ", "Belize"),
("IO", u"Territoire Britannique de l'Océan Indien"), ("IO", "Territoire Britannique de l'Océan Indien"),
("SB", u"Îles Salomon"), ("SB", "Îles Salomon"),
("VG", u"Îles Vierges Britanniques"), ("VG", "Îles Vierges Britanniques"),
("BN", u"Brunéi Darussalam"), ("BN", "Brunéi Darussalam"),
("BG", u"Bulgarie"), ("BG", "Bulgarie"),
("MM", u"Myanmar"), ("MM", "Myanmar"),
("BI", u"Burundi"), ("BI", "Burundi"),
("BY", u"Bélarus"), ("BY", "Bélarus"),
("KH", u"Cambodge"), ("KH", "Cambodge"),
("CM", u"Cameroun"), ("CM", "Cameroun"),
("CA", u"Canada"), ("CA", "Canada"),
("CV", u"Cap-vert"), ("CV", "Cap-vert"),
("KY", u"Îles Caïmanes"), ("KY", "Îles Caïmanes"),
("CF", u"République Centrafricaine"), ("CF", "République Centrafricaine"),
("LK", u"Sri Lanka"), ("LK", "Sri Lanka"),
("TD", u"Tchad"), ("TD", "Tchad"),
("CL", u"Chili"), ("CL", "Chili"),
("CN", u"Chine"), ("CN", "Chine"),
("TW", u"Taïwan"), ("TW", "Taïwan"),
("CX", u"Île Christmas"), ("CX", "Île Christmas"),
("CC", u"Îles Cocos (Keeling)"), ("CC", "Îles Cocos (Keeling)"),
("CO", u"Colombie"), ("CO", "Colombie"),
("KM", u"Comores"), ("KM", "Comores"),
("YT", u"Mayotte"), ("YT", "Mayotte"),
("CG", u"République du Congo"), ("CG", "République du Congo"),
("CD", u"République Démocratique du Congo"), ("CD", "République Démocratique du Congo"),
("CK", u"Îles Cook"), ("CK", "Îles Cook"),
("CR", u"Costa Rica"), ("CR", "Costa Rica"),
("HR", u"Croatie"), ("HR", "Croatie"),
("CU", u"Cuba"), ("CU", "Cuba"),
("CY", u"Chypre"), ("CY", "Chypre"),
("CZ", u"République Tchèque"), ("CZ", "République Tchèque"),
("BJ", u"Bénin"), ("BJ", "Bénin"),
("DK", u"Danemark"), ("DK", "Danemark"),
("DM", u"Dominique"), ("DM", "Dominique"),
("DO", u"République Dominicaine"), ("DO", "République Dominicaine"),
("EC", u"Équateur"), ("EC", "Équateur"),
("SV", u"El Salvador"), ("SV", "El Salvador"),
("GQ", u"Guinée Équatoriale"), ("GQ", "Guinée Équatoriale"),
("ET", u"Éthiopie"), ("ET", "Éthiopie"),
("ER", u"Érythrée"), ("ER", "Érythrée"),
("EE", u"Estonie"), ("EE", "Estonie"),
("FO", u"Îles Féroé"), ("FO", "Îles Féroé"),
("FK", u"Îles (malvinas) Falkland"), ("FK", "Îles (malvinas) Falkland"),
("GS", u"Géorgie du Sud et les Îles Sandwich du Sud"), ("GS", "Géorgie du Sud et les Îles Sandwich du Sud"),
("FJ", u"Fidji"), ("FJ", "Fidji"),
("FI", u"Finlande"), ("FI", "Finlande"),
("AX", u"Îles Åland"), ("AX", "Îles Åland"),
("FR", u"France"), ("FR", "France"),
("GF", u"Guyane Française"), ("GF", "Guyane Française"),
("PF", u"Polynésie Française"), ("PF", "Polynésie Française"),
("TF", u"Terres Australes Françaises"), ("TF", "Terres Australes Françaises"),
("DJ", u"Djibouti"), ("DJ", "Djibouti"),
("GA", u"Gabon"), ("GA", "Gabon"),
("GE", u"Géorgie"), ("GE", "Géorgie"),
("GM", u"Gambie"), ("GM", "Gambie"),
("PS", u"Territoire Palestinien Occupé"), ("PS", "Territoire Palestinien Occupé"),
("DE", u"Allemagne"), ("DE", "Allemagne"),
("GH", u"Ghana"), ("GH", "Ghana"),
("GI", u"Gibraltar"), ("GI", "Gibraltar"),
("KI", u"Kiribati"), ("KI", "Kiribati"),
("GR", u"Grèce"), ("GR", "Grèce"),
("GL", u"Groenland"), ("GL", "Groenland"),
("GD", u"Grenade"), ("GD", "Grenade"),
("GP", u"Guadeloupe"), ("GP", "Guadeloupe"),
("GU", u"Guam"), ("GU", "Guam"),
("GT", u"Guatemala"), ("GT", "Guatemala"),
("GN", u"Guinée"), ("GN", "Guinée"),
("GY", u"Guyana"), ("GY", "Guyana"),
("HT", u"Haïti"), ("HT", "Haïti"),
("HM", u"Îles Heard et Mcdonald"), ("HM", "Îles Heard et Mcdonald"),
("VA", u"Saint-Siège (état de la Cité du Vatican)"), ("VA", "Saint-Siège (état de la Cité du Vatican)"),
("HN", u"Honduras"), ("HN", "Honduras"),
("HK", u"Hong-Kong"), ("HK", "Hong-Kong"),
("HU", u"Hongrie"), ("HU", "Hongrie"),
("IS", u"Islande"), ("IS", "Islande"),
("IN", u"Inde"), ("IN", "Inde"),
("ID", u"Indonésie"), ("ID", "Indonésie"),
("IR", u"République Islamique d'Iran"), ("IR", "République Islamique d'Iran"),
("IQ", u"Iraq"), ("IQ", "Iraq"),
("IE", u"Irlande"), ("IE", "Irlande"),
("IL", u"Israël"), ("IL", "Israël"),
("IT", u"Italie"), ("IT", "Italie"),
("CI", u"Côte d'Ivoire"), ("CI", "Côte d'Ivoire"),
("JM", u"Jamaïque"), ("JM", "Jamaïque"),
("JP", u"Japon"), ("JP", "Japon"),
("KZ", u"Kazakhstan"), ("KZ", "Kazakhstan"),
("JO", u"Jordanie"), ("JO", "Jordanie"),
("KE", u"Kenya"), ("KE", "Kenya"),
("KP", u"République Populaire Démocratique de Corée"), ("KP", "République Populaire Démocratique de Corée"),
("KR", u"République de Corée"), ("KR", "République de Corée"),
("KW", u"Koweït"), ("KW", "Koweït"),
("KG", u"Kirghizistan"), ("KG", "Kirghizistan"),
("LA", u"République Démocratique Populaire Lao"), ("LA", "République Démocratique Populaire Lao"),
("LB", u"Liban"), ("LB", "Liban"),
("LS", u"Lesotho"), ("LS", "Lesotho"),
("LV", u"Lettonie"), ("LV", "Lettonie"),
("LR", u"Libéria"), ("LR", "Libéria"),
("LY", u"Jamahiriya Arabe Libyenne"), ("LY", "Jamahiriya Arabe Libyenne"),
("LI", u"Liechtenstein"), ("LI", "Liechtenstein"),
("LT", u"Lituanie"), ("LT", "Lituanie"),
("LU", u"Luxembourg"), ("LU", "Luxembourg"),
("MO", u"Macao"), ("MO", "Macao"),
("MG", u"Madagascar"), ("MG", "Madagascar"),
("MW", u"Malawi"), ("MW", "Malawi"),
("MY", u"Malaisie"), ("MY", "Malaisie"),
("MV", u"Maldives"), ("MV", "Maldives"),
("ML", u"Mali"), ("ML", "Mali"),
("MT", u"Malte"), ("MT", "Malte"),
("MQ", u"Martinique"), ("MQ", "Martinique"),
("MR", u"Mauritanie"), ("MR", "Mauritanie"),
("MU", u"Maurice"), ("MU", "Maurice"),
("MX", u"Mexique"), ("MX", "Mexique"),
("MC", u"Monaco"), ("MC", "Monaco"),
("MN", u"Mongolie"), ("MN", "Mongolie"),
("MD", u"République de Moldova"), ("MD", "République de Moldova"),
("MS", u"Montserrat"), ("MS", "Montserrat"),
("MA", u"Maroc"), ("MA", "Maroc"),
("MZ", u"Mozambique"), ("MZ", "Mozambique"),
("OM", u"Oman"), ("OM", "Oman"),
("NA", u"Namibie"), ("NA", "Namibie"),
("NR", u"Nauru"), ("NR", "Nauru"),
("NP", u"Népal"), ("NP", "Népal"),
("NL", u"Pays-Bas"), ("NL", "Pays-Bas"),
("AN", u"Antilles Néerlandaises"), ("AN", "Antilles Néerlandaises"),
("AW", u"Aruba"), ("AW", "Aruba"),
("NC", u"Nouvelle-Calédonie"), ("NC", "Nouvelle-Calédonie"),
("VU", u"Vanuatu"), ("VU", "Vanuatu"),
("NZ", u"Nouvelle-Zélande"), ("NZ", "Nouvelle-Zélande"),
("NI", u"Nicaragua"), ("NI", "Nicaragua"),
("NE", u"Niger"), ("NE", "Niger"),
("NG", u"Nigéria"), ("NG", "Nigéria"),
("NU", u"Niué"), ("NU", "Niué"),
("NF", u"Île Norfolk"), ("NF", "Île Norfolk"),
("NO", u"Norvège"), ("NO", "Norvège"),
("MP", u"Îles Mariannes du Nord"), ("MP", "Îles Mariannes du Nord"),
("UM", u"Îles Mineures Éloignées des États-Unis"), ("UM", "Îles Mineures Éloignées des États-Unis"),
("FM", u"États Fédérés de Micronésie"), ("FM", "États Fédérés de Micronésie"),
("MH", u"Îles Marshall"), ("MH", "Îles Marshall"),
("PW", u"Palaos"), ("PW", "Palaos"),
("PK", u"Pakistan"), ("PK", "Pakistan"),
("PA", u"Panama"), ("PA", "Panama"),
("PG", u"Papouasie-Nouvelle-Guinée"), ("PG", "Papouasie-Nouvelle-Guinée"),
("PY", u"Paraguay"), ("PY", "Paraguay"),
("PE", u"Pérou"), ("PE", "Pérou"),
("PH", u"Philippines"), ("PH", "Philippines"),
("PN", u"Pitcairn"), ("PN", "Pitcairn"),
("PL", u"Pologne"), ("PL", "Pologne"),
("PT", u"Portugal"), ("PT", "Portugal"),
("GW", u"Guinée-Bissau"), ("GW", "Guinée-Bissau"),
("TL", u"Timor-Leste"), ("TL", "Timor-Leste"),
("PR", u"Porto Rico"), ("PR", "Porto Rico"),
("QA", u"Qatar"), ("QA", "Qatar"),
("RE", u"Réunion"), ("RE", "Réunion"),
("RO", u"Roumanie"), ("RO", "Roumanie"),
("RU", u"Fédération de Russie"), ("RU", "Fédération de Russie"),
("RW", u"Rwanda"), ("RW", "Rwanda"),
("SH", u"Sainte-Hélène"), ("SH", "Sainte-Hélène"),
("KN", u"Saint-Kitts-et-Nevis"), ("KN", "Saint-Kitts-et-Nevis"),
("AI", u"Anguilla"), ("AI", "Anguilla"),
("LC", u"Sainte-Lucie"), ("LC", "Sainte-Lucie"),
("PM", u"Saint-Pierre-et-Miquelon"), ("PM", "Saint-Pierre-et-Miquelon"),
("VC", u"Saint-Vincent-et-les Grenadines"), ("VC", "Saint-Vincent-et-les Grenadines"),
("SM", u"Saint-Marin"), ("SM", "Saint-Marin"),
("ST", u"Sao Tomé-et-Principe"), ("ST", "Sao Tomé-et-Principe"),
("SA", u"Arabie Saoudite"), ("SA", "Arabie Saoudite"),
("SN", u"Sénégal"), ("SN", "Sénégal"),
("SC", u"Seychelles"), ("SC", "Seychelles"),
("SL", u"Sierra Leone"), ("SL", "Sierra Leone"),
("SG", u"Singapour"), ("SG", "Singapour"),
("SK", u"Slovaquie"), ("SK", "Slovaquie"),
("VN", u"Viet Nam"), ("VN", "Viet Nam"),
("SI", u"Slovénie"), ("SI", "Slovénie"),
("SO", u"Somalie"), ("SO", "Somalie"),
("ZA", u"Afrique du Sud"), ("ZA", "Afrique du Sud"),
("ZW", u"Zimbabwe"), ("ZW", "Zimbabwe"),
("ES", u"Espagne"), ("ES", "Espagne"),
("EH", u"Sahara Occidental"), ("EH", "Sahara Occidental"),
("SD", u"Soudan"), ("SD", "Soudan"),
("SR", u"Suriname"), ("SR", "Suriname"),
("SJ", u"Svalbard etÎle Jan Mayen"), ("SJ", "Svalbard etÎle Jan Mayen"),
("SZ", u"Swaziland"), ("SZ", "Swaziland"),
("SE", u"Suède"), ("SE", "Suède"),
("CH", u"Suisse"), ("CH", "Suisse"),
("SY", u"République Arabe Syrienne"), ("SY", "République Arabe Syrienne"),
("TJ", u"Tadjikistan"), ("TJ", "Tadjikistan"),
("TH", u"Thaïlande"), ("TH", "Thaïlande"),
("TG", u"Togo"), ("TG", "Togo"),
("TK", u"Tokelau"), ("TK", "Tokelau"),
("TO", u"Tonga"), ("TO", "Tonga"),
("TT", u"Trinité-et-Tobago"), ("TT", "Trinité-et-Tobago"),
("AE", u"Émirats Arabes Unis"), ("AE", "Émirats Arabes Unis"),
("TN", u"Tunisie"), ("TN", "Tunisie"),
("TR", u"Turquie"), ("TR", "Turquie"),
("TM", u"Turkménistan"), ("TM", "Turkménistan"),
("TC", u"Îles Turks et Caïques"), ("TC", "Îles Turks et Caïques"),
("TV", u"Tuvalu"), ("TV", "Tuvalu"),
("UG", u"Ouganda"), ("UG", "Ouganda"),
("UA", u"Ukraine"), ("UA", "Ukraine"),
("MK", u"L'ex-République Yougoslave de Macédoine"), ("MK", "L'ex-République Yougoslave de Macédoine"),
("EG", u"Égypte"), ("EG", "Égypte"),
("GB", u"Royaume-Uni"), ("GB", "Royaume-Uni"),
("IM", u"Île de Man"), ("IM", "Île de Man"),
("TZ", u"République-Unie de Tanzanie"), ("TZ", "République-Unie de Tanzanie"),
("US", u"États-Unis"), ("US", "États-Unis"),
("VI", u"Îles Vierges des États-Unis"), ("VI", "Îles Vierges des États-Unis"),
("BF", u"Burkina Faso"), ("BF", "Burkina Faso"),
("UY", u"Uruguay"), ("UY", "Uruguay"),
("UZ", u"Ouzbékistan"), ("UZ", "Ouzbékistan"),
("VE", u"Venezuela"), ("VE", "Venezuela"),
("WF", u"Wallis et Futuna"), ("WF", "Wallis et Futuna"),
("WS", u"Samoa"), ("WS", "Samoa"),
("YE", u"Yémen"), ("YE", "Yémen"),
("CS", u"Serbie-et-Monténégro"), ("CS", "Serbie-et-Monténégro"),
("ZM", u"Zambie"), ("ZM", "Zambie"),
) )

4
avisstage/templates/avisstage/base.html
View file

@ -37,9 +37,9 @@
<li><a href="{% url 'avisstage:moderation' %}">Modo</a></li> <li><a href="{% url 'avisstage:moderation' %}">Modo</a></li>
{% endif %} {% endif %}
{% if user.is_authenticated %} {% if user.is_authenticated %}
<li><a href="{% url "account_logout" %}"><span class="username">{{ user.username }}</span><br/> Déconnexion</a></li> <li><a href="{% url "authens:logout" %}"><span class="username">{{ user.username }}</span><br/> Déconnexion</a></li>
{% else %} {% else %}
<li><a href="{% url "account_login" %}">Connexion</a></li> <li><a href="{% url "authens:login" %}">Connexion</a></li>
{% endif %} {% endif %}
</ul> </ul>
</nav> </nav>

19
avisstage/templates/avisstage/compte/aconfirmer.html Normal file
View file

@ -0,0 +1,19 @@
{% extends "avisstage/base.html" %}
{% load staticfiles %}
{% block title %}Confirmation requise - ExperiENS{% endblock %}
{% block content %}
<h1>Confirmation requise</h1>
<article>
{% if object.confirmed_at %}
<p>L'adresse {{ object.email }} a déjà été confirmée.</p>
{% else %}
<p>Un mail de confirmation vous a été envoyé à l'adresse {{ object.email }} pour la vérifier.</p>
<p>Merci de cliquer sur le lien inclus pour confirmer qu'elle est correcte.</p>
<p>Si vous ne recevez rien, vérifier dans vos indésirables.</p>
{% endif %}
<p><a href="{% url "avisstage:parametres" %}">Retour</a></p>
</article>
{% endblock %}

29
avisstage/templates/avisstage/compte/edit_mdp.html Normal file
View file

@ -0,0 +1,29 @@
{% extends "avisstage/base.html" %}
{% load staticfiles %}
{% block content %}
<h1>Définir un mot de passe</h1>
<form action="" method="post">
{% csrf_token %}
{{ form.non_field_errors }}
<div class="field">
<label>Nom d'utilisateur</label>
<div class="input">
{{ user.username }}
</div>
</div>
{% for field in form %}
{{ field.errors }}
<div class="field">
<label for="{{ field.id_for_label }}">{{ field.label }}</label>
<div class="input">
{{ field }}
{% if field.help_text %}
<p class="help_text">{{ field.help_text }}</p>
{% endif %}
</div>
</div>
{% endfor %}
<input type="submit" value="Enregistrer" />
</form>
{% endblock %}

18
avisstage/templates/avisstage/compte/email_supprime.html Normal file
View file

@ -0,0 +1,18 @@
{% extends "avisstage/base.html" %}
{% load staticfiles %}
{% block title %}Supprimer une adresse mail - ExperiENS{% endblock %}
{% block content %}
<h1>Supprimer une adresse mail</h1>
<article>
<section class="profil">
<form action="" method="POST">
{% csrf_token %}
<p>Êtes-vous sûr⋅e de vouloir supprimer l'adresse mail {{ object.email }} ?</p>
<p><a href="{% url "avisstage:parametres" %}">Retour</a> &nbsp; <input type="submit" value="Confirmer la suppression"></p>
</form>
</section>
</article>
{% endblock %}

76
avisstage/templates/avisstage/compte/parametres.html Normal file
View file

@ -0,0 +1,76 @@
{% extends "avisstage/base.html" %}
{% load staticfiles %}
{% block title %}Mes paramètres - ExperiENS{% endblock %}
{% block content %}
<h1>Mes paramètres</h1>
<article>
<h2>Adresses e-mail</h2>
<ul class="mes-emails">
{% for email in request.user.email_address_set.all %}
<li>
<span class="adresse">{{ email.email }}
<span class="confirmee">{{ email.confirmed_at|yesno:"&#10003;,&#10007;"|safe }}</span></span>
{% if email.confirmed_at %}
<span class="principale">
{% if email.email == user.email %}
Principale
{% else %}
<form action="{% url "avisstage:emails_principal" email.email %}" method="POST">
{% csrf_token %}
<input type="submit" value="Rendre principale">
</form>
{% endif %}
</span>
{% else %}
<span class="confirmer">
<form action="{% url "avisstage:emails_reconfirme" email.email %}" method="POST">
{% csrf_token %}
<input type="submit" value="Renvoyer le lien de confirmation">
</form>
</span>
{% endif %}
<span class="supprimer">
{% if not email.email == user.email %}
<a href="{% url "avisstage:emails_supprime" email.email %}">Supprimer</a>
{% endif %}
</span>
</li>
{% endfor %}
<li>
<form action="" method="POST">
{% csrf_token %}
{{ form.non_field_errors }}
{% for field in form %}
{{ field.errors }}
<div class="field">
<div class="input">
{{ field }}
</div>
</div>
{% endfor %}
<input type="submit" value="Ajouter l'adresse">
</form>
</li>
</ul>
</article>
<article>
<h2>Mot de passe</h2>
<section class="profil">
{% if request.user.password and request.user.has_usable_password %}
<p>Un mot de passe interne est déjà défini pour ce compte.</p>
{% else %}
<p>Aucun mot de passe n'est défini pour ce compte. Créez-en un pour pouvoir vous connecter après la fin de votre scolarité à l'ENS.</p>
{% endif %}
<form action="{% url "avisstage:mdp_demande" %}" method="POST">
{% csrf_token %}
<input type="submit" value="Définir un nouveau mot de passe" />
</form>
<p>En cliquant sur ce bouton, un lien unique vous sera envoyé à votre adresse e-mail principale ({{ request.user.email }}) qui vous donnera accès au formulaire d'édition du mot de passe.</p>
</section>
</article>
{% endblock %}

4
avisstage/templates/avisstage/detail/profil.html
View file

@ -5,10 +5,10 @@
<script type="text/javascript" src="{% static "js/render.js" %}"></script> <script type="text/javascript" src="{% static "js/render.js" %}"></script>
{% endblock %} {% endblock %}
{% block title %}Profil de {{ object.nom }} - ExperiENS{% endblock %} {% block title %}Profil de {{ object.nom_complet }} - ExperiENS{% endblock %}
{% block content %} {% block content %}
<h1>Profil de {{ object.nom }} <h1>Profil de {{ object.nom_complet }}
{% if object.user == user %} {% if object.user == user %}
<a href="{% url "avisstage:profil_edit" %}" class="btn edit-btn">Modifier mes infos</a> <a href="{% url "avisstage:profil_edit" %}" class="btn edit-btn">Modifier mes infos</a>
{% endif %} {% endif %}

2
avisstage/templates/avisstage/detail/stage.html
View file

@ -72,7 +72,7 @@
<h1>{{ object.sujet }}</h1> <h1>{{ object.sujet }}</h1>
<p class="dates"><span class="year">{{ object.date_debut|date:"Y" }}</span><span class="debut">{{ object.date_debut|date:"d/m" }}</span><span class="fin">{{ object.date_fin|date:"d/m" }}</span></p> <p class="dates"><span class="year">{{ object.date_debut|date:"Y" }}</span><span class="debut">{{ object.date_debut|date:"d/m" }}</span><span class="fin">{{ object.date_fin|date:"d/m" }}</span></p>
</div> </div>
<p><a href="{% url "avisstage:profil" object.auteur.user.username %}">{{ object.auteur.nom }}</a> <p><a href="{% url "avisstage:profil" object.auteur.user.username %}">{{ object.auteur.nom_complet }}</a>
a fait {{ object.type_stage_fem|yesno:"cette,ce" }} <b>{{ object.type_stage_fancy }}</b> a fait {{ object.type_stage_fem|yesno:"cette,ce" }} <b>{{ object.type_stage_fancy }}</b>
{% if object.niveau_scol %}{{ object.niveau_scol_fancy }},{% endif %} {% if object.niveau_scol %}{{ object.niveau_scol_fancy }},{% endif %}
{% if object.structure %}au sein de {{ object.structure }}{% endif %}{% if object.encadrants %}, supervisé par {{ object.encadrants }}{% endif %}.</p> {% if object.structure %}au sein de {{ object.structure }}{% endif %}{% if object.encadrants %}, supervisé par {{ object.encadrants }}{% endif %}.</p>

9
avisstage/templates/avisstage/formulaires/profil.html
View file

@ -18,6 +18,13 @@
</div> </div>
</div> </div>
{% endfor %} {% endfor %}
<input type="submit" /> <div class="field">
<label>Adresse e-mail</label>
<div class="input">
{{ request.user.email }}
<p class="help_text">Allez dans <a href="{% url "avisstage:parametres" %}">les paramètres de connexion</a> pour modifier votre adresse principale</p>
</div>
</div>
<input type="submit" value="Enregistrer" />
</form> </form>
{% endblock %} {% endblock %}

4
avisstage/templates/avisstage/index.html
View file

@ -11,9 +11,9 @@
{% if not user.is_authenticated %} {% if not user.is_authenticated %}
<div class="entrer"> <div class="entrer">
<p><a href="{% url "clipper_login" %}" class="btn">Connexion</a></p> <p><a href="{% url "authens:login.cas" %}" class="btn">Connexion</a></p>
<p class="helptext">Connexion via le serveur central d'authentification ENS <br />(identifiants clipper)</p> <p class="helptext">Connexion via le serveur central d'authentification ENS <br />(identifiants clipper)</p>
<p class="archicubes"><a href="{% url "account_login" %}">Accès archicubes</a> <br /><i>Pour continuer à tenir à jour ses fiches, sans voir celles des autres</i></p> <p class="archicubes"><a href="{% url "authens:login.pwd" %}">Accès archicubes</a> <br /><i>Pour continuer à tenir à jour ses fiches, sans voir celles des autres</i></p>
</div> </div>
{% endif %} {% endif %}

8
avisstage/templates/avisstage/mails/reinit_mdp.html Normal file
View file

@ -0,0 +1,8 @@
Bonjour,
Pour créer ou modifier le mot de passe associé à votre compte {{ user.get_username }}, merci de cliquer sur le lien suivant ou de le copier dans votre navigateur :
{{ protocol }}://{{ domain }}{% url 'avisstage:mdp_edit' uidb64=uid token=token %}
Cordialement,
L'équipe ExperiENS

1
avisstage/templates/avisstage/mails/reinit_mdp.txt Normal file
View file

@ -0,0 +1 @@
[ExperiENS] Définition du mot de passe

54
avisstage/templates/avisstage/perso.html
View file

@ -4,38 +4,42 @@
{% block title %}Espace personnel - ExperiENS{% endblock %} {% block title %}Espace personnel - ExperiENS{% endblock %}
{% block content %} {% block content %}
<h1>Bonjour {{ user.profil.nom }} !</h1> <h1>Bonjour {{ user.profil.nom_complet }} !</h1>
<article> <article>
<h2>Mon compte</h2> <h2>Mon compte</h2>
<section class="profil"> <section class="two-cols">
{% if user.profil.en_scolarite %} <section class="profil">
<h3 class="scolarite">Statut : En scolarité</h3> {% if user.profil.en_scolarite %}
<p>Vous pouvez accéder à l'ensemble du site, et aux fiches de stages.</p> <h3 class="scolarite">Statut : En scolarité</h3>
<p>Quand vous n'aurez plus de compte clipper (après votre scolarité), votre accès sera restreint à vos propres expériences, que vous pourrez ajouter, modifier, supprimer.</p> <p>Vous pouvez accéder à l'ensemble du site, et aux fiches de stages.</p>
<p>Pensez à renseigner une adresse e-mail non-ENS pour conserver cet accès, et permettre aux futur⋅e⋅s normalien⋅ne⋅s de toujours vous contacter !</p> <p>Quand vous n'aurez plus de compte clipper (après votre scolarité), votre accès sera restreint à vos propres expériences, que vous pourrez ajouter, modifier, supprimer.</p>
{% else %} <p>Pensez à renseigner une adresse e-mail non-ENS pour conserver cet accès, et permettre aux futur⋅e⋅s normalien⋅ne⋅s de toujours vous contacter !</p>
<h3 class="scolarite">Statut : Archicube</h3> {% else %}
<p>Vous ne pouvez plus accéder qu'à vos propres expériences pour les modifier, et tenir à jour votre profil.</p> <h3 class="scolarite">Statut : Archicube</h3>
<p>Si vous êtes encore en scolarité, merci de vous <a href="{% url "clipper_login" %}?process=connect">reconnecter en passant par le serveur d'authentification de l'ENS</a> pour mettre à jour votre statut.</p> <p>Vous ne pouvez plus accéder qu'à vos propres expériences pour les modifier, et tenir à jour votre profil.</p>
{% endif %} <p>Si vous êtes encore en scolarité, merci de vous <a href="{% url "authens:login.cas" %}">reconnecter en passant par le serveur d'authentification de l'ENS</a> pour mettre à jour votre statut.</p>
<p><i>Le statut est mis à jour automatiquement chaque année selon le mode de connexion que vous utilisez.</i></p> {% endif %}
</section> <hr />
<section class="profil"> <p><i>Le statut est mis à jour automatiquement tous les deux mois selon le mode de connexion que vous utilisez.</i></p>
<h3>Adresses e-mail</h3> </section>
{% if not user.profil.has_nonENS_email %}<p align="center" class="warning">Vous n'avez pas renseigné d'adresse mail autre que celle de l'ENS. Pensez à le faire, pour que les générations futures puissent toujours vous contacter !</p>{% endif %} <section class="profil">
<p><a href="{% url "account_email" %}">Gérer les adresses e-mail liées à mon compte</a></p> <h3>Connexion</h3>
</section> <p><b>Adresse e-mail principale :</b><br/> {{ user.email }}</p>
<section class="profil"> {% if not user.profil.has_nonENS_email %}<p align="center" class="warning">Vous n'avez pas renseigné d'adresse mail autre que celle de l'ENS. Pensez à le faire, pour que les générations futures puissent toujours vous contacter !</p>{% endif %}
<h3>Mode de connexion</h3> <hr/>
{% if user.profil.en_scolarite %}<p>En scolarité, utilisez le serveur central d'authentification pour vous connecter. Quand vous n'aurez plus de compte clipper, vous devrez vous connecter directement via l'accès archicubes, avec l'identifiant {{ user.username }}</p>{% endif %}
{% if not user.password %}<p class="warning" align="center">Vous n'avez pas créé de mot de passe interne à ExperiENS. Pensez-y pour garder l'accès au site quand vous n'aurez plus de compte clipper !</p>{% endif %} <p><b>Mot de passe interne :</b> {% if user.password and user.has_usable_password %}Défini{% else %}Non défini{% endif %}</p>
<p><a href="{% url "account_change_password" %}">Créer / changer mon mot de passe ExperiENS</a></p> {% if not user.password or not user.has_usable_password %}<p class="warning" align="center">Pensez à définir un mot de passe propre à ExperiENS pour garder l'accès au site quand vous n'aurez plus de compte clipper !</p>{% endif %}
{% if user.profil.en_scolarite %}<p>En scolarité, utilisez le serveur central d'authentification pour vous connecter. Quand vous n'aurez plus de compte clipper, vous devrez vous connecter directement via l'accès archicubes, avec votre login <b>{{ user.username }}</b> et le mot de passe spécifique à ExperiENS que vous aurez défini.</p>{% endif %}
<hr/>
<p><a href="{% url "avisstage:parametres" %}">Gérer mes paramètres de connexion</a></p>
</section>
</section> </section>
</article> </article>
<article> <article>
<h2><a href="{% url "avisstage:profil" user.username %}">Mon profil public</a> <a href="{% url "avisstage:profil_edit" %}" class="edit-btn btn">Modifier mes infos</a></h2> <h2>Mon profil public <a href="{% url "avisstage:profil" user.username %}" class="btn">Voir</a> <a href="{% url "avisstage:profil_edit" %}" class="edit-btn btn">Modifier mes infos</a></h2>
{% with object=user.profil %} {% with object=user.profil %}
<section class="profil"> <section class="profil">
<div class="infos"> <div class="infos">

21
avisstage/templatetags/avisstage_tags.py
View file

@ -1,28 +1,32 @@
# coding: utf-8 import re
from django import template from django import template
from avisstage.forms import LieuForm, FeedbackForm from avisstage.forms import FeedbackForm, LieuForm
import re
register = template.Library() register = template.Library()
@register.inclusion_tag('avisstage/templatetags/widget_lieu.html')
@register.inclusion_tag("avisstage/templatetags/widget_lieu.html")
def lieu_widget(): def lieu_widget():
form = LieuForm() form = LieuForm()
return {"form": form} return {"form": form}
@register.inclusion_tag('avisstage/templatetags/widget_feedback.html')
@register.inclusion_tag("avisstage/templatetags/widget_feedback.html")
def feedback_widget(): def feedback_widget():
form = FeedbackForm() form = FeedbackForm()
return {"form": form} return {"form": form}
@register.filter @register.filter
def typonazisme(value): def typonazisme(value):
value = re.sub(r'(\w)\s*([?!:])', u'\\1 \\2', value) value = re.sub(r"(\w)\s*([?!:])", "\\1 \\2", value)
value = re.sub(r'(\w)\s*([,.])', u'\\1\\2', value) value = re.sub(r"(\w)\s*([,.])", "\\1\\2", value)
value = re.sub(r'([?!:,.])(\w)', u'\\1 \\2', value) value = re.sub(r"([?!:,.])(\w)", "\\1 \\2", value)
return value return value
@register.filter @register.filter
def avis_len(value): def avis_len(value):
if value < 5: if value < 5:
@ -32,6 +36,7 @@ def avis_len(value):
else: else:
return "long" return "long"
@register.simple_tag @register.simple_tag
def url_replace(request, field, value): def url_replace(request, field, value):
dict_ = request.GET.copy() dict_ = request.GET.copy()

590
avisstage/tests.py
View file

@ -1,307 +1,343 @@
from allauth.socialaccount.models import SocialAccount from datetime import date, timedelta
from allauth_cas.test.testcases import CASTestCase from unittest import mock
from allauth_ens.adapter import deprecate_clippers
from datetime import date from authens.models import CASAccount, OldCASAccount
from authens.tests.cas_utils import FakeCASClient
from django.conf import settings
from django.test import TestCase from django.test import TestCase
from django.urls import reverse from django.urls import reverse
from django.conf import settings from django.utils import timezone
from .models import User, Normalien, Lieu, Stage, StageMatiere, AvisLieu from .models import AvisLieu, Lieu, Normalien, Stage, StageMatiere, User
class ExperiENSTestCase(CASTestCase):
class ExperiENSTestCase(TestCase):
# Dummy database # Dummy database
def setUp(self): def setUp(self):
self.u_conscrit = User.objects.create_user('conscrit', self.u_conscrit = User.objects.create_user(
'conscrit@ens.fr', "conscrit", "conscrit@ens.fr", "conscrit"
'conscrit') )
self.p_conscrit = self.u_conscrit.profil self.p_conscrit = self.u_conscrit.profil
self.p_conscrit.nom="Petit conscrit" self.p_conscrit.nom = "Petit conscrit"
self.p_conscrit.promotion="Serpentard 2000" self.p_conscrit.promotion = "Serpentard 2020"
self.p_conscrit.bio="Je suis un petit conscrit" self.p_conscrit.bio = "Je suis un petit conscrit"
self.p_conscrit.save() self.p_conscrit.save()
self.sa_conscrit = SocialAccount(user=self.u_conscrit, self.sa_conscrit = CASAccount(
provider="clipper", user=self.u_conscrit,
uid="conscrit") cas_login="conscrit",
entrance_year=2020,
)
self.sa_conscrit.save() self.sa_conscrit.save()
self.u_archi = User.objects.create_user('archicube',
'archicube@ens.fr',
'archicube')
self.p_archi = self.u_archi.profil
self.p_archi.nom="Vieil archicube"
self.p_archi.promotion="Gryffondor 1994"
self.p_archi.bio="Je suis un vieil archicube"
self.lieu1 = Lieu(nom="Beaux-Bâtons", type_lieu="universite", self.u_archi = User.objects.create_user(
ville="Brocéliande", pays="FR", "archicube", "archicube@ens.fr", "archicube"
coord="POINT(-1.63971 48.116382)") )
self.p_archi = self.u_archi.profil
self.p_archi.nom = "Vieil archicube"
self.p_archi.promotion = "Gryffondor 2014"
self.p_archi.bio = "Je suis un vieil archicube"
self.lieu1 = Lieu(
nom="Beaux-Bâtons",
type_lieu="universite",
ville="Brocéliande",
pays="FR",
coord="POINT(-1.63971 48.116382)",
)
self.lieu1.save() self.lieu1.save()
self.lieu2 = Lieu(nom="Durmstrang", type_lieu="universite", self.lieu2 = Lieu(
ville="Edimbourg", pays="GB", nom="Durmstrang",
coord="POINT(56.32153 -1.259715)") type_lieu="universite",
ville="Edimbourg",
pays="GB",
coord="POINT(56.32153 -1.259715)",
)
self.lieu2.save() self.lieu2.save()
self.matiere1 = StageMatiere(nom="Arithmancie", slug="arithmancie") self.matiere1 = StageMatiere(nom="Arithmancie", slug="arithmancie")
self.matiere1.save() self.matiere1.save()
self.matiere2 = StageMatiere(nom="Sortilège", slug="sortilege") self.matiere2 = StageMatiere(nom="Sortilège", slug="sortilege")
self.matiere2.save() self.matiere2.save()
self.cstage1 = Stage(auteur=self.p_conscrit, sujet="Wingardium Leviosa", self.cstage1 = Stage(
date_debut=date(2000, 5, 10), auteur=self.p_conscrit,
date_fin=date(2000, 8, 26), sujet="Wingardium Leviosa",
type_stage="recherche", date_debut=date(2020, 5, 10),
niveau_scol="M1", public=True) date_fin=date(2020, 8, 26),
type_stage="recherche",
niveau_scol="M1",
public=True,
)
self.cstage1.save() self.cstage1.save()
self.cstage1.matieres.add(self.matiere1) self.cstage1.matieres.add(self.matiere1)
alieu1 = AvisLieu(stage=self.cstage1, lieu=self.lieu1, alieu1 = AvisLieu(stage=self.cstage1, lieu=self.lieu1, chapo="Trop bien")
chapo="Trop bien")
alieu1.save() alieu1.save()
self.cstage2 = Stage(auteur=self.p_conscrit, sujet="Avada Kedavra", self.cstage2 = Stage(
date_debut=date(2001, 5, 10), auteur=self.p_conscrit,
date_fin=date(2001, 8, 26), sujet="Avada Kedavra",
type_stage="sejour_dri", date_debut=date(2021, 5, 10),
niveau_scol="M2", public=False) date_fin=date(2021, 8, 26),
type_stage="sejour_dri",
niveau_scol="M2",
public=False,
)
self.cstage2.save() self.cstage2.save()
self.cstage2.matieres.add(self.matiere2) self.cstage2.matieres.add(self.matiere2)
alieu2 = AvisLieu(stage=self.cstage2, lieu=self.lieu2, alieu2 = AvisLieu(stage=self.cstage2, lieu=self.lieu2, chapo="Trop nul")
chapo="Trop nul")
alieu2.save() alieu2.save()
self.astage1 = Stage(
self.astage1 = Stage(auteur=self.p_archi, sujet="Alohomora", auteur=self.p_archi,
date_debut=date(1994, 5, 10), sujet="Alohomora",
date_fin=date(1994, 8, 26), date_debut=date(2014, 5, 10),
type_stage="recherche", date_fin=date(2014, 8, 26),
niveau_scol="M2", public=True) type_stage="recherche",
niveau_scol="M2",
public=True,
)
self.astage1.save() self.astage1.save()
self.astage1.matieres.add(self.matiere2) self.astage1.matieres.add(self.matiere2)
alieu3 = AvisLieu(stage=self.astage1, lieu=self.lieu1, alieu3 = AvisLieu(stage=self.astage1, lieu=self.lieu1, chapo="Trop moyen")
chapo="Trop moyen")
alieu3.save() alieu3.save()
def assertRedirectToLogin(self, testurl): def assertRedirectToLogin(self, testurl):
r = self.client.get(testurl) r = self.client.get(testurl)
return self.assertRedirects(r, settings.LOGIN_URL+"?next="+testurl) return self.assertRedirects(r, settings.LOGIN_URL + "?next=" + testurl)
def assertPageNotFound(self, testurl): def assertPageNotFound(self, testurl):
r = self.client.get(testurl) r = self.client.get(testurl)
self.assertEqual(r.status_code, 404) self.assertEqual(r.status_code, 404)
""" """
ACCÈS PUBLICS ACCÈS PUBLIC
""" """
class PublicViewsTest(ExperiENSTestCase): class PublicViewsTest(ExperiENSTestCase):
""" """
Vérifie que les fiches de stages ne sont pas visibles hors connexion Vérifie que les fiches de stages ne sont pas visibles hors connexion
""" """
def test_stage_visibility_public(self):
self.assertRedirectToLogin(reverse('avisstage:stage',
kwargs={'pk':self.cstage1.id}))
self.assertRedirectToLogin(reverse('avisstage:stage',
kwargs={'pk':self.cstage2.id}))
self.assertRedirectToLogin(reverse('avisstage:stage',
kwargs={'pk':self.astage1.id}))
def test_stage_visibility_public(self):
self.assertRedirectToLogin(
reverse("avisstage:stage", kwargs={"pk": self.cstage1.id})
)
self.assertRedirectToLogin(
reverse("avisstage:stage", kwargs={"pk": self.cstage2.id})
)
self.assertRedirectToLogin(
reverse("avisstage:stage", kwargs={"pk": self.astage1.id})
)
""" """
Vérifie que les profils de normaliens ne sont pas visibles hors connexion Vérifie que les profils de normaliens ne sont pas visibles hors connexion
""" """
def test_profil_visibility_public(self): def test_profil_visibility_public(self):
self.assertRedirectToLogin(reverse( self.assertRedirectToLogin(
'avisstage:profil', kwargs={'username': self.u_conscrit.username})) reverse("avisstage:profil", kwargs={"username": self.u_conscrit.username})
)
self.assertRedirectToLogin(reverse( self.assertRedirectToLogin(
'avisstage:profil', kwargs={'username': self.u_archi.username})) reverse("avisstage:profil", kwargs={"username": self.u_archi.username})
)
""" """
Vérifie que la recherche n'est pas accessible hors connexion Vérifie que la recherche n'est pas accessible hors connexion
""" """
def test_pages_visibility_public(self): def test_pages_visibility_public(self):
self.assertRedirectToLogin(reverse('avisstage:recherche')) self.assertRedirectToLogin(reverse("avisstage:recherche"))
self.assertRedirectToLogin(reverse('avisstage:recherche_resultats')) self.assertRedirectToLogin(reverse("avisstage:recherche_resultats"))
self.assertRedirectToLogin(reverse('avisstage:stage_items')) self.assertRedirectToLogin(reverse("avisstage:stage_items"))
self.assertRedirectToLogin(reverse('avisstage:feedback')) self.assertRedirectToLogin(reverse("avisstage:feedback"))
self.assertRedirectToLogin(reverse('avisstage:moderation')) self.assertRedirectToLogin(reverse("avisstage:moderation"))
""" """
Vérifie que l'API n'est pas accessible hors connexion Vérifie que l'API n'est pas accessible hors connexion
""" """
def test_api_visibility_public(self): def test_api_visibility_public(self):
testurl = reverse('avisstage:api_dispatch_list', testurl = reverse(
kwargs={"resource_name": "lieu", "avisstage:api_dispatch_list",
"api_name": "v1"}) kwargs={"resource_name": "lieu", "api_name": "v1"},
r = self.client.get(testurl) )
self.assertEqual(r.status_code, 401) r = self.client.get(testurl)
self.assertEqual(r.status_code, 401)
testurl = reverse('avisstage:api_dispatch_list',
kwargs={"resource_name": "stage", testurl = reverse(
"api_name": "v1"}) "avisstage:api_dispatch_list",
r = self.client.get(testurl) kwargs={"resource_name": "stage", "api_name": "v1"},
self.assertEqual(r.status_code, 401) )
r = self.client.get(testurl)
testurl = reverse('avisstage:api_dispatch_list', self.assertEqual(r.status_code, 401)
kwargs={"resource_name": "profil",
"api_name": "v1"}) testurl = reverse(
"avisstage:api_dispatch_list",
kwargs={"resource_name": "profil", "api_name": "v1"},
)
r = self.client.get(testurl) r = self.client.get(testurl)
self.assertEqual(r.status_code, 401) self.assertEqual(r.status_code, 401)
""" """
Vérifie que les pages d'édition ne sont pas accessible hors connexion Vérifie que les pages d'édition ne sont pas accessible hors connexion
""" """
def test_edit_visibility_public(self): def test_edit_visibility_public(self):
self.assertRedirectToLogin(reverse( self.assertRedirectToLogin(
'avisstage:stage_edit', kwargs={'pk':self.cstage1.id})) reverse("avisstage:stage_edit", kwargs={"pk": self.cstage1.id})
)
self.assertRedirectToLogin(reverse(
'avisstage:stage_edit', kwargs={'pk':self.astage1.id}))
self.assertRedirectToLogin(reverse( self.assertRedirectToLogin(
'avisstage:stage_publication', kwargs={'pk':self.cstage1.id})) reverse("avisstage:stage_edit", kwargs={"pk": self.astage1.id})
)
self.assertRedirectToLogin(reverse(
'avisstage:stage_publication', kwargs={'pk':self.astage1.id}))
self.assertRedirectToLogin(reverse('avisstage:stage_ajout'))
self.assertRedirectToLogin(reverse('avisstage:profil_edit'))
self.assertRedirectToLogin(
reverse("avisstage:stage_publication", kwargs={"pk": self.cstage1.id})
)
self.assertRedirectToLogin(
reverse("avisstage:stage_publication", kwargs={"pk": self.astage1.id})
)
self.assertRedirectToLogin(reverse("avisstage:stage_ajout"))
self.assertRedirectToLogin(reverse("avisstage:profil_edit"))
""" """
ACCÈS ARCHICUBE ACCÈS ARCHICUBE
""" """
class ArchicubeViewsTest(ExperiENSTestCase): class ArchicubeViewsTest(ExperiENSTestCase):
def setUp(self): def setUp(self):
super().setUp() super().setUp()
self.client.login(username='archicube', password='archicube') # Connexion with password
self.client.login(username="archicube", password="archicube")
def assert403Archicubes(self, testurl): def assert403Archicubes(self, testurl):
r = self.client.get(testurl) r = self.client.get(testurl)
return self.assertRedirects(r, reverse('avisstage:403-archicubes')) return self.assertRedirects(r, reverse("avisstage:403-archicubes"))
""" """
Vérifie que les seules fiches de stages visibles sont les siennes Vérifie que les seules fiches de stages visibles sont les siennes
""" """
def test_stage_visibility_archi(self): def test_stage_visibility_archi(self):
self.assertPageNotFound(reverse('avisstage:stage', self.assertPageNotFound(
kwargs={'pk':self.cstage1.id})) reverse("avisstage:stage", kwargs={"pk": self.cstage1.id})
)
self.assertPageNotFound(reverse('avisstage:stage',
kwargs={'pk':self.cstage2.id})) self.assertPageNotFound(
reverse("avisstage:stage", kwargs={"pk": self.cstage2.id})
testurl = reverse('avisstage:stage', )
kwargs={'pk':self.astage1.id})
testurl = reverse("avisstage:stage", kwargs={"pk": self.astage1.id})
r = self.client.get(testurl) r = self.client.get(testurl)
self.assertEqual(r.status_code, 200) self.assertEqual(r.status_code, 200)
""" """
Vérifie que le seul profil visible est le sien Vérifie que le seul profil visible est le sien
""" """
def test_profil_visibility_archi(self):
self.assertPageNotFound(reverse(
'avisstage:profil', kwargs={'username': self.u_conscrit.username}))
testurl = reverse('avisstage:profil', def test_profil_visibility_archi(self):
kwargs={'username': self.u_archi.username}) self.assertPageNotFound(
reverse("avisstage:profil", kwargs={"username": self.u_conscrit.username})
)
testurl = reverse(
"avisstage:profil", kwargs={"username": self.u_archi.username}
)
r = self.client.get(testurl) r = self.client.get(testurl)
self.assertEqual(r.status_code, 200) self.assertEqual(r.status_code, 200)
""" """
Vérifie que la recherche n'est pas accessible Vérifie que la recherche n'est pas accessible
""" """
def test_pages_visibility_archi(self): def test_pages_visibility_archi(self):
self.assert403Archicubes(reverse('avisstage:recherche')) self.assert403Archicubes(reverse("avisstage:recherche"))
self.assert403Archicubes(reverse('avisstage:recherche_resultats'))
self.assert403Archicubes(reverse('avisstage:stage_items')) self.assert403Archicubes(reverse("avisstage:recherche_resultats"))
testurl = reverse('avisstage:feedback') self.assert403Archicubes(reverse("avisstage:stage_items"))
r = self.client.post(testurl, {"objet": "Contact",
"message": "Ceci est un texte"})
self.assertRedirects(r, reverse('avisstage:index'))
testurl = reverse('avisstage:moderation') testurl = reverse("avisstage:feedback")
r = self.client.post(
testurl, {"objet": "Contact", "message": "Ceci est un texte"}
)
self.assertRedirects(r, reverse("avisstage:index"))
testurl = reverse("avisstage:moderation")
r = self.client.get(testurl) r = self.client.get(testurl)
self.assertRedirects(r, reverse('admin:login')+"?next="+testurl) self.assertRedirects(r, reverse("admin:login") + "?next=" + testurl)
""" """
Vérifie que la seule API accessible est celle des lieux Vérifie que la seule API accessible est celle des lieux
""" """
def test_api_visibility_archi(self): def test_api_visibility_archi(self):
testurl = reverse('avisstage:api_dispatch_list', testurl = reverse(
kwargs={"resource_name": "lieu", "avisstage:api_dispatch_list",
"api_name": "v1"}) kwargs={"resource_name": "lieu", "api_name": "v1"},
)
r = self.client.get(testurl) r = self.client.get(testurl)
self.assertEqual(r.status_code, 200) self.assertEqual(r.status_code, 200)
testurl = reverse('avisstage:api_dispatch_list', testurl = reverse(
kwargs={"resource_name": "stage", "avisstage:api_dispatch_list",
"api_name": "v1"}) kwargs={"resource_name": "stage", "api_name": "v1"},
r = self.client.get(testurl) )
self.assertEqual(r.status_code, 401) r = self.client.get(testurl)
self.assertEqual(r.status_code, 401)
testurl = reverse('avisstage:api_dispatch_list',
kwargs={"resource_name": "profil", testurl = reverse(
"api_name": "v1"}) "avisstage:api_dispatch_list",
kwargs={"resource_name": "profil", "api_name": "v1"},
)
r = self.client.get(testurl) r = self.client.get(testurl)
self.assertEqual(r.status_code, 401) self.assertEqual(r.status_code, 401)
""" """
Vérifie que le seul stage modifiable est le sien Vérifie que le seul stage modifiable est le sien
""" """
def test_edit_visibility_archi(self): def test_edit_visibility_archi(self):
testurl = reverse('avisstage:stage_edit', kwargs={'pk':self.cstage1.id}) testurl = reverse("avisstage:stage_edit", kwargs={"pk": self.cstage1.id})
r = self.client.get(testurl) r = self.client.get(testurl)
self.assertEqual(r.status_code, 403) self.assertEqual(r.status_code, 403)
testurl = reverse('avisstage:stage_edit', kwargs={'pk':self.astage1.id}) testurl = reverse("avisstage:stage_edit", kwargs={"pk": self.astage1.id})
r = self.client.get(testurl) r = self.client.get(testurl)
self.assertEqual(r.status_code, 200) self.assertEqual(r.status_code, 200)
testurl = reverse('avisstage:stage_publication', testurl = reverse("avisstage:stage_publication", kwargs={"pk": self.cstage1.id})
kwargs={'pk':self.cstage1.id})
r = self.client.post(testurl, {"publier": True}) r = self.client.post(testurl, {"publier": True})
self.assertEqual(r.status_code, 403) self.assertEqual(r.status_code, 403)
testurl = reverse('avisstage:stage_publication', testurl = reverse("avisstage:stage_publication", kwargs={"pk": self.astage1.id})
kwargs={'pk':self.astage1.id})
r = self.client.post(testurl, {"publier": True}) r = self.client.post(testurl, {"publier": True})
self.assertRedirects(r, reverse('avisstage:stage', self.assertRedirects(
kwargs={"pk": self.astage1.id})) r, reverse("avisstage:stage", kwargs={"pk": self.astage1.id})
)
testurl = reverse('avisstage:stage_ajout')
testurl = reverse("avisstage:stage_ajout")
r = self.client.get(testurl) r = self.client.get(testurl)
self.assertEqual(r.status_code, 200) self.assertEqual(r.status_code, 200)
testurl = reverse('avisstage:profil_edit') testurl = reverse("avisstage:profil_edit")
r = self.client.get(testurl) r = self.client.get(testurl)
self.assertEqual(r.status_code, 200) self.assertEqual(r.status_code, 200)
@ -309,187 +345,219 @@ class ArchicubeViewsTest(ExperiENSTestCase):
class DeprecatedArchicubeViewsTest(ArchicubeViewsTest): class DeprecatedArchicubeViewsTest(ArchicubeViewsTest):
def setUp(self): @mock.patch("authens.backends.get_cas_client")
def setUp(self, mock_cas_client):
super().setUp() super().setUp()
self.sa_archi = SocialAccount(user=self.u_archi, fake_cas_client = FakeCASClient(cas_login="archicube", entrance_year=2012)
provider="clipper", mock_cas_client.return_value = fake_cas_client
uid="archicube")
self.sa_archi = OldCASAccount(
user=self.u_archi,
cas_login="archicube",
entrance_year=2012,
)
self.sa_archi.save() self.sa_archi.save()
deprecate_clippers() # First connexion through CAS
self.client.login(ticket="dummy")
self.client.login(username='archicube', password='archicube') self.client.logout()
# Time flies
self.p_archi.last_cas_login = (timezone.now() - timedelta(days=365)).date()
self.p_archi.save()
# New connexion with password
self.client.login(username="archicube", password="archicube")
""" """
ACCÈS EN SCOLARITE ACCÈS EN SCOLARITE
""" """
class ScolariteViewsTest(ExperiENSTestCase): class ScolariteViewsTest(ExperiENSTestCase):
def setUp(self): @mock.patch("authens.backends.get_cas_client")
def setUp(self, mock_cas_client):
super().setUp() super().setUp()
self.u_vieuxcon = User.objects.create_user('vieuxcon', fake_cas_client = FakeCASClient(cas_login="vieuxcon", entrance_year=2017)
'vieuxcon@ens.fr', mock_cas_client.return_value = fake_cas_client
'vieuxcon')
self.u_vieuxcon = User.objects.create_user(
"vieuxcon", "vieuxcon@ens.fr", "vieuxcon"
)
self.p_vieuxcon = self.u_vieuxcon.profil self.p_vieuxcon = self.u_vieuxcon.profil
self.p_vieuxcon.nom="Vieux con" self.p_vieuxcon.nom = "Vieux con"
self.p_vieuxcon.promotion="Poufsouffle 1997" self.p_vieuxcon.promotion = "Poufsouffle 2017"
self.p_vieuxcon.bio="Je suis un vieux con encore en scolarité" self.p_vieuxcon.bio = "Je suis un vieux con encore en scolarité"
self.p_vieuxcon.save() self.p_vieuxcon.save()
self.sa_vieuxcon = SocialAccount(user=self.u_vieuxcon, self.sa_vieuxcon = CASAccount(
provider="clipper", user=self.u_vieuxcon,
uid="vieuxcon") cas_login="vieuxcon",
entrance_year=2017,
)
self.sa_vieuxcon.save() self.sa_vieuxcon.save()
self.vstage1 = Stage(auteur=self.p_vieuxcon, sujet="Oubliettes", self.vstage1 = Stage(
date_debut=date(1998, 5, 10), auteur=self.p_vieuxcon,
date_fin=date(1998, 8, 26), sujet="Oubliettes",
type_stage="recherche", date_debut=date(2018, 5, 10),
niveau_scol="M1", public=False) date_fin=date(2018, 8, 26),
type_stage="recherche",
niveau_scol="M1",
public=False,
)
self.vstage1.save() self.vstage1.save()
self.vstage1.matieres.add(self.matiere2) self.vstage1.matieres.add(self.matiere2)
alieu1 = AvisLieu(stage=self.vstage1, lieu=self.lieu2, alieu1 = AvisLieu(stage=self.vstage1, lieu=self.lieu2, chapo="Pas si mal")
chapo="Pas si mal")
alieu1.save() alieu1.save()
self.client.login(username='vieuxcon', password='vieuxcon') # Connexion through CAS
self.client.login(ticket="dummy")
""" """
Vérifie que les seules fiches de stages visibles sont les siennes ou celles Vérifie que les seules fiches de stages visibles sont les siennes ou celles
publiques publiques
""" """
def test_stage_visibility_scolarite(self): def test_stage_visibility_scolarite(self):
testurl = reverse('avisstage:stage', testurl = reverse("avisstage:stage", kwargs={"pk": self.cstage1.id})
kwargs={'pk':self.cstage1.id})
r = self.client.get(testurl) r = self.client.get(testurl)
self.assertEqual(r.status_code, 200) self.assertEqual(r.status_code, 200)
self.assertPageNotFound(reverse('avisstage:stage', self.assertPageNotFound(
kwargs={'pk':self.cstage2.id})) reverse("avisstage:stage", kwargs={"pk": self.cstage2.id})
)
testurl = reverse('avisstage:stage',
kwargs={'pk':self.vstage1.id}) testurl = reverse("avisstage:stage", kwargs={"pk": self.vstage1.id})
r = self.client.get(testurl) r = self.client.get(testurl)
self.assertEqual(r.status_code, 200) self.assertEqual(r.status_code, 200)
""" """
Vérifie que tous les profils sont visibles Vérifie que tous les profils sont visibles
""" """
def test_profil_visibility_scolarite(self): def test_profil_visibility_scolarite(self):
testurl = reverse('avisstage:profil', testurl = reverse(
kwargs={'username': self.u_conscrit.username}) "avisstage:profil", kwargs={"username": self.u_conscrit.username}
)
r = self.client.get(testurl) r = self.client.get(testurl)
self.assertEqual(r.status_code, 200) self.assertEqual(r.status_code, 200)
self.assertContains(r, "Wingardium Leviosa") # Public self.assertContains(r, "Wingardium Leviosa") # Public
self.assertNotContains(r, "Avada Kedavra") # Brouillon self.assertNotContains(r, "Avada Kedavra") # Brouillon
testurl = reverse('avisstage:profil', testurl = reverse(
kwargs={'username': self.u_archi.username}) "avisstage:profil", kwargs={"username": self.u_archi.username}
)
r = self.client.get(testurl) r = self.client.get(testurl)
self.assertEqual(r.status_code, 200) self.assertEqual(r.status_code, 200)
testurl = reverse('avisstage:profil', testurl = reverse(
kwargs={'username': self.u_vieuxcon.username}) "avisstage:profil", kwargs={"username": self.u_vieuxcon.username}
)
r = self.client.get(testurl) r = self.client.get(testurl)
self.assertEqual(r.status_code, 200) self.assertEqual(r.status_code, 200)
""" """
Vérifie que la recherche et les autres pages sont accessible Vérifie que la recherche et les autres pages sont accessibles
""" """
def test_pages_visibility_scolarite(self): def test_pages_visibility_scolarite(self):
testurl = reverse('avisstage:recherche') testurl = reverse("avisstage:recherche")
r = self.client.get(testurl) r = self.client.get(testurl)
self.assertEqual(r.status_code, 200) self.assertEqual(r.status_code, 200)
testurl = reverse('avisstage:recherche_resultats') testurl = reverse("avisstage:recherche_resultats")
r = self.client.get(testurl) r = self.client.get(testurl)
self.assertEqual(r.status_code, 200) self.assertEqual(r.status_code, 200)
self.assertContains(r, "Wingardium Leviosa") # Public self.assertContains(r, "Wingardium Leviosa") # Public
self.assertNotContains(r, "Avada Kedavra") # Brouillon self.assertNotContains(r, "Avada Kedavra") # Brouillon
testurl = reverse('avisstage:stage_items') + "?ids=" \ testurl = (
+ ";".join(("%d" % k.id) for k in [self.cstage1, reverse("avisstage:stage_items")
self.cstage2, + "?ids="
self.astage1]) + ";".join(
("%d" % k.id) for k in [self.cstage1, self.cstage2, self.astage1]
)
)
r = self.client.get(testurl) r = self.client.get(testurl)
self.assertEqual(r.status_code, 200) self.assertEqual(r.status_code, 200)
self.assertContains(r, "Wingardium Leviosa") # Public self.assertContains(r, "Wingardium Leviosa") # Public
self.assertNotContains(r, "Avada Kedavra") # Brouillon self.assertNotContains(r, "Avada Kedavra") # Brouillon
testurl = reverse('avisstage:feedback') testurl = reverse("avisstage:feedback")
r = self.client.post(testurl, {"objet": "Contact", r = self.client.post(
"message": "Ceci est un texte"}) testurl, {"objet": "Contact", "message": "Ceci est un texte"}
self.assertRedirects(r, reverse('avisstage:index')) )
self.assertRedirects(r, reverse("avisstage:index"))
testurl = reverse('avisstage:moderation') testurl = reverse("avisstage:moderation")
r = self.client.get(testurl) r = self.client.get(testurl)
self.assertRedirects(r, reverse('admin:login')+"?next="+testurl) self.assertRedirects(r, reverse("admin:login") + "?next=" + testurl)
""" """
Vérifie que toutes les API sont accessibles et qu'elles ne montrent que les Vérifie que toutes les API sont accessibles et qu'elles ne montrent que les
stages publics stages publics
""" """
def test_api_visibility_scolarite(self): def test_api_visibility_scolarite(self):
testurl = reverse('avisstage:api_dispatch_list', testurl = reverse(
kwargs={"resource_name": "lieu", "avisstage:api_dispatch_list",
"api_name": "v1"}) kwargs={"resource_name": "lieu", "api_name": "v1"},
r = self.client.get(testurl) )
self.assertEqual(r.status_code, 200) r = self.client.get(testurl)
self.assertEqual(r.status_code, 200)
testurl = reverse('avisstage:api_dispatch_list',
kwargs={"resource_name": "stage", testurl = reverse(
"api_name": "v1"}) "avisstage:api_dispatch_list",
r = self.client.get(testurl) kwargs={"resource_name": "stage", "api_name": "v1"},
self.assertEqual(r.status_code, 200) )
self.assertContains(r, "Wingardium Leviosa") # Public r = self.client.get(testurl)
self.assertNotContains(r, "Avada Kedavra") # Brouillon self.assertEqual(r.status_code, 200)
self.assertContains(r, "Wingardium Leviosa") # Public
testurl = reverse('avisstage:api_dispatch_list', self.assertNotContains(r, "Avada Kedavra") # Brouillon
kwargs={"resource_name": "profil",
"api_name": "v1"}) testurl = reverse(
"avisstage:api_dispatch_list",
kwargs={"resource_name": "profil", "api_name": "v1"},
)
r = self.client.get(testurl) r = self.client.get(testurl)
self.assertEqual(r.status_code, 200) self.assertEqual(r.status_code, 200)
""" """
Vérifie que le seul stage modifiable est le sien Vérifie que le seul stage modifiable est le sien
""" """
def test_edit_visibility_scolarite(self): def test_edit_visibility_scolarite(self):
testurl = reverse('avisstage:stage_edit', kwargs={'pk':self.cstage1.id}) testurl = reverse("avisstage:stage_edit", kwargs={"pk": self.cstage1.id})
r = self.client.get(testurl) r = self.client.get(testurl)
self.assertEqual(r.status_code, 403) self.assertEqual(r.status_code, 403)
testurl = reverse('avisstage:stage_edit', kwargs={'pk':self.astage1.id}) testurl = reverse("avisstage:stage_edit", kwargs={"pk": self.astage1.id})
r = self.client.get(testurl) r = self.client.get(testurl)
self.assertEqual(r.status_code, 403) self.assertEqual(r.status_code, 403)
testurl = reverse('avisstage:stage_edit', kwargs={'pk':self.vstage1.id}) testurl = reverse("avisstage:stage_edit", kwargs={"pk": self.vstage1.id})
r = self.client.get(testurl) r = self.client.get(testurl)
self.assertEqual(r.status_code, 200) self.assertEqual(r.status_code, 200)
testurl = reverse('avisstage:stage_publication', testurl = reverse("avisstage:stage_publication", kwargs={"pk": self.cstage1.id})
kwargs={'pk':self.cstage1.id})
r = self.client.post(testurl, {"publier": True}) r = self.client.post(testurl, {"publier": True})
self.assertEqual(r.status_code, 403) self.assertEqual(r.status_code, 403)
testurl = reverse('avisstage:stage_publication', testurl = reverse("avisstage:stage_publication", kwargs={"pk": self.vstage1.id})
kwargs={'pk':self.vstage1.id})
r = self.client.post(testurl, {"publier": True}) r = self.client.post(testurl, {"publier": True})
self.assertRedirects(r, reverse('avisstage:stage', self.assertRedirects(
kwargs={"pk": self.vstage1.id})) r, reverse("avisstage:stage", kwargs={"pk": self.vstage1.id})
)
testurl = reverse('avisstage:stage_ajout')
testurl = reverse("avisstage:stage_ajout")
r = self.client.get(testurl) r = self.client.get(testurl)
self.assertEqual(r.status_code, 200) self.assertEqual(r.status_code, 200)
testurl = reverse('avisstage:profil_edit') testurl = reverse("avisstage:profil_edit")
r = self.client.get(testurl) r = self.client.get(testurl)
self.assertEqual(r.status_code, 200) self.assertEqual(r.status_code, 200)

82
avisstage/urls.py
View file

@ -1,33 +1,65 @@
from django.conf.urls import include, url
from . import views, api
from tastypie.api import Api from tastypie.api import Api
v1_api = Api(api_name='v1') from django.urls import include, path
from . import api, views
v1_api = Api(api_name="v1")
v1_api.register(api.LieuResource()) v1_api.register(api.LieuResource())
v1_api.register(api.StageResource()) v1_api.register(api.StageResource())
v1_api.register(api.AuteurResource()) v1_api.register(api.AuteurResource())
app_name = "avisstage"
urlpatterns = [ urlpatterns = [
url(r'^$', views.index, name='index'), path("", views.index, name="index"),
url(r'^perso/$', views.perso, name='perso'), path("perso/", views.perso, name="perso"),
url(r'^faq/$', views.faq, name='faq'), path("faq/", views.faq, name="faq"),
url(r'^stage/nouveau/$', views.manage_stage, name='stage_ajout'), path("stage/nouveau/", views.manage_stage, name="stage_ajout"),
url(r'^stage/(?P<pk>\w+)/$', views.StageView.as_view(), name='stage'), path("stage/<int:pk>/", views.StageView.as_view(), name="stage"),
url(r'^stage/(?P<pk>\w+)/edit/$', views.manage_stage, name='stage_edit'), path("stage/<int:pk>/edit/", views.manage_stage, name="stage_edit"),
url(r'^stage/(?P<pk>\w+)/publication/$', views.publier_stage, path("stage/<int:pk>/publication/", views.publier_stage, name="stage_publication"),
name='stage_publication'), path("403/archicubes/", views.archicubes_interdits, name="403-archicubes"),
url(r'^403/archicubes/$', views.archicubes_interdits, path("lieu/save/", views.save_lieu, name="lieu_ajout"),
name='403-archicubes'), path("profil/show/<str:username>/", views.ProfilView.as_view(), name="profil"),
path("profil/edit/", views.ProfilEdit.as_view(), name="profil_edit"),
url(r'^lieu/save/$', views.save_lieu, name='lieu_ajout'), path("profil/parametres/", views.MesParametres.as_view(), name="parametres"),
url(r'^profil/show/(?P<username>[\w@]+)/$', views.ProfilView.as_view(), path(
name='profil'), "profil/emails/<str:email>/aconfirmer/",
url(r'^profil/edit/$', views.ProfilEdit.as_view(), name='profil_edit'), views.AdresseAConfirmer.as_view(),
url(r'^recherche/$', views.recherche, name='recherche'), name="emails_aconfirmer",
url(r'^recherche/resultats/$', views.recherche_resultats, ),
name='recherche_resultats'), path(
url(r'^recherche/items/$', views.stage_items, name='stage_items'), "profil/emails/<str:email>/supprime/",
url(r'^feedback/$', views.feedback, name='feedback'), views.SupprimeAdresse.as_view(),
url(r'^moderation/$', views.statistiques, name='moderation'), name="emails_supprime",
url(r'^api/', include(v1_api.urls)), ),
path(
"profil/emails/<str:email>/reconfirme/",
views.ReConfirmeAdresse.as_view(),
name="emails_reconfirme",
),
path(
"profil/emails/<str:email>/principal/",
views.RendAdressePrincipale.as_view(),
name="emails_principal",
),
path(
"profil/emails/confirme/<str:key>/",
views.ConfirmeAdresse.as_view(),
name="emails_confirme",
),
path(
"profil/mdp/demande/", views.EnvoieLienMotDePasse.as_view(), name="mdp_demande"
),
path(
"profil/mdp/<str:uidb64>/<str:token>/",
views.DefinirMotDePasse.as_view(),
name="mdp_edit",
),
path("recherche/", views.recherche, name="recherche"),
path("recherche/resultats/", views.recherche_resultats, name="recherche_resultats"),
path("recherche/items/", views.stage_items, name="stage_items"),
path("feedback/", views.feedback, name="feedback"),
path("moderation/", views.statistiques, name="moderation"),
path("api/", include(v1_api.urls)),
] ]

22
avisstage/utils.py
View file

@ -1,20 +1,26 @@
# coding: utf-8
from allauth.socialaccount.models import SocialAccount
from functools import reduce from functools import reduce
from math import cos, radians, sqrt from math import cos, radians, sqrt
def choices_length (choices):
return reduce (lambda m, choice: max (m, len (choice[0])), choices, 0) def choices_length(choices):
return reduce(lambda m, choice: max(m, len(choice[0])), choices, 0)
def en_scolarite(user): def en_scolarite(user):
return user.profil.en_scolarite return user.profil.en_scolarite
def approximate_distance(a, b): def approximate_distance(a, b):
lat_a = radians(a.y) lat_a = radians(a.y)
lat_b = radians(b.y) lat_b = radians(b.y)
dlon = radians(b.x - a.x) dlon = radians(b.x - a.x)
dlon = dlon * cos((lat_a + lat_b)/2) dlon = dlon * cos((lat_a + lat_b) / 2)
dlat = (lat_a - lat_b) dlat = lat_a - lat_b
distance = 6371000 * sqrt(dlon*dlon + dlat*dlat) distance = 6371000 * sqrt(dlon * dlon + dlat * dlat)
return distance return distance
def is_email_ens(mail, none=False):
if mail is None:
return none
return mail.endswith("ens.fr") or mail.endswith("ens.psl.eu")

441
avisstage/views.py
View file

@ -1,28 +1,47 @@
# coding: utf-8 import math
import random
from django.shortcuts import render, redirect, get_object_or_404
from django.views.generic import DetailView, ListView
from django.views.generic.edit import UpdateView, CreateView
from django import forms
from django.urls import reverse
from django.conf import settings
from django.contrib.admin.views.decorators import staff_member_required
from django.contrib.auth.decorators import login_required
from braces.views import LoginRequiredMixin
from django.http import JsonResponse, HttpResponseForbidden, Http404
from django.core.mail import send_mail
from django.db.models import Q, Count
from collections import Counter, defaultdict from collections import Counter, defaultdict
from .models import Normalien, Stage, Lieu, AvisLieu, AvisStage from braces.views import LoginRequiredMixin
from .forms import StageForm, LieuForm, AvisStageForm, AvisLieuForm, FeedbackForm from simple_email_confirmation.models import EmailAddress
from django import forms
from django.conf import settings
from django.contrib import messages
from django.contrib.admin.views.decorators import staff_member_required
from django.contrib.auth.decorators import login_required
from django.contrib.auth.tokens import default_token_generator
from django.contrib.auth.views import PasswordResetConfirmView
from django.core.mail import send_mail
from django.db.models import Count, Q
from django.http import Http404, HttpResponseForbidden, JsonResponse
from django.shortcuts import get_object_or_404, redirect, render
from django.urls import reverse, reverse_lazy
from django.views.generic import (
CreateView,
DeleteView,
DetailView,
FormView,
ListView,
TemplateView,
UpdateView,
View,
)
from django.views.generic.detail import SingleObjectMixin
from .forms import (
AdresseEmailForm,
AvisLieuForm,
AvisStageForm,
FeedbackForm,
LieuForm,
ReinitMdpForm,
StageForm,
)
from .models import AvisLieu, AvisStage, Lieu, Normalien, Stage
from .utils import en_scolarite from .utils import en_scolarite
from .views_search import * from .views_search import *
import random, math
# #
# LECTURE # LECTURE
# #
@ -30,8 +49,8 @@ import random, math
# Page d'accueil # Page d'accueil
def index(request): def index(request):
num_stages = Stage.objects.filter(public=True).count() num_stages = Stage.objects.filter(public=True).count()
return render(request, 'avisstage/index.html', return render(request, "avisstage/index.html", {"num_stages": num_stages})
{"num_stages": num_stages})
# Espace personnel # Espace personnel
@login_required @login_required
@ -43,40 +62,46 @@ def perso(request):
profil, created = Normalien.objects.get_or_create(user=request.user) profil, created = Normalien.objects.get_or_create(user=request.user)
profil.save() profil.save()
return render(request, 'avisstage/perso.html') return render(request, "avisstage/perso.html")
# 403 Archicubes # 403 Archicubes
@login_required @login_required
def archicubes_interdits(request): def archicubes_interdits(request):
return render(request, 'avisstage/403-archicubes.html') return render(request, "avisstage/403-archicubes.html")
# Profil # Profil
#login_required # login_required
class ProfilView(LoginRequiredMixin, DetailView): class ProfilView(LoginRequiredMixin, DetailView):
model = Normalien model = Normalien
template_name = 'avisstage/detail/profil.html' template_name = "avisstage/detail/profil.html"
# Récupération du profil # Récupération du profil
def get_object(self): def get_object(self):
# Restriction d'accès pour les archicubes # Restriction d'accès pour les archicubes
if (en_scolarite(self.request.user) or if (
self.kwargs.get('username') == self.request.user.username): en_scolarite(self.request.user)
or self.kwargs.get("username") == self.request.user.username
):
return get_object_or_404( return get_object_or_404(
Normalien, user__username=self.kwargs.get('username')) Normalien, user__username=self.kwargs.get("username")
)
else: else:
raise Http404 raise Http404
# Stage # Stage
#login_required # login_required
class StageView(LoginRequiredMixin, DetailView): class StageView(LoginRequiredMixin, DetailView):
model = Stage model = Stage
template_name = 'avisstage/detail/stage.html' template_name = "avisstage/detail/stage.html"
# Restriction aux stages publics ou personnels # Restriction aux stages publics ou personnels
def get_queryset(self): def get_queryset(self):
filtre = Q(auteur__user_id=self.request.user.id) filtre = Q(auteur__user_id=self.request.user.id)
# Restriction d'accès pour les archicubes # Restriction d'accès pour les archicubes
if en_scolarite(self.request.user): if en_scolarite(self.request.user):
filtre |= Q(public=True) filtre |= Q(public=True)
@ -85,30 +110,33 @@ class StageView(LoginRequiredMixin, DetailView):
def get_context_data(self, *args, **kwargs): def get_context_data(self, *args, **kwargs):
context = super().get_context_data(*args, **kwargs) context = super().get_context_data(*args, **kwargs)
context['MAPBOX_API_KEY'] = settings.MAPBOX_API_KEY context["MAPBOX_API_KEY"] = settings.MAPBOX_API_KEY
return context return context
# FAQ # FAQ
def faq(request): def faq(request):
return render(request, 'avisstage/faq.html') return render(request, "avisstage/faq.html")
# #
# EDITION # EDITION
# #
# Profil # Profil
#login_required # login_required
class ProfilEdit(LoginRequiredMixin, UpdateView): class ProfilEdit(LoginRequiredMixin, UpdateView):
model = Normalien model = Normalien
fields = ['nom', 'promotion', 'contactez_moi', 'bio'] fields = ["nom", "promotion", "contactez_moi", "bio"]
template_name = 'avisstage/formulaires/profil.html' template_name = "avisstage/formulaires/profil.html"
# Limitation à son propre profil # Limitation à son propre profil
def get_object(self): def get_object(self):
return self.request.user.profil return self.request.user.profil
def get_success_url(self): def get_success_url(self):
return reverse('avisstage:perso') return reverse("avisstage:perso")
# Stage # Stage
@login_required @login_required
@ -119,8 +147,9 @@ def manage_stage(request, pk=None):
stage = Stage(auteur=request.user.profil) stage = Stage(auteur=request.user.profil)
avis_stage = AvisStage(stage=stage) avis_stage = AvisStage(stage=stage)
c_del = False c_del = False
last_creation = Stage.objects.filter(auteur=request.user.profil)\ last_creation = Stage.objects.filter(auteur=request.user.profil).order_by(
.order_by("-date_creation")[:1] "-date_creation"
)[:1]
if len(last_creation) != 0: if len(last_creation) != 0:
last_maj = last_creation[0].date_creation last_maj = last_creation[0].date_creation
else: else:
@ -134,57 +163,71 @@ def manage_stage(request, pk=None):
# Formset pour les avis des lieux # Formset pour les avis des lieux
AvisLieuFormSet = forms.inlineformset_factory( AvisLieuFormSet = forms.inlineformset_factory(
Stage, AvisLieu, form=AvisLieuForm, can_delete=c_del, extra=0) Stage, AvisLieu, form=AvisLieuForm, can_delete=c_del, extra=0
)
if request.method == "POST": if request.method == "POST":
# Lecture des données # Lecture des données
form = StageForm(request.POST, request=request, instance=stage, prefix="stage") form = StageForm(request.POST, request=request, instance=stage, prefix="stage")
avis_stage_form = AvisStageForm(request.POST, avis_stage_form = AvisStageForm(
instance=avis_stage, prefix="avis") request.POST, instance=avis_stage, prefix="avis"
avis_lieu_formset = AvisLieuFormSet(request.POST, instance=stage, )
prefix="lieux") avis_lieu_formset = AvisLieuFormSet(
request.POST, instance=stage, prefix="lieux"
)
# Validation et enregistrement # Validation et enregistrement
if (form.is_valid() and if (
avis_stage_form.is_valid() and form.is_valid()
avis_lieu_formset.is_valid()): and avis_stage_form.is_valid()
and avis_lieu_formset.is_valid()
):
stage = form.save() stage = form.save()
avis_stage_form.instance.stage = stage avis_stage_form.instance.stage = stage
avis_stage_form.save() avis_stage_form.save()
avis_lieu_formset.save() avis_lieu_formset.save()
#print(request.POST) # print(request.POST)
if "continuer" in request.POST: if "continuer" in request.POST:
if pk is None: if pk is None:
return redirect(reverse('avisstage:stage_edit',kwargs={'pk':stage.id})) return redirect(
reverse("avisstage:stage_edit", kwargs={"pk": stage.id})
)
else: else:
return redirect(reverse('avisstage:stage', return redirect(reverse("avisstage:stage", kwargs={"pk": stage.id}))
kwargs={'pk':stage.id}))
else: else:
form = StageForm(instance=stage, prefix="stage") form = StageForm(instance=stage, prefix="stage")
avis_stage_form = AvisStageForm(instance=avis_stage, prefix="avis") avis_stage_form = AvisStageForm(instance=avis_stage, prefix="avis")
avis_lieu_formset = AvisLieuFormSet(instance=stage, prefix="lieux") avis_lieu_formset = AvisLieuFormSet(instance=stage, prefix="lieux")
# Affichage du formulaire # Affichage du formulaire
return render(request, "avisstage/formulaires/stage.html", return render(
{'form': form, 'avis_stage_form': avis_stage_form, request,
'avis_lieu_formset': avis_lieu_formset, "avisstage/formulaires/stage.html",
'creation': pk is None, "last_maj": last_maj, {
'GOOGLE_API_KEY': settings.GOOGLE_API_KEY, "form": form,
'MAPBOX_API_KEY': settings.MAPBOX_API_KEY}) "avis_stage_form": avis_stage_form,
"avis_lieu_formset": avis_lieu_formset,
"creation": pk is None,
"last_maj": last_maj,
"GOOGLE_API_KEY": settings.GOOGLE_API_KEY,
"MAPBOX_API_KEY": settings.MAPBOX_API_KEY,
},
)
# Ajout d'un lieu de stage # Ajout d'un lieu de stage
#login_required # login_required
# Stage # Stage
@login_required @login_required
def save_lieu(request): def save_lieu(request):
normalien = request.user.profil normalien = request.user.profil
if request.method == "POST": if request.method == "POST":
pk = request.POST.get("id", None) pk = request.POST.get("id", None)
#print(request.POST) # print(request.POST)
jitter = False jitter = False
if pk is None or pk == '': if pk is None or pk == "":
lieu = Lieu() lieu = Lieu()
else: else:
# Modification du lieu # Modification du lieu
@ -198,7 +241,7 @@ def save_lieu(request):
lieu = Lieu() lieu = Lieu()
# Servira à bouger un peu le lieu # Servira à bouger un peu le lieu
jitter = True jitter = True
# Lecture des données # Lecture des données
form = LieuForm(request.POST, instance=lieu) form = LieuForm(request.POST, instance=lieu)
@ -207,51 +250,54 @@ def save_lieu(request):
lieu = form.save(commit=False) lieu = form.save(commit=False)
if jitter: if jitter:
cdx, cdy = lieu.coord.get_coords() cdx, cdy = lieu.coord.get_coords()
ang = random.random() * 6.29; ang = random.random() * 6.29
rad = (random.random() + 0.5) * 3e-4 rad = (random.random() + 0.5) * 3e-4
cdx += math.cos(ang) * rad; cdx += math.cos(ang) * rad
cdy += math.sin(ang) * rad; cdy += math.sin(ang) * rad
lieu.coord.set_coords((cdx, cdy)) lieu.coord.set_coords((cdx, cdy))
lieu.save() lieu.save()
# Élimination des doublons # Élimination des doublons
if pk is None or pk == "": if pk is None or pk == "":
olieux = Lieu.objects.filter(nom=lieu.nom, coord__distance_lte=(lieu.coord, 10)) olieux = Lieu.objects.filter(
nom=lieu.nom, coord__distance_lte=(lieu.coord, 10)
)
for olieu in olieux: for olieu in olieux:
if olieu.type_lieu == lieu.type_lieu and \ if (
olieu.ville == lieu.ville and \ olieu.type_lieu == lieu.type_lieu
olieu.pays == lieu.pays: and olieu.ville == lieu.ville
and olieu.pays == lieu.pays
):
return JsonResponse({"success": True, "id": olieu.id}) return JsonResponse({"success": True, "id": olieu.id})
lieu.save() lieu.save()
return JsonResponse({"success": True, "id": lieu.id}) return JsonResponse({"success": True, "id": lieu.id})
else: else:
return JsonResponse({"success": False, return JsonResponse({"success": False, "errors": form.errors})
"errors": form.errors})
else: else:
return JsonResponse({"erreur": "Aucune donnée POST"}) return JsonResponse({"erreur": "Aucune donnée POST"})
class LieuAjout(LoginRequiredMixin, CreateView): class LieuAjout(LoginRequiredMixin, CreateView):
model = Lieu model = Lieu
form_class = LieuForm form_class = LieuForm
template_name = 'avisstage/formulaires/lieu.html' template_name = "avisstage/formulaires/lieu.html"
# Retourne d'un JSON si requête AJAX # Retourne d'un JSON si requête AJAX
def form_valid(self, form): def form_valid(self, form):
if self.request.GET.get("format", "") == "json": if self.request.GET.get("format", "") == "json":
self.object = form.save() self.object = form.save()
return JsonResponse({"success": True, return JsonResponse({"success": True, "id": self.object.id})
"id": self.object.id})
else: else:
super(LieuAjout, self).form_valid(form) super(LieuAjout, self).form_valid(form)
def form_invalid(self, form): def form_invalid(self, form):
if self.request.GET.get("format", "") == "json": if self.request.GET.get("format", "") == "json":
return JsonResponse({"success": False, return JsonResponse({"success": False, "errors": form.errors})
"errors": form.errors})
else: else:
super(LieuAjout, self).form_valid(form) super(LieuAjout, self).form_valid(form)
# Passage d'un stage en mode public # Passage d'un stage en mode public
@login_required @login_required
def publier_stage(request, pk): def publier_stage(request, pk):
@ -270,27 +316,28 @@ def publier_stage(request, pk):
stage.public = False stage.public = False
stage.save() stage.save()
return redirect(reverse("avisstage:stage", kwargs={"pk": pk})) return redirect(reverse("avisstage:stage", kwargs={"pk": pk}))
# #
# FEEDBACK # FEEDBACK
# #
@login_required @login_required
def feedback(request): def feedback(request):
if request.method == "POST": if request.method == "POST":
form = FeedbackForm(request.POST) form = FeedbackForm(request.POST)
if form.is_valid(): if form.is_valid():
objet = form.cleaned_data['objet'] objet = form.cleaned_data["objet"]
header = "[From : %s <%s>]\n" % (request.user, header = "[From : %s <%s>]\n" % (request.user, request.user.email)
request.user.email) message = header + form.cleaned_data["message"]
message = header + form.cleaned_data['message']
send_mail( send_mail(
"[experiENS] "+ objet, "[experiENS] " + objet,
message, message,
request.user.email, request.user.email,
['robin.champenois@ens.fr'], ["robin.champenois@ens.fr"],
fail_silently=False, fail_silently=False,
) )
if request.GET.get("format", None) == "json": if request.GET.get("format", None) == "json":
@ -298,8 +345,7 @@ def feedback(request):
return redirect(reverse("avisstage:index")) return redirect(reverse("avisstage:index"))
else: else:
if request.GET.get("format", None) == "json": if request.GET.get("format", None) == "json":
return JsonResponse({"success": False, return JsonResponse({"success": False, "errors": form.errors})
"errors": form.errors})
else: else:
form = FeedbackForm() form = FeedbackForm()
raise Http404() raise Http404()
@ -309,37 +355,210 @@ def feedback(request):
# STATISTIQUES # STATISTIQUES
# #
@login_required @login_required
@staff_member_required @staff_member_required
def statistiques(request): def statistiques(request):
nstages = Stage.objects.count() nstages = Stage.objects.count()
npubstages = Stage.objects.filter(public=True).count() npubstages = Stage.objects.filter(public=True).count()
nbymatiere_raw = Stage.objects.values('matieres__nom', 'public').annotate(scount=Count('matieres__nom')) nbymatiere_raw = Stage.objects.values("matieres__nom", "public").annotate(
scount=Count("matieres__nom")
)
nbymatiere = defaultdict(dict) nbymatiere = defaultdict(dict)
for npm in nbymatiere_raw: for npm in nbymatiere_raw:
nbymatiere[npm["matieres__nom"]]["publics" if npm["public"] else "drafts"] = npm["scount"] nbymatiere[npm["matieres__nom"]][
"publics" if npm["public"] else "drafts"
] = npm["scount"]
for mat, npm in nbymatiere.items(): for mat, npm in nbymatiere.items():
npm["matiere"] = mat npm["matiere"] = mat
nbymatiere = sorted(list(nbymatiere.values()), key=lambda npm: -npm.get("publics", 0)) nbymatiere = sorted(
nbylength = [("Vide", Stage.objects.filter(len_avis_stage__lt=5).count(), list(nbymatiere.values()), key=lambda npm: -npm.get("publics", 0)
Stage.objects.filter(len_avis_lieux__lt=5).count()), )
("Court", Stage.objects.filter(len_avis_stage__lt=30, len_avis_stage__gt=4).count(), nbylength = [
Stage.objects.filter(len_avis_lieux__lt=30, len_avis_lieux__gt=4).count()), (
("Moyen", Stage.objects.filter(len_avis_stage__lt=100, len_avis_stage__gt=29).count(), "Vide",
Stage.objects.filter(len_avis_lieux__lt=100, len_avis_lieux__gt=29).count()), Stage.objects.filter(len_avis_stage__lt=5).count(),
("Long", Stage.objects.filter(len_avis_stage__gt=99).count(), Stage.objects.filter(len_avis_lieux__lt=5).count(),
Stage.objects.filter(len_avis_lieux__gt=99).count())] ),
(
"Court",
Stage.objects.filter(len_avis_stage__lt=30, len_avis_stage__gt=4).count(),
Stage.objects.filter(len_avis_lieux__lt=30, len_avis_lieux__gt=4).count(),
),
(
"Moyen",
Stage.objects.filter(len_avis_stage__lt=100, len_avis_stage__gt=29).count(),
Stage.objects.filter(len_avis_lieux__lt=100, len_avis_lieux__gt=29).count(),
),
(
"Long",
Stage.objects.filter(len_avis_stage__gt=99).count(),
Stage.objects.filter(len_avis_lieux__gt=99).count(),
),
]
nusers = Normalien.objects.count() nusers = Normalien.objects.count()
nauts = Normalien.objects.filter(stages__isnull=False).distinct().count() nauts = Normalien.objects.filter(stages__isnull=False).distinct().count()
nbyaut = Counter(Normalien.objects.filter(stages__isnull=False).annotate(scount=Count('stages')).values_list('scount', flat="True")).items() nbyaut = Counter(
Normalien.objects.filter(stages__isnull=False)
.annotate(scount=Count("stages"))
.values_list("scount", flat="True")
).items()
nlieux = Lieu.objects.filter(stages__isnull=False).distinct().count() nlieux = Lieu.objects.filter(stages__isnull=False).distinct().count()
return render(request, 'avisstage/moderation/statistiques.html', return render(
{'num_stages': nstages, request,
'num_stages_pub': npubstages, "avisstage/moderation/statistiques.html",
'num_par_matiere': nbymatiere, {
'num_users': nusers, "num_stages": nstages,
'num_auteurs': nauts, "num_stages_pub": npubstages,
'num_par_auteur': nbyaut, "num_par_matiere": nbymatiere,
'num_lieux_utiles': nlieux, "num_users": nusers,
'num_par_longueur': nbylength, "num_auteurs": nauts,
}) "num_par_auteur": nbyaut,
"num_lieux_utiles": nlieux,
"num_par_longueur": nbylength,
},
)
#
# Compte
#
class MesAdressesMixin(LoginRequiredMixin):
slug_url_kwarg = "email"
slug_field = "email"
confirmed_only = False
def get_queryset(self, *args, **kwargs):
qs = self.request.user.email_address_set.all()
if self.confirmed_only:
qs = qs.filter(confirmed_at__isnull=False)
return qs
def _send_confirm_mail(email, request):
confirm_url = request.build_absolute_uri(
reverse("avisstage:emails_confirme", kwargs={"key": email.key})
)
send_mail(
"[ExperiENS] Confirmez votre adresse a-mail",
"""Bonjour,
Vous venez d'ajouter cette adresse e-mail à votre compte ExperiENS.
Pour la vérifier, merci de cliquer sur le lien suivant, ou de copier l'adresse dans votre navigateur :
{confirm_url}
Cordialement,
L'équipe ExperiENS""".format(
confirm_url=confirm_url
),
"experiens-nepasrepondre@eleves.ens.fr",
[email.email],
fail_silently=False,
)
return redirect(
reverse("avisstage:emails_aconfirmer", kwargs={"email": email.email})
)
class MesParametres(LoginRequiredMixin, FormView):
model = EmailAddress
template_name = "avisstage/compte/parametres.html"
form_class = AdresseEmailForm
def get_form_kwargs(self, *args, **kwargs):
kwargs = super().get_form_kwargs(*args, **kwargs)
kwargs["_user"] = self.request.user
return kwargs
def form_valid(self, form):
new = EmailAddress.objects.create_unconfirmed(
form.cleaned_data["email"], self.request.user
)
return _send_confirm_mail(new, self.request)
class RendAdressePrincipale(MesAdressesMixin, SingleObjectMixin, View):
model = EmailAddress
confirmed_only = True
def post(self, *args, **kwargs):
if not hasattr(self, "object"):
self.object = self.get_object()
self.request.user.email = self.object.email
self.request.user.save()
return redirect(reverse("avisstage:parametres"))
class AdresseAConfirmer(MesAdressesMixin, DetailView):
model = EmailAddress
template_name = "avisstage/compte/aconfirmer.html"
class ReConfirmeAdresse(MesAdressesMixin, DetailView):
model = EmailAddress
def post(self, *args, **kwargs):
email = self.get_object()
if email.confirmed_at is None:
return _send_confirm_mail(email, self.request)
return redirect(reverse("avisstage:parametres"))
class ConfirmeAdresse(LoginRequiredMixin, View):
def get(self, *args, **kwargs):
try:
email = EmailAddress.objects.confirm(
self.kwargs["key"], self.request.user, True
)
except Exception as e:
raise Http404()
messages.add_message(
self.request,
messages.SUCCESS,
"L'adresse email {email} a bien été confirmée".format(email=email.email),
)
return redirect(reverse("avisstage:parametres"))
class SupprimeAdresse(MesAdressesMixin, DeleteView):
model = EmailAddress
template_name = "avisstage/compte/email_supprime.html"
success_url = reverse_lazy("avisstage:parametres")
def get_queryset(self, *args, **kwargs):
qs = super().get_queryset(*args, **kwargs)
return qs.exclude(email=self.request.user.email)
class EnvoieLienMotDePasse(LoginRequiredMixin, View):
def post(self, *args, **kwargs):
form = ReinitMdpForm({"email": self.request.user.email})
form.is_valid()
form.save(
email_template_name="avisstage/mails/reinit_mdp.html",
from_email="experiens-nepasrepondre@eleves.ens.fr",
subject_template_name="avisstage/mails/reinit_mdp.txt",
)
messages.add_message(
self.request,
messages.INFO,
"Un mail a été envoyé à {email}. Merci de vérifier vos indésirables si vous ne le recevez pas bientôt".format(
email=self.request.user.email
),
)
return redirect(reverse("avisstage:parametres"))
class DefinirMotDePasse(PasswordResetConfirmView):
template_name = "avisstage/compte/edit_mdp.html"
success_url = reverse_lazy("avisstage:perso")
def get_user(self, *args, **kwargs):
user = super().get_user(*args, **kwargs)
if self.request.user.is_authenticated and user != self.request.user:
raise Http404("Ce token n'est pas valide pour votre compte")
return user

239
avisstage/views_search.py
View file

@ -1,18 +1,15 @@
# coding: utf-8 import json
import logging
from datetime import date from datetime import date
from django import forms from django import forms
from django.contrib.auth.decorators import login_required
from django.conf import settings from django.conf import settings
from django.contrib.auth.decorators import login_required
from django.core.cache import cache from django.core.cache import cache
from django.core.paginator import Paginator from django.core.paginator import Paginator
from django.db.models import Q, Case, When from django.db.models import Case, Q, When
from django.http import JsonResponse, HttpResponseBadRequest from django.http import HttpResponseBadRequest, JsonResponse
from django.shortcuts import render, redirect, get_object_or_404 from django.shortcuts import get_object_or_404, redirect, render
import json
import logging
USE_ELASTICSEARCH = getattr(settings, "USE_ELASTICSEARCH", True) USE_ELASTICSEARCH = getattr(settings, "USE_ELASTICSEARCH", True)
@ -21,36 +18,43 @@ if USE_ELASTICSEARCH:
from .decorators import en_scolarite_required from .decorators import en_scolarite_required
from .models import Stage from .models import Stage
from .statics import TYPE_LIEU_OPTIONS, TYPE_STAGE_OPTIONS, NIVEAU_SCOL_OPTIONS from .statics import NIVEAU_SCOL_OPTIONS, TYPE_LIEU_OPTIONS, TYPE_STAGE_OPTIONS
logger = logging.getLogger("recherche") logger = logging.getLogger("recherche")
# Recherche # Recherche
class SearchForm(forms.Form): class SearchForm(forms.Form):
generique = forms.CharField(required=False) generique = forms.CharField(required=False)
sujet = forms.CharField(label=u'À propos de', required=False) sujet = forms.CharField(label="À propos de", required=False)
contexte = forms.CharField(label=u'Contexte (lieu, encadrant⋅e⋅s, structure)', contexte = forms.CharField(
required=False) label="Contexte (lieu, encadrant⋅e⋅s, structure)", required=False
)
apres_annee = forms.IntegerField(label=u'Après cette année', required=False)
avant_annee = forms.IntegerField(label=u'Avant cette année', required=False)
type_stage = forms.ChoiceField(label="Type de stage", choices=([('', u'')] apres_annee = forms.IntegerField(label="Après cette année", required=False)
+ list(TYPE_STAGE_OPTIONS)), avant_annee = forms.IntegerField(label="Avant cette année", required=False)
required=False)
niveau_scol = forms.ChoiceField(label="Année d'étude", choices=([('', u'')] type_stage = forms.ChoiceField(
+ list(NIVEAU_SCOL_OPTIONS)), label="Type de stage",
required=False) choices=([("", "")] + list(TYPE_STAGE_OPTIONS)),
required=False,
type_lieu = forms.ChoiceField(label=u"Type de lieu d'accueil", )
choices=([('', u'')] niveau_scol = forms.ChoiceField(
+ list(TYPE_LIEU_OPTIONS)), label="Année d'étude",
required=False) choices=([("", "")] + list(NIVEAU_SCOL_OPTIONS)),
tri = forms.ChoiceField(label=u'Tri par', required=False,
choices=[('pertinence', u'Pertinence'), )
('-date_maj',u'Dernière mise à jour')],
required=False, initial='pertinence') type_lieu = forms.ChoiceField(
label="Type de lieu d'accueil",
choices=([("", "")] + list(TYPE_LIEU_OPTIONS)),
required=False,
)
tri = forms.ChoiceField(
label="Tri par",
choices=[("pertinence", "Pertinence"), ("-date_maj", "Dernière mise à jour")],
required=False,
initial="pertinence",
)
def cherche(**kwargs): def cherche(**kwargs):
@ -58,9 +62,11 @@ def cherche(**kwargs):
use_dsl = False use_dsl = False
def field_relevant(field, test_string=True): def field_relevant(field, test_string=True):
return field in kwargs and \ return (
kwargs[field] is not None and \ field in kwargs
((not test_string) or kwargs[field].strip() != '') and kwargs[field] is not None
and ((not test_string) or kwargs[field].strip() != "")
)
if USE_ELASTICSEARCH: if USE_ELASTICSEARCH:
dsl = StageDocument.search() dsl = StageDocument.search()
@ -71,28 +77,36 @@ def cherche(**kwargs):
# Champ générique : recherche dans tous les champs # Champ générique : recherche dans tous les champs
if field_relevant("generique"): if field_relevant("generique"):
#print("Filtre generique", kwargs['generique']) # print("Filtre generique", kwargs['generique'])
dsl = dsl.query( dsl = dsl.query(
"match", "match", _all={"query": kwargs["generique"], "fuzziness": "auto"}
_all={"query": kwargs["generique"], )
"fuzziness": "auto"})
use_dsl = True use_dsl = True
# Sujet -> Recherche dan les noms de sujets et les thématiques # Sujet -> Recherche dan les noms de sujets et les thématiques
if field_relevant("sujet"): if field_relevant("sujet"):
dsl = dsl.query("multi_match", dsl = dsl.query(
query = kwargs["sujet"], "multi_match",
fields = ['sujet^2', 'thematiques', 'matieres'], query=kwargs["sujet"],
fuzziness = "auto") fields=["sujet^2", "thematiques", "matieres"],
fuzziness="auto",
)
use_dsl = True use_dsl = True
# Contexte -> Encadrants, structure, lieu # Contexte -> Encadrants, structure, lieu
if field_relevant("contexte"): if field_relevant("contexte"):
dsl = dsl.query("multi_match", dsl = dsl.query(
query = kwargs["contexte"], "multi_match",
fields = ['encadrants', 'structure^2', query=kwargs["contexte"],
'lieux.nom', 'lieux.pays', 'lieux.ville'], fields=[
fuzziness = "auto") "encadrants",
"structure^2",
"lieux.nom",
"lieux.pays",
"lieux.ville",
],
fuzziness="auto",
)
use_dsl = True use_dsl = True
else: else:
@ -100,71 +114,74 @@ def cherche(**kwargs):
# recherche en base de données # recherche en base de données
if field_relevant("generique"): if field_relevant("generique"):
generique = kwargs["generique"] generique = kwargs["generique"]
filtres = (Q(sujet__icontains=generique) filtres = (
| Q(thematiques__name__icontains=generique) Q(sujet__icontains=generique)
| Q(matieres__nom__icontains=generique) | Q(thematiques__name__icontains=generique)
| Q(lieux__nom__icontains=generique)) | Q(matieres__nom__icontains=generique)
| Q(lieux__nom__icontains=generique)
)
# Autres champs -> non fonctionnels # Autres champs -> non fonctionnels
if field_relevant("sujet") or field_relevant("contexte"): if field_relevant("sujet") or field_relevant("contexte"):
raise NotImplementedError( raise NotImplementedError(
"ElasticSearch doit être activé pour ce type de recherche") "ElasticSearch doit être activé pour ce type de recherche"
)
# #
# Filtres directs db # Filtres directs db
# #
# Dates # Dates
if field_relevant('avant_annee', False): if field_relevant("avant_annee", False):
dte = date(kwargs['avant_annee']+1, 1, 1) dte = date(kwargs["avant_annee"] + 1, 1, 1)
filtres &= Q(date_fin__lt=dte) filtres &= Q(date_fin__lt=dte)
if field_relevant('apres_annee', False): if field_relevant("apres_annee", False):
dte = date(kwargs['apres_annee'], 1, 1) dte = date(kwargs["apres_annee"], 1, 1)
filtres &= Q(date_debut__gte=dte) filtres &= Q(date_debut__gte=dte)
# Type de stage # Type de stage
if field_relevant('type_stage'): if field_relevant("type_stage"):
filtres &= Q(type_stage=kwargs["type_stage"]) filtres &= Q(type_stage=kwargs["type_stage"])
if field_relevant('niveau_scol'): if field_relevant("niveau_scol"):
filtres &= Q(niveau_scol=kwargs["niveau_scol"]) filtres &= Q(niveau_scol=kwargs["niveau_scol"])
# Type de lieu # Type de lieu
if field_relevant('type_lieu'): if field_relevant("type_lieu"):
filtres &= Q(lieux__type_lieu=kwargs["type_lieu"]) filtres &= Q(lieux__type_lieu=kwargs["type_lieu"])
# Application # Application
if USE_ELASTICSEARCH and use_dsl: if USE_ELASTICSEARCH and use_dsl:
filtres &= Q(id__in=[s.meta.id for s in dsl.scan()]) filtres &= Q(id__in=[s.meta.id for s in dsl.scan()])
#print(filtres) # print(filtres)
resultat = Stage.objects.filter(filtres) resultat = Stage.objects.filter(filtres)
tri = 'pertinence' tri = "pertinence"
if not use_dsl: if not use_dsl:
kwargs['tri'] = '-date_maj' kwargs["tri"] = "-date_maj"
if field_relevant('tri') and kwargs['tri'] in ['-date_maj']: if field_relevant("tri") and kwargs["tri"] in ["-date_maj"]:
tri = kwargs['tri'] tri = kwargs["tri"]
resultat = resultat.order_by(tri) resultat = resultat.order_by(tri)
return resultat, tri return resultat, tri
@login_required @login_required
@en_scolarite_required @en_scolarite_required
def recherche(request): def recherche(request):
form = SearchForm() form = SearchForm()
return render(request, 'avisstage/recherche/recherche.html', return render(request, "avisstage/recherche/recherche.html", {"form": form})
{"form": form})
@login_required @login_required
@en_scolarite_required @en_scolarite_required
def recherche_resultats(request): def recherche_resultats(request):
stages = [] stages = []
tri = '' tri = ""
vue = 'vue-liste' vue = "vue-liste"
lieux = [] lieux = []
stageids = [] stageids = []
if request.method == "GET": if request.method == "GET":
@ -174,17 +191,22 @@ def recherche_resultats(request):
search_args = form.cleaned_data search_args = form.cleaned_data
# Gestion du cache # Gestion du cache
lsearch_args = {key: val for key, val in search_args.items() lsearch_args = {
if val != "" and val is not None} key: val
for key, val in search_args.items()
if val != "" and val is not None
}
cache_key = json.dumps(lsearch_args, sort_keys=True) cache_key = json.dumps(lsearch_args, sort_keys=True)
cached = cache.get(cache_key) cached = cache.get(cache_key)
if cached is None: if cached is None:
# Requête effective # Requête effective
stages, tri = cherche(**search_args) stages, tri = cherche(**search_args)
stageids = list(stages.values_list('id', flat=True)) stageids = list(stages.values_list("id", flat=True))
lieux = [[stageid, lieuid] for (stageid, lieuid) lieux = [
in stages.values_list('id', 'lieux') [stageid, lieuid]
if lieuid is not None] for (stageid, lieuid) in stages.values_list("id", "lieux")
if lieuid is not None
]
# Sauvegarde dans le cache # Sauvegarde dans le cache
to_cache = {"stages": stageids, "lieux": lieux, "tri": tri} to_cache = {"stages": stageids, "lieux": lieux, "tri": tri}
@ -205,42 +227,55 @@ def recherche_resultats(request):
stageids = [] stageids = []
if cached is None: if cached is None:
stages = stages[max(0, stageids.start_index()-1): stages = stages[
stageids.end_index()] max(0, stageids.start_index() - 1) : stageids.end_index()
]
else: else:
orderer = Case(*[When(pk=pk, then=pos) orderer = Case(
for pos, pk in enumerate(stageids)]) *[When(pk=pk, then=pos) for pos, pk in enumerate(stageids)]
)
stages = Stage.objects.filter(id__in=stageids).order_by(orderer) stages = Stage.objects.filter(id__in=stageids).order_by(orderer)
stages = stages.prefetch_related('lieux', 'auteur', stages = stages.prefetch_related(
'matieres', 'thematiques') "lieux", "auteur", "matieres", "thematiques"
)
else: else:
form = SearchForm() form = SearchForm()
if stages: if stages:
vue = 'vue-hybride' vue = "vue-hybride"
# Version JSON pour recherche dynamique # Version JSON pour recherche dynamique
if request.GET.get("format") == "json": if request.GET.get("format") == "json":
return JsonResponse({"stages": stages, "page": page, return JsonResponse(
"num_pages": paginator.num_pages}) {"stages": stages, "page": page, "num_pages": paginator.num_pages}
)
template_name = 'avisstage/recherche/resultats.html'
template_name = "avisstage/recherche/resultats.html"
if request.GET.get("format") == "raw": if request.GET.get("format") == "raw":
template_name = 'avisstage/recherche/stage_items.html' template_name = "avisstage/recherche/stage_items.html"
return render(request, template_name, return render(
{"form": form, "stages": stages, "paginator": stageids, request,
"tri": tri, "vue": vue, "lieux": lieux, template_name,
"MAPBOX_API_KEY": settings.MAPBOX_API_KEY}) {
"form": form,
"stages": stages,
"paginator": stageids,
"tri": tri,
"vue": vue,
"lieux": lieux,
"MAPBOX_API_KEY": settings.MAPBOX_API_KEY,
},
)
@login_required @login_required
@en_scolarite_required @en_scolarite_required
def stage_items(request): def stage_items(request):
try: try:
stageids = [int(a) for a in request.GET.get("ids", "").split(';')] stageids = [int(a) for a in request.GET.get("ids", "").split(";")]
except ValueError: except ValueError:
return HttpResponseBadRequest("Paramètre incorrect") return HttpResponseBadRequest("Paramètre incorrect")
stages = Stage.objects.filter(id__in=stageids)\ stages = Stage.objects.filter(id__in=stageids).prefetch_related(
.prefetch_related('lieux', 'auteur', "lieux", "auteur", "matieres", "thematiques"
'matieres', 'thematiques') )
return render(request, 'avisstage/recherche/stage_items.html', return render(request, "avisstage/recherche/stage_items.html", {"stages": stages})
{"stages": stages})

24
avisstage/widgets.py
View file

@ -1,14 +1,14 @@
from django import forms from django import forms
from django.core import validators from django.core import validators
class LatLonWidget(forms.MultiWidget): class LatLonWidget(forms.MultiWidget):
""" """
A Widget that splits Point input into two latitude/longitude boxes. A Widget that splits Point input into two latitude/longitude boxes.
""" """
def __init__(self, attrs=None, date_format=None, time_format=None): def __init__(self, attrs=None, date_format=None, time_format=None):
widgets = (forms.HiddenInput(attrs=attrs), widgets = (forms.HiddenInput(attrs=attrs), forms.HiddenInput(attrs=attrs))
forms.HiddenInput(attrs=attrs))
super(LatLonWidget, self).__init__(widgets, attrs) super(LatLonWidget, self).__init__(widgets, attrs)
def decompress(self, value): def decompress(self, value):
@ -23,13 +23,15 @@ class LatLonField(forms.MultiValueField):
srid = 4326 srid = 4326
default_error_messages = { default_error_messages = {
'invalid_latitude' : (u'Entrez une latitude valide.'), "invalid_latitude": ("Entrez une latitude valide."),
'invalid_longitude' : (u'Entrez une longitude valide.'), "invalid_longitude": ("Entrez une longitude valide."),
} }
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
fields = (forms.FloatField(min_value=-90, max_value=90), fields = (
forms.FloatField(min_value=-180, max_value=180)) forms.FloatField(min_value=-90, max_value=90),
forms.FloatField(min_value=-180, max_value=180),
)
super(LatLonField, self).__init__(fields, *args, **kwargs) super(LatLonField, self).__init__(fields, *args, **kwargs)
def compress(self, data_list): def compress(self, data_list):
@ -37,11 +39,11 @@ class LatLonField(forms.MultiValueField):
# Raise a validation error if latitude or longitude is empty # Raise a validation error if latitude or longitude is empty
# (possible if LatLongField has required=False). # (possible if LatLongField has required=False).
if data_list[0] in validators.EMPTY_VALUES: if data_list[0] in validators.EMPTY_VALUES:
raise forms.ValidationError(self.error_messages['invalid_latitude']) raise forms.ValidationError(self.error_messages["invalid_latitude"])
if data_list[1] in validators.EMPTY_VALUES: if data_list[1] in validators.EMPTY_VALUES:
raise forms.ValidationError(self.error_messages['invalid_longitude']) raise forms.ValidationError(self.error_messages["invalid_longitude"])
# SRID=4326;POINT(1.12345789 1.123456789) # SRID=4326;POINT(1.12345789 1.123456789)
srid_str = 'SRID=%d'%self.srid srid_str = "SRID=%d" % self.srid
point_str = 'POINT(%f %f)'%tuple(reversed(data_list)) point_str = "POINT(%f %f)" % tuple(reversed(data_list))
return ';'.join([srid_str, point_str]) return ";".join([srid_str, point_str])
return None return None

16
experiENS/auth.py
View file

@ -1,5 +1,13 @@
from django_cas_ng.backends import CASBackend from authens.backends import ENSCASBackend as AuthENSBackend
from authens.utils import parse_entrance_year
class ENSCASBackend(CASBackend):
def clean_username(self, username): class ENSCASBackend(AuthENSBackend):
return username.lower().strip() # Override AuthENS backend user creation to implement the @<promo> logic
def get_free_username(self, cas_login, attributes):
entrance_year = parse_entrance_year(attributes.get("homeDirectory"))
if entrance_year is None:
return super().get_free_username(cas_login, attributes)
entrance_year %= 100
return "%s@%02d" % (cas_login, entrance_year)

151
experiENS/settings_base.py
View file

@ -10,9 +10,10 @@ https://docs.djangoproject.com/en/1.7/ref/settings/
# Build paths inside the project like this: os.path.join(BASE_DIR, ...) # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
import os import os
from django.core.urlresolvers import reverse_lazy
from .secrets import SECRET_KEY, GOOGLE_API_KEY, MAPBOX_API_KEY from django.urls import reverse_lazy
from .secrets import GOOGLE_API_KEY, MAPBOX_API_KEY, SECRET_KEY
BASE_DIR = os.path.dirname(os.path.dirname(__file__)) BASE_DIR = os.path.dirname(os.path.dirname(__file__))
@ -24,72 +25,65 @@ ALLOWED_HOSTS = []
# Application definition # Application definition
INSTALLED_APPS = [ INSTALLED_APPS = [
'django.contrib.admin', "django.contrib.admin",
'django.contrib.auth', "django.contrib.auth",
'django.contrib.contenttypes', "django.contrib.contenttypes",
'django.contrib.sessions', "django.contrib.sessions",
'django.contrib.messages', "django.contrib.messages",
'django.contrib.staticfiles', "django.contrib.staticfiles",
'django.contrib.gis', "django.contrib.gis",
'django.contrib.sites', "django.contrib.sites",
"django_elasticsearch_dsl",
'django_elasticsearch_dsl', #'allauth', # Uncomment that part when you
#'allauth.account', # apply migration
'widget_tweaks', #'allauth.socialaccount', # Allauth -> AuthENS
'allauth_ens', "simple_email_confirmation",
"authens",
'allauth', "tastypie",
'allauth.account', "braces",
'allauth.socialaccount', "tinymce",
'allauth_cas', "taggit",
"taggit_autosuggest",
'allauth_ens.providers.clipper', "avisstage",
'tastypie',
'braces',
'tinymce',
'taggit',
'taggit_autosuggest',
'avisstage'
] ]
MIDDLEWARE_CLASSES = ( MIDDLEWARE = (
'django.contrib.sessions.middleware.SessionMiddleware', "django.middleware.security.SecurityMiddleware",
'django.middleware.common.CommonMiddleware', "django.contrib.sessions.middleware.SessionMiddleware",
'django.middleware.csrf.CsrfViewMiddleware', "django.middleware.common.CommonMiddleware",
'django.contrib.auth.middleware.AuthenticationMiddleware', "django.middleware.csrf.CsrfViewMiddleware",
'django.contrib.auth.middleware.SessionAuthenticationMiddleware', "django.contrib.auth.middleware.AuthenticationMiddleware",
'django.contrib.messages.middleware.MessageMiddleware', "django.contrib.messages.middleware.MessageMiddleware",
'django.middleware.clickjacking.XFrameOptionsMiddleware', "django.middleware.clickjacking.XFrameOptionsMiddleware",
) )
TEMPLATES = [ TEMPLATES = [
{ {
'BACKEND': 'django.template.backends.django.DjangoTemplates', "BACKEND": "django.template.backends.django.DjangoTemplates",
'DIRS': [ "DIRS": [
# insert your TEMPLATE_DIRS here # insert your TEMPLATE_DIRS here
], ],
'APP_DIRS': True, "APP_DIRS": True,
'OPTIONS': { "OPTIONS": {
'context_processors': [ "context_processors": [
'django.contrib.auth.context_processors.auth', "django.contrib.auth.context_processors.auth",
'django.template.context_processors.debug', "django.template.context_processors.debug",
'django.template.context_processors.i18n', "django.template.context_processors.i18n",
'django.template.context_processors.media', "django.template.context_processors.media",
'django.template.context_processors.static', "django.template.context_processors.static",
'django.template.context_processors.tz', "django.template.context_processors.tz",
'django.template.context_processors.request', "django.template.context_processors.request",
'django.contrib.messages.context_processors.messages', "django.contrib.messages.context_processors.messages",
], ],
}, },
}, },
] ]
ROOT_URLCONF = 'experiENS.urls' ROOT_URLCONF = "experiENS.urls"
WSGI_APPLICATION = 'experiENS.wsgi.application' WSGI_APPLICATION = "experiENS.wsgi.application"
# Database # Database
@ -98,9 +92,9 @@ WSGI_APPLICATION = 'experiENS.wsgi.application'
# Internationalization # Internationalization
# https://docs.djangoproject.com/en/1.7/topics/i18n/ # https://docs.djangoproject.com/en/1.7/topics/i18n/
LANGUAGE_CODE = 'fr' LANGUAGE_CODE = "fr"
TIME_ZONE = 'Europe/Paris' TIME_ZONE = "Europe/Paris"
USE_I18N = True USE_I18N = True
@ -113,44 +107,37 @@ SITE_ID = 1
# Static files (CSS, JavaScript, Images) # Static files (CSS, JavaScript, Images)
# https://docs.djangoproject.com/en/1.7/howto/static-files/ # https://docs.djangoproject.com/en/1.7/howto/static-files/
STATIC_URL = '/static/' STATIC_URL = "/static/"
AUTHENTICATION_BACKENDS = ( AUTHENTICATION_BACKENDS = (
'django.contrib.auth.backends.ModelBackend', "django.contrib.auth.backends.ModelBackend",
'experiENS.auth.ENSCASBackend', "experiENS.auth.ENSCASBackend",
) )
CAS_SERVER_URL = "https://cas.eleves.ens.fr/" #SPI CAS CAS_SERVER_URL = "https://cas.eleves.ens.fr/" # SPI CAS
CAS_VERIFY_URL = "https://cas.eleves.ens.fr/"
CAS_IGNORE_REFERER = True
CAS_REDIRECT_URL = reverse_lazy('avisstage:perso')
CAS_EMAIL_FORMAT = "%s@clipper.ens.fr"
CAS_FORCE_CHANGE_USERNAME_CASE = "lower"
CAS_VERSION = 'CAS_2_SAML_1_0'
ACCOUNT_ADAPTER = 'avisstage.allauth_adapter.AccountAdapter' AUTHENS_USE_OLDCAS = False
SOCIALACCOUNT_ADAPTER = 'avisstage.allauth_adapter.SocialAccountAdapter'
LOGIN_URL = reverse_lazy('account_login') LOGIN_URL = reverse_lazy("authens:login")
LOGOUT_URL = reverse_lazy('account_logout') LOGOUT_URL = reverse_lazy("authens:logout")
LOGIN_REDIRECT_URL = reverse_lazy('avisstage:perso') LOGIN_REDIRECT_URL = reverse_lazy("avisstage:perso")
ACCOUNT_HOME_URL = reverse_lazy('avisstage:index') LOGOUT_REDIRECT_URL = reverse_lazy("avisstage:index")
LOGGING = { LOGGING = {
'version': 1, "version": 1,
'disable_existing_loggers': False, "disable_existing_loggers": False,
'handlers': { "handlers": {
'file': { "file": {
'level': 'INFO', "level": "INFO",
'class': 'logging.FileHandler', "class": "logging.FileHandler",
'filename': os.path.join(BASE_DIR, 'recherche.log'), "filename": os.path.join(BASE_DIR, "recherche.log"),
}, },
}, },
'loggers': { "loggers": {
'recherche': { "recherche": {
'handlers': ['file'], "handlers": ["file"],
'level': 'INFO', "level": "INFO",
'propagate': True, "propagate": True,
}, },
}, },
} }

29
experiENS/settings_dev.py
View file

@ -3,45 +3,40 @@ from .settings_base import *
DEBUG = True DEBUG = True
DATABASES = { DATABASES = {
'default': { "default": {
'ENGINE': 'django.contrib.gis.db.backends.spatialite', "ENGINE": "django.contrib.gis.db.backends.spatialite",
'NAME': os.path.join(BASE_DIR, 'db.sqlite3'), "NAME": os.path.join(BASE_DIR, "db.sqlite3"),
} }
} }
USE_DEBUG_TOOLBAR = True USE_DEBUG_TOOLBAR = False
if USE_DEBUG_TOOLBAR: if USE_DEBUG_TOOLBAR:
INSTALLED_APPS += [ INSTALLED_APPS += [
'debug_toolbar', "debug_toolbar",
] ]
MIDDLEWARE_CLASSES = ( MIDDLEWARE = ("debug_toolbar.middleware.DebugToolbarMiddleware",) + MIDDLEWARE
'debug_toolbar.middleware.DebugToolbarMiddleware',
) + MIDDLEWARE_CLASSES
INTERNAL_IPS = ['127.0.0.1'] INTERNAL_IPS = ["127.0.0.1"]
SPATIALITE_LIBRARY_PATH = 'mod_spatialite' SPATIALITE_LIBRARY_PATH = "mod_spatialite"
STATIC_ROOT = "/home/evarin/Bureau/experiENS/static/" STATIC_ROOT = "/home/evarin/Bureau/experiENS/static/"
EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend' EMAIL_BACKEND = "django.core.mail.backends.console.EmailBackend"
STATIC_URL = "/experiens/static/" STATIC_URL = "/experiens/static/"
ELASTICSEARCH_DSL = { ELASTICSEARCH_DSL = {
'default': { "default": {"hosts": "localhost:9200"},
'hosts': 'localhost:9200'
},
} }
CLIPPER_LDAP_SERVER = 'ldaps://localhost:636' CLIPPER_LDAP_SERVER = "ldaps://localhost:636"
# Changer à True pour développer avec ES # Changer à True pour développer avec ES
USE_ELASTICSEARCH = False USE_ELASTICSEARCH = False
if not USE_ELASTICSEARCH: if not USE_ELASTICSEARCH:
INSTALLED_APPS.remove('django_elasticsearch_dsl') INSTALLED_APPS.remove("django_elasticsearch_dsl")

38
experiENS/settings_prod.py
View file

@ -1,8 +1,10 @@
from .settings_base import * import os
import sys
import os, sys
from django.core.urlresolvers import reverse_lazy from django.core.urlresolvers import reverse_lazy
from .settings_base import *
PROJECT_DIR = os.path.dirname(os.path.abspath(__file__)) PROJECT_DIR = os.path.dirname(os.path.abspath(__file__))
BASE_DIR = os.path.dirname(PROJECT_DIR) BASE_DIR = os.path.dirname(PROJECT_DIR)
@ -10,9 +12,7 @@ DEBUG = False
ALLOWED_HOSTS = ["www.eleves.ens.fr"] ALLOWED_HOSTS = ["www.eleves.ens.fr"]
ADMINS = ( ADMINS = (("Robin Champenois", "champeno@clipper.ens.fr"),)
('Robin Champenois', 'champeno@clipper.ens.fr'),
)
ADMIN_LOGINS = [ ADMIN_LOGINS = [
"champeno", "champeno",
@ -22,33 +22,31 @@ SERVER_EMAIL = "experiens@www.eleves.ens.fr"
ROOT_URL = "/experiens/" ROOT_URL = "/experiens/"
WSGI_APPLICATION = 'experiENS.wsgi.application' WSGI_APPLICATION = "experiENS.wsgi.application"
DATABASES = { DATABASES = {
'default': { "default": {
'ENGINE': 'django.contrib.gis.db.backends.postgis', "ENGINE": "django.contrib.gis.db.backends.postgis",
'NAME': 'experiens', "NAME": "experiens",
'USER': 'experiens', "USER": "experiens",
'PASSWORD': '', "PASSWORD": "",
'HOST': '', "HOST": "",
'PORT': '5432', "PORT": "5432",
} }
} }
STATIC_URL = ROOT_URL + 'static/' STATIC_URL = ROOT_URL + "static/"
MEDIA_URL = ROOT_URL + 'media/' MEDIA_URL = ROOT_URL + "media/"
STATIC_ROOT = os.path.join(BASE_DIR, 'static/') STATIC_ROOT = os.path.join(BASE_DIR, "static/")
EMAIL_HOST = "nef.ens.fr" EMAIL_HOST = "nef.ens.fr"
ELASTICSEARCH_DSL = { ELASTICSEARCH_DSL = {
'default': { "default": {"hosts": "127.0.0.1:9200"},
'hosts': '127.0.0.1:9200'
},
} }
CLIPPER_LDAP_SERVER = 'ldaps://ldap.spi.ens.fr:636' CLIPPER_LDAP_SERVER = "ldaps://ldap.spi.ens.fr:636"
DEFAULT_FROM_EMAIL = "experiens-no-reply@www.eleves.ens.fr" DEFAULT_FROM_EMAIL = "experiens-no-reply@www.eleves.ens.fr"

17
experiENS/urls.py
View file

@ -1,19 +1,18 @@
from django.conf import settings from django.conf import settings
from django.conf.urls import include, url
from django.contrib import admin from django.contrib import admin
from django.urls import include, path
urlpatterns = [ urlpatterns = [
url(r'^', include('avisstage.urls', namespace='avisstage')), path("", include("avisstage.urls")),
path("authens/", include("authens.urls")),
url(r'^account/', include('allauth_ens.urls')), path("tinymce/", include("tinymce.urls")),
path("taggit_autosuggest/", include("taggit_autosuggest.urls")),
url(r'^tinymce/', include('tinymce.urls')), path("admin/", admin.site.urls),
url(r'^taggit_autosuggest/', include('taggit_autosuggest.urls')),
url(r'^admin/', include(admin.site.urls)),
] ]
if settings.DEBUG: if settings.DEBUG:
import debug_toolbar import debug_toolbar
urlpatterns = [ urlpatterns = [
url(r'^__debug__/', include(debug_toolbar.urls)), path("__debug__/", include(debug_toolbar.urls)),
] + urlpatterns ] + urlpatterns

2
experiENS/wsgi.py
View file

@ -8,7 +8,9 @@ https://docs.djangoproject.com/en/1.7/howto/deployment/wsgi/
""" """
import os import os
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "experiENS.settings") os.environ.setdefault("DJANGO_SETTINGS_MODULE", "experiENS.settings")
from django.core.wsgi import get_wsgi_application from django.core.wsgi import get_wsgi_application
application = get_wsgi_application() application = get_wsgi_application()

19
requirements.txt
View file

@ -1,12 +1,11 @@
django==1.11.* django==2.2.*
django-cas-ng==3.5.* django-taggit==1.3.*
django-taggit==0.22.* django-tinymce==3.2.*
python-ldap==3.0.* django-braces==1.14.*
django-tinymce==2.7.*
django-braces==1.12.*
django-taggit-autosuggest==0.3.* django-taggit-autosuggest==0.3.*
pytz==2018.* pytz==2020.*
django-tastypie==0.14.* django-tastypie==0.14.*
lxml==4.2.* lxml==4.6.*
django-elasticsearch-dsl==0.4.* django-elasticsearch-dsl==7.1.*
django-allauth-ens==1.1.* authens
django-simple-email-confirmation==0.*

3
scripts/initalize_allauth.py
View file

@ -1,12 +1,11 @@
import sys import sys
from collections import defaultdict
from allauth.account.models import EmailAddress from allauth.account.models import EmailAddress
from allauth.socialaccount.models import SocialAccount from allauth.socialaccount.models import SocialAccount
from avisstage.models import Normalien from avisstage.models import Normalien
from collections import defaultdict
accounts = SocialAccount.objects.all().prefetch_related("user") accounts = SocialAccount.objects.all().prefetch_related("user")
profils = Normalien.objects.all() profils = Normalien.objects.all()
addresses = EmailAddress.objects.all() addresses = EmailAddress.objects.all()

10
setup.cfg Normal file
View file

@ -0,0 +1,10 @@
[flake8]
max-line-length = 99
exclude = .git, *.pyc, __pycache__, migrations
extend-ignore = E231, E203
[isort]
profile = black
known_django = django
known_first_party = avisstage
sections = FUTURE,STDLIB,THIRDPARTY,DJANGO,FIRSTPARTY,LOCALFOLDER