Merge branch 'main' of https://github.com/moevm/nosql1h25-parking

Author: vugardzhafarov

application/pay_parking/import_export/admin.py

@@ -3,12 +3,11 @@
 from .import_data import import_data
 from .export_data import export_data
 from django.http import HttpResponse
-from rest_framework import status
-from rest_framework.response import Response
 import json
 from .forms import ImportForm
 from django.shortcuts import redirect
 from django.contrib import messages
+from django.http import HttpResponseBadRequest
 
 
 class AdminSite(admin.AdminSite):
@@ -33,7 +32,7 @@ def import_view(self, request):
                 except Exception as e:
                     messages.error(request, "Ошибка при чтении файла")
                 return redirect('admin:index')
-        return Response(status=status.HTTP_400_BAD_REQUEST)
+        return HttpResponseBadRequest()
 
     def export_view(self, request):
         if request.method == 'GET':
@@ -42,7 +41,7 @@ def export_view(self, request):
             response = HttpResponse(content, content_type='application/json')
             response['Content-Disposition'] = 'attachment; filename="export_data.json"'
             return response
-        return Response(status=status.HTTP_400_BAD_REQUEST)
+        return HttpResponseBadRequest()
 
 
 admin.site = AdminSite('')

application/pay_parking/parking/admin.py

@@ -7,8 +7,7 @@
     MaxTotalLotsFilter, MinTotalLotsFilter,
     MinPricePerHourFilter, MaxPricePerHourFilter
 )
-from .forms import ParkingFilterForm
-from pay_parking.filters import FakeFilterWithForm
+from .forms import ParkingFilterForm, ParkingStatisticsForm
 from pay_parking.change_list import CustomChangeList
 from django.urls import reverse
 from django.utils.safestring import mark_safe
@@ -28,7 +27,7 @@ class ParkingAdmin(CustomModelAdmin):
     )
     search_fields = ('address',)
     list_filter = (
-        FakeFilterWithForm, ParkingZoneFilter, AddressFilter,
+        ParkingZoneFilter, AddressFilter,
         MinLatitudeFilter, MaxLatitudeFilter,
         MinLongitudeFilter, MaxLongitudeFilter,
         MinAvailableLotsFilter, MaxAvailableLotsFilter,
@@ -60,5 +59,7 @@ def payments_link(self, parking):
     def available_lots(self, parking):
         return parking.available_lots
 
+    statistics_form_class = ParkingStatisticsForm
+    
 
 admin.site.register(Parking, ParkingAdmin)

application/pay_parking/parking/forms.py

@@ -1,5 +1,5 @@
 from django import forms
-from pay_parking.forms import FormWithFormsets
+from pay_parking.forms import FormWithFormsets, StatisticsForm
 from django.core.validators import MinValueValidator, MaxValueValidator
 from .models import Parking
 
@@ -103,4 +103,19 @@ class Meta:
             ('Цена за час', {
                 'fields': ('min_price_per_hour', 'max_price_per_hour')
             }),
-        )
+        )
+
+
+class ParkingStatisticsForm(StatisticsForm):
+    y_choices = [
+        ("total_lots", "Всего мест"),
+        ("latitude", "Широта"),
+        ("longitude", "Долгота"),
+        ("price_per_hour", "Цена за час"),
+        ("available_lots", "Свободные места"),
+    ]
+    x_choices = y_choices + [
+        ("parking_zone", "Зона парковки"),
+    ]
+    x_attribute = forms.ChoiceField(choices=x_choices, label='Атрибут X', initial="parking_zone")
+    y_attribute = forms.ChoiceField(choices=y_choices, label='Атрибут Y', initial="price_per_hour")

application/pay_parking/pay_parking/admin.py

@@ -5,7 +5,10 @@
 from django.template.response import SimpleTemplateResponse
 from django.contrib.admin.options import IncorrectLookupParameters
 from django.http import HttpResponseRedirect
-
+from django.db import models
+from .forms import StatisticsForm
+import plotly.express as px
+from django.http import HttpResponseBadRequest  
 
 class UserSite(admin.AdminSite):
     enable_nav_sidebar = False
@@ -20,19 +23,30 @@ def has_permission(self, request):
 class CustomModelAdmin(admin.ModelAdmin):
     show_facets = admin.ShowFacets.NEVER
     list_per_page = 10
+    statistics_form_class = StatisticsForm
+    has_customisable_statistics = True
 
     def get_urls(self):
-        info = self.opts.app_label, self.opts.model_name
-        new_urls = [
-            path(
-                'customisable_statistics/',
-                self.admin_site.admin_view(self.customisable_statistics),
-                name="%s_%s_customisable_statistics" % info
-            ),
-        ]
+        new_urls= []
+        if self.has_customisable_statistics:
+            info = self.opts.app_label, self.opts.model_name
+            new_urls = [
+                path(
+                    'customisable_statistics/',
+                    self.admin_site.admin_view(self.customisable_statistics),
+                    name="%s_%s_customisable_statistics" % info
+                ),
+            ]
         return new_urls + super().get_urls()
+    
+    def changelist_view(self, request, extra_context=None):
+        extra_context = extra_context or {}
+        extra_context['has_customisable_statistics'] = self.has_customisable_statistics
+        return super().changelist_view(request, extra_context)
 
     def customisable_statistics(self, request):
+        if not self.has_customisable_statistics:
+            return HttpResponseBadRequest('This model has no customisable statistics')
         try:
             cl = self.get_changelist_instance(request)
         except IncorrectLookupParameters:
@@ -44,11 +58,37 @@ def customisable_statistics(self, request):
                     },
                 )
             return HttpResponseRedirect(request.path + "?" + ERROR_FLAG + "=1")
-        queryset = cl.queryset  # уже отфильтрованный
-        
+        queryset = cl.queryset
+        chart = None
+        form = self.statistics_form_class(request.GET or None)
+        if form.is_valid():
+            x_attribute = form.cleaned_data["x_attribute"]
+            y_attribute = form.cleaned_data["y_attribute"]
+            queryset = queryset.values(x_attribute).annotate(
+                **{y_attribute: models.Avg(y_attribute)}
+            ).order_by(x_attribute)
+            for item in queryset:
+                print(type(item[x_attribute]))
+            x_list = [item[x_attribute] for item in queryset]
+            y_list = [item[y_attribute] for item in queryset]
+            dict_choices = dict(form.fields['x_attribute'].choices)
+            fig = px.line(
+                x=x_list, y=y_list,
+                labels={
+                    "x": dict_choices[x_attribute],
+                    "y": dict_choices[y_attribute]
+                },
+                title=f'Среднее значение "{dict_choices[y_attribute]}" от "{dict_choices[x_attribute]}"'
+            )
+            fig.update_layout(title_x=0.5)
+
+            chart = fig.to_html()
+
         context = dict(
             self.admin_site.each_context(request),
             cl=cl,
-            title='Кастомизируемая статистика'
+            title='Кастомизируемая статистика',
+            form=form,
+            chart=chart
         )
         return render(request, "admin/customisable_statistics.html", context)

application/pay_parking/pay_parking/change_list.py

@@ -1,14 +1,5 @@
 from django.contrib.admin.views.main import ChangeList
-from django.core.exceptions import (
-    ImproperlyConfigured,
-    SuspiciousOperation,
-)
-from django.contrib.admin.utils import (
-    build_q_object_from_lookup_parameters,
-)
-from django.contrib.admin.options import (
-    IncorrectLookupParameters,
-)
+
 
 class CustomChangeList(ChangeList):
     filter_form_class = None
@@ -35,24 +26,24 @@ def get_queryset(self, request):
                 if new_qs is not None:
                     qs = new_qs
 
-        try:
-            # Finally, we apply the remaining lookup parameters from the query
-            # string (i.e. those that haven't already been processed by the
-            # filters).
-            q_object = build_q_object_from_lookup_parameters(
-                remaining_lookup_params)
-            qs = qs.filter(q_object)
-        except (SuspiciousOperation, ImproperlyConfigured):
-            # Allow certain types of errors to be re-raised as-is so that the
-            # caller can treat them in a special way.
-            raise
-        except Exception as e:
-            # Every other error is caught with a naked except, because we don't
-            # have any other way of validating lookup parameters. They might be
-            # invalid if the keyword arguments are incorrect, or if the values
-            # are not in the correct type, so we might get FieldError,
-            # ValueError, ValidationError, or ?.
-            raise IncorrectLookupParameters(e)
+        # try:
+        #     # Finally, we apply the remaining lookup parameters from the query
+        #     # string (i.e. those that haven't already been processed by the
+        #     # filters).
+        #     q_object = build_q_object_from_lookup_parameters(
+        #         remaining_lookup_params)
+        #     qs = qs.filter(q_object)
+        # except (SuspiciousOperation, ImproperlyConfigured):
+        #     # Allow certain types of errors to be re-raised as-is so that the
+        #     # caller can treat them in a special way.
+        #     raise
+        # except Exception as e:
+        #     # Every other error is caught with a naked except, because we don't
+        #     # have any other way of validating lookup parameters. They might be
+        #     # invalid if the keyword arguments are incorrect, or if the values
+        #     # are not in the correct type, so we might get FieldError,
+        #     # ValueError, ValidationError, or ?.
+        #     raise IncorrectLookupParameters(e)
 
         if not qs.query.select_related:
             qs = self.apply_select_related(qs)

application/pay_parking/pay_parking/filters.py

@@ -16,7 +16,7 @@ def choices(self, changelist):
 
 
 class FakeFilterWithForm(admin.SimpleListFilter):
-    template = 'admin/filter_with_form.html'
+    template = 'admin/empty.html'
     parameter_name = ''
     title = ''
 

application/pay_parking/pay_parking/forms.py

@@ -22,4 +22,18 @@ def fieldsets(self):
             yield Fieldset(
                 title=name,
                 fields=(self[f] for f in data['fields']),
-            )
+            )
+
+
+class StatisticsForm(forms.Form):
+    choices = []
+    x_attribute = forms.ChoiceField(choices=choices)
+    y_attribute = forms.ChoiceField(choices=choices)
+
+    def clean(self):
+        cleaned_data = super().clean()
+        x_attribute = cleaned_data.get('x_attribute')
+        y_attribute = cleaned_data.get('y_attribute')
+        if x_attribute and y_attribute:
+            if x_attribute == y_attribute:
+                raise forms.ValidationError("Выберите разные атрибуты для X и Y.")

application/pay_parking/paying/admin.py

@@ -1,6 +1,6 @@
 from django.contrib import admin
 from .models import Payment
-from .forms import AdminPaymentForm, PaymentFilterForm
+from .forms import AdminPaymentForm, PaymentFilterForm, PaymentStatisticsForm
 from pay_parking.change_list import CustomChangeList
 from django.utils.safestring import mark_safe
 from django.urls import reverse
@@ -16,8 +16,6 @@
     MaxPricePerHourFilter, MinPricePerHourFilter,
     MinAvailableLotsFilter, MaxAvailableLotsFilter
 )
-from pay_parking.filters import FakeFilterWithForm
-from django.shortcuts import get_object_or_404
 from .models import User, Parking
 from pay_parking.admin import CustomModelAdmin
 
@@ -44,7 +42,6 @@ class PaymentAdmin(CustomModelAdmin):
     )
 
     list_filter = (
-        FakeFilterWithForm,
         MinCreatedAtFilter, MaxCreatedAtFilter, MinStartFilter, MaxStartFilter,
         MinEndFilter, MaxEndFilter, MinPriceFilter, MaxPriceFilter,
         MinDurationFilter, MaxDurationFilter,
@@ -104,7 +101,7 @@ def get_changelist(self, request, **kwargs):
 
     def changelist_view(self, request, extra_context=None):
         user_id = request.GET.get('user_id')
-        extra_context = {}
+        extra_context = extra_context or {}
         if user_id:
             try:
                 extra_context['title'] = f'Оплаты {User.objects.get(pk=user_id)}'
@@ -121,4 +118,7 @@ def changelist_view(self, request, extra_context=None):
     def add_view(self, request, form_url='', extra_context=None):
         return super().add_view(request, form_url, extra_context)
 
+    statistics_form_class = PaymentStatisticsForm
+    
+
 admin.site.register(Payment, PaymentAdmin)

application/pay_parking/paying/forms.py

@@ -1,7 +1,7 @@
 from django import forms
 from .models import Payment, Parking, User
 from django.core.validators import MinValueValidator, MaxValueValidator
-from pay_parking.forms import FormWithFormsets
+from pay_parking.forms import FormWithFormsets, StatisticsForm
 from .models import now
 from datetime import datetime, timedelta
 from django.core.exceptions import ValidationError
@@ -257,3 +257,23 @@ class Meta:
                 'fields': ('first_name', 'second_name', 'third_name', 'email', 'is_staff', 'user_id')
             }),
         )
+
+
+class PaymentStatisticsForm(StatisticsForm):
+    y_choices = [
+        ("parking_detail__latitude", "Широта парковки"),
+        ("parking_detail__longitude", "Долгота парковки"),
+        ("parking_detail__total_lots", "Общее число мест парковки"),
+        ("parking_detail__price_per_hour", "Цена за час парковки"),
+        ("duration", "Длительность"),
+        ("price", "Цена"),
+    ]
+    x_choices = y_choices + [
+        ("parking_detail__parking_zone", "Номер парковочной зоны"),
+        ("user_detail__is_staff", "Сотрудник"),
+        ("created_at", "Создание"),
+        ("start", "Начало"),
+        ("end", "Конец"),
+    ]
+    x_attribute = forms.ChoiceField(choices=x_choices, label='Атрибут X', initial="parking_detail__parking_zone")
+    y_attribute = forms.ChoiceField(choices=y_choices, label='Атрибут Y', initial="price")

application/pay_parking/paying/views.py

@@ -15,7 +15,6 @@
     MaxPricePerHourFilter, MinPricePerHourFilter
 )
 from django.contrib.auth.decorators import login_required
-from pay_parking.filters import FakeFilterWithForm
 from pay_parking.admin import UserSite
 from .admin import PaymentAdmin
 from datetime import timedelta, datetime
@@ -34,7 +33,6 @@ class UserPaymentAdmin(PaymentAdmin):
     )
     list_display_links = None
     list_filter = (
-        FakeFilterWithForm,
         MinCreatedAtFilter, MaxCreatedAtFilter, MinStartFilter, MaxStartFilter,
         MinEndFilter, MaxEndFilter, MinPriceFilter, MaxPriceFilter,
         MinDurationFilter, MaxDurationFilter,