changement de theme

Reskreen/settings.py

@@ -12,7 +12,7 @@ https://docs.djangoproject.com/en/4.0/ref/settings/
 
 from pathlib import Path
 import os
-from Reskreen.server_config import *
+from .server_config import *
 
 # Build paths inside the project like this: BASE_DIR / 'subdir'.
 BASE_DIR = Path(__file__).resolve().parent.parent

carnet_rouge/admin.py

@@ -86,7 +86,11 @@ class cr_Message_Admin(SummernoteModelAdmin):
     always_show_username = True
     list_display = ('MessageId','sTitle', 'DestGroup', 'get_dtCreated',  'sAuthor','bEnabled', 'calc_read_quotas')
     list_filter = ["sAuthor", StatusFilter]
-    fields = ["Caterogy", "DestGroup", 'sTitle', "sText", "dtValidityFrom", "dtValidityTo", "bEnabled"]
+    fieldsets = (
+        ('Message', {'fields': ("Caterogy", "DestGroup", 'sTitle', "sText") }),
+        ('Validité', {'fields': ("dtValidityFrom", "dtValidityTo", "bEnabled")})
+    )
+
     search_fields = ['sTitle', 'sText']
 
 

collabs/admin.py

@@ -1,19 +1,43 @@
 from django.contrib import admin
 from rangefilter.filters import DateRangeFilter
+from django.contrib.admin import DateFieldListFilter
 from django.contrib.auth.models import User
 from django.db.models import Q
 from django.shortcuts import render
 from django.contrib.auth.models import Permission
+from django.utils.translation import gettext_lazy as _
 
 from collabs.models import *
 
-
 from django import forms
+import datetime
 
-from datetime import datetime
+from django.db import connection
+print(connection.queries)
+
+class myDateFilter(DateFieldListFilter):
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+
+        now = timezone.now()
+        today = now.date()
+        yesterday = today - datetime.timedelta(days=1)
+        if today.month == 1:
+            last_month = today.replace(year=today.year - 1, month=12, day=1)
+        else:
+            last_month = today.replace(month=today.month - 1, day=1)
+
+        last_month_end = today.replace(day=1) -datetime.timedelta(days=1)
 
 
 
+
+        self.links = list(self.links)
+        self.links.insert(1, ('Mois dernier', {
+            self.lookup_kwarg_since: str(last_month),
+            self.lookup_kwarg_until: str(last_month_end),
+        }))
+
 def is_member(user, group):
     return user.groups.filter(name=group).exists()
 
@@ -37,7 +61,9 @@ class Collabs_hour_Admin(admin.ModelAdmin):
         verbose_name_plural = 'Heures supplémentaires'
     list_display = ('dtDate', 'nHour', 'nMinutes', 'sTargetUser', 'sBases', 'type', 'get_total_hour_by_user', 'has_remarques', 'bNoticed')
 
-    list_filter = [('dtDate', DateRangeFilter), 'sTargetUser','sBases','type', 'bNoticed']
+    #list_filter = [('dtDate', DateRangeFilter), 'sTargetUser','sBases','type', 'bNoticed']
+    list_filter = (('dtDate', myDateFilter),'sTargetUser', 'sBases', 'type', 'bNoticed')
+
 
     search_fields = ['userName']
     readonly_fields = ["userName"]
@@ -46,8 +72,8 @@ class Collabs_hour_Admin(admin.ModelAdmin):
 
 
     def get_rangefilter_dtDate_default(self, request):
-
+        pass
-        return (datetime.today().replace(day=1), datetime.today())
+        #return (datetime.today().replace(day=1), datetime.today())
 
     def get_queryset(self, request):
         queryset = super(Collabs_hour_Admin, self).get_queryset(request)
@@ -58,8 +84,10 @@ class Collabs_hour_Admin(admin.ModelAdmin):
             pass
 
         if not "dtDate__range__gte" in request.GET.keys() and "/change/" not in request.path:
-            start, end = self.get_rangefilter_dtDate_default(request)
+            pass
-            queryset = queryset.filter(dtDate__range=[start,end])
+            #start, end = self.get_rangefilter_dtDate_default(request)
+            #queryset = queryset.filter(dtDate__range=[start,end])
+            #queryset = queryset.filter(dtDate=start)
 
         return queryset
 

collabs/templates/collabs_hour/detail.html

@@ -1,47 +0,0 @@
-
-{% load static %}
-<link rel="stylesheet" type="text/css" href="{% static 'collabs/style.css' %}">
-
-{% if latest_hour_list %}
-<h1>Liste des heures supplémentaires:</h1>
-<table>
-    <tr>
-        <th>Date</th>
-        <th>Qui</th>
-        <th>Combien</th>
-        <th>Total du mois</th>
-        <th>Traité</th>
-    </tr>
-    {% for collabs_hour in latest_hour_list %}
-    <tr>
-        <td>
-        <a href="/admin/collabs/collabs_hour/{{ collabs_hour.id }}/change/">{{ collabs_hour.dtCreated }}</a>
-        </td>
-        <td>
-            {{ collabs_hour.user }}
-        </td>
-        <td>
-             {{collabs_hour.nHour}}:{{collabs_hour.nMinutes}}
-        </td>
-        <td>
-             {{collabs_hour.total}}
-        </td>
-        <td>
-            {{collabs_hour.bNoticed}}
-        </td>
-    </tr>
-
-    {% endfor %}
-
-
-
-
-</table>
-<ul>
-    {% for collabs_hour in latest_hour_list %}
-    <li><a href="/admin/collabs/collabs_hour/{{ collabs_hour.id }}/change/">{{ collabs_hour.dtCreated }} {{ collabs_hour.user }} ({{collabs_hour.total}}) => {{collabs_hour.nHour}}:{{collabs_hour.nMinutes}}</a></li>
-    {% endfor %}
-</ul>
-{% else %}
-<p>No Collabs_hour.</p>
-{% endif %}