pas de date dernière utilisation si utilisé

services/admin.py

@@ -410,12 +410,16 @@ class IPResourceAdmin(admin.ModelAdmin):
 
     def get_queryset(self, request):
         qs = super().get_queryset(request)
-        qs = qs.annotate(last_use=models.Case(
+        now = timezone.now()
+        qs = qs.annotate(
+                last_use=models.Case(
+                    models.When(in_use=True, then=now),
                     models.When(category=0, then=models.Max('service_allocation__end')),
                     models.When(category=1, then=models.Max('antenna_allocation__end')),
                     default=None,
                 ))
-        qs = qs.annotate(up=models.Case(
+        qs = qs.annotate(
+                up=models.Case(
                     models.When(last_check__isnull=False, last_time_up__isnull=False, last_time_up=models.F('last_check'), then=True),
                     models.When(last_check__isnull=False, last_time_up__isnull=False, then=False),
                     default=None,