Première groose modification
This commit is contained in:
@@ -1,12 +1,12 @@
|
||||
import json
|
||||
from datetime import timedelta, datetime
|
||||
from datetime import date, timedelta, datetime
|
||||
from dateutil.relativedelta import relativedelta
|
||||
|
||||
from django.utils import timezone
|
||||
from django.contrib import messages
|
||||
from django.contrib.auth.models import User
|
||||
from django.contrib.auth import authenticate
|
||||
from django.shortcuts import render, redirect
|
||||
from django.shortcuts import get_object_or_404, render, redirect
|
||||
from django.contrib.auth.decorators import login_required
|
||||
|
||||
from django.http import JsonResponse
|
||||
@@ -124,8 +124,8 @@ def mon_profil(request):
|
||||
except Employe.DoesNotExist:
|
||||
messages.error(request, "Impossible d'acceder au menu 'Mon profil' car votre profil Utilisateur n'est lié à aucun profil Employé. Veuillez contacter l'Administrateur.")
|
||||
return redirect("gestion_conges:conge")
|
||||
|
||||
contrats = Contrat.objects.filter(employe=employe, statut='actif').first()
|
||||
|
||||
projets = Affectation.objects.filter(
|
||||
employe = employe,
|
||||
date_fin_daffectation__gte = timezone.now().date()
|
||||
@@ -140,6 +140,7 @@ def mon_profil(request):
|
||||
**model_to_dict(contrats),
|
||||
"type_contrat": dict(Contrat.TYPE_CONTRAT).get(contrats.type_contrat),
|
||||
"statut": dict(Contrat.STATUT_CONTRAT).get(contrats.statut),
|
||||
# "salaire_mensuel": dict(Contrat.SALAIRR_MENSSUEL).get(contrats.salaire_mensuel),
|
||||
"fichier_contrat": contrats.fichier_contrat.url if contrats.fichier_contrat else "",
|
||||
} if contrats else []],
|
||||
'projets': [
|
||||
@@ -192,7 +193,8 @@ def modifier_employer(request):
|
||||
employe.telephone = data['telephone']
|
||||
employe.adresse = data['adresse']
|
||||
employe.sexe = data['sexe']
|
||||
|
||||
if request.FILES.get("photo"):
|
||||
employe.photo = request.FILES["photo"]
|
||||
if data['date_naissance']:
|
||||
difference = relativedelta(timezone.now().date(), datetime.strptime(data['date_naissance'], "%Y-%m-%d").date())
|
||||
if difference.years >= 18:
|
||||
@@ -201,18 +203,18 @@ def modifier_employer(request):
|
||||
return JsonResponse({"message": "Veuillez entrez une date de naissance correcte."})
|
||||
employe.save()
|
||||
user.save()
|
||||
|
||||
return JsonResponse({"message": "Profil mis à jour avec succès."})
|
||||
|
||||
def enregistrement_document(request):
|
||||
employe = Employe.objects.get(user__username=request.user)
|
||||
employe = Employe.objects.get(user=request.user)
|
||||
if request.method == "POST":
|
||||
employe.CV = request.FILES["cv"] if 'cv' in request.FILES else employe.CV
|
||||
employe.diplome = request.FILES["diplome"] if 'diplome' in request.FILES else employe.diplome
|
||||
employe.rib = request.FILES["rib"] if 'rib' in request.FILES else employe.rib
|
||||
employe.casier_judiciaire = request.FILES["casier_judiciaire"] if 'casier_judiciaire' in request.FILES else employe.casier_judiciaire
|
||||
messages.success(request, "Documents enregistrés avec succès.")
|
||||
if request.FILES.get("photo"):employe.photo = request.FILES["photo"]
|
||||
if "cv" in request.FILES:employe.CV = request.FILES["cv"]
|
||||
if "diplome" in request.FILES: employe.diplome = request.FILES["diplome"]
|
||||
if "rib" in request.FILES: employe.rib = request.FILES["rib"]
|
||||
if "casier_judiciaire" in request.FILES:employe.casier_judiciaire = request.FILES["casier_judiciaire"]
|
||||
employe.save()
|
||||
messages.success(request, "Documents enregistrés avec succès.")
|
||||
|
||||
return redirect("gestion_employe:mon-profil")
|
||||
|
||||
@@ -240,14 +242,25 @@ def suppression_affectation(request):
|
||||
return JsonResponse({"message": "Affectation supprimée avec succès."})
|
||||
|
||||
def creation_contrat(request):
|
||||
"""Vue pour permettre à un utilisateur de créer un contrat pour un employé"""
|
||||
"""Créer un contrat pour un employé (avec contrôle d'existence de contrat actif)"""
|
||||
|
||||
try:
|
||||
employe = Employe.objects.get(id=request.POST.get('employe_id'))
|
||||
except Employe.DoesNotExist:
|
||||
messages.error(request, "Employé non trouvé.")
|
||||
return redirect('employe-index')
|
||||
|
||||
contrat_actif = Contrat.objects.filter(
|
||||
employe=employe,
|
||||
date_fin__gte=date.today()
|
||||
).exists()
|
||||
|
||||
if request.method == "POST":
|
||||
if contrat_actif:
|
||||
messages.error(
|
||||
request,
|
||||
"Impossible de créer un contrat : cet employé a déjà un contrat actif."
|
||||
)
|
||||
return redirect('gestion_employe:index')
|
||||
form = ContratForm(request.POST, request.FILES)
|
||||
if form.is_valid():
|
||||
contrat = form.save(commit=False)
|
||||
@@ -256,9 +269,13 @@ def creation_contrat(request):
|
||||
messages.success(request, "Contrat créé avec succès.")
|
||||
return redirect('gestion_employe:index')
|
||||
messages.error(request, "Formulaire non valide")
|
||||
|
||||
else:
|
||||
form = ContratForm(initial={'employe': employe})
|
||||
return render(request, 'gestion_employe/index.html', {'contrat_form': form})
|
||||
|
||||
return render(request, 'gestion_employe/index.html', {
|
||||
'contrat_form': form
|
||||
})
|
||||
|
||||
@login_required
|
||||
def enregistrer_detail_employe(request):
|
||||
@@ -281,76 +298,106 @@ def enregistrer_detail_employe(request):
|
||||
@login_required
|
||||
def liste_employe(request):
|
||||
""" Vue pour retourner la liste de tous les employés """
|
||||
|
||||
|
||||
employes = Employe.objects.exclude(user__first_name = '', user__last_name = '')
|
||||
|
||||
data = []
|
||||
for employe in employes:
|
||||
if employe.user.first_name == ' ' and employe.user.last_name == ' ':
|
||||
projets = [
|
||||
", ".join([
|
||||
a.projet.nom_projet for a in Affectation.objects.filter(
|
||||
employe=employe,
|
||||
date_fin_daffectation__gte=timezone.now().date()
|
||||
)
|
||||
])
|
||||
]
|
||||
formations = [
|
||||
{
|
||||
"titre": formation.titre,
|
||||
"organisme": formation.organisme,
|
||||
"description": formation.description,
|
||||
"date_obtention": formation.date_obtention,
|
||||
"date_fin": formation.date_fin,
|
||||
"certificat": formation.certificat.url if formation.certificat else "",
|
||||
} for formation in Formation.objects.filter(employe=employe)
|
||||
]
|
||||
|
||||
contrats = [
|
||||
{
|
||||
"numero_contrat": contrat.numero_contrat,
|
||||
"type_contrat": contrat.type_contrat,
|
||||
"date_debut": contrat.date_debut,
|
||||
"date_fin": contrat.date_fin,
|
||||
"salaire_mensuel": contrat.salaire_mensuel,
|
||||
"statut": contrat.statut,
|
||||
"fichier_contrat": contrat.fichier_contrat.url if contrat.fichier_contrat else "",
|
||||
} for contrat in Contrat.objects.filter(employe=employe, statut='actif')
|
||||
]
|
||||
|
||||
affectations = [
|
||||
{**model_to_dict(affectation), "projet": affectation.projet.nom_projet}
|
||||
for affectation in Affectation.objects.filter(
|
||||
projets = [
|
||||
", ".join([
|
||||
a.projet.nom_projet for a in Affectation.objects.filter(
|
||||
employe=employe,
|
||||
date_fin_daffectation__gte=timezone.now().date()
|
||||
)
|
||||
]
|
||||
])
|
||||
]
|
||||
formations = [
|
||||
{
|
||||
"titre": formation.titre,
|
||||
"organisme": formation.organisme,
|
||||
"description": formation.description,
|
||||
"date_obtention": formation.date_obtention,
|
||||
"date_fin": formation.date_fin,
|
||||
"certificat": formation.certificat.url if formation.certificat else "",
|
||||
} for formation in Formation.objects.filter(employe=employe)
|
||||
]
|
||||
|
||||
data.append(
|
||||
{
|
||||
"id": employe.id,
|
||||
"employe": f"{employe.user.first_name} {employe.user.last_name}",
|
||||
"matricule": employe.matricule,
|
||||
"email": employe.user.email,
|
||||
"formations": formations,
|
||||
"affectations": affectations,
|
||||
"projet": projets,
|
||||
"contrats": contrats,
|
||||
"departement": employe.departement.nom if employe.departement else "",
|
||||
"fonction": employe.fonction,
|
||||
"date_embauche": employe.date_embauche,
|
||||
"adresse": employe.adresse,
|
||||
"telephone": employe.telephone,
|
||||
"sexe": employe.sexe,
|
||||
"CV": employe.CV.url if employe.CV else "",
|
||||
"diplome": employe.diplome.url if employe.diplome else "",
|
||||
"rib": employe.rib.url if employe.rib else "",
|
||||
"photo": employe.photo.url if employe.photo else "",
|
||||
"casier_judiciaire": employe.casier_judiciaire.url if employe.casier_judiciaire else "",
|
||||
"date_naissance": employe.date_naissance,
|
||||
}
|
||||
contrats = [
|
||||
{
|
||||
"numero_contrat": contrat.numero_contrat,
|
||||
"type_contrat": contrat.type_contrat,
|
||||
"date_debut": contrat.date_debut,
|
||||
"date_fin": contrat.date_fin,
|
||||
"salaire_mensuel": contrat.salaire_mensuel,
|
||||
"statut": contrat.statut,
|
||||
"fichier_contrat": contrat.fichier_contrat.url if contrat.fichier_contrat else "",
|
||||
} for contrat in Contrat.objects.filter(employe=employe, statut='actif')
|
||||
]
|
||||
|
||||
affectations = [
|
||||
{**model_to_dict(affectation), "projet": affectation.projet.nom_projet}
|
||||
for affectation in Affectation.objects.filter(
|
||||
employe=employe,
|
||||
date_fin_daffectation__gte=timezone.now().date()
|
||||
)
|
||||
]
|
||||
|
||||
data.append(
|
||||
{
|
||||
"id": employe.id,
|
||||
"employe": f"{employe.user.first_name} {employe.user.last_name}",
|
||||
"matricule": employe.matricule,
|
||||
"email": employe.user.email,
|
||||
"formations": formations,
|
||||
"affectations": affectations,
|
||||
"projet": projets,
|
||||
"contrats": contrats,
|
||||
"departement": employe.departement.nom if employe.departement else "",
|
||||
"fonction": employe.fonction,
|
||||
"date_embauche": employe.date_embauche,
|
||||
"adresse": employe.adresse,
|
||||
"telephone": employe.telephone,
|
||||
"sexe": employe.sexe,
|
||||
"CV": employe.CV.url if employe.CV else "",
|
||||
"diplome": employe.diplome.url if employe.diplome else "",
|
||||
"rib": employe.rib.url if employe.rib else "",
|
||||
"photo": employe.photo.url if employe.photo else "",
|
||||
"casier_judiciaire": employe.casier_judiciaire.url if employe.casier_judiciaire else "",
|
||||
"date_naissance": employe.date_naissance,
|
||||
}
|
||||
)
|
||||
return JsonResponse({'success': True, 'data': data}, safe=False)
|
||||
|
||||
|
||||
|
||||
@login_required
|
||||
def modifier_contrat(request):
|
||||
|
||||
"""vue pour la modification du contrat """
|
||||
|
||||
id_contrat = json.loads(request.body)['id']
|
||||
try:
|
||||
contrat = Contrat.objects.get(numero_contrat = id_contrat)
|
||||
except Contrat.DoesNotExist:
|
||||
messages.error(request, "Contrat non trouvé.")
|
||||
return JsonResponse({"message": "Contrat non trouvé."}, status=404)
|
||||
|
||||
try:
|
||||
data = json.loads(request.body)
|
||||
id_contrat = data.get("id")
|
||||
contrat = get_object_or_404(Contrat, id=id_contrat)
|
||||
contrat.type_contrat = data.get("type_contrat")
|
||||
contrat.date_debut = data.get("date_debut")
|
||||
contrat.date_fin = data.get("date_fin")
|
||||
contrat.salaire_mensuel = data.get("salaire_mensuel")
|
||||
contrat.statut = data.get("statut")
|
||||
contrat.save()
|
||||
|
||||
return JsonResponse({"message": "Contrat modifié avec succès"})
|
||||
|
||||
except Exception as e:
|
||||
return JsonResponse({"message": str(e)}, status=400)
|
||||
@login_required
|
||||
def ajouter_formation(request):
|
||||
"""Vue pour permettre à un employé d'ajouter une formation à son profil"""
|
||||
|
||||
Reference in New Issue
Block a user