Переосмыслил отметки по ВЧ загрузке. Улучшил статистику

This commit is contained in:
2025-12-10 17:43:38 +03:00
parent 4949a03e68
commit 41e8dc30fd
16 changed files with 1834 additions and 980 deletions

View File

@@ -14,7 +14,7 @@ from django.views.generic import CreateView, DeleteView, UpdateView
from ..forms import GeoForm, ObjItemForm, ParameterForm
from ..mixins import CoordinateProcessingMixin, FormMessageMixin, RoleRequiredMixin
from ..models import Geo, Modulation, ObjItem, ObjectMark, Polarization, Satellite
from ..models import Geo, Modulation, ObjItem, Polarization, Satellite
from ..utils import (
format_coordinate,
format_coords_display,
@@ -105,12 +105,6 @@ class ObjItemListView(LoginRequiredMixin, View):
queryset=Satellite.objects.only('id', 'name').order_by('id')
)
# Create optimized prefetch for marks (through source)
marks_prefetch = Prefetch(
'source__marks',
queryset=ObjectMark.objects.select_related('created_by__user').order_by('-timestamp')
)
objects = (
ObjItem.objects.select_related(
"geo_obj",
@@ -131,7 +125,6 @@ class ObjItemListView(LoginRequiredMixin, View):
"parameter_obj__sigma_parameter",
"parameter_obj__sigma_parameter__polarization",
mirrors_prefetch,
marks_prefetch,
)
.filter(parameter_obj__id_satellite_id__in=selected_satellites)
)
@@ -142,12 +135,6 @@ class ObjItemListView(LoginRequiredMixin, View):
queryset=Satellite.objects.only('id', 'name').order_by('id')
)
# Create optimized prefetch for marks (through source)
marks_prefetch = Prefetch(
'source__marks',
queryset=ObjectMark.objects.select_related('created_by__user').order_by('-timestamp')
)
objects = ObjItem.objects.select_related(
"geo_obj",
"source",
@@ -166,7 +153,6 @@ class ObjItemListView(LoginRequiredMixin, View):
"parameter_obj__sigma_parameter",
"parameter_obj__sigma_parameter__polarization",
mirrors_prefetch,
marks_prefetch,
)
if freq_min is not None and freq_min.strip() != "":