Merge pull request #12 from daniviga/move-dcc-interface

Move decoder interface def into rolling stock

ram/metadata/admin.py

@@ -20,8 +20,8 @@ class PropertyAdmin(admin.ModelAdmin):
 @admin.register(Decoder)
 class DecoderAdmin(admin.ModelAdmin):
     readonly_fields = ("image_thumbnail",)
-    list_display = ("__str__", "interface")
-    list_filter = ("manufacturer", "interface")
+    list_display = ("__str__", "sound")
+    list_filter = ("manufacturer", "sound")
     search_fields = ("name", "manufacturer__name")
 
 

ram/metadata/migrations/0008_remove_decoder_interface.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.1.2 on 2022-10-31 23:01
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("metadata", "0007_rename_track_scale_tracks"),
+        ("roster", "0013_rollingstock_decoder_interface"),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name="decoder",
+            name="interface",
+        ),
+    ]

ram/metadata/models.py

@@ -66,9 +66,6 @@ class Decoder(models.Model):
         limit_choices_to={"category": "model"},
     )
     version = models.CharField(max_length=64, blank=True)
-    interface = models.PositiveSmallIntegerField(
-        choices=settings.DECODER_INTERFACES, null=True, blank=True
-    )
     sound = models.BooleanField(default=False)
     image = models.ImageField(upload_to="images/", null=True, blank=True)
 

ram/portal/static/css/main.css

@@ -23,6 +23,15 @@ a.badge, a.badge:hover {
   padding: .5rem;
 }
 
+#nav-journal ul, #nav-journal ol {
+  margin: 0;
+  padding-left: 1rem;
+}
+
+#nav-journal p {
+  margin: 0;
+}
+
 #footer > p {
   display: inline;
 }

ram/portal/templates/companies.html

@@ -59,7 +59,7 @@
         <ul class="pagination justify-content-center mt-4 mb-0">
           {% if company.has_previous %}
           <li class="page-item">
-            <a class="page-link" href="{% url 'company_pagination' page=company.previous_page_number %}#rolling-stock" tabindex="-1">Previous</a>
+            <a class="page-link" href="{% url 'companies_pagination' page=company.previous_page_number %}#rolling-stock" tabindex="-1">Previous</a>
           </li>
           {% else %}
           <li class="page-item disabled">
@@ -75,13 +75,13 @@
               {% if i == company.paginator.ELLIPSIS %}
               <li class="page-item"><span class="page-link">{{ i }}</span></li>
               {% else %}
-              <li class="page-item"><a class="page-link" href="{% url 'company_pagination' page=i %}#rolling-stock">{{ i }}</a></li>
+              <li class="page-item"><a class="page-link" href="{% url 'companies_pagination' page=i %}#rolling-stock">{{ i }}</a></li>
               {% endif %}
             {% endif %}
           {% endfor %}
           {% if company.has_next %}
           <li class="page-item">
-            <a class="page-link" href="{% url 'company_pagination' page=company.next_page_number %}#rolling-stock" tabindex="-1">Next</a>
+            <a class="page-link" href="{% url 'companies_pagination' page=company.next_page_number %}#rolling-stock" tabindex="-1">Next</a>
           </li>
           {% else %}
           <li class="page-item disabled">

ram/portal/templates/page.html

@@ -47,6 +47,7 @@
                   {% if rolling_stock.decoder %}<button class="nav-link" id="nav-dcc-tab" data-bs-toggle="tab" data-bs-target="#nav-dcc" type="button" role="tab" aria-controls="nav-dcc" aria-selected="false">DCC</button>{% endif %}
                   {% if rolling_stock.notes %}<button class="nav-link" id="nav-notes-tab" data-bs-toggle="tab" data-bs-target="#nav-notes" type="button" role="tab" aria-controls="nav-notes" aria-selected="false">Notes</button>{% endif %}
                   {% if rolling_stock.document.count > 0 %}<button class="nav-link" id="nav-documents-tab" data-bs-toggle="tab" data-bs-target="#nav-documents" type="button" role="tab" aria-controls="nav-documents" aria-selected="false">Documents</button>{% endif %}
+                  {% if rolling_stock_journal.count > 0 %}<button class="nav-link" id="nav-journal-tab" data-bs-toggle="tab" data-bs-target="#nav-journal" type="button" role="tab" aria-controls="nav-journal" aria-selected="false">Journal</button>{% endif %}
                  </div>
               </nav>
               <div class="tab-content" id="nav-tabContent">
@@ -101,7 +102,7 @@
                       </tr>
                     </tbody>
                   </table>
-                  {% if rolling_stock.decoder %}
+                  {% if rolling_stock.decoder or rolling_stock.decoder_interface %}
                   <table class="table table-striped">
                     <thead>
                       <tr>
@@ -110,13 +111,19 @@
                     </thead>
                     <tbody>
                       <tr>
-                        <th width="35%" scope="row">Decoder</th>
+                        <th width="35%" scope="row">Interface</th>
+                        <td>{{ rolling_stock.get_decoder_interface_display }}</td>
+                      </tr>
+                      {% if rolling_stock.decoder %}
+                      <tr>
+                        <th scope="row">Decoder</th>
                         <td>{{ rolling_stock.decoder }}</td>
                       </tr>
                       <tr>
                         <th scope="row">Address</th>
                         <td>{{ rolling_stock.address }}</td>
                       </tr>
+                      {% endif %}
                     </tbody>
                   </table>
                   {% endif %}
@@ -229,6 +236,10 @@
                       </tr>
                     </thead>
                     <tbody>
+                      <tr>
+                        <th scope="row">Interface</th>
+                        <td>{{ rolling_stock.get_decoder_interface_display }}</td>
+                      </tr>
                       <tr>
                         <th width="35%" scope="row">Address</th>
                         <td>{{ rolling_stock.address }}</td>
@@ -245,10 +256,6 @@
                         <th scope="row">Version</th>
                         <td>{{ rolling_stock.decoder.version }}</td>
                       </tr>
-                      <tr>
-                        <th scope="row">Interface</th>
-                        <td>{{ rolling_stock.decoder.get_interface_display }}</td>
-                      </tr>
                       <tr>
                         <th scope="row">Sound</th>
                         <td>{{ rolling_stock.decoder.sound | yesno:"Yes,No" }}</td>
@@ -277,6 +284,23 @@
                     </tbody>
                   </table>
                 </div>
+                <div class="tab-pane fade" id="nav-journal" role="tabpanel" aria-labelledby="nav-journal-tab">
+                  <table class="table table-striped">
+                    <thead>
+                      <tr>
+                        <th colspan="3" scope="row">Journal</th>
+                      </tr>
+                    </thead>
+                    <tbody>
+                    {% for j in rolling_stock_journal %}
+                      <tr>
+                          <th width="35%" scope="row">{{ j.date }}</th>
+                        <td>{{ j.log | safe }}</a></td>
+                      </tr>
+                    {% endfor %}
+                    </tbody>
+                  </table>
+                </div>
               </div>
               <div class="d-grid gap-2 d-md-flex justify-content-md-end">
                 {% if request.user.is_staff %}<a class="btn btn-sm btn-outline-danger" href="{% url 'admin:roster_rollingstock_change' rolling_stock.pk %}">Edit</a>{% endif %}

ram/portal/views.py

@@ -154,6 +154,12 @@ class GetRollingStock(View):
             else rolling_stock.property.filter(property__private=False)
         )
 
+        rolling_stock_journal = (
+            rolling_stock.journal.all()
+            if request.user.is_authenticated
+            else rolling_stock.journal.filter(private=False)
+        )
+
         return render(
             request,
             "page.html",
@@ -161,6 +167,7 @@ class GetRollingStock(View):
                 "rolling_stock": rolling_stock,
                 "class_properties": class_properties,
                 "rolling_stock_properties": rolling_stock_properties,
+                "rolling_stock_journal": rolling_stock_journal,
             },
         )
 

ram/ram/__init__.py

@@ -1,4 +1,4 @@
 from ram.utils import git_suffix
 
-__version__ = "0.0.17"
+__version__ = "0.0.20"
 __version__ += git_suffix(__file__)

ram/roster/admin.py

@@ -6,6 +6,7 @@ from roster.models import (
     RollingStockImage,
     RollingStockDocument,
     RollingStockProperty,
+    RollingStockJournal,
 )
 
 
@@ -31,6 +32,7 @@ class RollingStockDocInline(admin.TabularInline):
     model = RollingStockDocument
     min_num = 0
     extra = 0
+    classes = ["collapse"]
 
 
 class RollingStockImageInline(admin.TabularInline):
@@ -38,6 +40,7 @@ class RollingStockImageInline(admin.TabularInline):
     min_num = 0
     extra = 0
     readonly_fields = ("image_thumbnail",)
+    classes = ["collapse"]
 
 
 class RollingStockPropertyInline(admin.TabularInline):
@@ -46,6 +49,13 @@ class RollingStockPropertyInline(admin.TabularInline):
     extra = 0
 
 
+class RollingStockJournalInline(admin.TabularInline):
+    model = RollingStockJournal
+    min_num = 0
+    extra = 0
+    classes = ["collapse"]
+
+
 @admin.register(RollingStockDocument)
 class RollingStockDocumentAdmin(admin.ModelAdmin):
     list_display = (
@@ -62,12 +72,33 @@ class RollingStockDocumentAdmin(admin.ModelAdmin):
     )
 
 
+@admin.register(RollingStockJournal)
+class RollingJournalDocumentAdmin(admin.ModelAdmin):
+    list_display = (
+        "__str__",
+        "date",
+        "rolling_stock",
+        "private",
+    )
+    list_filter = (
+        "date",
+        "private",
+    )
+    search_fields = (
+        "rolling_stock__rolling_class__identifier",
+        "rolling_stock__road_number",
+        "rolling_stock__sku",
+        "log",
+    )
+
+
 @admin.register(RollingStock)
 class RollingStockAdmin(admin.ModelAdmin):
     inlines = (
         RollingStockPropertyInline,
         RollingStockImageInline,
         RollingStockDocInline,
+        RollingStockJournalInline,
     )
     readonly_fields = ("creation_time", "updated_time")
     list_display = (
@@ -117,6 +148,7 @@ class RollingStockAdmin(admin.ModelAdmin):
             "DCC",
             {
                 "fields": (
+                    "decoder_interface",
                     "decoder",
                     "address",
                 )

ram/roster/migrations/0012_rollingstockjournal.py

@@ -0,0 +1,45 @@
+# Generated by Django 4.1 on 2022-08-27 12:43
+
+import ckeditor_uploader.fields
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("roster", "0011_md_to_html"),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name="RollingStockJournal",
+            fields=[
+                (
+                    "id",
+                    models.BigAutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("date", models.DateField()),
+                ("log", ckeditor_uploader.fields.RichTextUploadingField()),
+                ("private", models.BooleanField(default=False)),
+                ("creation_time", models.DateTimeField(auto_now_add=True)),
+                ("updated_time", models.DateTimeField(auto_now=True)),
+                (
+                    "rolling_stock",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        related_name="journal",
+                        to="roster.rollingstock",
+                    ),
+                ),
+            ],
+            options={
+                "ordering": ["date", "rolling_stock"],
+            },
+        ),
+    ]

ram/roster/migrations/0013_rollingstock_decoder_interface.py

@@ -0,0 +1,42 @@
+# Generated by Django 4.1 on 2022-10-31 22:27
+
+from django.db import migrations, models
+
+
+def meta_to_roster(apps, schema_editor):
+    model = apps.get_model("roster", "RollingStock")
+
+    for row in model.objects.all():
+        if row.decoder:
+            decoder_interface = row.decoder.interface
+            row.__dict__["decoder_interface"] = decoder_interface
+            row.save(update_fields=["decoder_interface"])
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("roster", "0012_rollingstockjournal"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="rollingstock",
+            name="decoder_interface",
+            field=models.PositiveSmallIntegerField(
+                blank=True,
+                choices=[
+                    (1, "NEM651"),
+                    (2, "NEM652"),
+                    (3, "PluX"),
+                    (4, "21MTC"),
+                    (5, "Next18/Next18S"),
+                ],
+                null=True,
+            ),
+        ),
+        migrations.RunPython(
+            meta_to_roster,
+            reverse_code=migrations.RunPython.noop
+        ),
+    ]

ram/roster/models.py

@@ -3,6 +3,7 @@ import re
 from uuid import uuid4
 from django.db import models
 from django.urls import reverse
+from django.conf import settings
 from django.dispatch import receiver
 from django.utils.safestring import mark_safe
 
@@ -87,6 +88,9 @@ class RollingStock(models.Model):
     )
     scale = models.ForeignKey(Scale, on_delete=models.CASCADE)
     sku = models.CharField(max_length=32, blank=True)
+    decoder_interface = models.PositiveSmallIntegerField(
+        choices=settings.DECODER_INTERFACES, null=True, blank=True
+    )
     decoder = models.ForeignKey(
         Decoder, on_delete=models.CASCADE, null=True, blank=True
     )
@@ -191,6 +195,27 @@ class RollingStockProperty(models.Model):
         verbose_name_plural = "Properties"
 
 
+class RollingStockJournal(models.Model):
+    rolling_stock = models.ForeignKey(
+        RollingStock,
+        on_delete=models.CASCADE,
+        related_name="journal",
+        null=False,
+        blank=False,
+    )
+    date = models.DateField()
+    log = RichTextUploadingField()
+    private = models.BooleanField(default=False)
+    creation_time = models.DateTimeField(auto_now_add=True)
+    updated_time = models.DateTimeField(auto_now=True)
+
+    def __str__(self):
+        return "{0} - {1}".format(self.rolling_stock, self.date)
+
+    class Meta:
+        ordering = ["date", "rolling_stock"]
+
+
 # @receiver(models.signals.post_delete, sender=Cab)
 # def post_save_image(sender, instance, *args, **kwargs):
 #     try: