mirror of
https://github.com/daniviga/django-ram.git
synced 2025-08-04 21:27:49 +02:00
Run black
This commit is contained in:
@@ -8,28 +8,42 @@ class ConsistItemInline(SortableInlineAdminMixin, admin.TabularInline):
|
||||
model = ConsistItem
|
||||
min_num = 1
|
||||
extra = 0
|
||||
readonly_fields = ('address', 'type', 'company', 'era')
|
||||
readonly_fields = ("address", "type", "company", "era")
|
||||
|
||||
|
||||
@admin.register(Consist)
|
||||
class ConsistAdmin(admin.ModelAdmin):
|
||||
inlines = (ConsistItemInline,)
|
||||
readonly_fields = ('creation_time', 'updated_time',)
|
||||
list_display = ('identifier', 'company', 'era')
|
||||
readonly_fields = (
|
||||
"creation_time",
|
||||
"updated_time",
|
||||
)
|
||||
list_display = ("identifier", "company", "era")
|
||||
list_filter = list_display
|
||||
search_fields = list_display
|
||||
|
||||
fieldsets = (
|
||||
(None, {
|
||||
'fields': ('identifier',
|
||||
'consist_address',
|
||||
'company',
|
||||
'era',
|
||||
'notes',
|
||||
'tags')
|
||||
}),
|
||||
('Audit', {
|
||||
'classes': ('collapse',),
|
||||
'fields': ('creation_time', 'updated_time',)
|
||||
}),
|
||||
(
|
||||
None,
|
||||
{
|
||||
"fields": (
|
||||
"identifier",
|
||||
"consist_address",
|
||||
"company",
|
||||
"era",
|
||||
"notes",
|
||||
"tags",
|
||||
)
|
||||
},
|
||||
),
|
||||
(
|
||||
"Audit",
|
||||
{
|
||||
"classes": ("collapse",),
|
||||
"fields": (
|
||||
"creation_time",
|
||||
"updated_time",
|
||||
),
|
||||
},
|
||||
),
|
||||
)
|
||||
|
@@ -2,5 +2,5 @@ from django.apps import AppConfig
|
||||
|
||||
|
||||
class ConsistConfig(AppConfig):
|
||||
default_auto_field = 'django.db.models.BigAutoField'
|
||||
name = 'consist'
|
||||
default_auto_field = "django.db.models.BigAutoField"
|
||||
name = "consist"
|
||||
|
@@ -6,19 +6,15 @@ from roster.models import RollingStock
|
||||
|
||||
|
||||
class Consist(models.Model):
|
||||
uuid = models.UUIDField(
|
||||
primary_key=True, default=uuid4,
|
||||
editable=False)
|
||||
uuid = models.UUIDField(primary_key=True, default=uuid4, editable=False)
|
||||
identifier = models.CharField(max_length=128, unique=False)
|
||||
tags = models.ManyToManyField(
|
||||
Tag,
|
||||
related_name='consist',
|
||||
blank=True)
|
||||
tags = models.ManyToManyField(Tag, related_name="consist", blank=True)
|
||||
consist_address = models.SmallIntegerField(
|
||||
default=None, null=True, blank=True)
|
||||
default=None, null=True, blank=True
|
||||
)
|
||||
company = models.ForeignKey(
|
||||
Company, on_delete=models.CASCADE,
|
||||
null=True, blank=True)
|
||||
Company, on_delete=models.CASCADE, null=True, blank=True
|
||||
)
|
||||
era = models.CharField(max_length=32, blank=True)
|
||||
notes = models.TextField(blank=True)
|
||||
creation_time = models.DateTimeField(auto_now_add=True)
|
||||
@@ -29,14 +25,12 @@ class Consist(models.Model):
|
||||
|
||||
|
||||
class ConsistItem(models.Model):
|
||||
consist = models.ForeignKey(
|
||||
Consist, on_delete=models.CASCADE)
|
||||
rolling_stock = models.ForeignKey(
|
||||
RollingStock, on_delete=models.CASCADE)
|
||||
consist = models.ForeignKey(Consist, on_delete=models.CASCADE)
|
||||
rolling_stock = models.ForeignKey(RollingStock, on_delete=models.CASCADE)
|
||||
order = models.PositiveIntegerField(default=0, blank=False, null=False)
|
||||
|
||||
class Meta(object):
|
||||
ordering = ['order']
|
||||
ordering = ["order"]
|
||||
|
||||
def __str__(self):
|
||||
return "{0}".format(self.rolling_stock)
|
||||
|
Reference in New Issue
Block a user