From 4989bac4a5fe2650846ca4c166836e6c0e6a3926 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniele=20Vigan=C3=B2?= Date: Tue, 19 Apr 2022 19:18:31 +0200 Subject: [PATCH 1/5] Add support for consist and minor improvements --- ram/consist/models.py | 4 + ram/portal/templates/base.html | 73 ++++++----- ram/portal/templates/consist.html | 147 ++++++++++++++++++++++ ram/portal/templates/consists.html | 93 ++++++++++++++ ram/portal/templates/includes/login.html | 2 +- ram/portal/templates/includes/search.html | 4 +- ram/portal/templates/page.html | 8 +- ram/portal/urls.py | 33 ++++- ram/portal/views.py | 95 ++++++++++---- 9 files changed, 391 insertions(+), 68 deletions(-) create mode 100644 ram/portal/templates/consist.html create mode 100644 ram/portal/templates/consists.html diff --git a/ram/consist/models.py b/ram/consist/models.py index bb9b7ab..cdd1085 100644 --- a/ram/consist/models.py +++ b/ram/consist/models.py @@ -1,5 +1,6 @@ from uuid import uuid4 from django.db import models +from django.urls import reverse from metadata.models import Company, Tag from roster.models import RollingStock @@ -23,6 +24,9 @@ class Consist(models.Model): def __str__(self): return "{0}".format(self.identifier) + def get_absolute_url(self): + return reverse("consist", kwargs={"uuid": self.uuid}) + class ConsistItem(models.Model): consist = models.ForeignKey( diff --git a/ram/portal/templates/base.html b/ram/portal/templates/base.html index 8b62c38..35df3cd 100644 --- a/ram/portal/templates/base.html +++ b/ram/portal/templates/base.html @@ -32,11 +32,11 @@
-
+
- + {{ site_conf.site_name }} @@ -45,11 +45,20 @@
-
+
@@ -64,7 +73,7 @@
-
+
{% block cards %} {% for r in rolling_stock %}
@@ -74,6 +83,13 @@ {% endfor %}

{{ r }}

+ {% if r.tags.all %} +

Tags: + {% for t in r.tags.all %} + {{ t.name }}{# new line is required #} + {% endfor %} +

+ {% endif %} @@ -113,38 +129,31 @@ - -
SKU {{ r.sku }}
+ + {% if r.decoder %} - - - - - - - - - - - - - - - - -
DCC data
Decoder{{ r.decoder }}
Address{{ r.address }}
+ + + + + + + + + + + + + + + + +
DCC data
Decoder{{ r.decoder }}
Address{{ r.address }}
{% endif %}
Show all data {% if request.user.is_staff %}Edit{% endif %}
- {% if r.tags.all %} -

Tags: - {% for t in r.tags.all %} - {{ t.name }}{# new line is required #} - {% endfor %} -

- {% endif %}
Updated {{ r.updated_time | date:"M d, Y H:m" }}
diff --git a/ram/portal/templates/consist.html b/ram/portal/templates/consist.html new file mode 100644 index 0000000..711ff7b --- /dev/null +++ b/ram/portal/templates/consist.html @@ -0,0 +1,147 @@ +{% extends "base.html" %} +{% load markdown %} + + {% block header %} +

{{ consist }}

+ {% if consist.tags.all %} +

Tags: + {% for t in consist.tags.all %} + {{ t.name }}{# new line is required #} + {% endfor %} +

+ {% endif %} + {% endblock %} + {% block cards %} + {% for r in rolling_stock %} +
+
+ {% for i in r.rolling_stock.image.all %} + {% if i.is_thumbnail %}Card image cap{% endif %} + {% endfor %} +
+

{{ r }}

+ {% if r.rolling_stock.tags.all %} +

Tags: + {% for t in r.rolling_stock.tags.all %} + {{ t.name }}{# new line is required #} + {% endfor %} +

+ {% endif %} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Data
Type{{ r.rolling_stock.rolling_class.type }}
Company{{ r.rolling_stock.rolling_class.company }}
Class{{ r.rolling_stock.rolling_class.identifier }}
Road number{{ r.rolling_stock.road_number }}
Era{{ r.rolling_stock.era }}
Manufacturer{% if r.rolling_stock.manufacturer.website %}{% endif %}{{ r.rolling_stock.manufacturer }}{% if r.rolling_stock.manufacturer.website %}{% endif %} +
Scale{{ r.rolling_stock.scale }}
SKU{{ r.rolling_stock.sku }}
+ {% if r.rolling_stock.decoder %} + + + + + + + + + + + + + + + + +
DCC data
Decoder{{ r.rolling_stock.decoder }}
Address{{ r.rolling_stock.address }}
+ {% endif %} +
+ Show all data + {% if request.user.is_staff %}Edit{% endif %} +
+
+ Updated {{ r.rolling_stock.updated_time | date:"M d, Y H:m" }} +
+
+
+
+ {% endfor %} + {% endblock %} + {% block pagination %} + {% if rolling_stock.has_other_pages %} + + {% endif %} + {% endblock %} + {% block extra_content %} +
+
+
+
+ {% if request.user.is_staff %}Edit{% endif %} +
+
+
+
+ {% endblock %} diff --git a/ram/portal/templates/consists.html b/ram/portal/templates/consists.html new file mode 100644 index 0000000..b62e53b --- /dev/null +++ b/ram/portal/templates/consists.html @@ -0,0 +1,93 @@ +{% extends "base.html" %} +{% load markdown %} + + {% block header %} +

Consists

+ {% endblock %} + {% block cards %} + {% for c in consist %} +
+
+
+

{{ c.identifier }}

+ {% if c.tags.all %} +

Tags: + {% for t in c.tags.all %} + {{ t.name }}{# new line is required #} + {% endfor %} +

+ {% endif %} + + + + + + + + {% if c.address %} + + + + + {% endif %} + + + + + + + + + + + + + +
Consist data
Address{{ c.address }}
Company{{ c.company }}
Era{{ c.era }}
Length{{ c.consist_item.all | length }}
+
+ Show all data + {% if request.user.is_staff %}Edit{% endif %} +
+
+ Updated {{ c.updated_time | date:"M d, Y H:m" }} +
+
+
+
+ {% endfor %} + {% endblock %} + {% block pagination %} + {% if rolling_stock.has_other_pages %} + + {% endif %} + {% endblock %} diff --git a/ram/portal/templates/includes/login.html b/ram/portal/templates/includes/login.html index 6ecd6f4..b67f2ee 100644 --- a/ram/portal/templates/includes/login.html +++ b/ram/portal/templates/includes/login.html @@ -1,6 +1,6 @@ {% if request.user.is_staff %}
-
    diff --git a/ram/portal/templates/includes/search.html b/ram/portal/templates/includes/search.html index 37baf01..298367f 100644 --- a/ram/portal/templates/includes/search.html +++ b/ram/portal/templates/includes/search.html @@ -1,5 +1,5 @@ -
    + - +
    diff --git a/ram/portal/templates/page.html b/ram/portal/templates/page.html index 4e2c054..1ea1716 100644 --- a/ram/portal/templates/page.html +++ b/ram/portal/templates/page.html @@ -14,7 +14,7 @@ {% block cards %} {% for t in rolling_stock.image.all %}
    - Rolling stock image + Rolling stock image
    {% endfor %} {% endblock %} @@ -180,7 +180,11 @@ - Name + Address + {{ rolling_stock.address }} + + + Name {{ rolling_stock.decoder.name }} diff --git a/ram/portal/urls.py b/ram/portal/urls.py index c106df8..b06b83a 100644 --- a/ram/portal/urls.py +++ b/ram/portal/urls.py @@ -1,6 +1,12 @@ from django.urls import path -from portal.views import GetHome, GetHomeFiltered, GetRollingStock +from portal.views import ( + GetHome, + GetHomeFiltered, + GetRollingStock, + GetConsist, + Consists, +) urlpatterns = [ path("", GetHome.as_view(), name="index"), @@ -8,15 +14,30 @@ urlpatterns = [ path( "search", GetHomeFiltered.as_view(http_method_names=["post"]), - name="index_filtered", - ), - path( - "search/", GetHomeFiltered.as_view(), name="index_filtered" + name="search", ), + path("search/", GetHomeFiltered.as_view(), name="search"), path( "search//", GetHomeFiltered.as_view(), - name="index_filtered_pagination", + name="search_pagination", + ), + path("consist", Consists.as_view(), name="consists"), + path("consist/", GetConsist.as_view(), name="consist"), + path( + "consist//", + GetConsist.as_view(), + name="consist_pagination", + ), + path( + "/", + GetHomeFiltered.as_view(), + name="filtered", + ), + path( + "//", + GetHomeFiltered.as_view(), + name="filtered_pagination", ), path("", GetRollingStock.as_view(), name="rolling_stock"), ] diff --git a/ram/portal/views.py b/ram/portal/views.py index 5f393af..070d2a0 100644 --- a/ram/portal/views.py +++ b/ram/portal/views.py @@ -9,6 +9,7 @@ from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger from portal.utils import get_site_conf from roster.models import RollingStock +from consist.models import Consist class GetHome(View): @@ -28,30 +29,37 @@ class GetHome(View): class GetHomeFiltered(View): - def run_search(self, request, search, page=1): + def run_search(self, request, search, _filter, page=1): # if not hasattr(RollingStock, _filter): # raise Http404 site_conf = get_site_conf() - # 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() - ), - ) + if _filter is None: + 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() + ), + ) + elif _filter == "company": + query = Q( + Q(rolling_class__company__name__icontains=search) + | Q(rolling_class__company__extended_name__icontains=search) + ) + elif _filter == "scale": + query = Q(scale__scale__icontains=search) + else: + raise Http404 rolling_stock = RollingStock.objects.filter(query) paginator = Paginator(rolling_stock, site_conf.items_per_page) @@ -64,8 +72,8 @@ class GetHomeFiltered(View): return rolling_stock - def get(self, request, search, page=1): - rolling_stock = self.run_search(request, search, page) + def get(self, request, search, _filter=None, page=1): + rolling_stock = self.run_search(request, search, _filter, page) return render( request, @@ -73,11 +81,11 @@ class GetHomeFiltered(View): {"search": search, "rolling_stock": rolling_stock}, ) - def post(self, request, page=1): + def post(self, request, _filter=None, page=1): search = request.POST.get("search") if not search: raise Http404 - rolling_stock = self.run_search(request, search, page) + rolling_stock = self.run_search(request, search, _filter, page) return render( request, @@ -97,3 +105,40 @@ class GetRollingStock(View): "rolling_stock": rolling_stock, }, ) + + +class Consists(View): + def get(self, request, page=1): + site_conf = get_site_conf() + consist = Consist.objects.all() + paginator = Paginator(consist, site_conf.items_per_page) + + try: + consist = paginator.page(page) + except PageNotAnInteger: + consist = paginator.page(1) + except EmptyPage: + consist = paginator.page(paginator.num_pages) + + return render(request, "consists.html", {"consist": consist}) + + +class GetConsist(View): + def get(self, request, uuid, page=1): + site_conf = get_site_conf() + consist = Consist.objects.get(uuid=uuid) + rolling_stock = consist.consist_item.all() + paginator = Paginator(rolling_stock, site_conf.items_per_page) + + try: + rolling_stock = paginator.page(page) + except PageNotAnInteger: + rolling_stock = paginator.page(1) + except EmptyPage: + rolling_stock = paginator.page(paginator.num_pages) + + return render( + request, + "consist.html", + {"consist": consist, "rolling_stock": rolling_stock}, + ) From b88faf931c57efb49055e7eaadf6ee3f332cf9e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniele=20Vigan=C3=B2?= Date: Tue, 19 Apr 2022 19:20:53 +0200 Subject: [PATCH 2/5] Restore a g-0 --- ram/portal/templates/base.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ram/portal/templates/base.html b/ram/portal/templates/base.html index 35df3cd..ae063c0 100644 --- a/ram/portal/templates/base.html +++ b/ram/portal/templates/base.html @@ -45,9 +45,9 @@
-
+