From f438e749466593cb8587c227a2215d720d5c5f97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9A=D0=BE=D1=88=D0=BA=D0=B8=D0=BD=20=D0=A1=D0=B5=D1=80?= =?UTF-8?q?=D0=B3=D0=B5=D0=B9?= Date: Mon, 17 Nov 2025 10:45:32 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=BE=D0=BF=D1=80=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20=D0=B3=D0=B5=D0=BE=D1=84=D0=B8=D0=BB=D1=8C=D1=82=D1=80?= =?UTF-8?q?=20=D0=B8=20=D0=BE=D1=82=D0=BE=D0=B1=D1=80=D0=B0=D0=B6=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D1=8F=20=D0=B8=D1=81=D1=82=D0=BE=D1=87=D0=BD=D0=B8?= =?UTF-8?q?=D0=BA=D0=B0=20=D0=B2=20=D0=BE=D1=82=D0=BC=D0=B5=D1=82=D0=BA?= =?UTF-8?q?=D0=B0=D1=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mainapp/templates/mainapp/components/_navbar.html | 2 +- dbapp/mainapp/templates/mainapp/object_marks.html | 2 ++ dbapp/mainapp/views/api.py | 10 ++++++++-- dbapp/mainapp/views/marks.py | 6 ++++++ 4 files changed, 17 insertions(+), 3 deletions(-) diff --git a/dbapp/mainapp/templates/mainapp/components/_navbar.html b/dbapp/mainapp/templates/mainapp/components/_navbar.html index 9040d1b..c7848a3 100644 --- a/dbapp/mainapp/templates/mainapp/components/_navbar.html +++ b/dbapp/mainapp/templates/mainapp/components/_navbar.html @@ -32,7 +32,7 @@ Действия
  • - Отметки + Наличие сигнала
  • 3D карта diff --git a/dbapp/mainapp/templates/mainapp/object_marks.html b/dbapp/mainapp/templates/mainapp/object_marks.html index a69c486..26fbc75 100644 --- a/dbapp/mainapp/templates/mainapp/object_marks.html +++ b/dbapp/mainapp/templates/mainapp/object_marks.html @@ -150,6 +150,7 @@
    ID: {{ source.id }}
    +
    Имя объекта: {{ source.objitem_name }}
    Дата создания: {{ source.created_at|date:"d.m.Y H:i" }}
    Кол-во объектов: {{ source.source_objitems.count }}
    {% if source.coords_average %} @@ -218,6 +219,7 @@
    ID: {{ source.id }}
    +
    Имя объекта: {{ source.objitem_name }}
    Дата создания: {{ source.created_at|date:"d.m.Y H:i" }}
    Кол-во объектов: {{ source.source_objitems.count }}
    {% if source.coords_average %} diff --git a/dbapp/mainapp/views/api.py b/dbapp/mainapp/views/api.py index 9c02782..b68fef0 100644 --- a/dbapp/mainapp/views/api.py +++ b/dbapp/mainapp/views/api.py @@ -209,7 +209,10 @@ class SourceObjItemsAPIView(LoginRequiredMixin, View): if geo_date_from: try: geo_date_from_obj = datetime.strptime(geo_date_from, "%Y-%m-%d") - objitems = objitems.filter(geo_obj__timestamp__gte=geo_date_from_obj) + objitems = objitems.filter( + geo_obj__isnull=False, + geo_obj__timestamp__gte=geo_date_from_obj + ) except (ValueError, TypeError): pass @@ -218,7 +221,10 @@ class SourceObjItemsAPIView(LoginRequiredMixin, View): geo_date_to_obj = datetime.strptime(geo_date_to, "%Y-%m-%d") # Add one day to include entire end date geo_date_to_obj = geo_date_to_obj + timedelta(days=1) - objitems = objitems.filter(geo_obj__timestamp__lt=geo_date_to_obj) + objitems = objitems.filter( + geo_obj__isnull=False, + geo_obj__timestamp__lt=geo_date_to_obj + ) except (ValueError, TypeError): pass diff --git a/dbapp/mainapp/views/marks.py b/dbapp/mainapp/views/marks.py index ba899b4..67d810e 100644 --- a/dbapp/mainapp/views/marks.py +++ b/dbapp/mainapp/views/marks.py @@ -46,13 +46,19 @@ class ObjectMarksListView(LoginRequiredMixin, ListView): context['satellites'] = Satellite.objects.all().order_by('name') # Добавить информацию о возможности редактирования для каждой отметки + # и получить имя первого объекта для каждого источника for source in context['sources']: + # Получить имя первого объекта + first_objitem = source.source_objitems.first() + source.objitem_name = first_objitem.name if first_objitem and first_objitem.name else '-' + for mark in source.marks.all(): mark.editable = mark.can_edit() return context + class AddObjectMarkView(LoginRequiredMixin, View): """ API endpoint для добавления отметки источника.