From c606570a99ca2da65a03c2747486bd8694d15d7d Mon Sep 17 00:00:00 2001 From: Hugo LEVY-FALK Date: Fri, 9 Mar 2018 11:44:49 +0100 Subject: [PATCH] =?UTF-8?q?Vues=20d'affichage=20et=20d'=C3=A9dition=20pour?= =?UTF-8?q?=20les=20nouveaux=20mod=C3=A8les?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- content/migrations/0002_auto_20180309_1116.py | 23 +++ content/models.py | 8 +- content/templates/content/content.html | 4 +- content/templates/content/content_list.html | 8 +- content/urls.py | 14 +- content/views.py | 19 +-- settings/templates/settings/settings.html | 32 ++-- settings/views.py | 14 +- templates/nav_bar.html | 7 +- users/admin.py | 6 + users/forms.py | 10 +- users/migrations/0002_school_validated.py | 18 +++ users/migrations/0003_school_name.py | 18 +++ users/models.py | 9 +- users/templates/users/school.html | 151 ++++++++++++++++-- users/urls.py | 12 +- users/views.py | 68 +++++--- 17 files changed, 319 insertions(+), 102 deletions(-) create mode 100644 content/migrations/0002_auto_20180309_1116.py create mode 100644 users/migrations/0002_school_validated.py create mode 100644 users/migrations/0003_school_name.py diff --git a/content/migrations/0002_auto_20180309_1116.py b/content/migrations/0002_auto_20180309_1116.py new file mode 100644 index 0000000..392f4dd --- /dev/null +++ b/content/migrations/0002_auto_20180309_1116.py @@ -0,0 +1,23 @@ +# Generated by Django 2.0.1 on 2018-03-09 10:16 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('content', '0001_initial'), + ] + + operations = [ + migrations.AddField( + model_name='category', + name='description_short', + field=models.TextField(null=True, verbose_name='Description courte'), + ), + migrations.AlterField( + model_name='category', + name='description', + field=models.TextField(default='', verbose_name='Description de la catégorie'), + ), + ] diff --git a/content/models.py b/content/models.py index 9597d81..256b91f 100644 --- a/content/models.py +++ b/content/models.py @@ -13,8 +13,12 @@ class Category(models.Model): max_length=255, verbose_name="Nom de la catégorie" ) + description_short = models.TextField( + verbose_name="Description courte", + null=True, + ) description = models.TextField( - verbose_name="Descriton de la catégorie", + verbose_name="Description de la catégorie", default="" ) image = models.ImageField( @@ -23,7 +27,7 @@ class Category(models.Model): ) def get_absolute_url(self): - return reverse('content:category-list', kwargs={'pk': self.pk}) + return reverse('content:category', kwargs={'pk': self.pk}) def __str__(self): return self.name diff --git a/content/templates/content/content.html b/content/templates/content/content.html index 3785644..21d579d 100644 --- a/content/templates/content/content.html +++ b/content/templates/content/content.html @@ -5,15 +5,13 @@

{{content.name}}

-

Contenu proposé par {{content.school_owner.group.name}}

- {% if content.manager_right in perms %} +

Catégorie : {{content.category.name}}

Éditer Supprimer
- {% endif %}
diff --git a/content/templates/content/content_list.html b/content/templates/content/content_list.html index d6fb175..cc56d5b 100644 --- a/content/templates/content/content_list.html +++ b/content/templates/content/content_list.html @@ -22,15 +22,13 @@ $('html, body').animate({scrollTop: $('#category-content').offset().top}, 800);

{{category.name}}

-

{{category.description}}

+

{{category.description_short}}

Aller voir !

-
- {% for content in contents %} - {% include "content/content.html" %} - {% endfor %} +
+ {{category.description|safe}}


diff --git a/content/urls.py b/content/urls.py index ab53c2a..2ae991c 100644 --- a/content/urls.py +++ b/content/urls.py @@ -1,8 +1,8 @@ from django.urls import path from .views import ( - ContentCategoryList, CreateCategory, + ViewCategory, DeleteCategory, EditCategory, CreateContent, @@ -12,11 +12,6 @@ from .views import ( app_name = 'content' urlpatterns = [ - path( - 'category//', - ContentCategoryList.as_view(), - name='category-list' - ), path( 'category/delete/', DeleteCategory.as_view(), @@ -28,7 +23,12 @@ urlpatterns = [ name='category-new' ), path( - 'category/edit/', + 'category/', + ViewCategory.as_view(), + name='category', + ), + path( + 'category//edit', EditCategory.as_view(), name='category-edit', ), diff --git a/content/views.py b/content/views.py index 0548aef..6cee7dd 100644 --- a/content/views.py +++ b/content/views.py @@ -8,24 +8,11 @@ from .models import Content, Category from settings.models import SiteSettings -class ContentCategoryList(generic.ListView): - """Affiche les contenus d'une catégorie.""" - model = Content - context_object_name = "contents" +class ViewCategory(generic.DetailView): + """Affiche une catégorie.""" + model = Category template_name = "content/content_list.html" - def get_queryset(self): - pk = self.kwargs['pk'] - category = get_object_or_404(Category, pk=pk) - return Content.objects.filter(category=category) - - def get_context_data(self, **kwargs): - context = super(generic.ListView, self).get_context_data(**kwargs) - pk = self.kwargs['pk'] - category = get_object_or_404(Category, pk=pk) - context['category'] = category - return context - class CreateCategory(PermissionRequiredMixin, generic.CreateView): """Création de catégorie.""" diff --git a/settings/templates/settings/settings.html b/settings/templates/settings/settings.html index 4c24c22..06e86d0 100644 --- a/settings/templates/settings/settings.html +++ b/settings/templates/settings/settings.html @@ -24,7 +24,7 @@ {{admin.last_name}} {{admin.username}} - + Enlever le privilège Administrateur @@ -76,26 +76,28 @@ - - + {% for school in schools %} - - + - {% endfor %} @@ -142,9 +144,5 @@ {% endif %} - - - -
NomNombre de membres Nombre de contenus Nombre de catégories Numéro de téléphoneInscription
{{school.group.name}}{{school.group.user_set.count}}{{school.name}} {{school.content_set.count}} {{school.number_of_categories}} {{school.phone}} - - Éditer - - - - Supprimer - + + {% if school.validated %} + + + Inscription validée + + {% else %} + + + Inscription non validée + + {% endif %}
Nombre minimal de catégories{{ site_settings.min_number_of_categories }}
{% endblock %} diff --git a/settings/views.py b/settings/views.py index 6fdfd7c..ab09c6a 100644 --- a/settings/views.py +++ b/settings/views.py @@ -1,7 +1,7 @@ from django.views.generic import TemplateView, UpdateView from django.urls import reverse_lazy, reverse from django.contrib.auth.mixins import PermissionRequiredMixin, LoginRequiredMixin -from django.contrib.auth.decorators import permission_required +from django.contrib.admin.views.decorators import staff_member_required from django.contrib.auth.models import Group, User from django.shortcuts import get_object_or_404, redirect, render from django.contrib import messages @@ -22,7 +22,7 @@ class SettingsView(LoginRequiredMixin, PermissionRequiredMixin, TemplateView): context['site_settings'], _ = SiteSettings.objects.get_or_create() context['schools'] = School.objects.all() context['settings'] = True - context['administrators'] = Group.objects.get(name='admins').user_set.all() + context['administrators'] = User.objects.filter(is_staff=True) return context class EditSiteSettingsView(LoginRequiredMixin, PermissionRequiredMixin, UpdateView): @@ -42,24 +42,22 @@ class EditSiteSettingsView(LoginRequiredMixin, PermissionRequiredMixin, UpdateVi return context -@permission_required('auth.change_user') +@staff_member_required def degrade_user(request, pk): user = get_object_or_404(User, pk=pk) - admins,_ = Group.objects.get_or_create(name='admins') - user.groups.remove(admins) + user.is_staff = False user.save() messages.success(request, user.username + ' a été enlevé des administrateurs du site') return redirect(reverse('settings:index')) -@permission_required('auth.change_user') +@staff_member_required def promote_user(request): user_form = SelectUserForm(request.POST or None) user_form.populate() if user_form.is_valid(): user=user_form.get_user() - admins,_ = Group.objects.get_or_create(name='admins') - user.groups.add(admins) + user.is_staff = True user.save() messages.success(request, user.username + ' a été ajouté des administrateurs du site') return redirect(reverse('settings:index')) diff --git a/templates/nav_bar.html b/templates/nav_bar.html index 424cd60..8461033 100644 --- a/templates/nav_bar.html +++ b/templates/nav_bar.html @@ -17,14 +17,14 @@ {% for c in categories %}
  • - {{c.name}} + {{c.name}}
    • {% endfor %}
      - {% if request.user.userprofile.school %} -
    • Mon école
      • + {% if request.user.school %} +
    • Mon école
      • {% endif %}
    • Administration
      • {% if request.user.is_authenticated %} @@ -33,7 +33,6 @@ {{request.user}}
      - Accéder à mon profil Se déconnecter
      diff --git a/users/admin.py b/users/admin.py index e69de29..109a29e 100644 --- a/users/admin.py +++ b/users/admin.py @@ -0,0 +1,6 @@ +from django.contrib import admin +from .models import School + +class SchoolAdmin(admin.ModelAdmin): + pass +admin.site.register(School, SchoolAdmin) diff --git a/users/forms.py b/users/forms.py index 8d42501..ac12e8a 100644 --- a/users/forms.py +++ b/users/forms.py @@ -6,8 +6,14 @@ from .models import School class CreateSchool(forms.ModelForm): class Meta: - model = User - fields = '__all__' + model = School + fields = ['name', 'admin'] + + +class EditName(forms.ModelForm): + class Meta: + model = School + fields = ['name'] class CreateUser(forms.ModelForm): diff --git a/users/migrations/0002_school_validated.py b/users/migrations/0002_school_validated.py new file mode 100644 index 0000000..afb9316 --- /dev/null +++ b/users/migrations/0002_school_validated.py @@ -0,0 +1,18 @@ +# Generated by Django 2.0.1 on 2018-03-09 08:55 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('users', '0001_initial'), + ] + + operations = [ + migrations.AddField( + model_name='school', + name='validated', + field=models.BooleanField(default=False, verbose_name='Inscription validé.'), + ), + ] diff --git a/users/migrations/0003_school_name.py b/users/migrations/0003_school_name.py new file mode 100644 index 0000000..2015d1f --- /dev/null +++ b/users/migrations/0003_school_name.py @@ -0,0 +1,18 @@ +# Generated by Django 2.0.1 on 2018-03-09 09:07 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('users', '0002_school_validated'), + ] + + operations = [ + migrations.AddField( + model_name='school', + name='name', + field=models.CharField(default='', max_length=255, verbose_name="Nom de l'école"), + ), + ] diff --git a/users/models.py b/users/models.py index 253225c..9bc6c4f 100644 --- a/users/models.py +++ b/users/models.py @@ -13,6 +13,11 @@ def get_upload_to(instance, filename): class School(models.Model): """Ajoute un champ pour distinguer les groupes écoles des autres.""" + name = models.CharField( + verbose_name="Nom de l'école", + max_length=255, + default="" + ) admin = models.OneToOneField( User, verbose_name="Administrateur de l'école", @@ -83,10 +88,10 @@ class School(models.Model): def __str__(self): - return self.group.name + return self.name def get_absolute_url(self): - return reverse("users:school", kwargs={'pk':self.group.pk}) + return reverse("users:school", kwargs={'pk':self.pk}) def number_of_categories(self): return self.content_set.values('category').distinct().count() diff --git a/users/templates/users/school.html b/users/templates/users/school.html index 1a3de49..c1ea193 100644 --- a/users/templates/users/school.html +++ b/users/templates/users/school.html @@ -2,24 +2,155 @@ {% load bootstrap4 %} {% block content %} -

      {{school.name}}

      -{% if manager_right in perms %} -Numéro de téléphone : -{% if school.phone %}{{school.phone}} -{%else%} -Non indiqué{%endif%}
      -{%endif%} - +{% if school.validated %} + + +Inscription validée + +{% endif %} +

      + {{school.name}} +

      +       Éditer + + + + + + + + + + + + + + + + + + + + + +
      + Numéro de téléphone + + {% if school.phone %}{{school.phone}}{%else%} + Non indiqué{%endif%} + + + + Éditer + +
      + Email + + {{school.admin.email}} + + + + Éditer + +
      + Juré n°1 + + + + + + + + + + + + + + + + + + +
      + Nom + + {{school.last_name_j1}} +
      + Prénom + + {{school.first_name_j1}} +
      + Email + + {{school.mail_j1}} +
      + N° de téléphone + + {{school.phone_j1}} +
      +       		+ + + Éditer + +
      + Juré n°2 + + + + + + + + + + + + + + + + + + +
      + Nom + + {{school.last_name_j2}} +
      + Prénom + + {{school.first_name_j2}} +
      + Email + + {{school.mail_j2}} +
      + N° de téléphone + + {{school.phone_j2}} +
      +       		+ + + Éditer + +
      + + + + Valider mon inscription + +

      Contenus

      -{% if manager_right in perms %} Ajouter un contenu -{% endif %}

      diff --git a/users/urls.py b/users/urls.py index 2fcf4f3..26563ae 100644 --- a/users/urls.py +++ b/users/urls.py @@ -21,12 +21,17 @@ urlpatterns = [ 'school/', views.school, name='school', - ) + ), path( 'school//edit_phone', views.edit_phone, name='edit-school-phone' ), + path( + 'school//edit_name', + views.edit_name, + name='edit-school-name' + ), path( 'school//edit_mail', views.edit_mail, @@ -42,4 +47,9 @@ urlpatterns = [ views.edit_jury_2, name='edit-jury-2' ), + path( + 'school//validate', + views.validate, + name='validate', + ) ] diff --git a/users/views.py b/users/views.py index ffe6d23..87f3eb5 100644 --- a/users/views.py +++ b/users/views.py @@ -30,7 +30,7 @@ def create_school(request): if school_form.is_valid(): s = school_form.save() messages.success(request, "L'école {} a bien été créée.".format(s.name)) - return redirect(redirect('settings:index')) + return redirect(reverse('settings:index')) return render(request, 'edit.html', { 'form': school_form, 'title': "Création d'une école", @@ -52,12 +52,12 @@ def edit_phone(request, pk): can = request.user.is_staff or request.user == school.admin if not can: messages.error(request, 'Vous ne pouvez pas accéder à cette page') - return redirect(reverse('settings:index')) + return redirect(reverse('home')) school_form = forms.EditPhone(request.POST or None, instance=school) if school_form.is_valid(): s = school_form.save() messages.success(request, "L'école {} a bien été modifiée.".format(s.name)) - return redirect(redirect('settings:index')) + return redirect(s.get_absolute_url()) return render(request, 'edit.html', { 'form': school_form, 'title': "Édition du numéro de téléphone", @@ -70,12 +70,12 @@ def edit_logo(request, pk): can = request.user.is_staff or request.user == school.admin if not can: messages.error(request, 'Vous ne pouvez pas accéder à cette page') - return redirect(reverse('settings:index')) + return redirect(reverse('home')) school_form = forms.EditLogo(request.POST or None, instance=school) if school_form.is_valid(): s = school_form.save() messages.success(request, "L'école {} a bien été modifiée.".format(s.name)) - return redirect(redirect('settings:index')) + return redirect(s.get_absolute_url()) return render(request, 'edit.html', { 'form': school_form, 'title': "Édition du logo", @@ -88,12 +88,12 @@ def edit_mail(request, pk): can = request.user.is_staff or request.user == school.admin if not can: messages.error(request, 'Vous ne pouvez pas accéder à cette page') - return redirect(reverse('settings:index')) + return redirect(reverse('home')) user_form = forms.EditMail(request.POST or None, instance=school.admin) if user_form.is_valid(): s = user_form.save() - messages.success(request, "L'école {} a bien été modifiée.".format(s.name)) - return redirect(redirect('settings:index')) + messages.success(request, "L'école {} a bien été modifiée.".format(s.school.name)) + return redirect(s.school.get_absolute_url()) return render(request, 'edit.html', { 'form': user_form, 'title': "Édition du numéro du mail", @@ -106,12 +106,12 @@ def edit_jury_1(request, pk): can = request.user.is_staff or request.user == school.admin if not can: messages.error(request, 'Vous ne pouvez pas accéder à cette page') - return redirect(reverse('settings:index')) + return redirect(reverse('home')) school_form = forms.EditJury1(request.POST or None, instance=school) if school_form.is_valid(): s = school_form.save() messages.success(request, "L'école {} a bien été modifiée.".format(s.name)) - return redirect(redirect('settings:index')) + return redirect(s.get_absolute_url()) return render(request, 'edit.html', { 'form': school_form, 'title': "Édition du jury 1", @@ -124,12 +124,12 @@ def edit_jury_2(request, pk): can = request.user.is_staff or request.user == school.admin if not can: messages.error(request, 'Vous ne pouvez pas accéder à cette page') - return redirect(reverse('settings:index')) + return redirect(reverse('home')) school_form = forms.EditJury2(request.POST or None, instance=school) if school_form.is_valid(): s = school_form.save() messages.success(request, "L'école {} a bien été modifiée.".format(s.name)) - return redirect(redirect('settings:index')) + return redirect(s.get_absolute_url()) return render(request, 'edit.html', { 'form': school_form, 'title': "Édition du jury 2", @@ -137,27 +137,45 @@ def edit_jury_2(request, pk): }) +def edit_name(request, pk): + school = get_object_or_404(School, pk=pk) + can = request.user.is_staff or request.user == school.admin + if not can: + messages.error(request, 'Vous ne pouvez pas accéder à cette page') + return redirect(reverse('home')) + school_form = forms.EditName(request.POST or None, instance=school) + if school_form.is_valid(): + s = school_form.save() + messages.success(request, "L'école {} a bien été modifiée.".format(s.name)) + return redirect(s.get_absolute_url()) + return render(request, 'edit.html', { + 'form': school_form, + 'title': "Édition du nom", + 'validate': "Modifier" + }) + + def validate(request, pk): school = get_object_or_404(School, pk=pk) can = request.user.is_staff or request.user == school.admin if not can: messages.error(request, 'Vous ne pouvez pas accéder à cette page') - return redirect(reverse('settings:index')) + return redirect(reverse('home')) jury_1_ok = any([ - school.first_name_j1 is not None, - school.last_name_j1 is not None, - school.phone_j1 is not None, - school.mail_j1 is not None + school.first_name_j1, + school.last_name_j1, + school.phone_j1, + school.mail_j1 ]) jury_2_ok = any([ - school.first_name_j2 is not None, - school.last_name_j2 is not None, - school.phone_j2 is not None, - school.mail_j2 is not None + school.first_name_j2, + school.last_name_j2, + school.phone_j2, + school.mail_j2 ]) - logo_ok = school.logo is not None - phone_ok = school.phone is not None - mail_ok = school.admin.email is not None + logo_ok = school.logo + phone_ok = school.phone + mail_ok = school.admin.email if not jury_1_ok: messages.warning(request, 'Pas de jury n°1 défini.') if not jury_2_ok: @@ -178,4 +196,4 @@ def validate(request, pk): school.save() messages.success(request, 'Inscription validée.') - return redirect(reverse('settings:index')) + return redirect(school.get_absolute_url())