From 1a21998c39a7a41786dec934adf3ff789a66c0f2 Mon Sep 17 00:00:00 2001 From: Soriba SYLLA Date: Fri, 4 Sep 2026 12:19:27 +0000 Subject: [PATCH] Ajout de la barre de navigation --- SIRH/__pycache__/sso.cpython-310.pyc | Bin 1281 -> 1247 bytes SIRH/sso.py | 2 -- SIRH/templates/SIRH/BASE.html | 2 +- .../SIRH/parts/menu_application.html | 29 +++++++++++++----- .../fonctions_utilitaire.cpython-310.pyc | Bin 1947 -> 2272 bytes fonction_utilitaire/fonctions_utilitaire.py | 13 ++++++++ .../__pycache__/views.cpython-310.pyc | Bin 6056 -> 6041 bytes gestion_conge/views.py | 2 +- .../__pycache__/views.cpython-310.pyc | Bin 15876 -> 15843 bytes .../static/gestion_employe/js/mon_profil.js | 4 +++ .../parts/modalDetailEmploye.html | 5 +-- gestion_employe/views.py | 16 ++-------- .../__pycache__/views.cpython-310.pyc | Bin 16691 -> 16691 bytes .../js/enregistrement_bailleur.js | 2 -- .../__pycache__/views.cpython-310.pyc | Bin 7512 -> 7505 bytes .../static/gestion_salle/js/index.js | 11 +++++++ .../templates/gestion_salle/index.html | 4 +-- .../parts/modalDetailResevation.html | 6 ++-- gestion_salle/views.py | 8 ++--- 19 files changed, 62 insertions(+), 42 deletions(-) diff --git a/SIRH/__pycache__/sso.cpython-310.pyc b/SIRH/__pycache__/sso.cpython-310.pyc index a243941f2743f92a76cb3267e91f3993f438dc14..9f8e58a71cb1f6472dc223e5fd6fc43a42e99334 100644 GIT binary patch delta 307 zcmYk1ze>bF5XNU_H~(GnKnpv$6G0HH#23gL*s4LYB8I?e5(Hrv5$jZ29av;bJ8gWJ zYYwb@jN9xLIxsWe{66?#Uei?~=0c?4su>p5_m|kimrr*o9KeDmw^5=bOE@x=?4RZv z-O(EiOrb^XT+JmadV=P(<5f_FiiXG~1eRpjqm1@J^DcHyqL|{|^_en$CzelRy@bRCH$FXs=>#?tThuKOi( s-JZA+n+3Z+9MMt~MOojpZFyVQMbS(h+l+%z&CC)1*!hEA&CH5V*IHdjF#rGn delta 328 zcmYjMJxc>Y5Z#&Gz0Yin$Q6P`)HF6${sAG4wb-eR8|1D?&dZ`GyGTr(YAeCwwzRad z5d0sKM(nKo4ep%?8JNeL_n0@#XFN;9M2Lj=dVP2-eqKZd_iujEP!mTCDv+RYj?gG5 zQBwEM*$U@>T+unHnFa@jN@|!yjn||)P`n6=P-7kWgutN;7a*feVwj4(lW3}0>o%E( zDB~xT$)Y*btnf?Xa7fP94OeL!#AUjGQ#64IH7z=|(18OWS4Wy2lf91pfZ^JmI2rfL zk;+wHji$0ZB3y7 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 48d389bfa4192de8bff50ec06a96ab6c77d92f27..bef30f741e9da5eda07522414119527de6090ff5 100644 GIT binary patch delta 793 zcmYk3&ui2`6vs1@NjAHi{grlWD=VawQo_>hT0AI-Akw0sEwqZ5%d+g7)`V;#nN(;g z^q?Rf3f71R{S&+`$t zrFBy8u(v1O#UrMH1|l-YCBHPWjmR38{qnftSMY55RVev3Sbh!4e*K^+8?q8M!xmJa zddxxxY^Xu~m_K9w)I%*6Or!Zog9bF8YyLE}z`?x@Q!tJD479g3Z{{ae;<3VNE16|M zysPj~Rx*acco;;VJ_yd7{3G8tXE89H%~y0_m-09ID>j`k3XhrjrdTx%x)k{f(Z}d7 zqT4x*CT|B(R8q$Jyf+TifNybl;zy;}&HtVQVZ3m5k3L-2f+TS?x z^pxICIihH+-Me|`?%?+3_Wi+w?X@jWFATL8$}DZubq%CK#fRB2NToXe6}q)4*S<_A zZJ-Y*(u(VxaVBtaR{51)L)V6Pp{PPQjCYe>9|hhyP2N0njgnOMsN6|mg?;AU%YsN@ z$G(~unUQ}tJ5>|kI@R5KUAh`yrlU)kC#(|sgk=I1G|7Ih>`5;s-L|fe6WEL74TfRL aMcA6naPlS-*ch6eyUfI2SlpVk%l`lrOsfF^ delta 546 zcmYjNL2J}N6waHSolSR>Y!b?XTB;zW4QschhvGp53sMwar9Fr#bi3>uw;QraNwS4{ zQP6{zf@My{vp=B!z@r}g137u{(xZQ%IIl}f=fO9;_kGOwz4_yPYdWcI*A0DseLRh} zYbVYe9GP4q=>A@MiXa_A#$*e4YZEgCkUHwjD&+h z_0~WeozF(-ViR3`d+2Q&fqza;XMZ^ZSDmvX(b8?!Qu`HzJL-4kEBI=c2f)=Az9uR} zGWCP6YV|+fo|~#^dRs%;$kP~QZ;&QK>8gj-MQE$N>QBcag{`3*nAx&g7x!O0piz}z zp5U&AlEw|Ucp~#2H37?9V!Xk=e3$o79`v(9j%8A0H>}lnvG5_#x}1yz;~uK-xlg(%9xw$l0A^v)wY?ay$L7RZG+=zX-z~#4@kF@zDmXARzavE8N T#a!Te6Dr2;fdB?3vu^zdxr}&y 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 da300629a26af234181b390219fb9abc481122ee..a871557f30dd4c1883836e118dad6970dee0f4bb 100644 GIT binary patch delta 151 zcmZ3XKU1GKpO=@50SK;ao0XNik#{o(qsrui9CeI+lN~rkfn*qG1xpR%LdMOvI6avd zB_=ZpN=>%o*)aJlPX`wVBimmNHV&quxXtan$C(%tH~S0xVr0zS>?P#H%vdnFS5#LZ r6=-&mB#4j!5e1V^i6(MX0-2h!MJ1b!#UvQH<3JL*Afj?|n0OEX!Llet delta 163 zcmbQKze1lkpO=@50SNNuP0cFZ$h(bC{Ph zrZeU-rZc2)r|`5e)G)g+G&7b+HZ#;PrSO)5%r60|mnxCYlF0_DOW`Y#P2sN*XDX@z z2?GWAo0(Ds=CC(22Qz32ZVnZ)Wt==k_$A}w$#o)j?0#-Vj6g?E-XoGW`H-~q$;Nis9?Y+kCW%*5C|xyMkO z(Q)!u^{b3Vn@?-}WM+)md{pNZ6Jy8b4f=A7jQx|(8@yngHF<~OBF1H#qm8;58S6Jc zH?C)5Jh3_545;AdS1L3ym_^?5fi&U7bAx-hxFtpwh92l Cn|+D^ delta 504 zcmXYsPe>F|9LMMTo1LB4tUK+xJ7cSxEQxKRU|M8p7Ey?h3E3sO1TrO!u)^#JL2po* zrN5HUJA~vRLoZQLy{mQX9AOaM!b@e>4j!c5P`@AF&-;D({vN!yb*sVcnQYe5RE^Is z`~317yC-imWiv`=mFi54=Ie8uJT{9cxn6Z9I>&nTC&BLJa5%I9_124qQ;wka2cwOHgw21DZs<_}B z74MyjSa61WyI3%&{uG=^5GQCPxSilmg1ZV|S#9#FKQkND#g0?K718Q;S#YPkuNuNBAU1j;Vz$acy7; t-{kKBldvs!Pb>nv^8QdiRgYU>1y)vSVi`K99@?ptoTDnS$x>6^#$OvZgeU+2 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 0f793398784c2e4bec114d3cc55dc9f2c2267204..b15798f1b236ccb717af76172ee0078599856080 100644 GIT binary patch delta 21 bcmdno#JIVMkt?5KMVyO delta 21 bcmdno#JIVMkt?5X 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 c5ea1204fc91851859ae8f8012b1fc38789b6231..638c83b41baf7a6aa3a858e9acc8bbb79860f734 100644 GIT binary patch delta 597 zcmX|7&1(};5Z{^IY?ICI+s)?7l3LqDtwHc0)I$+H6uk)QLFqB6eNpx`%}TNxL~mSre(5?c?% zn{6wJ%q3=1&Qo?SM-}`A^}rDzCPLsDKGj2UkWce6uk>)u3E93!&fy;PCkIMs-v>V% z+TsvDvW%f3R52wc_)$JX{`5cz%AvCk{Me(!S|+H33a^HlXjOZS^4!=dH%@V{-B=1d zzg2};Yb~xsx5u{N^mVTpG}>``b+OrPbZSkn6U2!nzuO98wdJqG`i-{Vz1fNN#x1fs zu{P>xr|1t=SJqOVe4nbrraWQvvN|FlXhU7qf1~aI16O`DhHzYdNMD2V@}zkOJo(bx zAmxm;164V+F2P-Sk=4n4&gNl5erNBX8tvG#Fe68Mnxw)Y38*@tfdj@~XoNLV^`9n- zN|`SRPoiJhR{(G2i~L#kgD%m26b{SSZpc6R+5!qoFkwGbcq-h-4q+q61gdb?p^v0y z2S8eyP_Ccn<{q<%75+0utVlifE^3=QmfWNnnVG1I2?Z;K zE=Gil3m=69qzFnu#+948uq#(C6dC;iB8rOLws;aj@Ls;l`M&erbKsnJ^B?DBQP6;Vgnm;5sM0c)v3bg8`)WTAJ z2*j>!SltQizhIfyn(dPBi36esQQEYOhSM}VLsMsI)!?Vb=KPyuPvPu}Wp=OIfrNI) zumZ`r)wCTuh~HRhcMW^7jVuT^%x=dCLLGB85QmBt#U53iUx_y1G=CkXu+3*;UM5W> zLV$pHD21d0B59xi;d`+|ILY6{m*E_*BsQSMcM^9{IV11FEdMQEfK6Uku449yQil!x zMR^Oe{!6t6mHWe4PU54G2oO;N5j2R6u86S+5s>y1s;?zK5qRc*(_ewKH~f?5zjU4N zW-7{0q__rwLW@`pzMolK6PV1DM*@waE;ALQn4>u%hNJBhm$1|TP>W-v_tP{nVluMK zKc*ndqDS2t>N%{EUjeFlArKs?KaPt@j%xqkCAAeE5D@$i*@wVug*m>Rufco%IbVVW e{~*6Z;Jg34a2IlyNg)O)g=94#;|LXzOT!;vL#(d= 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] )