SGL avec une premiere implementation de SSO
This commit is contained in:
@@ -1,12 +1,12 @@
|
||||
"""Views pour la gestion des véhicules."""
|
||||
|
||||
from pyexpat.errors import messages
|
||||
from django.shortcuts import render, redirect
|
||||
from django.http import JsonResponse
|
||||
|
||||
from authentification.models import Profile
|
||||
from django.contrib.auth.models import Group
|
||||
from django.contrib.auth.decorators import login_required
|
||||
from django.contrib import messages
|
||||
from . import forms
|
||||
from . import models
|
||||
|
||||
@@ -132,7 +132,7 @@ def liste_demande(request):
|
||||
"""
|
||||
liste_demande_vehicule = []
|
||||
|
||||
if request.user.groups.filter(name="Chauffeur").exists():
|
||||
if request.user.groups.filter(name="chauffeur").exists():
|
||||
liste_demande_vehicule = models.DemandeVehicule.objects.filter(
|
||||
chauffeur__user_id=request.user.id
|
||||
)
|
||||
@@ -144,16 +144,20 @@ def liste_demande(request):
|
||||
{"id": vehicule.id, "immatriculation": vehicule.immatriculation}
|
||||
for vehicule in models.Vehicule.objects.filter(disponible=True)
|
||||
]
|
||||
chauffeur_group = Group.objects.get(name="Chauffeur")
|
||||
chauffeurs = [
|
||||
{
|
||||
"chauffeur_id": chauffeur.user.id,
|
||||
"chauffeur_name": (
|
||||
f"{chauffeur.user.first_name} {chauffeur.user.last_name}"
|
||||
),
|
||||
}
|
||||
for chauffeur in Profile.objects.filter(user__groups=chauffeur_group)
|
||||
]
|
||||
|
||||
try:
|
||||
chauffeur_group = Group.objects.get(name="chauffeur")
|
||||
chauffeurs = [
|
||||
{
|
||||
"chauffeur_id": chauffeur.user.id,
|
||||
"chauffeur_name": (
|
||||
f"{chauffeur.user.first_name} {chauffeur.user.last_name}"
|
||||
),
|
||||
}
|
||||
for chauffeur in Profile.objects.filter(user__groups=chauffeur_group)
|
||||
]
|
||||
except Group.DoesNotExist:
|
||||
chauffeurs = []
|
||||
|
||||
demandes_en_cours = [
|
||||
{
|
||||
@@ -182,6 +186,8 @@ def liste_demande(request):
|
||||
for demande in liste_demande_vehicule
|
||||
]
|
||||
|
||||
|
||||
|
||||
return JsonResponse(demandes_en_cours, safe=False)
|
||||
|
||||
@login_required(login_url="login")
|
||||
|
||||
Reference in New Issue
Block a user