Merge remote-tracking branch 'origin/master'

# Conflicts:
#	db.sqlite3

Reskreen/settings.py

@@ -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)

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 = 'Heure supplémentaire'
-        verbose_name_plural = 'Heures suplémentaires'
+        verbose_name_plural = 'Heures supplé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"):
@@ -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_types)
 #admin.site.register(Collabs_hour)

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"

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")),
+                ('userName', models.CharField(max_length=100, verbose_name='Auteur')),
-                ('collab', models.CharField(max_length=10, verbose_name='Collaborateur')),
+                ('nHour', models.PositiveIntegerField(default=0, validators=[django.core.validators.MinValueValidator(0), django.core.validators.MaxValueValidator(23)], verbose_name='Heures')),
-                ('nHour', models.IntegerField(default=0, verbose_name='Heure')),
+                ('nMinutes', models.PositiveIntegerField(default=0, validators=[django.core.validators.MinValueValidator(0), django.core.validators.MaxValueValidator(60)], verbose_name='Minutes')),
-                ('nMinutes', models.IntegerField(default=0, verbose_name='Minutes')),
+                ('sRemarques', models.TextField(blank=True, verbose_name='Remarques')),
-                ('sRemarques', models.TextField(verbose_name='Remarques')),
+                ('bNoticed', models.BooleanField(blank=True, default=False, verbose_name='Vérifiée')),
-                ('bNoticed', models.BooleanField(default=0, verbose_name='Pris en compte')),
+                ('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'),),
+            },
         ),
     ]

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'),
+        ),
+    ]

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'),
+        ),
+    ]

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'),
+        ),
+    ]

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)),
+            ],
+        ),
+    ]

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'),
         ),
     ]

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'),
         ),
     ]

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'},
+        ),
+    ]

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 = "heure supplémentaire"
-        verbose_name_plural = "heures suplémentaires"
+        verbose_name_plural = "heures supplémentaires"
         permissions = (
             ("can_notice", "Peut noter comme traitée"),
 
         )
-
-
-

my.cnf

@@ -3,5 +3,5 @@ database = 	django_dev
 user = 	django_usr
 password = YwVHV36ovBTXWugb
 default-character-set = utf8
-host =192.168.3.113
+host =localhost
 port =3306