diff --git a/SIRH/__pycache__/sso.cpython-310.pyc b/SIRH/__pycache__/sso.cpython-310.pyc index a243941..9f8e58a 100644 Binary files a/SIRH/__pycache__/sso.cpython-310.pyc and b/SIRH/__pycache__/sso.cpython-310.pyc differ diff --git a/SIRH/sso.py b/SIRH/sso.py index 45e2f04..ef82683 100644 --- a/SIRH/sso.py +++ b/SIRH/sso.py @@ -11,8 +11,6 @@ class SIRHClient(Client): def build_user(self, user_data): """Crée le User et son Profile avec les infos reçues du serveur.""" user_data_copy = user_data.copy() - - print("Un petit test", user_data_copy) user_data.pop("departement", None) user_data.pop("chef_departement", None) diff --git a/SIRH/templates/SIRH/BASE.html b/SIRH/templates/SIRH/BASE.html index faa8f2f..531649d 100644 --- a/SIRH/templates/SIRH/BASE.html +++ b/SIRH/templates/SIRH/BASE.html @@ -14,8 +14,8 @@
+ {% include 'parts/menu_application.html' %}
- {% include 'parts/menu_application.html' %} {% include 'parts/menu_principal.html' %}
{% block 'contenu' %} {% endblock %} diff --git a/SIRH/templates/SIRH/parts/menu_application.html b/SIRH/templates/SIRH/parts/menu_application.html index 8e9a8b0..0ea4fed 100644 --- a/SIRH/templates/SIRH/parts/menu_application.html +++ b/SIRH/templates/SIRH/parts/menu_application.html @@ -1,8 +1,21 @@ -
- - SIRH - - - SGL - -
+{% load static %} + \ No newline at end of file diff --git a/fonction_utilitaire/__pycache__/fonctions_utilitaire.cpython-310.pyc b/fonction_utilitaire/__pycache__/fonctions_utilitaire.cpython-310.pyc index 48d389b..bef30f7 100644 Binary files a/fonction_utilitaire/__pycache__/fonctions_utilitaire.cpython-310.pyc and b/fonction_utilitaire/__pycache__/fonctions_utilitaire.cpython-310.pyc differ diff --git a/fonction_utilitaire/fonctions_utilitaire.py b/fonction_utilitaire/fonctions_utilitaire.py index e7ea8aa..c60c140 100644 --- a/fonction_utilitaire/fonctions_utilitaire.py +++ b/fonction_utilitaire/fonctions_utilitaire.py @@ -1,3 +1,5 @@ +from django.conf import settings +from django.core.mail import send_mail from django.utils import timezone from gestion_conge.models import Conge @@ -46,3 +48,14 @@ def destinataire_mail_demande_conges(employe): if employe.departement: chefs_departement = Employe.objects.filter(departement=employe.departement, chef=True) return list(chefs_departement.values_list('user__email', flat=True)) + +def envoyer_mail(sujet, message, destinataires): + """Fonction d'envoi de mail""" + + send_mail( + sujet, + message, + settings.EMAIL_HOST_USER, + destinataires, + fail_silently=False, + ) diff --git a/gestion_conge/__pycache__/views.cpython-310.pyc b/gestion_conge/__pycache__/views.cpython-310.pyc index da30062..a871557 100644 Binary files a/gestion_conge/__pycache__/views.cpython-310.pyc and b/gestion_conge/__pycache__/views.cpython-310.pyc differ diff --git a/gestion_conge/views.py b/gestion_conge/views.py index a6947b8..8683826 100644 --- a/gestion_conge/views.py +++ b/gestion_conge/views.py @@ -129,7 +129,7 @@ def demander_conge(request): fonctions_utilitaire.envoyer_mail( sujet = "Demande de congé", message = f"""Bonjour {employe.user.first_name} {employe.user.last_name}, votre demande de congé a été enregistrée. Veuillez consulter votre profil pour plus de détails.""", - destinataires = fonctions_utilitaire.destinataire_mail_demande_conges() + [employe.user.email] + destinataires = fonctions_utilitaire.destinataire_mail_demande_conges(employe) ) return redirect("gestion_conges:conge") diff --git a/gestion_employe/__pycache__/views.cpython-310.pyc b/gestion_employe/__pycache__/views.cpython-310.pyc index f0c137a..9aaf3ee 100644 Binary files a/gestion_employe/__pycache__/views.cpython-310.pyc and b/gestion_employe/__pycache__/views.cpython-310.pyc differ diff --git a/gestion_employe/static/gestion_employe/js/mon_profil.js b/gestion_employe/static/gestion_employe/js/mon_profil.js index 99ec969..6995890 100644 --- a/gestion_employe/static/gestion_employe/js/mon_profil.js +++ b/gestion_employe/static/gestion_employe/js/mon_profil.js @@ -13,6 +13,10 @@ const tableau_certificat = new Tabulator("#tableau-certificat", { inputFormat:"yyyy-MM-dd", outputFormat:"dd/MM/yy", }}, + {"title": "Fichier", "field": "certificat", formatter:"link", formatterParams:{ + label:"Voir le fichier", + target:"_blank", + }}, ], ajaxURL: url_certificat, }) diff --git a/gestion_employe/templates/gestion_employe/parts/modalDetailEmploye.html b/gestion_employe/templates/gestion_employe/parts/modalDetailEmploye.html index ffac7f5..309cfe1 100644 --- a/gestion_employe/templates/gestion_employe/parts/modalDetailEmploye.html +++ b/gestion_employe/templates/gestion_employe/parts/modalDetailEmploye.html @@ -8,7 +8,7 @@
-
+
@@ -98,9 +98,6 @@ {% if user|has_group:"ressource_humaine" %}
- diff --git a/gestion_employe/views.py b/gestion_employe/views.py index 0de134f..04e4d2c 100644 --- a/gestion_employe/views.py +++ b/gestion_employe/views.py @@ -147,15 +147,6 @@ def mon_profil(request): date_fin_daffectation__gte=timezone.now().date() ).select_related('projet') - has_contrat = contrats is not None - expiration_contrat = False - contrat_nb_jours_restant = None - - if contrats: - nb_jours = contrats.nombre_jours_restant - contrat_nb_jours_restant = nb_jours - expiration_contrat = nb_jours <= fonctions_utilitaire.DUREE_FIN_CONTRAT - return render( request, 'gestion_employe/monprofil.html', @@ -180,9 +171,9 @@ def mon_profil(request): ], "formation_form": FormationForm(), - "has_contrat": has_contrat, - "expiration_contrat": expiration_contrat, - "contrat_nb_jours_restant": contrat_nb_jours_restant + "has_contrat": contrats is not None, + "expiration_contrat": contrats.nombre_jours_restant <= fonctions_utilitaire.DUREE_FIN_CONTRAT if contrats else False, + "contrat_nb_jours_restant": max(0, contrats.nombre_jours_restant if contrats else 0) } ) @login_required @@ -231,7 +222,6 @@ def modifier_employer(request): user.save() messages.success(request, "Profil mis à jour avec succès.") return redirect("gestion_employe:mon-profil") - def enregistrement_document(request): """Vue pour permettre à un utilisateur de télécharger et enregistrer des documents liés à son profil""" diff --git a/gestion_projet/__pycache__/views.cpython-310.pyc b/gestion_projet/__pycache__/views.cpython-310.pyc index 0f79339..b15798f 100644 Binary files a/gestion_projet/__pycache__/views.cpython-310.pyc and b/gestion_projet/__pycache__/views.cpython-310.pyc differ diff --git a/gestion_projet/static/gestion_projet/js/enregistrement_bailleur.js b/gestion_projet/static/gestion_projet/js/enregistrement_bailleur.js index aa5e918..9348c45 100644 --- a/gestion_projet/static/gestion_projet/js/enregistrement_bailleur.js +++ b/gestion_projet/static/gestion_projet/js/enregistrement_bailleur.js @@ -1,8 +1,6 @@ const btnEnregistrerBailleur = document.getElementById('btnEnregistrerBailleur'); let table; -let table; - btnEnregistrerBailleur.addEventListener('click', function() { const form = document.getElementById('formBailleur'); const formData = new FormData(form); diff --git a/gestion_salle/__pycache__/views.cpython-310.pyc b/gestion_salle/__pycache__/views.cpython-310.pyc index c5ea120..638c83b 100644 Binary files a/gestion_salle/__pycache__/views.cpython-310.pyc and b/gestion_salle/__pycache__/views.cpython-310.pyc differ diff --git a/gestion_salle/static/gestion_salle/js/index.js b/gestion_salle/static/gestion_salle/js/index.js index 4eef819..c9f82d1 100644 --- a/gestion_salle/static/gestion_salle/js/index.js +++ b/gestion_salle/static/gestion_salle/js/index.js @@ -188,6 +188,7 @@ tableau_reservation_attente.on("rowClick", (row, rowData) => { } const id_user = $("current-user-id").dataset.userid; + $("id_reservation_detail").value = data.id; $("id_reservation_refus").value = data.id; $("id_reservation_zoom").value = data.id; @@ -204,6 +205,16 @@ tableau_reservation_attente.on("rowClick", (row, rowData) => { $("besoin_ordinateur").checked=data.besoin_ordi; $("lien_zoom").value=data.lien_zoom; + console.log("Verification de data :", data); + + const refuserReservation = document.querySelector("#refuserReservation"); + const bouton_valider = document.querySelector("#bouton-valider"); + + if((refuserReservation | bouton_valider) && data.statut === "En attente"){ + refuserReservation.style.display = "inline-block"; + bouton_valider.style.display = "inline-block"; + } + if (id_user != data.employe_id){ $("bouton-annuler").className = "d-none"; } diff --git a/gestion_salle/templates/gestion_salle/index.html b/gestion_salle/templates/gestion_salle/index.html index 70e6408..6d178e3 100644 --- a/gestion_salle/templates/gestion_salle/index.html +++ b/gestion_salle/templates/gestion_salle/index.html @@ -9,8 +9,8 @@ {% if messages %} {% for message in messages %} {% endfor %} {% endif %} diff --git a/gestion_salle/templates/gestion_salle/parts/modalDetailResevation.html b/gestion_salle/templates/gestion_salle/parts/modalDetailResevation.html index 2cd51e2..bbf4381 100644 --- a/gestion_salle/templates/gestion_salle/parts/modalDetailResevation.html +++ b/gestion_salle/templates/gestion_salle/parts/modalDetailResevation.html @@ -12,7 +12,7 @@
{% csrf_token %} - +
@@ -50,14 +50,14 @@
- +
{% if appartient_au_departement_informatique %} {% endif %} - {% if appartient_direction and reservation.statut == "en_attente" %} + {% if appartient_direction %} {% endif %} diff --git a/gestion_salle/views.py b/gestion_salle/views.py index fa01d30..3382142 100644 --- a/gestion_salle/views.py +++ b/gestion_salle/views.py @@ -87,8 +87,6 @@ Veuillez vous connecter à la plateforme pour plus de détails.""", formulaire_reservation = ReservationForm() departement = employe.departement - appartient_direction = request.user.groups.filter(name='direction').exists() - liste_demande_reservation = Reservation.objects.filter( employe=employe, statut='en_attente' @@ -98,7 +96,7 @@ Veuillez vous connecter à la plateforme pour plus de détails.""", 'formulaire_reservation': formulaire_reservation, 'nb_reservation_attente': Reservation.objects.filter(statut='en_attente').count(), 'appartient_au_departement_informatique': departement and departement.nom == "Systeme informatique", - 'appartient_direction': appartient_direction, + 'appartient_direction': request.user.groups.filter(name='direction').exists(), 'liste_demande_reservation': list(liste_demande_reservation), } @@ -147,12 +145,10 @@ def liste_reservation_attente(request): return JsonResponse(liste_reservation, safe=False) def detail_reservation(request:HttpRequest, reservation_id:int): - reservation = Reservation.objects.get(id=reservation_id) employe = reservation.employe.user reservation_json = { - 'id_reservation': reservation_id, 'employe': f"{employe.first_name} {employe.last_name}", 'salle': reservation.salle, @@ -227,7 +223,7 @@ def valider_reservation(request: HttpRequest): fonctions_utilitaire.envoyer_mail( sujet = "Reservation de salle", - message = f"""Bonjour {request.user.first_name} {request.user.last_name}, votre reservation de la salle {dict(Reservation.TYPE_CHOICES).get(reservation.salle)} du {reservation.date_debut.strftime('%d/%m/%Y')} au {reservation.date_fin.strftime('%d/%m/%Y')} pour motif "{reservation.motif_reservation}" a été validée. Veuillez vous connecter à la plateforme pour plus de détails.""", + message = f"""Bonjour {reservation.employe.user.first_name} {reservation.employe.user.last_name}, votre reservation de la salle {dict(Reservation.TYPE_CHOICES).get(reservation.salle)} du {reservation.date_debut.strftime('%d/%m/%Y')} au {reservation.date_fin.strftime('%d/%m/%Y')} pour motif "{reservation.motif_reservation}" a été validée. Veuillez vous connecter à la plateforme pour plus de détails.""", destinataires = [reservation.employe.user.email] )