summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ishtar/ishtar_base/models.py9
1 files changed, 6 insertions, 3 deletions
diff --git a/ishtar/ishtar_base/models.py b/ishtar/ishtar_base/models.py
index e686b6ca2..a41b17215 100644
--- a/ishtar/ishtar_base/models.py
+++ b/ishtar/ishtar_base/models.py
@@ -400,7 +400,8 @@ class FileDashboard:
.order_by('-date')
self.research['by_dpt'] = FileByDepartment.objects\
- .filter(file__file_type=prog_type)\
+ .filter(file__file_type=prog_type,
+ department__isnull=False)\
.values('department__label')\
.annotate(number=Count('file'))\
.order_by('department__label')
@@ -436,7 +437,8 @@ class FileDashboard:
.order_by('-date')
self.rescue['by_dpt'] = FileByDepartment.objects\
- .filter(file__file_type=rescue_type)\
+ .filter(file__file_type=rescue_type,
+ department__isnull=False)\
.values('department__label')\
.annotate(number=Count('file'))\
.order_by('department__label')
@@ -476,7 +478,8 @@ class FileDashboard:
.annotate(number=Sum('file__total_surface'))\
.order_by('-number','town__name')[:10]
self.rescue['surface_by_dpt'] = FileByDepartment.objects\
- .filter(file__file_type=rescue_type)\
+ .filter(file__file_type=rescue_type,
+ department__isnull=False)\
.values('department__label')\
.annotate(number=Sum('file__total_surface'))\
.order_by('department__label')