diff --git a/Reskreen/settings.py b/Reskreen/settings.py index cc62fef..91a1df7 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 @@ -127,7 +127,7 @@ TIME_ZONE = 'Europe/Zurich' USE_I18N = True -USE_TZ = True +USE_TZ = False # Static files (CSS, JavaScript, Images) @@ -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/admin.py b/collabs/admin.py index cc46971..24782e7 100644 --- a/collabs/admin.py +++ b/collabs/admin.py @@ -1,7 +1,8 @@ from django.contrib import admin from rangefilter.filters import DateRangeFilter +from django.contrib.auth.models import User -from collabs.models import Collabs_hour +from collabs.models import * from django import forms @@ -17,18 +18,20 @@ class Collabs_hour_Form_admin(forms.ModelForm): class Collabs_hour_Admin(admin.ModelAdmin): + always_show_username = True + 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') + 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'] + 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"): @@ -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): @@ -46,4 +68,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/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/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/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/collabs/models.py b/collabs/models.py index 92ba18d..20f3b27 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,16 +60,26 @@ 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 + + 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"), ) - - - 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