Change how images and consists are sorted (#14 )

Update README.md
Add possibility to inject js in head (analytics)
2025-08-09 15:47:50 +02:00 · 2023-01-02 16:08:25 +01:00 · 2022-12-30 09:28:08 +01:00 · 2022-12-28 23:54:49 +01:00
14 changed files with 119 additions and 18 deletions
--- a/README.md
+++ b/README.md
@@ -21,7 +21,7 @@ it has been developed with a commitment of few minutes a day;
 it lacks any kind of documentation, code review, architectural review,
 security assesment, pentest, ISO certification, etc.
-This project probably doesn't match you needs nor expectations. Be aware.
+This project probably doesn't match your needs nor expectations. Be aware.
 Your model train may also catch fire while using this software.
--- a/ram/consist/migrations/0008_alter_consist_options.py
+++ b/ram/consist/migrations/0008_alter_consist_options.py
@@ -0,0 +1,17 @@
 # Generated by Django 4.1.3 on 2023-01-02 15:03
 from django.db import migrations
 class Migration(migrations.Migration):
    dependencies = [
        ("consist", "0007_alter_consist_image"),
    ]
    operations = [
        migrations.AlterModelOptions(
            name="consist",
            options={"ordering": ["company", "-creation_time"]},
        ),
    ]
--- a/ram/consist/models.py
+++ b/ram/consist/models.py
@@ -32,7 +32,7 @@ class Consist(models.Model):
        return reverse("consist", kwargs={"uuid": self.uuid})
    class Meta:
-        ordering = ["creation_time"]
+        ordering = ["company", "-creation_time"]
 class ConsistItem(models.Model):
--- a/ram/portal/admin.py
+++ b/ram/portal/admin.py
@@ -3,7 +3,34 @@ from solo.admin import SingletonModelAdmin
 from portal.models import SiteConfiguration, Flatpage
-admin.site.register(SiteConfiguration, SingletonModelAdmin)
+@admin.register(SiteConfiguration)
 class SiteConfigurationAdmin(SingletonModelAdmin):
    fieldsets = (
        (
            None,
            {
                "fields": (
                    "site_name",
                    "site_author",
                    "about",
                    "items_per_page",
                    "items_ordering",
                    "footer",
                    "footer_extended",
                )
            },
        ),
        (
            "Advanced",
            {
                "classes": ("collapse",),
                "fields": (
                    "show_version",
                    "extra_head",
                ),
            },
        ),
    )
@admin.register(Flatpage)
--- a/ram/portal/migrations/0014_siteconfiguration_extra_head.py
+++ b/ram/portal/migrations/0014_siteconfiguration_extra_head.py
@@ -0,0 +1,18 @@
 # Generated by Django 4.1.3 on 2022-12-28 22:43
 from django.db import migrations, models
 class Migration(migrations.Migration):
    dependencies = [
        ("portal", "0013_remove_flatpage_draft_flatpage_published"),
    ]
    operations = [
        migrations.AddField(
            model_name="siteconfiguration",
            name="extra_head",
            field=models.TextField(blank=True),
        ),
    ]
--- a/ram/portal/models.py
+++ b/ram/portal/models.py
@@ -35,6 +35,7 @@ class SiteConfiguration(SingletonModel):
    footer = RichTextField(blank=True)
    footer_extended = RichTextField(blank=True)
    show_version = models.BooleanField(default=True)
    extra_head = models.TextField(blank=True)
    class Meta:
        verbose_name = "Site Configuration"
--- a/ram/portal/templates/base.html
+++ b/ram/portal/templates/base.html
@@ -34,6 +34,10 @@
      html.dark .d-light-inline { display: none !important; }
      html.dark .d-dark-inline { display: inline !important; }
    </style>
    {% block extra_head %}
    {{ site_conf.extra_head | safe }}
    {% endblock %}
  </head>
  <body>
    <header>
@@ -96,7 +100,7 @@
            <div class="col">
              <div class="card shadow-sm">
                {% for i in r.image.all %}
-                {% if i.is_thumbnail %}<a href="{{r.get_absolute_url}}"><img src="{{ i.image.url }}" alt="Card image cap"></a>{% endif %}
+                {% if forloop.first %}<a href="{{r.get_absolute_url}}"><img src="{{ i.image.url }}" alt="Card image cap"></a>{% endif %}
                {% endfor %}
                <div class="card-body">
                  <p class="card-text" style="position: relative;">
--- a/ram/portal/templates/consist.html
+++ b/ram/portal/templates/consist.html
@@ -15,7 +15,7 @@
      <div class="col">
        <div class="card shadow-sm">
          {% for i in r.rolling_stock.image.all %}
-          {% if i.is_thumbnail %}<a href="{{r.rolling_stock.get_absolute_url}}"><img src="{{ i.image.url }}" alt="Card image cap"></a>{% endif %}
+          {% if forloop.first %}<a href="{{r.rolling_stock.get_absolute_url}}"><img src="{{ i.image.url }}" alt="Card image cap"></a>{% endif %}
          {% endfor %}
          <div class="card-body">
            <p class="card-text" style="position: relative;">
--- a/ram/portal/templates/consists.html
+++ b/ram/portal/templates/consists.html
@@ -10,7 +10,7 @@
          {% else %}
            {% with c.consist_item.first.rolling_stock as r %}
            {% for i in r.image.all %}
-              {% if i.is_thumbnail %}<img src="{{ i.image.url }}" alt="Card image cap">{% endif %}
+              {% if forloop.first %}<img src="{{ i.image.url }}" alt="Card image cap">{% endif %}
            {% endfor %}
            {% endwith %}
          {% endif %}
--- a/ram/ram/init.py
+++ b/ram/ram/init.py
@@ -1,4 +1,4 @@
 from ram.utils import git_suffix
-__version__ = "0.0.22"
+__version__ = "0.0.24"
 __version__ += git_suffix(__file__)
--- a/ram/roster/admin.py
+++ b/ram/roster/admin.py
@@ -1,4 +1,6 @@
 from django.contrib import admin
 from adminsortable2.admin import SortableAdminBase, SortableInlineAdminMixin
 from roster.models import (
    RollingClass,
    RollingClassProperty,
@@ -35,7 +37,7 @@ class RollingStockDocInline(admin.TabularInline):
    classes = ["collapse"]
-class RollingStockImageInline(admin.TabularInline):
+class RollingStockImageInline(SortableInlineAdminMixin, admin.TabularInline):
    model = RollingStockImage
    min_num = 0
    extra = 0
@@ -93,7 +95,7 @@ class RollingJournalDocumentAdmin(admin.ModelAdmin):
@admin.register(RollingStock)
-class RollingStockAdmin(admin.ModelAdmin):
+class RollingStockAdmin(SortableAdminBase, admin.ModelAdmin):
    inlines = (
        RollingStockPropertyInline,
        RollingStockImageInline,
--- a/ram/roster/migrations/0016_alter_rollingstockimage_options_and_more.py
+++ b/ram/roster/migrations/0016_alter_rollingstockimage_options_and_more.py
@@ -0,0 +1,22 @@
 # Generated by Django 4.1.3 on 2023-01-02 12:34
 from django.db import migrations, models
 class Migration(migrations.Migration):
    dependencies = [
        ("roster", "0015_alter_rollingstockimage_options"),
    ]
    operations = [
        migrations.AlterModelOptions(
            name="rollingstockimage",
            options={"ordering": ["order"]},
        ),
        migrations.AddField(
            model_name="rollingstockimage",
            name="order",
            field=models.PositiveIntegerField(default=0),
        ),
    ]
--- a/ram/roster/migrations/0017_remove_rollingstockimage_is_thumbnail.py
+++ b/ram/roster/migrations/0017_remove_rollingstockimage_is_thumbnail.py
@@ -0,0 +1,17 @@
 # Generated by Django 4.1.3 on 2023-01-02 15:02
 from django.db import migrations
 class Migration(migrations.Migration):
    dependencies = [
        ("roster", "0016_alter_rollingstockimage_options_and_more"),
    ]
    operations = [
        migrations.RemoveField(
            model_name="rollingstockimage",
            name="is_thumbnail",
        ),
    ]
--- a/ram/roster/models.py
+++ b/ram/roster/models.py
@@ -155,13 +155,13 @@ class RollingStockDocument(models.Model):
 class RollingStockImage(models.Model):
    order = models.PositiveIntegerField(default=0, blank=False, null=False)
    rolling_stock = models.ForeignKey(
        RollingStock, on_delete=models.CASCADE, related_name="image"
    )
    image = models.ImageField(
        upload_to="images/", storage=DeduplicatedStorage, null=True, blank=True
    )
    is_thumbnail = models.BooleanField()
    def image_thumbnail(self):
        return get_image_preview(self.image.url)
@@ -171,15 +171,8 @@ class RollingStockImage(models.Model):
    def __str__(self):
        return "{0}".format(os.path.basename(self.image.name))
    def save(self, **kwargs):
        if self.is_thumbnail:
            RollingStockImage.objects.filter(
                rolling_stock=self.rolling_stock
            ).update(is_thumbnail=False)
        super().save(**kwargs)
    class Meta:
-        ordering = ["-is_thumbnail"]
+        ordering = ["order"]
 class RollingStockProperty(models.Model):
Author	SHA1	Message	Date
Daniele Viganò	32b5522a1e	Change how images and consists are sorted (#14 )	2023-01-02 16:08:25 +01:00
Daniele Viganò	89b666dab2	Update README.md	2022-12-30 09:28:08 +01:00
Daniele Viganò	ffad964373	Add possibility to inject js in head (analytics)	2022-12-28 23:54:49 +01:00