From 8ea92a0d9b0692ad2f20b23dce84cd0208a24fd6 Mon Sep 17 00:00:00 2001 From: Ali Jetha Date: Thu, 28 Oct 2010 18:56:27 -0400 Subject: [PATCH] Expertise --- auf_savoirs_en_partage/chercheurs/forms.py | 2 +- auf_savoirs_en_partage/chercheurs/views.py | 14 ++++++++++++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/auf_savoirs_en_partage/chercheurs/forms.py b/auf_savoirs_en_partage/chercheurs/forms.py index 8d1506c..d4e702b 100644 --- a/auf_savoirs_en_partage/chercheurs/forms.py +++ b/auf_savoirs_en_partage/chercheurs/forms.py @@ -63,7 +63,7 @@ class RepertoireSearchForm (forms.Form): mots_cles = forms.CharField (required = False, label="Mots-clés") discipline = forms.ModelChoiceField(queryset=Discipline.objects.all(), required=False, label="Discipline", empty_label="Tous") domaine = forms.ModelChoiceField(queryset=Groupe.objects.all(), required=False, label="Domaine de recherche", empty_label="Tous") - #fonction = forms.ChoiceField(choices=(('','Tous'),)+FONCTION_CHOICES, required=False, label="Fonction") + fonction = forms.ChoiceField(choices=(('','Tous'),('chercheur','Chercheur'), ('enseignant','Enseignant-Chercheur'), ('expert','Expert')), required=False, label="Fonction") pays = forms.ModelChoiceField(queryset=Pays.objects.all().order_by("nom"), required=False, label="Localisation", empty_label="Tous") class SendPasswordForm(forms.Form): diff --git a/auf_savoirs_en_partage/chercheurs/views.py b/auf_savoirs_en_partage/chercheurs/views.py index 7c3abf5..291833e 100644 --- a/auf_savoirs_en_partage/chercheurs/views.py +++ b/auf_savoirs_en_partage/chercheurs/views.py @@ -142,6 +142,14 @@ def chercheur_queryset (request): mots_cles = simpleForm.cleaned_data["mots_cles"] if mots_cles: list = list.search(mots_cles) + fonction = simpleForm.cleaned_data["fonction"] + if fonction: + if fonction == "enseignant": + list = list.filter(enseignant=True) + if fonction == "expert": + list = list.exclude(expertise=None) + + return list def index(request): @@ -196,7 +204,8 @@ def inscription(request): pub = publication4_form.save() c.publication4 = pub these = these_form.save() - expertise = expertise_form.save() + if expertise_form.is_valid() and expertise_form.cleaned_data['nom']: + expertise = expertise_form.save() c.these = these c.expertise = expertise etablissement_form.save(commit=False) @@ -288,7 +297,8 @@ def edit(request): if publication4_form.is_valid() and publication4_form.cleaned_data['titre']: chercheur.publication4 = publication4_form.save() chercheur.these = these_form.save() - chercheur.expertise = expertise_form.save() + if expertise_form.cleaned_data['nom']: + chercheur.expertise = expertise_form.save() chercheur.save() #Gestion des groupes groupes = request.POST.getlist('groupe-groupes') -- 1.7.10.4