{% for d in consists %}
diff --git a/ram/portal/urls.py b/ram/portal/urls.py
index 5454759..0b27cf4 100644
--- a/ram/portal/urls.py
+++ b/ram/portal/urls.py
@@ -4,6 +4,7 @@ from portal.views import (
GetData,
GetRoster,
GetObjectsFiltered,
+ GetManufacturerItem,
GetFlatpage,
GetRollingStock,
GetConsist,
@@ -20,7 +21,11 @@ from portal.views import (
urlpatterns = [
path("", GetData.as_view(template="home.html"), name="index"),
path("roster", GetRoster.as_view(), name="roster"),
- path("roster/", GetRoster.as_view(), name="roster_pagination"),
+ path(
+ "roster/page/",
+ GetRoster.as_view(),
+ name="roster_pagination"
+ ),
path(
"page/",
GetFlatpage.as_view(),
@@ -32,13 +37,13 @@ urlpatterns = [
name="consists"
),
path(
- "consists/",
+ "consists/page/",
Consists.as_view(template="consists.html"),
name="consists_pagination"
),
path("consist/", GetConsist.as_view(), name="consist"),
path(
- "consist//",
+ "consist//page/",
GetConsist.as_view(),
name="consist_pagination",
),
@@ -48,7 +53,7 @@ urlpatterns = [
name="companies"
),
path(
- "companies/",
+ "companies/page/",
Companies.as_view(template="companies.html"),
name="companies_pagination",
),
@@ -58,7 +63,7 @@ urlpatterns = [
name="manufacturers"
),
path(
- "manufacturers//",
+ "manufacturers//page/",
Manufacturers.as_view(template="manufacturers.html"),
name="manufacturers_pagination",
),
@@ -68,7 +73,7 @@ urlpatterns = [
name="scales"
),
path(
- "scales/",
+ "scales/page/",
Scales.as_view(template="scales.html"),
name="scales_pagination"
),
@@ -78,7 +83,7 @@ urlpatterns = [
name="types"
),
path(
- "types/",
+ "types/page/",
Types.as_view(template="types.html"),
name="types_pagination"
),
@@ -88,7 +93,7 @@ urlpatterns = [
name="books"
),
path(
- "bookshelf/books/",
+ "bookshelf/books/page/",
Books.as_view(template="bookshelf/books.html"),
name="books_pagination"
),
@@ -99,17 +104,37 @@ urlpatterns = [
name="search",
),
path(
- "search//",
+ "search//page/",
SearchObjects.as_view(),
name="search_pagination",
),
+ path(
+ "manufacturer/",
+ GetManufacturerItem.as_view(),
+ name="manufacturer",
+ ),
+ path(
+ "manufacturer//page/",
+ GetManufacturerItem.as_view(),
+ name="manufacturer_pagination",
+ ),
+ path(
+ "manufacturer//",
+ GetManufacturerItem.as_view(),
+ name="manufacturer",
+ ),
+ path(
+ "manufacturer///page/",
+ GetManufacturerItem.as_view(),
+ name="manufacturer_pagination",
+ ),
path(
"/",
GetObjectsFiltered.as_view(),
name="filtered",
),
path(
- "//",
+ "//page/",
GetObjectsFiltered.as_view(),
name="filtered_pagination",
),
diff --git a/ram/portal/views.py b/ram/portal/views.py
index 8722b0c..9c57125 100644
--- a/ram/portal/views.py
+++ b/ram/portal/views.py
@@ -7,7 +7,7 @@ from django.views import View
from django.http import Http404, HttpResponseBadRequest
from django.db.utils import OperationalError, ProgrammingError
from django.db.models import Q
-from django.shortcuts import render, get_object_or_404
+from django.shortcuts import render, get_object_or_404, get_list_or_404
from django.core.exceptions import ObjectDoesNotExist
from django.core.paginator import Paginator
@@ -215,6 +215,58 @@ class SearchObjects(View):
return self.get(request, search, page)
+class GetManufacturerItem(View):
+ def get(self, request, manufacturer, search="all", page=1):
+ site_conf = get_site_conf()
+
+ if search != "all":
+ rolling_stock = get_list_or_404(
+ RollingStock.objects.order_by(*order_by_fields()),
+ Q(
+ Q(manufacturer__name__iexact=manufacturer)
+ & Q(item_number__exact=search)
+ )
+ )
+ title = "{0}: {1}".format(
+ rolling_stock[0].manufacturer,
+ search
+ )
+ else:
+ rolling_stock = get_list_or_404(
+ RollingStock.objects.order_by(*order_by_fields()),
+ Q(rolling_class__manufacturer__slug__iexact=manufacturer)
+ | Q(manufacturer__slug__iexact=manufacturer)
+ )
+ title = "Manufacturer: {0}".format(
+ get_object_or_404(Manufacturer, slug__iexact=manufacturer)
+ )
+
+ data = []
+ for item in rolling_stock:
+ data.append({
+ "type": "rolling_stock",
+ "item": item
+ })
+
+ paginator = Paginator(data, site_conf.items_per_page)
+ data = paginator.get_page(page)
+ page_range = paginator.get_elided_page_range(
+ data.number, on_each_side=2, on_ends=1
+ )
+ return render(
+ request,
+ "manufacturer.html",
+ {
+ "title": title,
+ "manufacturer": manufacturer,
+ "search": search,
+ "data": data,
+ "matches": paginator.count,
+ "page_range": page_range,
+ },
+ )
+
+
class GetObjectsFiltered(View):
def run_filter(self, request, search, _filter, page=1):
site_conf = get_site_conf()
@@ -226,12 +278,6 @@ class GetObjectsFiltered(View):
title = get_object_or_404(Company, slug__iexact=search)
query = Q(rolling_class__company__slug__iexact=search)
query_2nd = Q(company__slug__iexact=search)
- elif _filter == "manufacturer":
- title = get_object_or_404(Manufacturer, slug__iexact=search)
- query = Q(
- Q(rolling_class__manufacturer__slug__iexact=search)
- | Q(manufacturer__slug__iexact=search)
- )
elif _filter == "scale":
title = get_object_or_404(Scale, slug__iexact=search)
query = Q(scale__slug__iexact=search)
@@ -347,6 +393,16 @@ class GetRollingStock(View):
consist_item__rolling_stock=rolling_stock
)] # A dict with "item" is required by the consists card
+ set = [{
+ "type": "set",
+ "item": s
+ } for s in RollingStock.objects.filter(
+ Q(
+ Q(item_number__exact=rolling_stock.item_number)
+ & Q(set=True)
+ )
+ )]
+
return render(
request,
"rollingstock.html",
@@ -358,6 +414,7 @@ class GetRollingStock(View):
"decoder_documents": decoder_documents,
"documents": documents,
"journal": journal,
+ "set": set,
"consists": consists,
},
)
diff --git a/ram/ram/__init__.py b/ram/ram/__init__.py
index 9f73a85..f113a06 100644
--- a/ram/ram/__init__.py
+++ b/ram/ram/__init__.py
@@ -1,4 +1,4 @@
from ram.utils import git_suffix
-__version__ = "0.11.1"
+__version__ = "0.12.0"
__version__ += git_suffix(__file__)
diff --git a/ram/roster/admin.py b/ram/roster/admin.py
index a32ddd4..aa9804f 100644
--- a/ram/roster/admin.py
+++ b/ram/roster/admin.py
@@ -141,6 +141,7 @@ class RollingStockAdmin(SortableAdminBase, admin.ModelAdmin):
"scale",
"manufacturer",
"item_number",
+ "set",
"era",
"description",
"production_year",
diff --git a/ram/roster/migrations/0025_rollingstock_set_alter_rollingstock_era_and_more.py b/ram/roster/migrations/0025_rollingstock_set_alter_rollingstock_era_and_more.py
new file mode 100644
index 0000000..f4c01e9
--- /dev/null
+++ b/ram/roster/migrations/0025_rollingstock_set_alter_rollingstock_era_and_more.py
@@ -0,0 +1,40 @@
+# Generated by Django 5.0.4 on 2024-04-20 12:55
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ("roster", "0024_rollingstock_description"),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name="rollingstock",
+ name="set",
+ field=models.BooleanField(default=False, help_text="Part of a set"),
+ ),
+ migrations.AlterField(
+ model_name="rollingstock",
+ name="era",
+ field=models.CharField(
+ blank=True, help_text="Era or epoch of the model", max_length=32
+ ),
+ ),
+ migrations.AlterField(
+ model_name="rollingstock",
+ name="item_number",
+ field=models.CharField(
+ blank=True, help_text="Catalog item number or code", max_length=32
+ ),
+ ),
+ migrations.AlterField(
+ model_name="rollingstockjournal",
+ name="private",
+ field=models.BooleanField(
+ default=False,
+ help_text="Journal log will be visible only to logged users",
+ ),
+ ),
+ ]
diff --git a/ram/roster/models.py b/ram/roster/models.py
index 13e7c5f..3cbda4e 100644
--- a/ram/roster/models.py
+++ b/ram/roster/models.py
@@ -74,7 +74,15 @@ class RollingStock(models.Model):
limit_choices_to={"category": "model"},
)
scale = models.ForeignKey(Scale, on_delete=models.CASCADE)
- item_number = models.CharField(max_length=32, blank=True)
+ item_number = models.CharField(
+ max_length=32,
+ blank=True,
+ help_text="Catalog item number or code",
+ )
+ set = models.BooleanField(
+ default=False,
+ help_text="Part of a set",
+ )
decoder_interface = models.PositiveSmallIntegerField(
choices=settings.DECODER_INTERFACES, null=True, blank=True
)
@@ -82,7 +90,11 @@ class RollingStock(models.Model):
Decoder, on_delete=models.CASCADE, null=True, blank=True
)
address = models.SmallIntegerField(default=None, null=True, blank=True)
- era = models.CharField(max_length=32, blank=True)
+ era = models.CharField(
+ max_length=32,
+ blank=True,
+ help_text="Era or epoch of the model",
+ )
production_year = models.SmallIntegerField(null=True, blank=True)
purchase_date = models.DateField(null=True, blank=True)
description = tinymce.HTMLField(blank=True)
@@ -177,7 +189,10 @@ class RollingStockJournal(models.Model):
)
date = models.DateField()
log = tinymce.HTMLField()
- private = models.BooleanField(default=False)
+ private = models.BooleanField(
+ default=False,
+ help_text="Journal log will be visible only to logged users",
+ )
creation_time = models.DateTimeField(auto_now_add=True)
updated_time = models.DateTimeField(auto_now=True)