[collector] rename Views and urls
This commit is contained in:
parent
6e078fe03d
commit
3cd0aa3932
2 changed files with 20 additions and 5 deletions
|
@ -5,8 +5,8 @@ from . import views
|
||||||
app_name = "collector"
|
app_name = "collector"
|
||||||
|
|
||||||
urlpatterns = [
|
urlpatterns = [
|
||||||
path("", views.IndexView.as_view(), name="index"),
|
path("", views.IndexView.as_view(), name="list"),
|
||||||
path("recorded/<int:pk>/", views.DetailView.as_view(), name="detail"),
|
path("recorded/<int:pk>/", views.DetailView.as_view(), name="detail"),
|
||||||
path("enter/", views.enter, name="enter"),
|
path("enter/", views.enter, name="enter"),
|
||||||
path("all/", views.ListView.as_view(), name="all"),
|
path("all/", views.TeileListView.as_view(), name="list-all"),
|
||||||
]
|
]
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
import logging
|
import logging
|
||||||
|
from typing import Any
|
||||||
|
|
||||||
from django.db import transaction
|
from django.db import transaction
|
||||||
from django.db.models import QuerySet
|
from django.db.models import QuerySet
|
||||||
|
@ -11,15 +12,23 @@ from .models import Teil
|
||||||
logger = logging.getLogger(__name__)
|
logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
|
||||||
class ListView(generic.ListView):
|
DEFAULT_TEILE_NUMBER = 10
|
||||||
|
|
||||||
|
class TeileListView(generic.ListView):
|
||||||
template_name = "collector/index.html"
|
template_name = "collector/index.html"
|
||||||
context_object_name = "teile_list"
|
context_object_name = "teile_list"
|
||||||
|
|
||||||
def get_queryset(self) -> QuerySet:
|
def get_queryset(self) -> QuerySet:
|
||||||
return Teil.objects.order_by("-modified")
|
return Teil.objects.order_by("-modified")
|
||||||
|
|
||||||
|
def get_context_data(self, **kwargs) -> dict[str, Any]:
|
||||||
|
context = super().get_context_data(**kwargs)
|
||||||
|
context["default_teile_number"] = DEFAULT_TEILE_NUMBER
|
||||||
|
|
||||||
class IndexView(ListView):
|
return context
|
||||||
|
|
||||||
|
|
||||||
|
class IndexView(TeileListView):
|
||||||
def get_queryset(self) -> QuerySet:
|
def get_queryset(self) -> QuerySet:
|
||||||
return super().get_queryset()[:10]
|
return super().get_queryset()[:10]
|
||||||
|
|
||||||
|
@ -28,6 +37,12 @@ class DetailView(generic.DetailView):
|
||||||
model = Teil
|
model = Teil
|
||||||
template_name = "collector/detail.html"
|
template_name = "collector/detail.html"
|
||||||
|
|
||||||
|
def get_context_data(self, **kwargs) -> dict[str, Any]:
|
||||||
|
context = super().get_context_data(**kwargs)
|
||||||
|
context["default_teile_number"] = DEFAULT_TEILE_NUMBER
|
||||||
|
|
||||||
|
return context
|
||||||
|
|
||||||
|
|
||||||
def enter(request: HttpRequest) -> HttpResponse:
|
def enter(request: HttpRequest) -> HttpResponse:
|
||||||
try:
|
try:
|
||||||
|
@ -36,4 +51,4 @@ def enter(request: HttpRequest) -> HttpResponse:
|
||||||
except Exception:
|
except Exception:
|
||||||
logger.warning("Teil already existed")
|
logger.warning("Teil already existed")
|
||||||
|
|
||||||
return HttpResponseRedirect(reverse("collector:index"))
|
return HttpResponseRedirect(reverse("collector:list"))
|
||||||
|
|
Loading…
Add table
Reference in a new issue