From 52dbe120c87fc17769885d28f0b9fb8edf516a36 Mon Sep 17 00:00:00 2001 From: Ambulance Clerc Date: Fri, 29 Jul 2022 17:47:18 +0200 Subject: [PATCH] =?UTF-8?q?d=C3=A9bug=20op=20view?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- collabs/migrations/0001_initial.py | 26 ++--- .../0002_collabs_hour_user.py | 0 .../0003_remove_collabs_hour_collab.py | 0 ..._rename_user_collabs_hour_collaborateur.py | 0 ...bs_hour_collaborateur_collabs_hour_user.py | 0 .../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 | 0 ...pes_alter_collabs_hour_options_and_more.py | 0 collabs/migrations_dev/0001_initial.py | 28 ----- collabs/migrations_prod/0001_initial.py | 38 +++++++ ...labs_hour_types_alter_collabs_hour_user.py | 0 ...llabs_hour_type_alter_collabs_hour_user.py | 0 ...llabs_hour_type_alter_collabs_hour_user.py | 0 .../__init__.py | 0 db.sqlite3 | Bin 192512 -> 196608 bytes mycaldav/last_sync_config.bin | Bin 0 -> 36 bytes mycaldav/models.py | 96 ++++++++++++++++-- mycaldav/templates/task/task.html | 2 +- mycaldav/views.py | 2 + polls/admin.py | 4 +- vehicles/admin.py | 40 +++++++- vehicles/apps.py | 1 + ...ses_vehicles_nstatus_vhc_problems_ntype.py | 28 +++++ ..._vehicles_benabled_alter_vehicles_sname.py | 22 ++++ .../migrations/0004_alter_vehicles_options.py | 17 ++++ .../0005_rename_vhc_problems_vhc_infos.py | 18 ++++ .../0006_rename_vhc_infos_vehicles_infos.py | 18 ++++ .../0007_alter_vehicles_infos_options.py | 17 ++++ ...08_alter_vehicles_infos_author_and_more.py | 65 ++++++++++++ .../0009_alter_vehicles_infos_dtend.py | 18 ++++ vehicles/models.py | 61 ++++++++--- 41 files changed, 428 insertions(+), 73 deletions(-) rename collabs/{migrations_dev => migrations}/0002_collabs_hour_user.py (100%) rename collabs/{migrations_dev => migrations}/0003_remove_collabs_hour_collab.py (100%) rename collabs/{migrations_dev => migrations}/0004_rename_user_collabs_hour_collaborateur.py (100%) rename collabs/{migrations_dev => migrations}/0005_remove_collabs_hour_collaborateur_collabs_hour_user.py (100%) rename collabs/{migrations_dev => migrations}/0006_alter_collabs_hour_username.py (100%) rename collabs/{migrations_dev => migrations}/0007_rename_user_collabs_hour_collaborateur_and_more.py (100%) rename collabs/{migrations_dev => migrations}/0008_rename_collaborateur_collabs_hour_user.py (100%) rename collabs/{migrations_dev => migrations}/0009_alter_collabs_hour_dtcreated_and_more.py (100%) rename collabs/{migrations_dev => migrations}/0010_alter_collabs_hour_bnoticed.py (100%) rename collabs/{migrations_dev => migrations}/0011_alter_collabs_hour_options_alter_collabs_hour_nhour.py (100%) rename collabs/{migrations_dev => migrations}/0012_collabs_hour_dtdate_alter_collabs_hour_bnoticed.py (100%) rename collabs/{migrations_dev => migrations}/0013_alter_collabs_hour_dtdate.py (100%) rename collabs/{migrations_dev => migrations}/0014_alter_collabs_hour_dtdate.py (100%) rename collabs/{migrations_dev => migrations}/0015_alter_collabs_hour_dtdate_and_more.py (100%) rename collabs/{migrations_dev => migrations}/0016_collabs_hour_sbases.py (100%) rename collabs/{migrations_dev => migrations}/0017_alter_collabs_hour_options.py (100%) rename collabs/{migrations_dev => migrations}/0018_collabs_hour_types_alter_collabs_hour_options_and_more.py (100%) delete mode 100644 collabs/migrations_dev/0001_initial.py create mode 100644 collabs/migrations_prod/0001_initial.py rename collabs/{migrations => migrations_prod}/0002_collabs_hour_types_alter_collabs_hour_user.py (100%) rename collabs/{migrations => migrations_prod}/0003_collabs_hour_type_alter_collabs_hour_user.py (100%) rename collabs/{migrations => migrations_prod}/0004_alter_collabs_hour_type_alter_collabs_hour_user.py (100%) rename collabs/{migrations_dev => migrations_prod}/__init__.py (100%) create mode 100644 mycaldav/last_sync_config.bin create mode 100644 vehicles/migrations/0002_vehicles_nbases_vehicles_nstatus_vhc_problems_ntype.py create mode 100644 vehicles/migrations/0003_remove_vehicles_benabled_alter_vehicles_sname.py create mode 100644 vehicles/migrations/0004_alter_vehicles_options.py create mode 100644 vehicles/migrations/0005_rename_vhc_problems_vhc_infos.py create mode 100644 vehicles/migrations/0006_rename_vhc_infos_vehicles_infos.py create mode 100644 vehicles/migrations/0007_alter_vehicles_infos_options.py create mode 100644 vehicles/migrations/0008_alter_vehicles_infos_author_and_more.py create mode 100644 vehicles/migrations/0009_alter_vehicles_infos_dtend.py diff --git a/collabs/migrations/0001_initial.py b/collabs/migrations/0001_initial.py index 4ab29de..716e957 100644 --- a/collabs/migrations/0001_initial.py +++ b/collabs/migrations/0001_initial.py @@ -1,8 +1,6 @@ -# Generated by Django 4.0 on 2022-03-06 19:55 +# Generated by Django 4.0 on 2022-01-31 15:05 -import django.core.validators from django.db import migrations, models -import django.db.models.deletion class Migration(migrations.Migration): @@ -10,7 +8,6 @@ class Migration(migrations.Migration): initial = True dependencies = [ - ('auth', '0012_alter_user_first_name_max_length'), ] operations = [ @@ -18,21 +15,14 @@ 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='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')), + ('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, 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')), + ('dtCreated', models.DateTimeField(auto_now_add=True)), ], - 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/0002_collabs_hour_user.py b/collabs/migrations/0002_collabs_hour_user.py similarity index 100% rename from collabs/migrations_dev/0002_collabs_hour_user.py rename to collabs/migrations/0002_collabs_hour_user.py diff --git a/collabs/migrations_dev/0003_remove_collabs_hour_collab.py b/collabs/migrations/0003_remove_collabs_hour_collab.py similarity index 100% rename from collabs/migrations_dev/0003_remove_collabs_hour_collab.py rename to collabs/migrations/0003_remove_collabs_hour_collab.py diff --git a/collabs/migrations_dev/0004_rename_user_collabs_hour_collaborateur.py b/collabs/migrations/0004_rename_user_collabs_hour_collaborateur.py similarity index 100% rename from collabs/migrations_dev/0004_rename_user_collabs_hour_collaborateur.py rename to collabs/migrations/0004_rename_user_collabs_hour_collaborateur.py diff --git a/collabs/migrations_dev/0005_remove_collabs_hour_collaborateur_collabs_hour_user.py b/collabs/migrations/0005_remove_collabs_hour_collaborateur_collabs_hour_user.py similarity index 100% rename from collabs/migrations_dev/0005_remove_collabs_hour_collaborateur_collabs_hour_user.py rename to collabs/migrations/0005_remove_collabs_hour_collaborateur_collabs_hour_user.py diff --git a/collabs/migrations_dev/0006_alter_collabs_hour_username.py b/collabs/migrations/0006_alter_collabs_hour_username.py similarity index 100% rename from collabs/migrations_dev/0006_alter_collabs_hour_username.py rename to collabs/migrations/0006_alter_collabs_hour_username.py diff --git a/collabs/migrations_dev/0007_rename_user_collabs_hour_collaborateur_and_more.py b/collabs/migrations/0007_rename_user_collabs_hour_collaborateur_and_more.py similarity index 100% rename from collabs/migrations_dev/0007_rename_user_collabs_hour_collaborateur_and_more.py rename to collabs/migrations/0007_rename_user_collabs_hour_collaborateur_and_more.py diff --git a/collabs/migrations_dev/0008_rename_collaborateur_collabs_hour_user.py b/collabs/migrations/0008_rename_collaborateur_collabs_hour_user.py similarity index 100% rename from collabs/migrations_dev/0008_rename_collaborateur_collabs_hour_user.py rename to collabs/migrations/0008_rename_collaborateur_collabs_hour_user.py diff --git a/collabs/migrations_dev/0009_alter_collabs_hour_dtcreated_and_more.py b/collabs/migrations/0009_alter_collabs_hour_dtcreated_and_more.py similarity index 100% rename from collabs/migrations_dev/0009_alter_collabs_hour_dtcreated_and_more.py rename to collabs/migrations/0009_alter_collabs_hour_dtcreated_and_more.py diff --git a/collabs/migrations_dev/0010_alter_collabs_hour_bnoticed.py b/collabs/migrations/0010_alter_collabs_hour_bnoticed.py similarity index 100% rename from collabs/migrations_dev/0010_alter_collabs_hour_bnoticed.py rename to collabs/migrations/0010_alter_collabs_hour_bnoticed.py diff --git a/collabs/migrations_dev/0011_alter_collabs_hour_options_alter_collabs_hour_nhour.py b/collabs/migrations/0011_alter_collabs_hour_options_alter_collabs_hour_nhour.py similarity index 100% rename from collabs/migrations_dev/0011_alter_collabs_hour_options_alter_collabs_hour_nhour.py rename to collabs/migrations/0011_alter_collabs_hour_options_alter_collabs_hour_nhour.py diff --git a/collabs/migrations_dev/0012_collabs_hour_dtdate_alter_collabs_hour_bnoticed.py b/collabs/migrations/0012_collabs_hour_dtdate_alter_collabs_hour_bnoticed.py similarity index 100% rename from collabs/migrations_dev/0012_collabs_hour_dtdate_alter_collabs_hour_bnoticed.py rename to collabs/migrations/0012_collabs_hour_dtdate_alter_collabs_hour_bnoticed.py diff --git a/collabs/migrations_dev/0013_alter_collabs_hour_dtdate.py b/collabs/migrations/0013_alter_collabs_hour_dtdate.py similarity index 100% rename from collabs/migrations_dev/0013_alter_collabs_hour_dtdate.py rename to collabs/migrations/0013_alter_collabs_hour_dtdate.py diff --git a/collabs/migrations_dev/0014_alter_collabs_hour_dtdate.py b/collabs/migrations/0014_alter_collabs_hour_dtdate.py similarity index 100% rename from collabs/migrations_dev/0014_alter_collabs_hour_dtdate.py rename to collabs/migrations/0014_alter_collabs_hour_dtdate.py diff --git a/collabs/migrations_dev/0015_alter_collabs_hour_dtdate_and_more.py b/collabs/migrations/0015_alter_collabs_hour_dtdate_and_more.py similarity index 100% rename from collabs/migrations_dev/0015_alter_collabs_hour_dtdate_and_more.py rename to collabs/migrations/0015_alter_collabs_hour_dtdate_and_more.py diff --git a/collabs/migrations_dev/0016_collabs_hour_sbases.py b/collabs/migrations/0016_collabs_hour_sbases.py similarity index 100% rename from collabs/migrations_dev/0016_collabs_hour_sbases.py rename to collabs/migrations/0016_collabs_hour_sbases.py diff --git a/collabs/migrations_dev/0017_alter_collabs_hour_options.py b/collabs/migrations/0017_alter_collabs_hour_options.py similarity index 100% rename from collabs/migrations_dev/0017_alter_collabs_hour_options.py rename to collabs/migrations/0017_alter_collabs_hour_options.py diff --git a/collabs/migrations_dev/0018_collabs_hour_types_alter_collabs_hour_options_and_more.py b/collabs/migrations/0018_collabs_hour_types_alter_collabs_hour_options_and_more.py similarity index 100% rename from collabs/migrations_dev/0018_collabs_hour_types_alter_collabs_hour_options_and_more.py rename to collabs/migrations/0018_collabs_hour_types_alter_collabs_hour_options_and_more.py diff --git a/collabs/migrations_dev/0001_initial.py b/collabs/migrations_dev/0001_initial.py deleted file mode 100644 index 716e957..0000000 --- a/collabs/migrations_dev/0001_initial.py +++ /dev/null @@ -1,28 +0,0 @@ -# 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_prod/0001_initial.py b/collabs/migrations_prod/0001_initial.py new file mode 100644 index 0000000..4ab29de --- /dev/null +++ b/collabs/migrations_prod/0001_initial.py @@ -0,0 +1,38 @@ +# 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): + + initial = True + + dependencies = [ + ('auth', '0012_alter_user_first_name_max_length'), + ] + + 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='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, 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/0002_collabs_hour_types_alter_collabs_hour_user.py b/collabs/migrations_prod/0002_collabs_hour_types_alter_collabs_hour_user.py similarity index 100% rename from collabs/migrations/0002_collabs_hour_types_alter_collabs_hour_user.py rename to collabs/migrations_prod/0002_collabs_hour_types_alter_collabs_hour_user.py diff --git a/collabs/migrations/0003_collabs_hour_type_alter_collabs_hour_user.py b/collabs/migrations_prod/0003_collabs_hour_type_alter_collabs_hour_user.py similarity index 100% rename from collabs/migrations/0003_collabs_hour_type_alter_collabs_hour_user.py rename to collabs/migrations_prod/0003_collabs_hour_type_alter_collabs_hour_user.py diff --git a/collabs/migrations/0004_alter_collabs_hour_type_alter_collabs_hour_user.py b/collabs/migrations_prod/0004_alter_collabs_hour_type_alter_collabs_hour_user.py similarity index 100% rename from collabs/migrations/0004_alter_collabs_hour_type_alter_collabs_hour_user.py rename to collabs/migrations_prod/0004_alter_collabs_hour_type_alter_collabs_hour_user.py diff --git a/collabs/migrations_dev/__init__.py b/collabs/migrations_prod/__init__.py similarity index 100% rename from collabs/migrations_dev/__init__.py rename to collabs/migrations_prod/__init__.py diff --git a/db.sqlite3 b/db.sqlite3 index bfbb98c087fbb58508d59f32028698c8b2e8c4e3..5fc97e398f92347b4046c0bb07a43af0f509d6a8 100644 GIT binary patch delta 3961 zcmbtXeQXow8Nc_=vFopU9mpC;$T*zPBtV?|@cGUTS!c39QbN9yks>fod`|56BZ-|) zhMZ8C=-NWl6ScYzKw8&sQU_bj>OW|;b!=jyQj0XCjcwZ4#0_gtB&!AB}l@ zaVg?sX_jrEg$CMAF-{lFx){#JiB8c@chd;RQ;Z|7j^mw@q zjpQP{H{fD42a40hJ8cZ@5P3&?148R5M&om63fRO{bT}l1V+G`5D9*(&E{?a+v|V&K zb|khTtd?Rd`^p$siH>&hqRUR(>@?@#grThnW3m{7Lwv%~8L99Lhf%bMm2V|@B9_^O zVuA>paoGi%DB5|J_iRDfhl{b<0%&B|8*0fFo z7+~=Fd@BH5Wg1Ygx>8HA#rdcPG!)#Zaxp7bJ*Z+~tp?QQz*U(e_4K|)jjqi+LNeqp zQ0kb?a#i?3S+;kHF4pei7#mCTjMFavBYX|VF!^HSInxpk%-B-1TVKAuQKrM|<#@Ec zVB~Pwoi>)C1)fV?iMpr?BN4>NKbqe#EgM6IHhs1By6$et1JY;EnD4Y=j^PyMicp(EfD=6YLq2gkj= zeW6`!EIQ72#CwK<1KhxTPsgBpXlS&L_CFb(8L&Sgstjn3Vo~cBU7Toh+69Loq%NH5 zHdGkNAO`;gUm%098n(eOOq18iljL3U0(vAJWM>Vr2Rv+VOc|wz1!Bx7$#0&bQold9 zZ4=Q+8Jlbcue55)TB!w=YwRUT?I+J(2W5$D z8?d>MBI8`8o-^2}%2xnC=0y7SOfCSmMho0k$rcgmHSl@bsyxqlzeK6cEVf0+DywXZ zm9w&fZjA%!);4Ad7b_}URYCeYzXO4FC~05A;NRdS_%b{O{csnogL?87`40IS>hCAW zd1FtQeif;AyNHO|7ZYi4$=6AnI9_oAsN_Za2_FEFOqYNfhh% zdHs|(=JTT~Ps?7I<&JQu4Wc6)Cvf+zuy&g$I9WT3Gp}^#o!`OW9c(jlUY+506PgU5 z1X~N?9u6Ja-k88kES1C<2Hm91e5T}t_LAm9O&c+0>^Gdz{}YhQ%eI8}I8jmF+6s=h z$1{hL2ffT6v}SGTZFTpzQvL279j%o0fvQxUHQ=*Sfk<2$l{-y!$>+VG6cNFP(RBb_ zPb!3%|BKM(FGxt)8- zd>+Q>^)r5f%WLE(1yAb|>S6P9&8<{dCuPms<|m4Q6(z!8-lesEi9Mt%_ac@94`k`i zezYKxlz-SS4)abSkDH%l9c1=nCCh@jYW+}>c@t~>(Y6I$c~cWOUaMqh-d}#AIL`l< znb4VUxooRmk(BqS6|`ixi7!gUtzRG&(=R=TkM|O#`e&268+eu0P@(^e{#o?m8rC=T zg!GsjRt^Atp)snTj+wsWFGi@r-%-R-o6f+MGm= z<=CwGzC%{j$|axGMIFl6wgoe$+*SbYF-2cD96F}h94yZZA~TrFCMr4{lt$uI9h2O8 a1z2z+p7!0szguEa3L!fv{WjZ@0ro$t!Ls83 delta 964 zcmZuvO-vI(6yBNL?Yi6UyhW=mO0^dJ!C2ZA3${kVXktBB>TgUu6r@EOL5LdETbqDd ziNw0WjeoHRqZh@WZQO&HXgH8yVu+e3Y7Ft`pdfniU`#{@h(9q-=FQA|^YXoK=6$J@ zEj4UCIj6wOFpQ7duW=^3v>bVF)?Na(luK!Xvc*u{3ppcYZ@12sNjD4cAp&=x4PfcXzX9*iX`fvxfYdvMHs7ssYTZfWb+_z8+z!QefLUHQ)if>18 zsYDCQWR!t1ct8Q~f|ZOy4z@x94nZfBK*%U)9U$81>WH(Db1gt^iN<7oQ(}KxV|}c3 zU(2qhM6iV2XoDl{-!VnBVFIn@5&=PXb68Sts zUdXp?S!r6k|8oqXoCMN;Y!$zNbBu( z8_#-{&SwLpUlRs58I6NJLWx%!{jXNtXOnWLF67W2^H2^UIh%8uo!8J|Oygg4;Rbq4 zOU;(eFL#kLoec=*bYT$fp|MiIJogkOowWW323|uST!Id0fc3B#Xoxmukmy&(kxlDA zJ>8u41ASF2@`R8Sv*0uS1lg$dU;nZnE6POA8D(N&im7?b0tF9)LL0*{Jj<~n!YnI_ zm!nv*Oy&N@yWNU;rH~6Vu!fY$7j3Vl9tnw?_%2HyH^PM}>Brb^IfgGds;W?C?SVR~ zkG+Y5vDl>K_&-Pe+YtvySj7__D>tpSBzS-1{i|_=WmHMZ4?3FrZCWJ}IpxJi> zcVQvzT_ZSRm3mzU&z-S-N|Ui Jour {% for task in latest_task_list %} - {{task.key}}    {{ task.name }}
{{task.desc}} + {{task.key}}    {{ task.name }}
{{task.desc}}{{task.dtstart}} {% endfor %}   diff --git a/mycaldav/views.py b/mycaldav/views.py index d21eddd..d427959 100644 --- a/mycaldav/views.py +++ b/mycaldav/views.py @@ -16,6 +16,7 @@ def view_task_caldav(request): o_caldav.get_caldav_data() template = loader.get_template("task/task.html") context = {'latest_task_list':o_caldav.day, 'night_task_list': o_caldav.night} + myClient = cls_caldav_client() return HttpResponse(template.render(context,request)) @xframe_options_exempt @@ -55,4 +56,5 @@ def view_dayly_caldav(request): myClient = cls_caldav_client() + return HttpResponse(ret) diff --git a/polls/admin.py b/polls/admin.py index 607162c..892ae87 100644 --- a/polls/admin.py +++ b/polls/admin.py @@ -1,7 +1,7 @@ from django.contrib import admin from polls.models import Question, Choice -from vehicles.models import * + class ChoiceInline(admin.TabularInline): @@ -19,4 +19,4 @@ class QuestionAdmin(admin.ModelAdmin): admin.site.register(Question, QuestionAdmin) admin.site.register(Choice) -admin.site.register(Vehicles) + diff --git a/vehicles/admin.py b/vehicles/admin.py index 8c38f3f..fd6eb6b 100644 --- a/vehicles/admin.py +++ b/vehicles/admin.py @@ -1,3 +1,41 @@ from django.contrib import admin -# Register your models here. +from vehicles.models import * + +class _vhc_admin(admin.ModelAdmin): + + list_display = ('sName', 'nBases', 'nStatus') + + + + search_fields = ['sName'] + + + #fields = ["sBases", "dtDate",'type', "user","nHour", "nMinutes", "sRemarques"] + +class _vhc_infos_admin(admin.ModelAdmin): + + #list_display = ('Vehicle', 'nType', 'sTitle','sDesc') + + + + search_fields = ['sName'] + + + #fields = ["Vehicle", "nType",'sTitle', "sDesc","dtStart", "dtEnd", "Author"] + fieldsets = ( + ('Informations liées au véhicule', { + 'fields': ('Vehicle',) + }), + ('Information sur le message', { + 'fields': ('nType','sTitle','sDesc') + }), + ('Information supplémentaires et validité', { + 'fields': ("dtStart","dtEnd", 'Author') + }), + ) + + + +admin.site.register(vehicles_infos, _vhc_infos_admin) +admin.site.register(vehicles, _vhc_admin) diff --git a/vehicles/apps.py b/vehicles/apps.py index a32e145..cdc8787 100644 --- a/vehicles/apps.py +++ b/vehicles/apps.py @@ -4,3 +4,4 @@ from django.apps import AppConfig class VehiclesConfig(AppConfig): default_auto_field = 'django.db.models.BigAutoField' name = 'vehicles' + verbose_name = "Clerc véhicule" diff --git a/vehicles/migrations/0002_vehicles_nbases_vehicles_nstatus_vhc_problems_ntype.py b/vehicles/migrations/0002_vehicles_nbases_vehicles_nstatus_vhc_problems_ntype.py new file mode 100644 index 0000000..587be0a --- /dev/null +++ b/vehicles/migrations/0002_vehicles_nbases_vehicles_nstatus_vhc_problems_ntype.py @@ -0,0 +1,28 @@ +# Generated by Django 4.0 on 2022-07-04 10:37 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('vehicles', '0001_initial'), + ] + + operations = [ + migrations.AddField( + model_name='vehicles', + name='nBases', + field=models.CharField(choices=[('1', 'Monthey'), ('2', 'Uvrier')], default=1, max_length=1, verbose_name='Basé à '), + ), + migrations.AddField( + model_name='vehicles', + name='nStatus', + field=models.CharField(choices=[('1', 'Opérationnel'), ('2', 'Hors Service'), ('3', 'Réserve'), ('4', 'Utilisation altérée')], default=1, max_length=1, verbose_name='Statut'), + ), + migrations.AddField( + model_name='vhc_problems', + name='nType', + field=models.CharField(choices=[('1', 'Technique'), ('2', 'Matériel'), ('3', 'Opérationnel')], default=1, max_length=1, verbose_name='Type'), + ), + ] diff --git a/vehicles/migrations/0003_remove_vehicles_benabled_alter_vehicles_sname.py b/vehicles/migrations/0003_remove_vehicles_benabled_alter_vehicles_sname.py new file mode 100644 index 0000000..c2d7558 --- /dev/null +++ b/vehicles/migrations/0003_remove_vehicles_benabled_alter_vehicles_sname.py @@ -0,0 +1,22 @@ +# Generated by Django 4.0 on 2022-07-04 10:51 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('vehicles', '0002_vehicles_nbases_vehicles_nstatus_vhc_problems_ntype'), + ] + + operations = [ + migrations.RemoveField( + model_name='vehicles', + name='bEnabled', + ), + migrations.AlterField( + model_name='vehicles', + name='sName', + field=models.CharField(max_length=250, verbose_name='Indicatif'), + ), + ] diff --git a/vehicles/migrations/0004_alter_vehicles_options.py b/vehicles/migrations/0004_alter_vehicles_options.py new file mode 100644 index 0000000..4fb1225 --- /dev/null +++ b/vehicles/migrations/0004_alter_vehicles_options.py @@ -0,0 +1,17 @@ +# Generated by Django 4.0 on 2022-07-04 10:58 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('vehicles', '0003_remove_vehicles_benabled_alter_vehicles_sname'), + ] + + operations = [ + migrations.AlterModelOptions( + name='vehicles', + options={'verbose_name': 'véhicule', 'verbose_name_plural': 'véhicules'}, + ), + ] diff --git a/vehicles/migrations/0005_rename_vhc_problems_vhc_infos.py b/vehicles/migrations/0005_rename_vhc_problems_vhc_infos.py new file mode 100644 index 0000000..a8a0361 --- /dev/null +++ b/vehicles/migrations/0005_rename_vhc_problems_vhc_infos.py @@ -0,0 +1,18 @@ +# Generated by Django 4.0 on 2022-07-04 13:11 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('auth', '0012_alter_user_first_name_max_length'), + ('vehicles', '0004_alter_vehicles_options'), + ] + + operations = [ + migrations.RenameModel( + old_name='Vhc_problems', + new_name='Vhc_infos', + ), + ] diff --git a/vehicles/migrations/0006_rename_vhc_infos_vehicles_infos.py b/vehicles/migrations/0006_rename_vhc_infos_vehicles_infos.py new file mode 100644 index 0000000..2960e24 --- /dev/null +++ b/vehicles/migrations/0006_rename_vhc_infos_vehicles_infos.py @@ -0,0 +1,18 @@ +# Generated by Django 4.0 on 2022-07-04 16:13 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('auth', '0012_alter_user_first_name_max_length'), + ('vehicles', '0005_rename_vhc_problems_vhc_infos'), + ] + + operations = [ + migrations.RenameModel( + old_name='Vhc_infos', + new_name='Vehicles_infos', + ), + ] diff --git a/vehicles/migrations/0007_alter_vehicles_infos_options.py b/vehicles/migrations/0007_alter_vehicles_infos_options.py new file mode 100644 index 0000000..c6d445a --- /dev/null +++ b/vehicles/migrations/0007_alter_vehicles_infos_options.py @@ -0,0 +1,17 @@ +# Generated by Django 4.0 on 2022-07-04 18:19 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('vehicles', '0006_rename_vhc_infos_vehicles_infos'), + ] + + operations = [ + migrations.AlterModelOptions( + name='vehicles_infos', + options={'verbose_name': 'véhicule info', 'verbose_name_plural': 'véhicule infos'}, + ), + ] diff --git a/vehicles/migrations/0008_alter_vehicles_infos_author_and_more.py b/vehicles/migrations/0008_alter_vehicles_infos_author_and_more.py new file mode 100644 index 0000000..116aacc --- /dev/null +++ b/vehicles/migrations/0008_alter_vehicles_infos_author_and_more.py @@ -0,0 +1,65 @@ +# Generated by Django 4.0 on 2022-07-04 18:59 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('auth', '0012_alter_user_first_name_max_length'), + ('vehicles', '0007_alter_vehicles_infos_options'), + ] + + operations = [ + migrations.AlterField( + model_name='vehicles_infos', + name='Author', + field=models.ForeignKey(on_delete=django.db.models.deletion.DO_NOTHING, to='auth.user', verbose_name='Auteur'), + ), + migrations.AlterField( + model_name='vehicles_infos', + name='Vehicle', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='vehicles.vehicles', verbose_name='Véhicule'), + ), + migrations.AlterField( + model_name='vehicles_infos', + name='bEnabled', + field=models.BooleanField(default=1, verbose_name='Actif'), + ), + migrations.AlterField( + model_name='vehicles_infos', + name='dtCreated', + field=models.DateTimeField(auto_now_add=True, verbose_name='date published'), + ), + migrations.AlterField( + model_name='vehicles_infos', + name='dtEnd', + field=models.DateField(blank=True, verbose_name='Date de fin'), + ), + migrations.AlterField( + model_name='vehicles_infos', + name='dtStart', + field=models.DateField(verbose_name='Date de début'), + ), + migrations.AlterField( + model_name='vehicles_infos', + name='dtUpdated', + field=models.DateTimeField(auto_now=True, verbose_name='date updated'), + ), + migrations.AlterField( + model_name='vehicles_infos', + name='sAuthor', + field=models.CharField(max_length=120, verbose_name='auteur string'), + ), + migrations.AlterField( + model_name='vehicles_infos', + name='sDesc', + field=models.TextField(verbose_name='Description'), + ), + migrations.AlterField( + model_name='vehicles_infos', + name='sTitle', + field=models.CharField(max_length=250, verbose_name='Titre'), + ), + ] diff --git a/vehicles/migrations/0009_alter_vehicles_infos_dtend.py b/vehicles/migrations/0009_alter_vehicles_infos_dtend.py new file mode 100644 index 0000000..03f7c0b --- /dev/null +++ b/vehicles/migrations/0009_alter_vehicles_infos_dtend.py @@ -0,0 +1,18 @@ +# Generated by Django 4.0 on 2022-07-04 19:02 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('vehicles', '0008_alter_vehicles_infos_author_and_more'), + ] + + operations = [ + migrations.AlterField( + model_name='vehicles_infos', + name='dtEnd', + field=models.DateField(blank=True, null=True, verbose_name='Date de fin'), + ), + ] diff --git a/vehicles/models.py b/vehicles/models.py index 545a04e..e1c612f 100644 --- a/vehicles/models.py +++ b/vehicles/models.py @@ -4,20 +4,53 @@ from django.db import models from django.conf import settings from django.utils import timezone +BASES_CHOICES = [ + ('1', 'Monthey'), + ('2', 'Uvrier'), +] +STATUS_CHOICES = [ + ('1', 'Opérationnel'), + ('2', 'Hors Service'), + ('3', 'Réserve'), + ('4', 'Utilisation altérée'), +] +TYPES_CHOICES = [ + ('1', 'Technique'), + ('2', 'Matériel'), + ('3', 'Opérationnel'), +] -class Vehicles(models.Model): - sName = models.CharField (max_length=250) - bEnabled = models.BooleanField( default=0 ) -class Vhc_problems(models.Model): - Vehicle = models.ForeignKey( Vehicles, on_delete=models.CASCADE) - sTitle = models.CharField( max_length=250) - sDesc = models.TextField() - bEnabled = models.BooleanField( default=1) - dtStart = models.DateTimeField() - dtEnd = models.DateTimeField() - sAuthor = models.CharField( max_length=120) - Author = models.ForeignKey( settings.AUTH_USER_MODEL, on_delete=models.DO_NOTHING ) - dtUpdated = models.DateTimeField('date updated') - dtCreated = models.DateTimeField('date published') +class vehicles(models.Model): + sName = models.CharField("Indicatif", max_length=250) + nBases = models.CharField('Basé à ', max_length=1, choices=BASES_CHOICES, default=1) + nStatus = models.CharField('Statut', max_length=1, choices=STATUS_CHOICES, default=1) + def __str__(self): + return self.sName + + class Meta: + verbose_name = "véhicule" + verbose_name_plural = "véhicules" + + +class vehicles_infos(models.Model): + Vehicle = models.ForeignKey(vehicles, on_delete=models.CASCADE, verbose_name="Véhicule") + nType = models.CharField('Type', max_length=1, choices=TYPES_CHOICES, default=1) + sTitle = models.CharField("Titre",max_length=250) + sDesc = models.TextField("Description") + bEnabled = models.BooleanField("Actif",default=1) + + dtStart = models.DateField("Date de début") + dtEnd = models.DateField("Date de fin", blank=True, null=True) + sAuthor = models.CharField("auteur string",max_length=120) + Author = models.ForeignKey(settings.AUTH_USER_MODEL,verbose_name="Auteur", on_delete=models.DO_NOTHING) + dtUpdated = models.DateTimeField('date updated', auto_now=True) + dtCreated = models.DateTimeField('date published', auto_now_add=True) + + def __str__(self): + return self.sTitle + + class Meta: + verbose_name = "véhicule info" + verbose_name_plural = "véhicule infos"