From 7cb115eb1a13ecf9c4f57e8e020c65a98badf3ba Mon Sep 17 00:00:00 2001 From: kirosbr Date: Mon, 7 Mar 2022 00:55:13 +0100 Subject: [PATCH] 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"), ) - - -