dani/django-ram
1
0
Fork 0
mirror of https://github.com/daniviga/django-ram.git synced 2025-08-04 21:27:49 +02:00
Code Issues Packages Projects Releases Wiki Activity

Refactor roster and initial support for consists

Browse Source
This commit is contained in:
Daniele Viganò
2022-04-02 18:33:29 +02:00
parent 915bc13575
commit fd43ee34cb
20 changed files with 245 additions and 286 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
dcc/roster/admin.py
View File

@@ -1,7 +1,13 @@
from django.contrib import admin
from roster.models import (
RollingStockImage, RollingStockDocument, Engine, Car,
Equipment, Other)
RollingClass, RollingStock, RollingStockImage, RollingStockDocument)
@admin.register(RollingClass)
class RollingClass(admin.ModelAdmin):
list_display = ('__str__', 'type', 'company')
list_filter = ('type', 'company')
search_fields = list_display
class RollingStockDocInline(admin.TabularInline):
@@ -17,50 +23,32 @@ class RollingStockImageInline(admin.TabularInline):
readonly_fields = ('image_thumbnail',)
@admin.register(RollingStock)
class RollingStockAdmin(admin.ModelAdmin):
inlines = (RollingStockImageInline, RollingStockDocInline)
readonly_fields = ('creation_time', 'updated_time',)
list_display = ('identifier', 'manufacturer', 'sku', 'company')
list_filter = list_display
readonly_fields = ('creation_time', 'updated_time')
list_display = (
'__str__', 'manufacturer', 'scale', 'sku', 'company', 'country')
list_filter = ('manufacturer', 'scale')
search_fields = list_display
fieldsets = (
(None, {
'fields': ('identifier',
'type',
'tags',
'fields': ('rolling_class',
'road_number',
'manufacturer',
'scale',
'sku',
'decoder',
'address',
'company',
'epoch',
'era',
'production_year',
'purchase_date',
'notes')
'notes',
'tags')
}),
('Audit', {
'classes': ('collapse',),
'fields': ('creation_time', 'updated_time',)
}),
)
@admin.register(Engine)
class Engine(RollingStockAdmin):
list_display = ('identifier', 'address', 'manufacturer', 'sku', 'company')
@admin.register(Car)
class Car(RollingStockAdmin):
pass
@admin.register(Equipment)
class Equipment(RollingStockAdmin):
pass
@admin.register(Other)
class Other(RollingStockAdmin):
pass

50
dcc/roster/migrations/0001_initial.py
View File

@@ -1,4 +1,4 @@
# Generated by Django 4.0.2 on 2022-04-01 20:25
# Generated by Django 4.0.2 on 2022-04-02 14:25
from django.db import migrations, models
import django.db.models.deletion
@@ -14,12 +14,21 @@ class Migration(migrations.Migration):
]
operations = [
migrations.CreateModel(
name='Class',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('identifier', models.CharField(max_length=128)),
('company', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='metadata.company')),
('type', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='metadata.rollingstocktype')),
],
),
migrations.CreateModel(
name='RollingStock',
fields=[
('uuid', models.UUIDField(default=uuid.uuid4, editable=False, primary_key=True, serialize=False)),
('identifier', models.CharField(max_length=128)),
('address', models.SmallIntegerField(blank=True, default=3, null=True)),
('road_number', models.CharField(max_length=128)),
('address', models.SmallIntegerField(blank=True, default=None, null=True)),
('sku', models.CharField(blank=True, max_length=32)),
('epoch', models.CharField(blank=True, max_length=32)),
('production_year', models.SmallIntegerField(blank=True, null=True)),
@@ -27,14 +36,13 @@ class Migration(migrations.Migration):
('notes', models.TextField(blank=True)),
('creation_time', models.DateTimeField(auto_now_add=True)),
('updated_time', models.DateTimeField(auto_now=True)),
('company', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='metadata.company')),
('_class', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='roster.class')),
('decoder', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='metadata.decoder')),
('manufacturer', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='metadata.manufacturer')),
('tags', models.ManyToManyField(blank=True, related_name='rolling_stock', to='metadata.Tag')),
],
options={
'verbose_name_plural': 'Rolling stock',
'ordering': ['address', 'identifier'],
},
),
migrations.CreateModel(
@@ -60,36 +68,4 @@ class Migration(migrations.Migration):
'unique_together': {('rolling_stock', 'file')},
},
),
migrations.CreateModel(
name='Other',
fields=[
('rollingstock_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='roster.rollingstock')),
('type', models.ForeignKey(blank=True, limit_choices_to={'category': 'other'}, null=True, on_delete=django.db.models.deletion.CASCADE, to='metadata.rollingstocktype')),
],
bases=('roster.rollingstock',),
),
migrations.CreateModel(
name='Equipment',
fields=[
('rollingstock_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='roster.rollingstock')),
('type', models.ForeignKey(blank=True, limit_choices_to={'category': 'equipment'}, null=True, on_delete=django.db.models.deletion.CASCADE, to='metadata.rollingstocktype')),
],
bases=('roster.rollingstock',),
),
migrations.CreateModel(
name='Engine',
fields=[
('rollingstock_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='roster.rollingstock')),
('type', models.ForeignKey(blank=True, limit_choices_to={'category': 'engine'}, null=True, on_delete=django.db.models.deletion.CASCADE, to='metadata.rollingstocktype')),
],
bases=('roster.rollingstock',),
),
migrations.CreateModel(
name='Car',
fields=[
('rollingstock_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='roster.rollingstock')),
('type', models.ForeignKey(blank=True, limit_choices_to={'category': 'car'}, null=True, on_delete=django.db.models.deletion.CASCADE, to='metadata.rollingstocktype')),
],
bases=('roster.rollingstock',),
),
]

18
dcc/roster/migrations/0002_alter_rollingstock_address.py
View File

@@ -1,18 +0,0 @@
# Generated by Django 4.0.2 on 2022-04-01 20:32
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('roster', '0001_initial'),
]
operations = [
migrations.AlterField(
model_name='rollingstock',
name='address',
field=models.SmallIntegerField(blank=True, default=None, null=True),
),
]

48
dcc/roster/migrations/0002_rename_class_rollingclass_alter_rollingclass_options_and_more.py Normal file
View File

@@ -0,0 +1,48 @@
# Generated by Django 4.0.2 on 2022-04-02 16:18
from django.db import migrations, models
import django.db.models.deletion
class Migration(migrations.Migration):
dependencies = [
('metadata', '0002_scale_manufacturer_website_and_more'),
('roster', '0001_initial'),
]
operations = [
migrations.RenameModel(
old_name='Class',
new_name='RollingClass',
),
migrations.AlterModelOptions(
name='rollingclass',
options={'ordering': ['company', 'identifier'], 'verbose_name': 'Class', 'verbose_name_plural': 'Classes'},
),
migrations.AlterModelOptions(
name='rollingstock',
options={'ordering': ['rolling_class', 'road_number'], 'verbose_name_plural': 'Rolling stock'},
),
migrations.RenameField(
model_name='rollingstock',
old_name='epoch',
new_name='era',
),
migrations.RemoveField(
model_name='rollingstock',
name='_class',
),
migrations.AddField(
model_name='rollingstock',
name='rolling_class',
field=models.ForeignKey(default=None, on_delete=django.db.models.deletion.CASCADE, to='roster.rollingclass', verbose_name='Class'),
preserve_default=False,
),
migrations.AddField(
model_name='rollingstock',
name='scale',
field=models.ForeignKey(default=None, on_delete=django.db.models.deletion.CASCADE, to='metadata.scale'),
preserve_default=False,
),
]

36
dcc/roster/migrations/0003_consistitem_consist.py
View File

@@ -1,36 +0,0 @@
# Generated by Django 4.0.2 on 2022-04-02 09:09
from django.db import migrations, models
import django.db.models.deletion
import uuid
class Migration(migrations.Migration):
dependencies = [
('metadata', '0001_initial'),
('roster', '0002_alter_rollingstock_address'),
]
operations = [
migrations.CreateModel(
name='ConsistItem',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('rolling_stock', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='roster.rollingstock')),
],
),
migrations.CreateModel(
name='Consist',
fields=[
('uuid', models.UUIDField(default=uuid.uuid4, editable=False, primary_key=True, serialize=False)),
('identifier', models.CharField(max_length=128)),
('epoch', models.CharField(blank=True, max_length=32)),
('notes', models.TextField(blank=True)),
('creation_time', models.DateTimeField(auto_now_add=True)),
('updated_time', models.DateTimeField(auto_now=True)),
('company', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='metadata.company')),
('tags', models.ManyToManyField(blank=True, related_name='consist', to='metadata.Tag')),
],
),
]

20
dcc/roster/migrations/0004_consistitem_consist.py
View File

@@ -1,20 +0,0 @@
# Generated by Django 4.0.2 on 2022-04-02 09:13
from django.db import migrations, models
import django.db.models.deletion
class Migration(migrations.Migration):
dependencies = [
('roster', '0003_consistitem_consist'),
]
operations = [
migrations.AddField(
model_name='consistitem',
name='consist',
field=models.ForeignKey(default=None, on_delete=django.db.models.deletion.CASCADE, to='roster.consist'),
preserve_default=False,
),
]

27
dcc/roster/migrations/0005_remove_consistitem_consist_and_more.py
View File

@@ -1,27 +0,0 @@
# Generated by Django 4.0.2 on 2022-04-02 09:21
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
('roster', '0004_consistitem_consist'),
]
operations = [
migrations.RemoveField(
model_name='consistitem',
name='consist',
),
migrations.RemoveField(
model_name='consistitem',
name='rolling_stock',
),
migrations.DeleteModel(
name='Consist',
),
migrations.DeleteModel(
name='ConsistItem',
),
]

90
dcc/roster/models.py
View File

@@ -1,12 +1,13 @@
import os
from uuid import uuid4
from django.db import models
from django.urls import reverse
# from django.core.files.storage import FileSystemStorage
# from django.dispatch import receiver
from dcc.utils import get_image_preview
from metadata.models import (
Manufacturer, Decoder, Company, Tag, RollingStockType)
Scale, Manufacturer, Decoder, Company, Tag, RollingStockType)
# class OverwriteMixin(FileSystemStorage):
# def get_available_name(self, name, max_length):
@@ -14,67 +15,66 @@ from metadata.models import (
# return name
class RollingStock(models.Model):
uuid = models.UUIDField(
primary_key=True, default=uuid4,
editable=False)
class RollingClass(models.Model):
identifier = models.CharField(max_length=128, unique=False)
tags = models.ManyToManyField(
Tag,
related_name='rolling_stock',
blank=True)
address = models.SmallIntegerField(default=None, null=True, blank=True)
manufacturer = models.ForeignKey(
Manufacturer, on_delete=models.CASCADE,
null=True, blank=True)
sku = models.CharField(max_length=32, blank=True)
decoder = models.ForeignKey(
Decoder, on_delete=models.CASCADE,
type = models.ForeignKey(
RollingStockType, on_delete=models.CASCADE,
null=True, blank=True)
company = models.ForeignKey(
Company, on_delete=models.CASCADE,
null=True, blank=True)
epoch = models.CharField(max_length=32, blank=True)
class Meta:
ordering = ['company', 'identifier']
verbose_name = "Class"
verbose_name_plural = "Classes"
def __str__(self):
return "{0} {1}".format(self.company, self.identifier)
class RollingStock(models.Model):
uuid = models.UUIDField(
primary_key=True, default=uuid4,
editable=False)
rolling_class = models.ForeignKey(
RollingClass, on_delete=models.CASCADE,
null=False, blank=False,
verbose_name="Class")
road_number = models.CharField(max_length=128, unique=False)
manufacturer = models.ForeignKey(
Manufacturer, on_delete=models.CASCADE,
null=True, blank=True)
scale = models.ForeignKey(
Scale, on_delete=models.CASCADE)
sku = models.CharField(max_length=32, blank=True)
decoder = models.ForeignKey(
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)
production_year = models.SmallIntegerField(null=True, blank=True)
purchase_date = models.DateField(null=True, blank=True)
notes = models.TextField(blank=True)
tags = models.ManyToManyField(
Tag,
related_name='rolling_stock',
blank=True)
creation_time = models.DateTimeField(auto_now_add=True)
updated_time = models.DateTimeField(auto_now=True)
class Meta:
ordering = ['address', 'identifier']
ordering = ['rolling_class', 'road_number']
verbose_name_plural = "Rolling stock"
def __str__(self):
return "{0} {1}".format(self.manufacturer, self.identifier)
return "{0} {1}".format(self.rolling_class, self.road_number)
def country(self):
return str(self.rolling_class.company.country)
class Engine(RollingStock):
type = models.ForeignKey(
RollingStockType, on_delete=models.CASCADE,
limit_choices_to={'category': 'engine'},
null=True, blank=True)
class Car(RollingStock):
type = models.ForeignKey(
RollingStockType, on_delete=models.CASCADE,
limit_choices_to={'category': 'car'},
null=True, blank=True)
class Equipment(RollingStock):
type = models.ForeignKey(
RollingStockType, on_delete=models.CASCADE,
limit_choices_to={'category': 'equipment'},
null=True, blank=True)
class Other(RollingStock):
type = models.ForeignKey(
RollingStockType, on_delete=models.CASCADE,
limit_choices_to={'category': 'other'},
null=True, blank=True)
def company(self):
return str(self.rolling_class.company)
class RollingStockDocument(models.Model):