Run black on py

This commit is contained in:
2022-04-19 14:25:29 +02:00
parent 13cc531c5d
commit b925af1e7a
13 changed files with 95 additions and 86 deletions

View File

@@ -2,5 +2,5 @@ from django.apps import AppConfig
class PortalConfig(AppConfig):
default_auto_field = 'django.db.models.BigAutoField'
name = 'portal'
default_auto_field = "django.db.models.BigAutoField"
name = "portal"

View File

@@ -7,14 +7,14 @@ from solo.models import SingletonModel
class SiteConfiguration(SingletonModel):
site_name = models.CharField(
max_length=256,
default="Railroad Assets Manager")
max_length=256, default="Railroad Assets Manager"
)
site_author = models.CharField(max_length=256, blank=True)
about = models.TextField(blank=True)
items_per_page = models.CharField(
max_length=2, choices=[
(str(x * 3), str(x * 3)) for x in range(2, 11)],
default='6'
max_length=2,
choices=[(str(x * 3), str(x * 3)) for x in range(2, 11)],
default="6",
)
footer = models.TextField(blank=True)
footer_extended = models.TextField(blank=True)

View File

@@ -9,4 +9,4 @@ register = template.Library()
@register.filter
@stringfilter
def markdown(value):
return md.markdown(value, extensions=['markdown.extensions.fenced_code'])
return md.markdown(value, extensions=["markdown.extensions.fenced_code"])

View File

@@ -3,16 +3,20 @@ from django.urls import path
from portal.views import GetHome, GetHomeFiltered, GetRollingStock
urlpatterns = [
path("", GetHome.as_view(), name='index'),
path("<int:page>", GetHome.as_view(), name='index_pagination'),
path("", GetHome.as_view(), name="index"),
path("<int:page>", GetHome.as_view(), name="index_pagination"),
path(
"search",
GetHomeFiltered.as_view(http_method_names=['post']),
name='index_filtered'
GetHomeFiltered.as_view(http_method_names=["post"]),
name="index_filtered",
),
path("search/<str:search>",
GetHomeFiltered.as_view(), name='index_filtered'),
path("search/<str:search>/<int:page>",
GetHomeFiltered.as_view(), name='index_filtered_pagination'),
path("<uuid:uuid>", GetRollingStock.as_view(), name='rolling_stock'),
path(
"search/<str:search>", GetHomeFiltered.as_view(), name="index_filtered"
),
path(
"search/<str:search>/<int:page>",
GetHomeFiltered.as_view(),
name="index_filtered_pagination",
),
path("<uuid:uuid>", GetRollingStock.as_view(), name="rolling_stock"),
]

View File

@@ -2,5 +2,5 @@ from django.apps import apps
def get_site_conf():
SiteConfiguration = apps.get_model('portal', 'SiteConfiguration')
SiteConfiguration = apps.get_model("portal", "SiteConfiguration")
return SiteConfiguration.get_solo()

View File

@@ -24,9 +24,7 @@ class GetHome(View):
except EmptyPage:
rolling_stock = paginator.page(paginator.num_pages)
return render(request, "home.html", {
"rolling_stock": rolling_stock
})
return render(request, "home.html", {"rolling_stock": rolling_stock})
class GetHomeFiltered(View):
@@ -37,17 +35,23 @@ class GetHomeFiltered(View):
# query = {
# _filter: _value
# }
query = reduce(operator.or_, (Q(
Q(rolling_class__identifier__icontains=s) |
Q(rolling_class__description__icontains=s) |
Q(rolling_class__type__type__icontains=s) |
Q(road_number__icontains=s) |
Q(rolling_class__company__name__icontains=s) |
Q(rolling_class__company__country__icontains=s) |
Q(manufacturer__name__icontains=s) |
Q(scale__scale__icontains=s) |
Q(tags__name__icontains=s)
) for s in search.split()))
query = reduce(
operator.or_,
(
Q(
Q(rolling_class__identifier__icontains=s)
| Q(rolling_class__description__icontains=s)
| Q(rolling_class__type__type__icontains=s)
| Q(road_number__icontains=s)
| Q(rolling_class__company__name__icontains=s)
| Q(rolling_class__company__country__icontains=s)
| Q(manufacturer__name__icontains=s)
| Q(scale__scale__icontains=s)
| Q(tags__name__icontains=s)
)
for s in search.split()
),
)
rolling_stock = RollingStock.objects.filter(query)
paginator = Paginator(rolling_stock, site_conf.items_per_page)
@@ -63,10 +67,11 @@ class GetHomeFiltered(View):
def get(self, request, search, page=1):
rolling_stock = self.run_search(request, search, page)
return render(request, "search.html", {
"search": search,
"rolling_stock": rolling_stock
})
return render(
request,
"search.html",
{"search": search, "rolling_stock": rolling_stock},
)
def post(self, request, page=1):
search = request.POST.get("search")
@@ -74,16 +79,21 @@ class GetHomeFiltered(View):
raise Http404
rolling_stock = self.run_search(request, search, page)
return render(request, "search.html", {
"search": search,
"rolling_stock": rolling_stock
})
return render(
request,
"search.html",
{"search": search, "rolling_stock": rolling_stock},
)
class GetRollingStock(View):
def get(self, request, uuid):
rolling_stock = RollingStock.objects.get(uuid=uuid)
return render(request, "page.html", {
"rolling_stock": rolling_stock,
})
return render(
request,
"page.html",
{
"rolling_stock": rolling_stock,
},
)