From 7d870643bbe46dc17275249e1b216cce363fe049 Mon Sep 17 00:00:00 2001 From: kirosbr Date: Sun, 6 Mar 2022 22:07:48 +0100 Subject: [PATCH 1/4] changement settings mysql --- Reskreen/settings.py | 12 ++++---- collabs/migrations/0001_initial.py | 26 +++++++++++----- collabs/migrations_dev/0001_initial.py | 28 ++++++++++++++++++ .../0002_collabs_hour_user.py | 2 +- .../0003_remove_collabs_hour_collab.py | 0 ..._rename_user_collabs_hour_collaborateur.py | 0 ...bs_hour_collaborateur_collabs_hour_user.py | 2 +- .../0006_alter_collabs_hour_username.py | 0 ...ser_collabs_hour_collaborateur_and_more.py | 0 ..._rename_collaborateur_collabs_hour_user.py | 0 ...9_alter_collabs_hour_dtcreated_and_more.py | 0 .../0010_alter_collabs_hour_bnoticed.py | 0 ...s_hour_options_alter_collabs_hour_nhour.py | 0 ...hour_dtdate_alter_collabs_hour_bnoticed.py | 0 .../0013_alter_collabs_hour_dtdate.py | 0 .../0014_alter_collabs_hour_dtdate.py | 0 ...0015_alter_collabs_hour_dtdate_and_more.py | 0 .../0016_collabs_hour_sbases.py | 0 .../0017_alter_collabs_hour_options.py | 17 +++++++++++ collabs/migrations_dev/__init__.py | 0 db.sqlite3 | Bin 184320 -> 184320 bytes my.cnf | 4 +-- 22 files changed, 73 insertions(+), 18 deletions(-) create mode 100644 collabs/migrations_dev/0001_initial.py rename collabs/{migrations => migrations_dev}/0002_collabs_hour_user.py (78%) rename collabs/{migrations => migrations_dev}/0003_remove_collabs_hour_collab.py (100%) rename collabs/{migrations => migrations_dev}/0004_rename_user_collabs_hour_collaborateur.py (100%) rename collabs/{migrations => migrations_dev}/0005_remove_collabs_hour_collaborateur_collabs_hour_user.py (80%) rename collabs/{migrations => migrations_dev}/0006_alter_collabs_hour_username.py (100%) rename collabs/{migrations => migrations_dev}/0007_rename_user_collabs_hour_collaborateur_and_more.py (100%) rename collabs/{migrations => migrations_dev}/0008_rename_collaborateur_collabs_hour_user.py (100%) rename collabs/{migrations => migrations_dev}/0009_alter_collabs_hour_dtcreated_and_more.py (100%) rename collabs/{migrations => migrations_dev}/0010_alter_collabs_hour_bnoticed.py (100%) rename collabs/{migrations => migrations_dev}/0011_alter_collabs_hour_options_alter_collabs_hour_nhour.py (100%) rename collabs/{migrations => migrations_dev}/0012_collabs_hour_dtdate_alter_collabs_hour_bnoticed.py (100%) rename collabs/{migrations => migrations_dev}/0013_alter_collabs_hour_dtdate.py (100%) rename collabs/{migrations => migrations_dev}/0014_alter_collabs_hour_dtdate.py (100%) rename collabs/{migrations => migrations_dev}/0015_alter_collabs_hour_dtdate_and_more.py (100%) rename collabs/{migrations => migrations_dev}/0016_collabs_hour_sbases.py (100%) create mode 100644 collabs/migrations_dev/0017_alter_collabs_hour_options.py create mode 100644 collabs/migrations_dev/__init__.py diff --git a/Reskreen/settings.py b/Reskreen/settings.py index cc62fef..c534d20 100644 --- a/Reskreen/settings.py +++ b/Reskreen/settings.py @@ -42,8 +42,8 @@ INSTALLED_APPS = [ 'vehicles.apps.VehiclesConfig', 'collabs.apps.CollabsConfig', 'rangefilter', - - + + ] MIDDLEWARE = [ @@ -81,7 +81,7 @@ WSGI_APPLICATION = 'Reskreen.wsgi.application' # https://docs.djangoproject.com/en/4.0/ref/settings/#databases - +""" DATABASES = { 'default': { 'ENGINE': 'django.db.backends.sqlite3', @@ -97,7 +97,7 @@ DATABASES = { }, } } -""" + # Password validation # https://docs.djangoproject.com/en/4.0/ref/settings/#auth-password-validators @@ -223,8 +223,8 @@ JAZZMIN_SETTINGS = { # Custom links to append to app groups, keyed on app name "custom_links": { "books": [{ - "name": "Make Messages", - "url": "make_messages", + "name": "Make Messages", + "url": "make_messages", "icon": "fas fa-comments", "permissions": ["books.view_book"] }] diff --git a/collabs/migrations/0001_initial.py b/collabs/migrations/0001_initial.py index 716e957..4ab29de 100644 --- a/collabs/migrations/0001_initial.py +++ b/collabs/migrations/0001_initial.py @@ -1,6 +1,8 @@ -# Generated by Django 4.0 on 2022-01-31 15:05 +# Generated by Django 4.0 on 2022-03-06 19:55 +import django.core.validators from django.db import migrations, models +import django.db.models.deletion class Migration(migrations.Migration): @@ -8,6 +10,7 @@ class Migration(migrations.Migration): initial = True dependencies = [ + ('auth', '0012_alter_user_first_name_max_length'), ] operations = [ @@ -15,14 +18,21 @@ class Migration(migrations.Migration): name='Collabs_hour', fields=[ ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('userName', models.CharField(max_length=100, verbose_name="Nom d'utilisateur")), - ('collab', models.CharField(max_length=10, verbose_name='Collaborateur')), - ('nHour', models.IntegerField(default=0, verbose_name='Heure')), - ('nMinutes', models.IntegerField(default=0, verbose_name='Minutes')), - ('sRemarques', models.TextField(verbose_name='Remarques')), - ('bNoticed', models.BooleanField(default=0, verbose_name='Pris en compte')), + ('userName', models.CharField(max_length=100, verbose_name='Auteur')), + ('nHour', models.PositiveIntegerField(default=0, validators=[django.core.validators.MinValueValidator(0), django.core.validators.MaxValueValidator(23)], verbose_name='Heures')), + ('nMinutes', models.PositiveIntegerField(default=0, validators=[django.core.validators.MinValueValidator(0), django.core.validators.MaxValueValidator(60)], verbose_name='Minutes')), + ('sRemarques', models.TextField(blank=True, verbose_name='Remarques')), + ('bNoticed', models.BooleanField(blank=True, default=False, verbose_name='Vérifiée')), + ('dtDate', models.DateField(verbose_name='Date')), + ('sBases', models.CharField(choices=[('1', 'Monthey'), ('2', 'Uvrier')], default=1, max_length=1, verbose_name='Employé de la base de')), ('dtUpdate', models.DateTimeField(auto_now=True, verbose_name='Date de modification')), - ('dtCreated', models.DateTimeField(auto_now_add=True)), + ('dtCreated', models.DateTimeField(auto_now_add=True, verbose_name='Date de création')), + ('user', models.ForeignKey(default=0, on_delete=django.db.models.deletion.DO_NOTHING, to='auth.user', verbose_name='Collaborateur')), ], + options={ + 'verbose_name': 'heure suplémentaire', + 'verbose_name_plural': 'heures suplémentaires', + 'permissions': (('can_notice', 'Peut noter comme traitée'),), + }, ), ] diff --git a/collabs/migrations_dev/0001_initial.py b/collabs/migrations_dev/0001_initial.py new file mode 100644 index 0000000..716e957 --- /dev/null +++ b/collabs/migrations_dev/0001_initial.py @@ -0,0 +1,28 @@ +# Generated by Django 4.0 on 2022-01-31 15:05 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + ] + + operations = [ + migrations.CreateModel( + name='Collabs_hour', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('userName', models.CharField(max_length=100, verbose_name="Nom d'utilisateur")), + ('collab', models.CharField(max_length=10, verbose_name='Collaborateur')), + ('nHour', models.IntegerField(default=0, verbose_name='Heure')), + ('nMinutes', models.IntegerField(default=0, verbose_name='Minutes')), + ('sRemarques', models.TextField(verbose_name='Remarques')), + ('bNoticed', models.BooleanField(default=0, verbose_name='Pris en compte')), + ('dtUpdate', models.DateTimeField(auto_now=True, verbose_name='Date de modification')), + ('dtCreated', models.DateTimeField(auto_now_add=True)), + ], + ), + ] diff --git a/collabs/migrations/0002_collabs_hour_user.py b/collabs/migrations_dev/0002_collabs_hour_user.py similarity index 78% rename from collabs/migrations/0002_collabs_hour_user.py rename to collabs/migrations_dev/0002_collabs_hour_user.py index 6cc6eed..19cf3ba 100644 --- a/collabs/migrations/0002_collabs_hour_user.py +++ b/collabs/migrations_dev/0002_collabs_hour_user.py @@ -15,6 +15,6 @@ class Migration(migrations.Migration): migrations.AddField( model_name='collabs_hour', name='user', - field=models.ForeignKey(default=0, on_delete=django.db.models.deletion.DO_NOTHING, to='auth.user'), + field=models.ForeignKey( on_delete=django.db.models.deletion.DO_NOTHING, to='auth.user'), ), ] diff --git a/collabs/migrations/0003_remove_collabs_hour_collab.py b/collabs/migrations_dev/0003_remove_collabs_hour_collab.py similarity index 100% rename from collabs/migrations/0003_remove_collabs_hour_collab.py rename to collabs/migrations_dev/0003_remove_collabs_hour_collab.py diff --git a/collabs/migrations/0004_rename_user_collabs_hour_collaborateur.py b/collabs/migrations_dev/0004_rename_user_collabs_hour_collaborateur.py similarity index 100% rename from collabs/migrations/0004_rename_user_collabs_hour_collaborateur.py rename to collabs/migrations_dev/0004_rename_user_collabs_hour_collaborateur.py diff --git a/collabs/migrations/0005_remove_collabs_hour_collaborateur_collabs_hour_user.py b/collabs/migrations_dev/0005_remove_collabs_hour_collaborateur_collabs_hour_user.py similarity index 80% rename from collabs/migrations/0005_remove_collabs_hour_collaborateur_collabs_hour_user.py rename to collabs/migrations_dev/0005_remove_collabs_hour_collaborateur_collabs_hour_user.py index 413fc84..691422d 100644 --- a/collabs/migrations/0005_remove_collabs_hour_collaborateur_collabs_hour_user.py +++ b/collabs/migrations_dev/0005_remove_collabs_hour_collaborateur_collabs_hour_user.py @@ -19,6 +19,6 @@ class Migration(migrations.Migration): migrations.AddField( model_name='collabs_hour', name='user', - field=models.ForeignKey(default=0, on_delete=django.db.models.deletion.DO_NOTHING, to='auth.user', verbose_name='test'), + field=models.ForeignKey( on_delete=django.db.models.deletion.DO_NOTHING, to='auth.user', verbose_name='test'), ), ] diff --git a/collabs/migrations/0006_alter_collabs_hour_username.py b/collabs/migrations_dev/0006_alter_collabs_hour_username.py similarity index 100% rename from collabs/migrations/0006_alter_collabs_hour_username.py rename to collabs/migrations_dev/0006_alter_collabs_hour_username.py diff --git a/collabs/migrations/0007_rename_user_collabs_hour_collaborateur_and_more.py b/collabs/migrations_dev/0007_rename_user_collabs_hour_collaborateur_and_more.py similarity index 100% rename from collabs/migrations/0007_rename_user_collabs_hour_collaborateur_and_more.py rename to collabs/migrations_dev/0007_rename_user_collabs_hour_collaborateur_and_more.py diff --git a/collabs/migrations/0008_rename_collaborateur_collabs_hour_user.py b/collabs/migrations_dev/0008_rename_collaborateur_collabs_hour_user.py similarity index 100% rename from collabs/migrations/0008_rename_collaborateur_collabs_hour_user.py rename to collabs/migrations_dev/0008_rename_collaborateur_collabs_hour_user.py diff --git a/collabs/migrations/0009_alter_collabs_hour_dtcreated_and_more.py b/collabs/migrations_dev/0009_alter_collabs_hour_dtcreated_and_more.py similarity index 100% rename from collabs/migrations/0009_alter_collabs_hour_dtcreated_and_more.py rename to collabs/migrations_dev/0009_alter_collabs_hour_dtcreated_and_more.py diff --git a/collabs/migrations/0010_alter_collabs_hour_bnoticed.py b/collabs/migrations_dev/0010_alter_collabs_hour_bnoticed.py similarity index 100% rename from collabs/migrations/0010_alter_collabs_hour_bnoticed.py rename to collabs/migrations_dev/0010_alter_collabs_hour_bnoticed.py diff --git a/collabs/migrations/0011_alter_collabs_hour_options_alter_collabs_hour_nhour.py b/collabs/migrations_dev/0011_alter_collabs_hour_options_alter_collabs_hour_nhour.py similarity index 100% rename from collabs/migrations/0011_alter_collabs_hour_options_alter_collabs_hour_nhour.py rename to collabs/migrations_dev/0011_alter_collabs_hour_options_alter_collabs_hour_nhour.py diff --git a/collabs/migrations/0012_collabs_hour_dtdate_alter_collabs_hour_bnoticed.py b/collabs/migrations_dev/0012_collabs_hour_dtdate_alter_collabs_hour_bnoticed.py similarity index 100% rename from collabs/migrations/0012_collabs_hour_dtdate_alter_collabs_hour_bnoticed.py rename to collabs/migrations_dev/0012_collabs_hour_dtdate_alter_collabs_hour_bnoticed.py diff --git a/collabs/migrations/0013_alter_collabs_hour_dtdate.py b/collabs/migrations_dev/0013_alter_collabs_hour_dtdate.py similarity index 100% rename from collabs/migrations/0013_alter_collabs_hour_dtdate.py rename to collabs/migrations_dev/0013_alter_collabs_hour_dtdate.py diff --git a/collabs/migrations/0014_alter_collabs_hour_dtdate.py b/collabs/migrations_dev/0014_alter_collabs_hour_dtdate.py similarity index 100% rename from collabs/migrations/0014_alter_collabs_hour_dtdate.py rename to collabs/migrations_dev/0014_alter_collabs_hour_dtdate.py diff --git a/collabs/migrations/0015_alter_collabs_hour_dtdate_and_more.py b/collabs/migrations_dev/0015_alter_collabs_hour_dtdate_and_more.py similarity index 100% rename from collabs/migrations/0015_alter_collabs_hour_dtdate_and_more.py rename to collabs/migrations_dev/0015_alter_collabs_hour_dtdate_and_more.py diff --git a/collabs/migrations/0016_collabs_hour_sbases.py b/collabs/migrations_dev/0016_collabs_hour_sbases.py similarity index 100% rename from collabs/migrations/0016_collabs_hour_sbases.py rename to collabs/migrations_dev/0016_collabs_hour_sbases.py diff --git a/collabs/migrations_dev/0017_alter_collabs_hour_options.py b/collabs/migrations_dev/0017_alter_collabs_hour_options.py new file mode 100644 index 0000000..df4c2db --- /dev/null +++ b/collabs/migrations_dev/0017_alter_collabs_hour_options.py @@ -0,0 +1,17 @@ +# Generated by Django 4.0 on 2022-03-06 19:48 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('collabs', '0016_collabs_hour_sbases'), + ] + + operations = [ + migrations.AlterModelOptions( + name='collabs_hour', + options={'permissions': (('can_notice', 'Peut noter comme traitée'),), 'verbose_name': 'heure suplémentaire', 'verbose_name_plural': 'heures suplémentaires'}, + ), + ] diff --git a/collabs/migrations_dev/__init__.py b/collabs/migrations_dev/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/db.sqlite3 b/db.sqlite3 index cee418031133f322311291ba633e9ced9926ceed..22d525208c2c594329bcdf651d66d042ac619a64 100644 GIT binary patch delta 4748 zcmai&Yj7LY6~}e8vSc~ldu0+k4+3#sO+fZ$ckez$1D0$@w)~WzvGZ_bJ?!`)IhN$a zVOqx&`k^x|7#GygrVW!$X+IPwZt(;tZD@x=2v8oKAwZxhq|?ypKtB|iP}1Ie6?+^j z4!Yx?*4p#mbM~Hd&t2)r@nuJjFS~CI1Xhd1QcnKZYig@zC!Yv)Q@@IwSXXRE7f~a6 z8jT?yy^S705hSCjnYE=Cp?s6Y=?o`^hTt-8JqV>!{XKo7iS!7E-n10YU2Xn-jf*qE z^uwTJW!VajD+iH*P`oeE6N(J)kM|5E`eM_OZRI5^ipVK;sdO?rn!R4qG5yFkFMu-_ zx2+P3$OWzNs0G!)qlI@D-o5NUGg9dX%WV8jmV2i|uJ2l{f1C-qimVfpWstW_Znxxb zDfT;^c=br{U?e8@B>O|Ms%^ruNM4%)-f^)h)mAy!UlqsAjR(4dfsTRdP41|BARtO3 zO*q-^j*qq_TE?T^hCZ>aYrx&z7&i{rx>M3{V@;}C**+Y`W<_`?IvN(j{oY7qd>|2u z$3vnJBF7ccWO*o=9u=aIbU2jSpNPw%ESHP8T+~V>)1$~9tOuB2x+W1{K|WVYW$eL* zN6`eyG_fL1pH6t76_@XsRJKT8q_a)mUsS zQP&b38*OivTYSB~uvhiV-um&NSE*Lp#%r~7i$6TnEsiwT9jI>T8fXkFzSdw*xT?M> zI#yHe^^R*ze$gYvgHff=qx&R(d2DCr@ZsikwIR29+meF=OiU%u#EUU6C-L=8NrYSi(8W~I+lvQI4_lfGjSb99ve>j~^nWO4{ zb98+Ay<<<*#eu{Ug)1XFtE&RT{jG_yL#f)@DtWkf zAQqnYYm`ccN76i!D5zM*5}w(3^t`%ijIy&r%$y0u6=m61o|!LWRhJ?8Nw?tZ_Lr z7Tu57*8z~d@sAK0B*ecU_s#Tnu70ryAm=C`9|LsBf-aGJB7+FtMJrZbWlZCMjwdUC z-BrLWKS5*=%X4UX$wEsOu;a;n0JxT;^W?g3TS&)#eQprNvt)YDXQ$V0a{?gQiJs); z#uWwVA`yIOK_8;`<^~a*Mu?msRyNKFsPRgY#4E-hSkMRP+}t3>FCtggm zTrvI_wSEl^q9~k%of+40u+|6fglU+7`(YUFfk9XYtKl8cgcue>1f8TvzT`jS|IPoC zzrerGpXJ}+U*`YBpW>h9f5Sh<|AIfkAIp>-2i^Iw9BzT@;f*BAFBVQv@3t6Ylrh2> zX6$7QG45mRVcg5OhjBOKF2-)gF2I1{iA@YbZHCJKn)q%~-`)$>?MBQgRiPg?BLC&bU2~oBiRVU_anukjpq82NR9( z6nqBG!YAM_;m_d-_+xk!ejnZozXR`qM@Rz3-~l)U`(Q6g!A{r;8(}T1B5CkI6^hUe zzeXl@EnEq2fIQ5H9GT*6`~pZ4|8(EfhhDW{M_?MjKb<1P%1Co}!K-Kv7FkL*b{`K~YUnMNvuNqwrEx%s&4t zxE&N)(Wi6`xzQKs(^=Q=!QW9H`L}G}>=&;BCv7)pEM&QzLFY(;Kb37aE^aee*loDX zxsSn?l6>T}pueF%pr4|9Pz?FeR^)^qktXp51hyI zi#n;+4V=!odzpWfQ6#~TMJy>-r0=}~R)>`c6Y#mdB#%sXNJYiO7bd>c`Nt?5H(3&1 zDn@L2uqvpcV&W^hMKRv$>s=y7B9$~jF*HL_naj+>XTX~6N@$4?$zzym3WiR0aY>RF zg-9nDTka#P%(~gWY^=OL@^esv$@kRt-@S7kk;glo#@Zq6(%d z8LG}y%u5LGBKBxYZk=G2-V4UqFjRAqlgZ+4QYPqHrHmEoMiDh#HJEHsmE7X(Vh(dF z8Iz|sUBIet>Izk|`1azROT{O9Bva5#RaLODC_ZoJQa&VFiMlK*icCdUd~__~LnehQ z3%a4{rlK$Q(Y}NanG_94rzy%rH|Jvlw=Ly^)Ql!*hM{XZt#!O$IpWsqi&RsWbh3t} zg=-kMTtl>je(jO7u4GfwMbc#?Wr3^hL8`hfw+@I%F$GZ*v8ZX8;2BVSt9DBvx4rrL z_E<6uQD^qI=+wUH`u3tu8dB!eN$aXD#JKS~#)e>$1*YPR^pthgL?MS8sPQ!_m_#m< zZ*#PwaL&xuUtc5|lBwm)Y+a6MBHM+tu0%tWO=a=S;y{jSUL;~c6HUp)+T!Y}Wun|w zB5NL*ls%a&RU{&iE#a74L+v-`rcY8mq9TwrqG_^9a=swt?S7_d&DkO(#iPmsX}%)X z@xm=PGxY*kqcnzwqZ{^o;~RT8YsC(BiQF(HvZINlg`4C>-Dc>fv|FuacU82|Bm3e_ zzP3q{plJri%GIgbwZ~@NS;b_XOUPs$i>8qYod#QFKm8>n$)dAayDOP)SFR4z4ytHa zQx&GWZ6uUT9!!izt|%vMzHEal&(+Fw|1?FB>`yG!3mRO@E144)B*>xgFKAvhF0((`6=Ok@P7g*K9&Fg delta 2375 zcmah~Yiv_h96#sYyW1YN-hYR@CLmolGQwG z!0OT}*HuY*77-Flr&3ZSUyGx;k>2i};dCy;Jy6ZNiFM9p6T@X<_CY5fz=dOY+4A*E zc;1cUebK?5baym9uy3$CmF{UO#Jz5=h7^Ymb4v=xy&)`=u6kFN;{$7;t< z(&-X)IUMye<@G>dAf~DtW2wY&%oFQv9!|%i*?oh_^zcA*WZzIOu`xRE zL@pH_j3wN2mlzmzQ^l>wE`O<3o>a4et!^ z>CEnqjcpi+QT?{jW#_0{r7o%m*-zFz0aYbdj3^By~vo%5kdd`O4IyHd4n}KuUE-z7?G!)FHS8FF+l%!2nE_YBK;rJ>QNC zjYnLC*0(tXGSHr!dNmCsAXwSd276tQS?;&wYc1S_BlM8fy_)n-keJ!pWv`5iTS60cPQM=IT|r%y2G%QNc49o4^w+T3f-I zd28k@1Iw~A=$70pd=E2B_B@2mOVnn~max|n_E^GhOW0D}BppUfXbSovVX2;h&){SD zh;_|l@G^8m7j!_obg?*m6h~OZu~hi_a>eA+Z{cywH%aG;wi7td=o_WUb7$})c##=K zHXdf7l%C^$hRNBBn3!2)Mqam!n}XuZHQc~zs};d_a28&NCm{)~thQ7rlAE}yV7#<= zGI0~Xnqhx|D+qpp-&h^7oXPleSYi6a6DtUIYj1feh;JO?TuxK>t+7seN_vW={h+i0 z=Nbrc*h3*)yP%sC&wRiw6J$mAS-ZTs<8Sv*gB8W9`wQN=#(#4b z0Hd=F#D2F$dDfNhk=HbjCi{Ip`rn*|$bAeMOkYE+-9J`Qi5dvLTN6_Rcj5VivYmAw zDyxQ39Aa@sx0Ni3_L7|e9e6AMo?irQ89a>pFLi4@0a1C7KbVx%0@t+XAJGLGi;0-=dkDZ zyP9M?n#{)YiKHuNfim4RL-Tnw&8NzKt}H~|GNoNM(-GpBQ+CgT zWHxuRx2tkcW&l*744aix`60GgiV{>Qdx%w8pC45^BwE-TZe!nhI7VIj$77?T=2ZUT f<#oP0b2<&xERhAAnjrNDb;aWk7(P`K?(pcpDcnNz diff --git a/my.cnf b/my.cnf index 70a4010..6777dcf 100644 --- a/my.cnf +++ b/my.cnf @@ -3,5 +3,5 @@ database = django_dev user = django_usr password = YwVHV36ovBTXWugb default-character-set = utf8 -host =192.168.3.113 -port =3306 \ No newline at end of file +host =localhost +port =3306 From 7cb115eb1a13ecf9c4f57e8e020c65a98badf3ba Mon Sep 17 00:00:00 2001 From: kirosbr Date: Mon, 7 Mar 2022 00:55:13 +0100 Subject: [PATCH 2/4] ajout types heures sup --- Reskreen/settings.py | 2 +- collabs/admin.py | 11 ++--- collabs/apps.py | 1 + ...labs_hour_types_alter_collabs_hour_user.py | 32 +++++++++++++++ ...llabs_hour_type_alter_collabs_hour_user.py | 25 ++++++++++++ ...llabs_hour_type_alter_collabs_hour_user.py | 25 ++++++++++++ collabs/models.py | 40 ++++++++++++++++--- 7 files changed, 124 insertions(+), 12 deletions(-) create mode 100644 collabs/migrations/0002_collabs_hour_types_alter_collabs_hour_user.py create mode 100644 collabs/migrations/0003_collabs_hour_type_alter_collabs_hour_user.py create mode 100644 collabs/migrations/0004_alter_collabs_hour_type_alter_collabs_hour_user.py diff --git a/Reskreen/settings.py b/Reskreen/settings.py index c534d20..91a1df7 100644 --- a/Reskreen/settings.py +++ b/Reskreen/settings.py @@ -127,7 +127,7 @@ TIME_ZONE = 'Europe/Zurich' USE_I18N = True -USE_TZ = True +USE_TZ = False # Static files (CSS, JavaScript, Images) diff --git a/collabs/admin.py b/collabs/admin.py index cc46971..fe6a5ea 100644 --- a/collabs/admin.py +++ b/collabs/admin.py @@ -1,7 +1,7 @@ from django.contrib import admin from rangefilter.filters import DateRangeFilter -from collabs.models import Collabs_hour +from collabs.models import * from django import forms @@ -20,15 +20,15 @@ class Collabs_hour_Admin(admin.ModelAdmin): class Meta: verbose_name = 'Heure suplémentaire' verbose_name_plural = 'Heures suplémentaires' - list_display = ('dtDate','nHour', 'nMinutes', 'user', 'sBases', 'get_total_hour_by_user', 'bNoticed') + list_display = ('dtDate','nHour', 'nMinutes', 'user', 'sBases', 'type','get_total_hour_by_user', 'bNoticed') list_editable = ['bNoticed'] - list_filter = [('dtDate', DateRangeFilter), ('user', admin.RelatedOnlyFieldListFilter),'sBases'] + list_filter = [('dtDate', DateRangeFilter), ('user', admin.RelatedOnlyFieldListFilter),'sBases','type'] search_fields = ['userName'] readonly_fields = ["userName"] - fields = ["sBases", "dtDate", "user","nHour", "nMinutes", "sRemarques"] + fields = ["sBases", "dtDate",'type', "user","nHour", "nMinutes", "sRemarques"] def get_form(self, request, obj=None, **kwargs): #if request.user.has_perm("collabs.can_notice"): @@ -46,4 +46,5 @@ class Collabs_hour_Admin(admin.ModelAdmin): admin.site.register(Collabs_hour, Collabs_hour_Admin) -#admin.site.register(Collabs_hour) \ No newline at end of file +admin.site.register(Collabs_hour_types) +#admin.site.register(Collabs_hour) diff --git a/collabs/apps.py b/collabs/apps.py index 3c47b0e..b12f97a 100644 --- a/collabs/apps.py +++ b/collabs/apps.py @@ -4,3 +4,4 @@ from django.apps import AppConfig class CollabsConfig(AppConfig): default_auto_field = 'django.db.models.BigAutoField' name = 'collabs' + verbose_name = "Clerc collaborateurs" diff --git a/collabs/migrations/0002_collabs_hour_types_alter_collabs_hour_user.py b/collabs/migrations/0002_collabs_hour_types_alter_collabs_hour_user.py new file mode 100644 index 0000000..56e5a0c --- /dev/null +++ b/collabs/migrations/0002_collabs_hour_types_alter_collabs_hour_user.py @@ -0,0 +1,32 @@ +# Generated by Django 4.0 on 2022-03-06 21:17 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('collabs', '0001_initial'), + ] + + operations = [ + migrations.CreateModel( + name='Collabs_hour_types', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('name', models.CharField(max_length=100, verbose_name='Dénomination')), + ('dtUpdate', models.DateTimeField(auto_now=True, verbose_name='Date de modification')), + ('dtCreated', models.DateTimeField(auto_now_add=True, verbose_name='Date de création')), + ], + options={ + 'verbose_name': "type d'heures suplémentaires", + 'verbose_name_plural': "types d'heures suplémentaires", + }, + ), + migrations.AlterField( + model_name='collabs_hour', + name='user', + field=models.ForeignKey(default=0, on_delete=django.db.models.deletion.DO_NOTHING, to='collabs.collabs_hour_types', verbose_name='Types'), + ), + ] diff --git a/collabs/migrations/0003_collabs_hour_type_alter_collabs_hour_user.py b/collabs/migrations/0003_collabs_hour_type_alter_collabs_hour_user.py new file mode 100644 index 0000000..aee3961 --- /dev/null +++ b/collabs/migrations/0003_collabs_hour_type_alter_collabs_hour_user.py @@ -0,0 +1,25 @@ +# Generated by Django 4.0 on 2022-03-06 21:24 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('auth', '0012_alter_user_first_name_max_length'), + ('collabs', '0002_collabs_hour_types_alter_collabs_hour_user'), + ] + + operations = [ + migrations.AddField( + model_name='collabs_hour', + name='type', + field=models.ForeignKey( on_delete=django.db.models.deletion.DO_NOTHING, to='collabs.collabs_hour_types', verbose_name='Types'), + ), + migrations.AlterField( + model_name='collabs_hour', + name='user', + field=models.ForeignKey(on_delete=django.db.models.deletion.DO_NOTHING, to='auth.user', verbose_name='Collaborateur'), + ), + ] diff --git a/collabs/migrations/0004_alter_collabs_hour_type_alter_collabs_hour_user.py b/collabs/migrations/0004_alter_collabs_hour_type_alter_collabs_hour_user.py new file mode 100644 index 0000000..435ccf3 --- /dev/null +++ b/collabs/migrations/0004_alter_collabs_hour_type_alter_collabs_hour_user.py @@ -0,0 +1,25 @@ +# Generated by Django 4.0 on 2022-03-06 21:30 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('auth', '0012_alter_user_first_name_max_length'), + ('collabs', '0003_collabs_hour_type_alter_collabs_hour_user'), + ] + + operations = [ + migrations.AlterField( + model_name='collabs_hour', + name='type', + field=models.ForeignKey(on_delete=django.db.models.deletion.DO_NOTHING, to='collabs.collabs_hour_types', verbose_name='Types'), + ), + migrations.AlterField( + model_name='collabs_hour', + name='user', + field=models.ForeignKey(limit_choices_to={'groups__name': 'Intervenants'}, on_delete=django.db.models.deletion.DO_NOTHING, to='auth.user', verbose_name='Collaborateur'), + ), + ] diff --git a/collabs/models.py b/collabs/models.py index 92ba18d..cc1813a 100644 --- a/collabs/models.py +++ b/collabs/models.py @@ -1,5 +1,6 @@ import datetime import math +import time from django.core.validators import MinValueValidator, MaxValueValidator from django.db import models @@ -7,6 +8,22 @@ from django.conf import settings from django.utils import timezone from django.contrib import admin + +class Collabs_hour_types(models.Model): + + + name = models.CharField("Dénomination", max_length=100) + dtUpdate = models.DateTimeField('Date de modification', auto_now=True) + dtCreated = models.DateTimeField('Date de création', auto_now_add=True) + + def __str__(self): + return self.name + + class Meta: + verbose_name = "type" + verbose_name_plural = "types" + + class Collabs_hour(models.Model): BASES_CHOICES = [ @@ -15,13 +32,14 @@ class Collabs_hour(models.Model): ] userName = models.CharField("Auteur", max_length=100) - user = models.ForeignKey(settings.AUTH_USER_MODEL, verbose_name="Collaborateur", on_delete=models.DO_NOTHING, default=0) + user = models.ForeignKey(settings.AUTH_USER_MODEL, limit_choices_to={'groups__name': "Intervenants"}, verbose_name="Collaborateur", on_delete=models.DO_NOTHING) nHour = models.PositiveIntegerField("Heures", default=0, validators=[MinValueValidator(0), MaxValueValidator(23)]) nMinutes = models.PositiveIntegerField("Minutes", default=0, validators=[MinValueValidator(0), MaxValueValidator(60)]) sRemarques = models.TextField("Remarques", blank=True) bNoticed = models.BooleanField("Vérifiée", blank=True, default=False) dtDate = models.DateField('Date', blank=False) sBases = models.CharField('Employé de la base de', max_length=1, choices=BASES_CHOICES,default=1) + type = models.ForeignKey(Collabs_hour_types, verbose_name="Types", on_delete=models.DO_NOTHING) dtUpdate = models.DateTimeField('Date de modification', auto_now=True) dtCreated = models.DateTimeField('Date de création', auto_now_add=True) @@ -29,7 +47,10 @@ class Collabs_hour(models.Model): @admin.display( description='Total du mois') def get_total_hour_by_user(self): - objs = Collabs_hour.objects.filter(user=self.user,dtCreated__year=self.dtCreated.year, dtCreated__month=self.dtCreated.month) + #objs = Collabs_hour.objects.filter(user_id=self.user_id,dtCreated__year=self.dtCreated.year, dtCreated__month=self.dtCreated.month) + objs = Collabs_hour.objects.filter(user_id=self.user_id, dtCreated__year=self.dtCreated.year , dtCreated__month=self.dtCreated.month) + print(f"user {self.user} dtCreated__year {self.dtCreated.year} dtCreated__month {self.dtCreated.month}") + print( Collabs_hour.objects.all()) total = 0.0 @@ -39,8 +60,18 @@ class Collabs_hour(models.Model): print(total) + print(objs) + if total > 0.0: + hours = int(total) + minutes = (total*60) % 60 - return str(int(math.floor(total))) + ':' + str(int((total%(math.floor(total)))*60)) + f" ({total})" + ret_string = ("%d:%02d" % (hours, minutes)) + #ret_string = str(int(math.floor(total))) + ':' + str(int((total%(math.floor(total)))*60)) + f" ({total})" + #ret_string = time.strftime("%H:%M", time.gmtime(total)) + else: + ret_string = "0" + + return ret_string class Meta: verbose_name = "heure suplémentaire" @@ -49,6 +80,3 @@ class Collabs_hour(models.Model): ("can_notice", "Peut noter comme traitée"), ) - - - From 3bc35247986134a67437c7e835935896bc037fd5 Mon Sep 17 00:00:00 2001 From: kirosbr Date: Sun, 20 Mar 2022 18:03:02 +0100 Subject: [PATCH 3/4] changement titre modification --- collabs/admin.py | 4 ++-- collabs/models.py | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/collabs/admin.py b/collabs/admin.py index fe6a5ea..7bd7b89 100644 --- a/collabs/admin.py +++ b/collabs/admin.py @@ -18,8 +18,8 @@ class Collabs_hour_Form_admin(forms.ModelForm): class Collabs_hour_Admin(admin.ModelAdmin): class Meta: - verbose_name = 'Heure suplémentaire' - verbose_name_plural = 'Heures suplémentaires' + verbose_name = 'Heure supplémentaire' + verbose_name_plural = 'Heures supplémentaires' list_display = ('dtDate','nHour', 'nMinutes', 'user', 'sBases', 'type','get_total_hour_by_user', 'bNoticed') list_editable = ['bNoticed'] list_filter = [('dtDate', DateRangeFilter), ('user', admin.RelatedOnlyFieldListFilter),'sBases','type'] diff --git a/collabs/models.py b/collabs/models.py index cc1813a..20f3b27 100644 --- a/collabs/models.py +++ b/collabs/models.py @@ -73,9 +73,12 @@ class Collabs_hour(models.Model): return ret_string + def __str__(self): + return f"Heure supplémentaire: {self.user} : {self.dtCreated.strftime('%d.%m.%Y')} " + class Meta: - verbose_name = "heure suplémentaire" - verbose_name_plural = "heures suplémentaires" + verbose_name = "heure supplémentaire" + verbose_name_plural = "heures supplémentaires" permissions = ( ("can_notice", "Peut noter comme traitée"), From 02c8a095418c923c856127dff3a6868401fb9395 Mon Sep 17 00:00:00 2001 From: kirosbr Date: Sun, 20 Mar 2022 18:39:02 +0100 Subject: [PATCH 4/4] affichage des utilisateurs avec fname et lname dans editio heure --- collabs/admin.py | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/collabs/admin.py b/collabs/admin.py index 7bd7b89..24782e7 100644 --- a/collabs/admin.py +++ b/collabs/admin.py @@ -1,5 +1,6 @@ from django.contrib import admin from rangefilter.filters import DateRangeFilter +from django.contrib.auth.models import User from collabs.models import * @@ -17,6 +18,8 @@ class Collabs_hour_Form_admin(forms.ModelForm): class Collabs_hour_Admin(admin.ModelAdmin): + always_show_username = True + class Meta: verbose_name = 'Heure supplémentaire' verbose_name_plural = 'Heures supplémentaires' @@ -38,6 +41,25 @@ class Collabs_hour_Admin(admin.ModelAdmin): return super().get_form(request, obj, **kwargs) + def formfield_for_foreignkey(self, db_field, request=None, **kwargs): + field = super(Collabs_hour_Admin, self).formfield_for_foreignkey( db_field, request, **kwargs) + if db_field.remote_field.model == User: + field.label_from_instance = self.get_user_label + return field + + def formfield_for_manytomany(self, db_field, request=None, **kwargs): + field = super(Collabs_hour_Admin, self).formfield_for_manytomany( db_field, request, **kwargs) + if db_field.remote_field.model == User: + field.label_from_instance = self.get_user_label + return field + + def get_user_label(self, user): + name = user.get_full_name() + username = user.username + if not self.always_show_username: + return name or username + return (name and name != username and '%s (%s)' % (name, username) or username) + def save_model(self, request, obj, form, change):