From 3c5c58b5d18621d726c08ad862016f64d6240105 Mon Sep 17 00:00:00 2001 From: Soriba SYLLA Date: Thu, 3 Sep 2026 14:08:01 +0000 Subject: [PATCH] =?UTF-8?q?Mise=20a=20jour:=20Integration=20de=20toutes=20?= =?UTF-8?q?les=20suggestions=20pass=C3=A9es?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Jenkinsfile | 1 - SIRH/__pycache__/__init__.cpython-310.pyc | Bin 149 -> 149 bytes SIRH/__pycache__/settings.cpython-310.pyc | Bin 3097 -> 3061 bytes SIRH/__pycache__/sso.cpython-310.pyc | Bin 1281 -> 1281 bytes SIRH/__pycache__/urls.cpython-310.pyc | Bin 1504 -> 1530 bytes SIRH/__pycache__/views.cpython-310.pyc | Bin 721 -> 703 bytes SIRH/__pycache__/wsgi.cpython-310.pyc | Bin 520 -> 546 bytes SIRH/urls.py | 2 +- .../contexte_universel.cpython-310.pyc | Bin 363 -> 363 bytes .../fonctions_utilitaire.cpython-310.pyc | Bin 2251 -> 1977 bytes .../__pycache__/__init__.cpython-310.pyc | Bin 132 -> 158 bytes .../__pycache__/admin.cpython-310.pyc | Bin 173 -> 199 bytes .../__pycache__/apps.cpython-310.pyc | Bin 424 -> 450 bytes .../__pycache__/forms.cpython-310.pyc | Bin 858 -> 880 bytes .../__pycache__/models.cpython-310.pyc | Bin 1284 -> 1308 bytes .../__pycache__/urls.cpython-310.pyc | Bin 551 -> 577 bytes .../__pycache__/views.cpython-310.pyc | Bin 6050 -> 6056 bytes gestion_conge/migrations/0001_initial.py | 14 +------ .../__pycache__/__init__.cpython-310.pyc | Bin 134 -> 160 bytes .../__pycache__/admin.cpython-310.pyc | Bin 625 -> 651 bytes .../__pycache__/forms.cpython-310.pyc | Bin 2739 -> 2731 bytes .../__pycache__/models.cpython-310.pyc | Bin 5604 -> 5614 bytes .../__pycache__/urls.cpython-310.pyc | Bin 1508 -> 1630 bytes .../__pycache__/views.cpython-310.pyc | Bin 14541 -> 15414 bytes gestion_employe/forms.py | 2 +- gestion_employe/migrations/0001_initial.py | 38 +----------------- .../0002_alter_contrat_type_contrat.py | 18 --------- .../tags_personnaliser.cpython-310.pyc | Bin 1117 -> 1143 bytes .../__pycache__/__init__.cpython-310.pyc | Bin 133 -> 159 bytes .../__pycache__/admin.cpython-310.pyc | Bin 438 -> 464 bytes .../__pycache__/forms.cpython-310.pyc | Bin 4551 -> 4548 bytes .../__pycache__/models.cpython-310.pyc | Bin 7654 -> 7677 bytes .../__pycache__/urls.cpython-310.pyc | Bin 2346 -> 2320 bytes .../__pycache__/views.cpython-310.pyc | Bin 16650 -> 16305 bytes gestion_projet/migrations/0001_initial.py | 14 +------ gestion_projet/views.py | 4 +- .../__pycache__/__init__.cpython-310.pyc | Bin 132 -> 158 bytes .../__pycache__/admin.cpython-310.pyc | Bin 173 -> 199 bytes .../__pycache__/apps.cpython-310.pyc | Bin 367 -> 393 bytes .../__pycache__/forms.cpython-310.pyc | Bin 1553 -> 1575 bytes .../__pycache__/models.cpython-310.pyc | Bin 1499 -> 1517 bytes .../__pycache__/urls.cpython-310.pyc | Bin 926 -> 952 bytes .../__pycache__/views.cpython-310.pyc | Bin 7585 -> 7488 bytes gestion_salle/migrations/0001_initial.py | 14 +------ 44 files changed, 8 insertions(+), 99 deletions(-) delete mode 100644 gestion_employe/migrations/0002_alter_contrat_type_contrat.py diff --git a/Jenkinsfile b/Jenkinsfile index 4ee86cf..6908fb3 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -2,7 +2,6 @@ pipeline { agent any options { - // This is required if you want to clean before build skipDefaultCheckout(true) } diff --git a/SIRH/__pycache__/__init__.cpython-310.pyc b/SIRH/__pycache__/__init__.cpython-310.pyc index dd5995fcd20c7e8b499ebdd58795ff29d47897fa..7dc0af0339df094783ead4525548817ff673e67c 100644 GIT binary patch delta 18 YcmbQrIF*qrpO=@50SFc@p2*b=03*EwGynhq delta 18 YcmbQrIF*qrpO=@50SK=6Pvq(b03&P!6951J diff --git a/SIRH/__pycache__/settings.cpython-310.pyc b/SIRH/__pycache__/settings.cpython-310.pyc index b408a864619a1f8e5656e3b53fa6e15469d6da27..b25a13ac7c25ea47c4efe58aaf05a59a50b499d9 100644 GIT binary patch delta 737 zcmZWlOKTHR7@a%0nM@{4J53)+n?BMukEUs+zFi2?*Py}LgiKQLx(IE*F-%Mo%~YvH z$fD>@K?Vv!7g{&&`x9LF3xqOs=iZ$=p?-4}5xkds&Uel?=iZNb7yA*-wZmaW!1dtc zVdJb{5Wach-{o}|@!0S-SMSyZ2pZ#&Lw%xWFcmvvC0*orF1-K$Syx3g+1~XOKcV{vn<{?2LYDD-WBZ4BVR?%oAXQqks3nw+Q}h#MTp{z`@Wv2^a~->IrYEE z?5DQdtzC0(*Q`BlSAt(Mzo7{ywtT-aEu=(RigeYckz)#bIq z3fGFKai|Tw?0lCO9XXU1vkQ(9eBrpk73#BEyUv*MX(YH-#93<9@>(Z}({)lFq!FCY zimr4ro}Bfh7P7AIVL=7Cr-$^2s!x`BeGyUi%VDaBG(tooi{d%`NzbV&21FwL*@|-( S(xOxrWg-(wDfzuUC6iw$C%IMt delta 726 zcmYjN&rcIU6yBL`x7%$?e?Xz7{DuOhvLc8cjFD9zcjiOaZ!12#Z3P#UNskTKC5u!w*r2LG)NO33NjbYT_rv zBG7w;6&8m+)@yhnaY!J!P3o7_PGs zWOG;@g&S-P=GizbunD-y(s*hTd~6C9*)-f@8DpBwNI*+M=Jx43@|utUPkFu%?Z+K! zXSZ%t9H*&bR2;*8Vc4#>-ZZVo=}*r$LOlG;`-bmGcOJU|O@FdnEa{4h>m{w|MlW~Qa;4JKLNVW=cvL8rJLp=WSk6dx0w=PQ2t4c?B+1iRUybl{ z`Cb}d`+Rq|Y454l-cr@Dw=7d_+NP^KXy@~D^NX1*zw3Xg_*V)zWo5m%!q5D9PLxml ztCHt&|0ItDEbSFG7X>*OBta7K$WoUlMrBd#lBuXrF-9nnDZLPXix*-z=%bXPPW&TX TP?-|xzw<8vHS7_|mCNKWSM;}0 diff --git a/SIRH/__pycache__/sso.cpython-310.pyc b/SIRH/__pycache__/sso.cpython-310.pyc index 8313db24062eb616695eeb17d65041aa9c0f273d..652cc773c2fb9a22a83f9daa73138f64e172e244 100644 GIT binary patch delta 287 zcmXAjy-LJD6h`Ma$!0gQpe_~`+8Kmc`T#2X0Cuqmapw}VWHMngDXe5!Ye5DUtQ33# zYe9UDyn&6Cm6fyW{hD)calX3<7h$BLC`4|qURU$)$LRPDBY^~|h@>gqFs+#6Dc>-w zJn5&t4AKB2z)O@4rbuw%-6P=vU(z%b{w0coueCGA{Z;`c>srv6R01k@;Zv=;#({TM zl~9|Q^uu##a&17mbT9ynX&+% Jn0RD|`~fSdQ3n73 delta 267 zcmXAhyH3L}7=?X{lb8lo;-Zc)Mo4Aj1pswqVDl1%`d4XX$B}V{PN*s~60#WB5O2WD z01v^GH(+36Vj>OaET43azLi*s%x0NDT|O@!7vB%r(XAnpV5E>Dni?iq&s0Z-OWrfn zu}Nft5%4vV=>(}r@jIkAur-xJ#g`~gzBbOBwDGyAwOvBHbq00mJQ%2aj$3}J=l`@l z179>Z;0j|E=(HQ7iL*`p`tge~4R7RdL^@eJY-&|{D6A`{4mxr?{E#Os!aaS)X*gzk s;f0OZ<{XwR-``P-vYOfP)K=cjuf}ELuU!-*I|%RWWH7{ozMSlmKbL+;r2qf` diff --git a/SIRH/__pycache__/urls.cpython-310.pyc b/SIRH/__pycache__/urls.cpython-310.pyc index d2c4290a4da086d990472d679850bea6038a5587..e38103f86af9a3075d7e1505a9bdd8f78472fb1b 100644 GIT binary patch delta 298 zcmaFB{fnD7pO=@50R+}h%QBkCYt7BbkiwY4lEa$I7Bw+gsh%l|CzUCS7l`?qnWOkq z*;6=DIkN;(I8(TKnSnfRAWtxb2g>73WlP~}W^85x%J2i(0#LRfkSzpd3j^6AP_}3) zOO{ZUFj&1*?1TQ7z05!!H;^Zo!UN^;rn02)H8VCd0cH4sYyl`+5XcsSvW05VqSW_UUGh3Nl|7}5fji~x45B#rA0Z#Ma)2v pA{Jy}pxU&_r&%U*O6iv+7U`FlmrrhF)npT3 zNOPue1~X`KP0Y~d(PX^EQJh**l9`uYJaKYA9|zEwU()(ziADP5<>iyT80C0DLd8r# zf`_SyYjP>$bW=7UrwAkrAvl4oTihwB$@zJCsTG;|c|1UYViq95!NkE-#0_NlX>v_= zWODWgD$7dDOV8H>s!c0m1txRakRpO=@50SKZOPs_T_K9Ns`aneL>Np41l6owS$9F|U~Nb5pDG^HPCqR_FY@^i)lzTkJqaNl{|SEq2%3f}H%y zjkgn+l!Ns%@^e%5i}Q<8bM%WVi%U{-Q{&T9i%T-|^Wu|Ji_$XFC%Z7)GRjPDV&28b zGTD~Jh>>}60ZR>|;N-U~I+H`#E;8y)R%2IY(*ast#5&oZJ-c2D$Smdo5^PK?jBHFo zj6#eo|B8%&0)Co8w|G*r67$mY^-4=JbBc?YfTFiV;5LHXs+XIek_wb!21$v*q*B3- zhD)*lC5u==ggQu>pr605Q;=(XfTO$TWJ?YWd3}(S9Egwy5e6Va4@78#2&2iZ96C}w aOahE7KqrEr3?mbh0wWtE6C(!`k0byW<7F%W delta 643 zcmX|;L2DC16vy|?&hDnorcD!xCKU}RNN7w&YBUrD4JiuRfT@>W;?kLhO?PKyX4{ak zwHFV9cnEv*|lSm8eiyHgJ7k`!Js8 z<||j>?R=w}59vMygBi>W=Kag|tjP16&fm8?tn|*BX7T3*Q9Mlw;pQZ}jE&YqHeYJn`h_WHL#m`4HCA&*nEU(<6Eptn?F2pqQ>( z%`;QyUMvfr4ptXS-9cf%NMM9;Y9b#X9|_G zVm}gfc8iOX$geYA4?RDSfPo0Oq_|*1?dZQbQ#_7+F;Y9YD;%ObRDQrk987l`R#s$V zPmH40K_q!=k|R(mfVKYKoW+8^uNyE&KyG(VO`I diff --git a/gestion_conge/__pycache__/__init__.cpython-310.pyc b/gestion_conge/__pycache__/__init__.cpython-310.pyc index 0f5db88e731d01c582a7825fa97cc3bb602182e9..f0c1f283c5719b98ead9752f7cb685d420fad392 100644 GIT binary patch delta 58 zcmZo+oX5zW&&$ij00avcPo2nZqwJ`kk)NBYUz}f*nxkJ_SzMBun;M^n+a delta 32 mcmbQo*uu!2&&$ij00eV+x+ikmaH{KG64W_n+Q4p diff --git a/gestion_conge/__pycache__/admin.cpython-310.pyc b/gestion_conge/__pycache__/admin.cpython-310.pyc index 4a98ea97eda62848a1d4ae871c527e9b1cf20a15..1c4aa8f2b702ab75463091ad06ad666f688f0416 100644 GIT binary patch delta 58 zcmZ3>c$|?tpO=@50SFc@o;r~`L)lJ0BR@A)zc{}rHAla=vbZEQH#I&zwYVfRKQBHx MwJ0q!ePWFv01#^w9RL6T delta 32 mcmX@kxR#MSpO=@50SM;ubWh~Y;8f8sODxhaFE5`s%@6>7A_(39 diff --git a/gestion_conge/__pycache__/apps.cpython-310.pyc b/gestion_conge/__pycache__/apps.cpython-310.pyc index b934e948a4e52ad40b821461248ccf1b90391fd1..aeafb5bb4e3b468594c6879708a0a29fd78d8bee 100644 GIT binary patch delta 60 zcmZ3%e2AGlpO=@50SFc@p1P4+no-$SKO;XkRlhjDC^bjFxU#q;H8(XrJ+-(bGe0jr OIkhM)Gkvl?VlKpO=@50SM;ubZ_LAX5>`XFH0=aFE1~j?8#UO0EaIKsQ>@~ diff --git a/gestion_conge/__pycache__/forms.cpython-310.pyc b/gestion_conge/__pycache__/forms.cpython-310.pyc index 584a4e5414eb3fc52e23cfc664f5c84a681f3358..e59548d6b73d55dcb4b0ed966f89bac0a6e2fd98 100644 GIT binary patch delta 113 zcmcb`_JNHzpO=@50SKZOPs<9N$oo|=0LV#Yh+<4(h+;}*j$%pKEY29nsBEX7k)NBY zUz}f*nxkJ_SzMBun;M^* diff --git a/gestion_conge/__pycache__/models.cpython-310.pyc b/gestion_conge/__pycache__/models.cpython-310.pyc index 8f3f2040926e38ebaf01445d2046e1fe8b988616..5c119e18d030068e371abf58901a82d5348bde9e 100644 GIT binary patch delta 124 zcmZqSn#0AH&&$ij00hyCr)7n*OyuhongryfGDI<^Fhnt>Fh((_Fil*)nUQgGB4a&&$ij00eV+y0f;iPUPzqnF8dcGDI<^Fhnt>Fh((_Fr_n2T)TO55@R1D zr>cHgVv&A%dHG~vW^G1=&GyV@jKZuy9mOg@f`fsDk%^h*9}D;7HkQfEjABdxmJSu7 diff --git a/gestion_conge/__pycache__/urls.cpython-310.pyc b/gestion_conge/__pycache__/urls.cpython-310.pyc index 64ad42ba184bcf77b98e2feb1c92512bad53deea..11885c10ba40f8d578d2ebb247471e71bb6fce47 100644 GIT binary patch delta 60 zcmZ3^a*%~PpO=@50SFc@p1P5HE2FZlenx(7s(x{PQEHBUab*(ZoAuU_g{AlC>j#PNCcJ>;UxG0G=K+5Jv8giuoOC-b=p-kXn&PYs*dwyD4uy?wpa zJ+hbfk%AShg;}b5ddk_*pgAv>vL5EC>6s}TVS!qnMQzVc-9QC*`ZaHC#`5 z9HR%ywEJ78et#Mba+JhzvrS^)V#wM-+fm&zM(S*fn01M#_fd;d{S!-Z|Nm+|vJ*0##m zdV0K;7+Ax0fDWMO=lb=Y9wBUkrP<43wTt*JtV7=dko4_iz%# delta 938 zcmZ`&zi-n(6!yC$cKkDrle)hLXe+4NCKXf_VgVLF3_t~{Dhny3J-2o7#nss*1wt!S z2Bb)`-#J(ptxo8cfC@`gb2RcztHQ|aI=c*8ugagitBjd1MXQi?}8 zF5`g|k72kaO}pR4(yy~KaGD_)XOH0|I|1dXd=e1LKHdJTFa=mPD*iro5wQvXfG%Ey!Eh^jUWc7ZXR-4Tx`>afW z)&8NJ%g(4mpA(@XLREwX5pq0qaz3RIr5Qn(?4~gc3fnR|@?B2E=h-!LBC8<>+L8GQ zfyNf?i(s;*Jr5t*k?l?Y*BlAMbj^zb>1?Jr3kF*$HsKljT6_s3Y|~kRLw4-U?AKaZ ztlvZQ3N{*m%~qzSa>nA!a!Zbv69s2+A%Fwk&>nxMCG$#+S8A;sMms>C@L6~Se?4^0 z2#;OvvHOolm*4AqjB%698{@46Qd(wrUxg9hzhb*tdIae9W%jFl2#Dh;+Vx$7nI$j@M^CTQG>>>>>> 0047b1f (Ajout de la prise en charge des photos de profil) -======= -# Generated by Django 5.2.13 on 2026-04-17 12:03 ->>>>>>> f6b90e7 (Verification du statut avant la creation d'un contrat) -======= -# Generated by Django 5.2.13 on 2026-04-17 12:03 ->>>>>>> 6026af5 (Bug : Affichages des conges) +# Generated by Django 5.2.13 on 2026-09-01 10:51 import django.db.models.deletion from django.db import migrations, models diff --git a/gestion_employe/__pycache__/__init__.cpython-310.pyc b/gestion_employe/__pycache__/__init__.cpython-310.pyc index d4b74982abe6268ee91db93b474955305ced4ea7..671be181a6a7f139faf4e759fc9efb4f5b3c2d3e 100644 GIT binary patch delta 58 zcmZo;T)@bk&&$ij00avcPo2nZqwK7ok)NBYUz}f*nxkJ_SzMBun;M^G6Mi|F$h8c diff --git a/gestion_employe/__pycache__/admin.cpython-310.pyc b/gestion_employe/__pycache__/admin.cpython-310.pyc index a9c93d4c341672a70bfd41c8e36dea07b6b539d3..3a732dde1b38735d569d17ab0a75b3e29de64ed2 100644 GIT binary patch delta 84 zcmey!(#^`7&&$ij00hyCr)33iq5X+bd7E|#VhJgC%PRnbdO5Iim+nZ(E@TV}UlPx0VM z1PKHE8!S=~>P_$;@a9Q!@K5j(5v>=$w<|Wpv`xrk^39uX-h1=y7v2`^U~0-@^!c*4 z^OWcN_Q!ngX0s{kQ7vi*-TtRD{h#moQ0?)ZjSSHSMki1H4%Gb(OlTHlN1SZqD$z_R_Ro9RXI?VuP2?iO@ zYXo)Ai}w$&Nmi#o%MzsbziKb|(pj9)qwP&mb#r5#qz-ZcP*gAVi@kr6M|wd7C?Qlp zn9l9&G@s@+eXZY#$X$KBHI7Zxwm=)OF~sF2bGSsMPCur8XtSD}R}YP4{#-pyEvh%h z=N=r$^MG@JGGGbd5>(y%_{|3P5>r@d1cU4&@hrOE-Q0@g1r(R#;@!3{lHv-AlifdH z47Y_vg1`22HrY=Cpa^~?5y;9>J=SO=*1rnIn);^A!(}T|(It(TdY38nTs}y3gHF{= zkK4gKjM$khlCkTcod(2HbF`YP#JL7utOoxmd-Yu_LQ}(B;gXUss}JTYeo5WSE{x}Y zT=W>=5v_<`UIxT@n|Oqp6g7DTwPP}8>^3n%jEQ+G89D1PbL-$FkLz@B19!w8*VUqR er;I6+cnS&65|sa5T)nnRIn7Bqwlm|*6^%bQjIAgD delta 1061 zcmah|J#W)c6n)RJW5-D?a6U>K3gW9^RB8zZKrM(CfnbR$!IULf^-C2<0EZHUT3S37d3)b=l547EQsf+y!b}nIBC$v+Irx#W}L1!Skn)82`>RF z;b7L?^0?b>x5ZoKdodQ^5UmjzANqQs>4N)9_gYC8|eC% z3SbbM^0KJuGjv)!)8>jhKr&LLKB+1!RaMuBPd|#+sgl^!zHg&#egWYe!dZk_go^+b zCpT;YTl6Nul>!iF9e|vSGqebiw;ii(=}SveC3h&qEBtdsaCLFani#RYFH=9YFtlD z;uic5&yd+WL*s4U1oC1Y8BD3;mJ#yt36G7IqF684ZIFNjm-y$5(y nIY!3ug>aONIvKIC2;cH%lijAE2rYmdIZ18Bw(Pt;SY#jk}Zf5_h|5F zw16GOk)Oh15*>8)VrJW}@%7is)wvdogro+G>fX8nS7q5e=3lUf)=a~o>(>BuGiInI zd(_$c=Mvo7ISRYVif2$e8NamG8`{LLHu#J$Q#epli6NZV5~omAMzULtB|D-Nm+B#2 Y+^po}0N+w8$)gB$G{*JZjyqBrh>*@n0z)&%|0#r#l4MBB5Gl?M}L=qbWv8e!C zD-l7jq4P*@0x+YFLW^;V?^?EIZQ1?r)wQ zz+4S;v%0Ins=7B@u%*`dD&D2dZwKc5pwV6sFxDSbMQb6^_&2R{XO$>8DiN7S|8nHY zvVDK7=kI()HYqezE;jq452?%80qm7jR!+oN8?HUlk??VhW|r;RT@?-7UeKb?(h0jiR0dV{EsZ6h0jUdHYyVy z1QzTIAVT;i$as)YB1A}0R2XEEf|4LcilZWsASF>zP)RA23~5pZr9hUHL&YHfqX`s{ zaVSu;h)O__w17&&BB_K@VTrViN)rcub7ZWbPIGAsCaAPti zdLynKTy)_UoO~P4;7QJ#Jm;Oxr~PdWCyrw(m?!%__6M&Qhk92A`hj@=1@94DW&i*H diff --git a/gestion_employe/__pycache__/views.cpython-310.pyc b/gestion_employe/__pycache__/views.cpython-310.pyc index 2efdd50790df355c7828e80bac6bd99a27211644..b139809dac3733ad9a823faadec1dddc6fba2ac4 100644 GIT binary patch delta 4708 zcmb7HYiu0V6`p%{c6Pikuf6Nn+KykbowZ}fcAk&|c^XKGqa+TGjnHc2JKpSOX4knh z1`@5ir7;z12`IYaQ3%K`5E^Kef)TW8sb~UJw7klXR17U`;ZIS2K%Z(uNqWv*Ck6{D zbyxGvx#!&1dE9gEyngVx+rouV$gjX}@1ytSmhL$gZYoU^MPUjfrjo=rHHk%%#G*+` zuXO#X3d^7LOWJ1!tY9)IY26H2;bd6S6=tOsNk$~? zH><4bWVNJA0W)gFk}<0$StA)iv(~Ch)=4^K)>{q92B5>N(u`Y;$wsRw*<>{*ngWq`eEE4@K&$^$r}QCko647#!5zZD~XjKqHjhL)YVzqF`TSrxD|-ZFrBn` zlhl+f!?x2I!%h%4n4Wa@8+j)?27RF&HVc_-KE;iLlUZ&s;HZ0SgTvdid(whe$SS}@ zDW{NP*)azg!EJUSzss;E3VGYWRbdzm9dlfb8+j(j>bU;lLLOI$jf*oh>irNxMiKYW zfnL=OY#bkl0cj^&$h*GHg}lSlj_ccMO_+s4u>0Wxx1@0HEL~5vAdKX-qR!hlg5sir%?Uu`$a9Y2d zmKpmdow7GlK-h@TDIV~x zC9B0-zHK|(kkJk>d=gw_r^k(iUmAk1LCIPKX@^Rn+^Q{mc5U678oqWUwRy+L=&p^U zTv~1jyA2=&!~uO98JK%c|EktgiyV}>!7T;D9w|6mZ_9$^yvPEbd4Y53geuWn*_4Q3 zcbvtoNM|zK$eWQM|+y4iBOe!kr>3%zr3o=40z<_Qb1;Bn96Bt!Bfqp%PQPuD0#&lWh= zPSX*ks206Nja44^&7G?XkOs8-Nm_Ol`f;9iZSnBDzeI9_$nc zqGlXZrWElcQa2)OMTm*NL|2oiM0e~;n(&EiED;RsPumv*LmZ0@mM(dOUyVch5ylbF zB|L*59U{FdUEv+ia&VdS4IYq%xNyU^VZw2PLvDhnm>bI%tbN=_1lOc~$d-J=^v_l#Z&DzpgSgm4W)6d&`&5x;7_Sf z{X`@5LWD+0g!unMy)ee7{#*4+IZ;1UKjnA9^kW3z;twr}&t_$=xpst*yM~A1%7lMZ16?OIPA@oARTUNPW4A<`@KM@bqcawYPUabEGAxFiX@nLdK zycsvzm9!Kx~;qUab&0npZ6`N*hvS+PsqgYJ!GW0 z%^${|s9ZTzjv-|s$nC11@eoE9q^&F@WXRrQhWKY=J9$$yG+jm>lex_rteBfg4~hZV0l|&)snU3&%#{NO`a6# z*5T(^B;vo2q{iYMT_c8^{fKpyfZQJQF}{eB?}cvmas7N@i;Z2 zxnqLdC+_ZulcnNh$Ei{m?!6BnQM=eL(s7Fnh`~^<3j;`DD9J+NdYuAGAL4_^kiJCw z@)?Bv2-17YqlzBjD6-}%uHz~W7TfrnS3hD&Yj*=N4 zm=_GfbXGAvpUS6HM}>^9&s5ApN@xD#P$}T96d2*7u&O*2rAc&u`Ob0XWNW^VZ*_QK z@|H6vc{yUR<6hijpl_k9e=dcf#V}rW!(*EO8KtP)JTyg$B&Wbb9O`&-DwHBGv@|G1 zBdR#w74^q&^!ykb)IT{_#r`VSUOdUo6+-{+EG_ zdN5H?0!4%P&(jN<2Ib}g6b%g2i1sm!>LAh2^V5((n&%F8){ww`xa52)d9dr-S1(E> zU#ip@9QP8!%LsUMz;Uuf{v2pwbq|oVc%-|7yfSyX`vfIZBHME|{wj9$@=oYfa*vo=-a^{M!^=nO7OpIKHocxF6wvZ~YqVa%umIcFzMK#p_K6_UcAJJ<4&2R~Y^l!tDsZ7WenJ5l8&E|0p>t zUaXIay(``!KN7145+p8C10$Oj1&q|#z@d1FDqk~ZkXn>*y~vX`42q8iYM@km2Un68 z#ASmmZp5-z}X2x*IEK+!>fKmHSHXKckcXX delta 3919 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 I;wVb~3w6(k-T(jq diff --git a/gestion_employe/forms.py b/gestion_employe/forms.py index b84720f..027742e 100644 --- a/gestion_employe/forms.py +++ b/gestion_employe/forms.py @@ -62,7 +62,7 @@ class ContratForm(forms.ModelForm): class DepartementForm(forms.ModelForm): class Meta: model = Departement - fields = ('nom') + fields = ('nom', ) class FormationForm(forms.ModelForm): class Meta: diff --git a/gestion_employe/migrations/0001_initial.py b/gestion_employe/migrations/0001_initial.py index 64863d6..99015b4 100644 --- a/gestion_employe/migrations/0001_initial.py +++ b/gestion_employe/migrations/0001_initial.py @@ -1,16 +1,4 @@ -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -# Generated by Django 5.2.13 on 2026-06-16 11:06 -======= -# Generated by Django 5.2.13 on 2026-04-17 12:03 ->>>>>>> 0047b1f (Ajout de la prise en charge des photos de profil) -======= -# Generated by Django 5.2.13 on 2026-04-17 12:03 ->>>>>>> f6b90e7 (Verification du statut avant la creation d'un contrat) -======= -# Generated by Django 5.2.13 on 2026-04-17 12:03 ->>>>>>> 6026af5 (Bug : Affichages des conges) +# Generated by Django 5.2.13 on 2026-09-01 10:51 import django.db.models.deletion from django.conf import settings @@ -39,19 +27,7 @@ class Migration(migrations.Migration): fields=[ ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('matricule', models.CharField(blank=True, max_length=10, null=True, unique=True)), -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD ('fonction', models.CharField(blank=True, choices=[('directeur', 'Directeur'), ('assistant_direction', 'Assistante de direction'), ('assistant_technique_recherche', 'Assistant technique de recherche'), ('comptable', 'Comptable'), ('raf', 'RAF'), ('data_manager', 'Data Manager'), ('logisticien', 'Logisticien'), ('post_doctorant', 'Post-Doctorant'), ('qualiticien', 'Qualiticien'), ('technicien_surface', 'Technicien de surface'), ('chauffeur', 'Chauffeur')], max_length=50, null=True)), -======= - ('fonction', models.CharField(blank=True, choices=[('directeur', 'Directeur'), ('assistant_direction', 'Assistante de direction'), ('comptable', 'Comptable'), ('raf', 'RAF'), ('data_manager', 'Data Manager'), ('logisticien', 'Logisticien'), ('post_doctorant', 'Post-Doctorant'), ('qualiticien', 'Qualiticien'), ('technicien_surface', 'Technicien de surface'), ('chauffeur', 'Chauffeur')], max_length=50, null=True)), ->>>>>>> 0047b1f (Ajout de la prise en charge des photos de profil) -======= - ('fonction', models.CharField(blank=True, choices=[('directeur', 'Directeur'), ('assistant_direction', 'Assistante de direction'), ('comptable', 'Comptable'), ('raf', 'RAF'), ('data_manager', 'Data Manager'), ('logisticien', 'Logisticien'), ('post_doctorant', 'Post-Doctorant'), ('qualiticien', 'Qualiticien'), ('technicien_surface', 'Technicien de surface'), ('chauffeur', 'Chauffeur')], max_length=50, null=True)), ->>>>>>> f6b90e7 (Verification du statut avant la creation d'un contrat) -======= - ('fonction', models.CharField(blank=True, choices=[('directeur', 'Directeur'), ('assistant_direction', 'Assistante de direction'), ('comptable', 'Comptable'), ('raf', 'RAF'), ('data_manager', 'Data Manager'), ('logisticien', 'Logisticien'), ('post_doctorant', 'Post-Doctorant'), ('qualiticien', 'Qualiticien'), ('technicien_surface', 'Technicien de surface'), ('chauffeur', 'Chauffeur')], max_length=50, null=True)), ->>>>>>> 6026af5 (Bug : Affichages des conges) ('date_embauche', models.DateField(blank=True, null=True)), ('adresse', models.CharField(blank=True, max_length=100, null=True)), ('telephone', models.CharField(blank=True, max_length=15, null=True)), @@ -72,19 +48,7 @@ class Migration(migrations.Migration): fields=[ ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('numero_contrat', models.CharField(max_length=100, unique=True)), -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD ('type_contrat', models.CharField(choices=[('contrat_duree_determinee', 'Contrat à Durée Déterminée'), ('contrat_duree_indeterminee', 'Contrat à Durée Indéterminée'), ('contrat_prestation', 'Contrat de Prestation de Service'), ('contrat_stage', 'Contrat de Stage'), ('convention_bourse_entretien', "Convention de bourse d'entretien")], max_length=50)), -======= - ('type_contrat', models.CharField(choices=[('contrat_duree_determinee', 'Contrat à Durée Déterminée'), ('contrat_duree_indeterminee', 'Contrat à Durée Indéterminée'), ('contrat_prestation', 'Contrat de Prestation de Service'), ('contrat_stage', 'Contrat de Stage')], max_length=50)), ->>>>>>> 0047b1f (Ajout de la prise en charge des photos de profil) -======= - ('type_contrat', models.CharField(choices=[('contrat_duree_determinee', 'Contrat à Durée Déterminée'), ('contrat_duree_indeterminee', 'Contrat à Durée Indéterminée'), ('contrat_prestation', 'Contrat de Prestation de Service'), ('contrat_stage', 'Contrat de Stage')], max_length=50)), ->>>>>>> f6b90e7 (Verification du statut avant la creation d'un contrat) -======= - ('type_contrat', models.CharField(choices=[('contrat_duree_determinee', 'Contrat à Durée Déterminée'), ('contrat_duree_indeterminee', 'Contrat à Durée Indéterminée'), ('contrat_prestation', 'Contrat de Prestation de Service'), ('contrat_stage', 'Contrat de Stage')], max_length=50)), ->>>>>>> 6026af5 (Bug : Affichages des conges) ('date_debut', models.DateField()), ('date_fin', models.DateField(blank=True, null=True)), ('salaire_mensuel', models.DecimalField(blank=True, decimal_places=2, max_digits=10, null=True)), diff --git a/gestion_employe/migrations/0002_alter_contrat_type_contrat.py b/gestion_employe/migrations/0002_alter_contrat_type_contrat.py deleted file mode 100644 index 4fd9717..0000000 --- a/gestion_employe/migrations/0002_alter_contrat_type_contrat.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 6.0.4 on 2026-04-29 10:42 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('gestion_employe', '0001_initial'), - ] - - operations = [ - migrations.AlterField( - model_name='contrat', - name='type_contrat', - field=models.CharField(choices=[('contrat_duree_determinee', 'Contrat à Durée Déterminée'), ('contrat_duree_indeterminee', 'Contrat à Durée Indéterminée'), ('contrat_prestation', 'Contrat de Prestation de Service'), ('contrat_stage', 'Contrat de Stage'), ('convention_bourse_entretien', "Convention de bourse d'entretien")], max_length=50), - ), - ] diff --git a/gestion_employe/templatetags/__pycache__/tags_personnaliser.cpython-310.pyc b/gestion_employe/templatetags/__pycache__/tags_personnaliser.cpython-310.pyc index 53e7edd10b4ffdacd4275b65f4534f9d29ff9638..0164d3d5c46436e56dff36da33e3f74f40401029 100644 GIT binary patch delta 87 zcmcc1@tuP=pO=@50SKZOPs{S%$g9Sr9HpO;pPQ;*oL`ihqhDNET#}lb8lRq8T#}ie p7oVJ3l$M!3*@nrPk#BPYlRP7%@Z<%|o4A=cm{^#&7+F~O7y+cR7;*pr delta 61 zcmey)ahHQPpO=@50SM;ubZ2>QG6eu}<_JCj diff --git a/gestion_projet/__pycache__/admin.cpython-310.pyc b/gestion_projet/__pycache__/admin.cpython-310.pyc index 961f9838022c437a048591ffde25319d74a85a32..2b18843324c5283ab9ec5e4c184285fe8a4cfb0c 100644 GIT binary patch delta 60 zcmdnSe1VxepO=@50SFc@p1P5ng;CjFKO;XkRlhjDC^bjFxU#q;H8(XrJ+-(bGe0jr OIkhM)GkvlI<2(Q(3KRVR delta 34 ocmcb>yp5SVpO=@50SM;ubZ_KlVdPZRFH0=aFE1~jY{WPZ0Etxyz5oCK diff --git a/gestion_projet/__pycache__/forms.cpython-310.pyc b/gestion_projet/__pycache__/forms.cpython-310.pyc index 45f6f821d0fb34adbe8817ccc8e220a575f1d7d4..dae3d28a2e81f3ebe25ebde61dee7a87e4c0a8fa 100644 GIT binary patch delta 1450 zcmah}OH30{6rJh6otb{dw17}86vP3fET|vEB0>O-PBbQl_(=oI@JnIHE5^9OL=$7; zrg=tJhJ|j}nXqPOV%)jz&KMW0U6{D?p4ZW8QQD-3`_6s$zVlA+<3sj+R&z8hBGKp0 zo0qFY6)i2lt@P)&WNBKm{8r$JWCd(_HS*YdTOlTBg@_5cj7m({iVzcV8I2glQi)Mr zCQ6KEMTv>JOpKVA6(=U{GI1+$Q!?~@$S~xpf6=LYIU@Tj-%UOqY};jW!K0^;i!hb` zFbxprd){;)iZI5%dS9F}5CVRT<(8c_J6Cp?UCNaomN)G+ySQYRH&>kX;)2Z#;^`#{p>Whixy`PodujD zFb%Eol0oD$fcho7rAbl^ns4>#f}-wwAAHZdYk zt*3F&Fd*+*5QyB8e+|#Pk_(8dwD4C-XDd9ZDjTJ_1$)^kSvISAGr~V9y-8u%d32fp zz!^5mRkg4+hETMr%_No=0pkRwp*Gs$M=k@X+akOWuD}r112}XPinOCVN)X~7)zM~F z6lmi;^c(~fTq|y95qbU}gJ9Bg`}<9>5b833y5?>yn=5_B_oCTm0%<6ur|2gHPPzgI zVlg?1;W{v`{CYe&dx24ViA(tbY)o7jH!kba6&pA1TzSszM5QWiGGEVp=gyh$d~@!7pZk#0JWY#9 z_@ylNQ9FiA%x83D z6kA0`^_e&_nyn+F`%D6vxSc>I;WJ4)c}+5nU6Nw5+LsO%u6?%-){QBzTv}drrktzJ z;*tY+ZBMWpZCVE{jDd!Kp!2tZjFO@-PLSZA0?!WgQAqG3U)U@`p;D>vr@)guz89i3r_rR;UFdk@cJz-2!p=3 zJCXaWDohdzyQl^!6k2x!7@2KAsd^B+$~qjvaI3*UhO!|zjej6YoT2C}!8ruW)S8=& zP_C)TyflSmFJ(l($1tiJlde;O(t_*EEW6I^>e|NL{f(I8ucKW9EsPk(($n;!A%bDw z0y%b_h5Zq+l|opwlIG8q?zCuJS#wK^&XVWa4m7+u&p#`@?ZU7Ts)P+l!Wp>0b#=5l zPWPfrqb%J{5L`sCOtsmT5apU|5nc#a$PhS6u%s5W~koIyY+VNY2Ow^hkHlD!tJ$pcYsV4n$+isYpwY)-_dieq|z6AMD>K!Y5%JY z#N(_=V&BLr$`C4;2yFtRI8=d!)oF zE5teUv#i&lX`Zzcp11)=Zv+wJeth#`o7PV?E=2)v#F5~BBi@V?9`M#0j}tcvTOBS| z-8DF`9Hmvbth`E9_*Pk=Ie0={uDpPWIcZWxnhK*$l_>|;)L$r_fJA?To`7%k*D-$F znCLrsTSTT+=T&7GcEIXyG`Qa4bSJX?H0x^;-`BRWTW74~e0a=2~R zDj(zcUw!=5{!p!Y$bYAfqok!U3R*1cYy><^vdnN(AEn>Hmjg?4|13cGa-*!u7P{1w zU23(xXd}sPM{LXa^HScF^G1kCMI_F_%;2d?fap3t@hd3ZmjwprX&~!7_-*i0N;eO7 zhdcCf*^M;U4#N$f3o(Zyv54X*!j}FFESC@I@}4z#dXx=+Am`LnPuxWC-W?*!PSFpy zMxS5&-&4qzifdB-Dq5VAL%CnJb6R>aihSMt6*23)!xS$_=DDAUpL{s>SJ^g_Nvd>e^(@z3LoxPM~si8y^p HLrZ@G%0wps delta 1221 zcmZ{j?`u<67{||ZZ|=>{nGd1oakd+~$ut8L6mity5bnP9j*7o@>c%k}D@S zc8+J_AU1@$l3tl|sb`(_M$qc83YaW6L5e6_c8g+1pqI0i1^eEFWwd7kI| zyzBdZ+h=)}6=U?fmAL9YzHV*%3Mv4MGp;qXre4vN*BhaxQ89pxF&^T^3gd%uUyt%*w zbB~^pk&Db_KHS#suz4n;tFg^_J&4HV&77;ZgiaBG;d{J#5r2vIX9BbBSN)EEo_O0N zN#eQK$oMI8KD!Nf*d?HXniwY4m1@#aX+`AN0CPi^v_%!CyuL^~n-7U$-@xawtr1hr zD#kGrZ^SOhiIOA{yb>3%gspnxrw{BucxWTekX+@Smd?ep`JTbauHYl8z;QiW%w41Y8*Z~dy`&G-Y3whs zZ7oQ&yygt|W;;!%<*Vv+_Ji;<{?tD?_TNQ_c{!O{=oxZBOx;}7^*X*fAh9UNPfGb* zj+-qiDm-xlYuV9EgV0TC?axRyp3MF1I5gJQv-beLSoT`5U#dborWXC7)6Q+ z5?d1~>Bps{UrR`&&A{*bp9K#l_t7e`Fg?&1_lVee&5WlRyBxKF=c z2Fj65WzG^zk%RK&fjprU1t?Du$P-Rcg7TDsJdqR?C{Gp06HQTr^3;Jmu@ns`PZP)! zPtk(%w1GT{6dfo}7s!)L(Sup959CUv7=R?x#iFEB41*aojV4cHT(miqDVR}!KPR)e zBvm&lF*7G8wX~>s^KxcICPtabCt0I58?zl})Kvodt_Vc@veVDV&rQ`Y&M!*M(J!t9 rYRgTHPfsl_$;{7-PfjgL%S@ll%c0HqWU?iP(d2rLJRo*u;+O^i)d^K> delta 350 zcmbOrv`R=jpO=@50SM;ubZ2egVPJR+;vfTQAjbiSi_<1*cX5iQu=g^jGNy=4+^1j9 z3+2e9GG_^<$U=E?K%P*FJd~#ZsRsTWEPjC>cT}fYcho}Zti1NU}BV=yq-0RpAW1c9;RS32iploVP#-A q6oH6eD*9!KMf&CC<&*!iYcsx^tjS@-$TqovqmhvtNLn#*bO8X`O<0lu diff --git a/gestion_projet/__pycache__/views.cpython-310.pyc b/gestion_projet/__pycache__/views.cpython-310.pyc index b1aa7392b25bb995b198c663c61bf2d41624a1f4..e919e1df69291a09b1724aa781cb4941cc5f49f9 100644 GIT binary patch delta 3512 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 diff --git a/gestion_projet/migrations/0001_initial.py b/gestion_projet/migrations/0001_initial.py index 969351f..090b4f1 100644 --- a/gestion_projet/migrations/0001_initial.py +++ b/gestion_projet/migrations/0001_initial.py @@ -1,16 +1,4 @@ -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -# Generated by Django 5.2.13 on 2026-06-16 11:06 -======= -# Generated by Django 5.2.13 on 2026-04-17 12:03 ->>>>>>> 0047b1f (Ajout de la prise en charge des photos de profil) -======= -# Generated by Django 5.2.13 on 2026-04-17 12:03 ->>>>>>> f6b90e7 (Verification du statut avant la creation d'un contrat) -======= -# Generated by Django 5.2.13 on 2026-04-17 12:03 ->>>>>>> 6026af5 (Bug : Affichages des conges) +# Generated by Django 5.2.13 on 2026-09-01 10:51 import django.db.models.deletion from django.db import migrations, models diff --git a/gestion_projet/views.py b/gestion_projet/views.py index 39def94..8d2295c 100644 --- a/gestion_projet/views.py +++ b/gestion_projet/views.py @@ -1,4 +1,4 @@ -from datetime import datetime +import datetime from decimal import Decimal, InvalidOperation from django.contrib import messages @@ -92,7 +92,7 @@ def index(request): 'nombre_personnel': nombre_personnel, 'budget_total': budget_total, 'formulaire_creation_projet': ProjetForm(), - 'projet_en_cours': Projet.objects.filter(date_fin__gte=datetime.date.today()).count(), + 'projet_en_cours': Projet.objects.filter(date_fin__gte=datetime.datetime.now(tz=datetime.timezone.utc).date()).count(), } return render(request, 'gestion_projet/index.html', context) diff --git a/gestion_salle/__pycache__/__init__.cpython-310.pyc b/gestion_salle/__pycache__/__init__.cpython-310.pyc index 97ed76c45d169ee3fb9210806ef6cd8dce8bce76..57599a12d7c90f3ddbb9a685b55ffbfdbaa8fbd0 100644 GIT binary patch delta 58 zcmZo+oX5zW&&$ij00avcPo2nZqwJ`kk)NBYUz}f*nxkJ_SzMBun;M^n+a delta 32 mcmbQo*uu!2&&$ij00eV+x+ikmaH{KG64W_n+Q4p diff --git a/gestion_salle/__pycache__/admin.cpython-310.pyc b/gestion_salle/__pycache__/admin.cpython-310.pyc index 5199f490db1258f6046e19c799bd9514e82f7344..b6fbb6b649c69413a8442087540a7c868e1ed44d 100644 GIT binary patch delta 58 zcmZ3>c$|?tpO=@50SFc@o;r~`L)lJ0BR@A)zc{}rHAla=vbZEQH#I&zwYVfRKQBHx MwJ0q!ePWFv01#^w9RL6T delta 32 mcmX@kxR#MSpO=@50SM;ubWh~Y;8f8sODxhaFE5`s%@6>7A_(39 diff --git a/gestion_salle/__pycache__/apps.cpython-310.pyc b/gestion_salle/__pycache__/apps.cpython-310.pyc index 6ffca1b320e3885f24e419691e7a58baf0d9a944..e5df81edad03988a09b3314d954b2de1ff9a89c6 100644 GIT binary patch delta 58 zcmaFQ)XB`9&&$ij00avcPo2p9MA=q9BR@A)zc{}rHAla=vbZEQH#I&zwYVfRKQBHx MwJ0q!ed3RD04DAgVE_OC delta 33 ncmeBVe$T|6&&$ij00eV+x+ii!;Z)WyODxhaFE5`g#8?ghjVK8v diff --git a/gestion_salle/__pycache__/forms.cpython-310.pyc b/gestion_salle/__pycache__/forms.cpython-310.pyc index 9ebd88429971f53e5ef609c399e12a486a9a1aac..a8ab8322e98b5d475fd70df06a45922dd1838baf 100644 GIT binary patch delta 121 zcmbQpvz&)FpO=@50SKZOPs`Gq$ooog2auD>5XG3n5XF?r9L18dnTPQ;ld_$DMt*Lp zesO+LYL0$!WpPPrZfbmbYH>+seqMZXYEfEd`Xm-5K6aq)Vhtd{!N9`EGTDG7f{|@= UCks0xqwM5~tktYcLd;^~0M30LqyPW_ delta 100 zcmZ3^Gm(ckpO=@50SM;ubZ2QzB-Akt63R^n8d^ZaYGdE diff --git a/gestion_salle/__pycache__/models.cpython-310.pyc b/gestion_salle/__pycache__/models.cpython-310.pyc index f284349297d9c8759118746a44eaf70743123a39..46d0b9d8f854ae70a9f6dce245aa3c02d5a940e8 100644 GIT binary patch delta 120 zcmcc3{g#_IpO=@50SKZOPs@s&$lEHm1;|Ndh+<4(h+;}%jABkj zMt*LpesO+LYL0$!WpPPrZfbmbYH>+seqMZXYEfEd`s8KIYK)4T&oY-X3a|l9Dpmp# S91JXsKsY&wwT+ocj2QqR?I1b; delta 102 zcmaFMeVdy%pO=@50SM;ubZ3Q6Mlq)|q%bXFjA8-O%!?Q| zu6WDDsj6R=SfpQGUOssTvl^qq=KIX0i~_7ceZ@*Zf`fsDk%N(Aatdo3Gou(Y03XU1 AdjJ3c diff --git a/gestion_salle/__pycache__/urls.cpython-310.pyc b/gestion_salle/__pycache__/urls.cpython-310.pyc index 535d878f68f67d3dc0912646a3e73c24dfff1ed9..16bf89e7371c8cb9ea97c0bb0ea59cbe618471c6 100644 GIT binary patch delta 68 zcmbQozJr}NpO=@50SKZOPs>W!$jij6Y^$G4VeiduW;2=X zy*HL_6PCKA_Mv^)UhqYPEGqcmgAfE?{DFNdmZFaV-+a;j4Wj3Uurr*G@B7Z-%;DTS zN3Z>|7G^=<8TefP^0Q>{@?m&7j16i~(uS181dPLrFH}G~cH2$8*h>p>VXX6QKMmr; z{qs{^lhBYB?^*{C&(nZ;hrccCdvum9HZ5ABb9b${!fc(u!g*RA7gmp*1-dwPmX4hY zt&W}LV`qsjkDU_~t{Alwf9r`iYA|wTD`k|mWdntiG9emUOdwYjqBmd^q#0)GGON?p zrmT@s;gXcQm)VUj6LRFgE3(dICU&!qV3>3`qb<%h<;do&Lm3}_4+9&V;Z?^3a8>Ny zKe@iTouzD5WSq5E#VsLO%If${*~&WgO~#w8E%n?z2~(=*J%#(~PjB(PbA3~qJu|@t z;p)u3r8%{B2(Qvy-|Bc{4X9618#SSMtRaIO`nJqVBXJI3;G*)>M&WU7l-uR4j^sHectyi3f?D(A>JAcd8X+VWIN*VWVUNQae&>e(IrVd}4foWU@GCeN zJ`I7uqv5mYYXXky&RmCYhQH5nK=D@T9r$(lp!BWI+^%e>Ps^{uAL_^Q`F#sNP{hy! zh$jfr7(mZR$Px6R2LqD=GP37NE6F8hk5KXu`sRm5C$bFm>|3Y6(67u>lUgk}0Nc1` zTrqAM6!%bfdgj1A(s?f_P@Cqlx1R)`8`RNkKM9e#vWTrBT$Wz<)DfVkmpeU}p@p&X zQOzE!096TV!Y?$N!-n%)K#LE}$rzCy125dvUhQg^tx&cyIcZHfYj%Yu?ZygUW`gmL z8~PS-y>Q;r@S=tr2+H`y~+nc&Ek4lBa1d!koeDDbdP7zI*Ply>oc#V`j Rm=4Jt&bNS3#F(Fj{{e=+6ng*w delta 1164 zcmZ8g--{bn6u#%qWHOmdX0!RdNwyod(ly0yLHva-MO)D#vdFGl8j&UR%y&=*1c4;0S~>pqxp&V1i@zI*4)nYrIQ zK7GRRQz?tl@3#G}clv>`bIR#J1Arkz-sTNHKEGP&BpQiGG1^uq*+_Qmh8^*Edpz1$ zw0Ai=xNuWHghmllu06iHG_o=0mUnf`W8tRWsJKR0AY&0rk+FKLEMYlPmXDPRRwL!a zv9gROB4q{nHmk4v5q4aMc|x{2F1l^m+$3gp+#qP~xdCB?kX9c)z;ny1Qf^cpL%wEf~Tc8}b1>&0c+MsG&C02b!m$ewB+N#)f*=iZ~EoL4!EQ z_)wR+jL|N}Axz>_H>Yq&b06?Yf|&LH8fi%in?kjcU)9AjH8GF%M5`;sdBWmCm>vpK zE==br&3W&tx@b45`$U3MlpL;uNnwEzh0Y7JJGKLmQ1?>%@RoYS`2^ma{p0|L@$BdH zryOGHF#8I8Hv1(jfXG(-qMcR$b@ZdGtAN#nCqA5Ik(*1e&C8)zw6e-cb^lyrv5DC zp9x>h^UeRHrfm7$T6fKTy%k8e)@ugqVvQWvpL&Vbxk9*oQ47}Sd#v?@kNp;z+P(dM#)mi%8P1RDyX+B*$d%e2v#XsS_U}JfCDz9f&XLZ zCg_~Q3*npo+cxyS#0|35YjYEu(hbj!;3SBl`mu8E$uxS+?w-FM?E6Aq>B~UG!lFTG zo;<4U)8P^EP&Px^K9YBR(FxS0>U(fQ{a!u&pv_F`A?zX@T|;aG*V5oz=4A^q4lhuL LOB4$f#T@(#G(aR% diff --git a/gestion_salle/migrations/0001_initial.py b/gestion_salle/migrations/0001_initial.py index 1688f51..7bbd5c3 100644 --- a/gestion_salle/migrations/0001_initial.py +++ b/gestion_salle/migrations/0001_initial.py @@ -1,16 +1,4 @@ -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -# Generated by Django 5.2.13 on 2026-06-16 11:06 -======= -# Generated by Django 5.2.13 on 2026-04-17 12:03 ->>>>>>> 0047b1f (Ajout de la prise en charge des photos de profil) -======= -# Generated by Django 5.2.13 on 2026-04-17 12:03 ->>>>>>> f6b90e7 (Verification du statut avant la creation d'un contrat) -======= -# Generated by Django 5.2.13 on 2026-04-17 12:03 ->>>>>>> 6026af5 (Bug : Affichages des conges) +# Generated by Django 5.2.13 on 2026-09-01 10:51 import django.db.models.deletion from django.db import migrations, models