avancé dev

collabs/admin.py

@@ -1,4 +1,5 @@
 from django.contrib import admin
+from rangefilter.filters import DateRangeFilter
 
 from collabs.models import Collabs_hour
 
@@ -6,8 +7,9 @@ from collabs.models import Collabs_hour
 from django import forms
 
 
+
 class Collabs_hour_Form_admin(forms.ModelForm):
-    class Meta:
+
         model = Collabs_hour
         fields = ["user", "sRemarques", "bNoticed"]
         readonly_fields = ["user", "nHour", "nMinutes"]
@@ -15,18 +17,23 @@ class Collabs_hour_Form_admin(forms.ModelForm):
 
 
 class Collabs_hour_Admin(admin.ModelAdmin):
-    list_display = ('user','dtCreated','bNoticed')
+    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_editable = ['bNoticed']
-    list_filter = ['dtCreated']
-    search_fields = ['userName']
-    readonly_fields = ['userName']
+    list_filter = [('dtDate', DateRangeFilter), ('user', admin.RelatedOnlyFieldListFilter),'sBases']
 
-    fields = ["user","nHour", "nMinutes", "sRemarques"]
+
+    search_fields = ['userName']
+
+    readonly_fields = ["userName"]
+    fields = ["sBases", "dtDate", "user","nHour", "nMinutes", "sRemarques"]
 
     def get_form(self, request, obj=None, **kwargs):
         #if request.user.has_perm("collabs.can_notice"):
         if request.user.is_superuser:
-            kwargs['form'] = Collabs_hour_Form_admin  # ModelForm
+            #kwargs['form'] = Collabs_hour_Form_admin  # ModelForm
             print("PASS SUPERUSER")
 
         return super().get_form(request, obj, **kwargs)
@@ -34,8 +41,7 @@ class Collabs_hour_Admin(admin.ModelAdmin):
 
 
     def save_model(self, request, obj, form, change):
-
-
+        obj.userName = obj.user.username
         super().save_model(request, obj, form, change)