Run black

This commit is contained in:
2022-04-02 22:58:42 +02:00
parent 6478800f77
commit b598e38f70
27 changed files with 318 additions and 259 deletions

View File

@@ -1,40 +1,46 @@
from django.contrib import admin
from metadata.models import (
Decoder, Scale, Manufacturer, Company, Tag, RollingStockType)
Decoder,
Scale,
Manufacturer,
Company,
Tag,
RollingStockType,
)
@admin.register(Decoder)
class DecoderAdmin(admin.ModelAdmin):
readonly_fields = ('image_thumbnail',)
list_display = ('__str__', 'interface')
list_filter = ('manufacturer', 'interface')
readonly_fields = ("image_thumbnail",)
list_display = ("__str__", "interface")
list_filter = ("manufacturer", "interface")
@admin.register(Scale)
class ScaleAdmin(admin.ModelAdmin):
list_display = ('scale', 'ratio', 'gauge')
list_filter = ('ratio', 'gauge')
list_display = ("scale", "ratio", "gauge")
list_filter = ("ratio", "gauge")
@admin.register(Company)
class CompanyAdmin(admin.ModelAdmin):
readonly_fields = ('logo_thumbnail',)
list_display = ('name', 'country')
readonly_fields = ("logo_thumbnail",)
list_display = ("name", "country")
list_filter = list_display
@admin.register(Manufacturer)
class ManufacturerAdmin(admin.ModelAdmin):
readonly_fields = ('logo_thumbnail',)
readonly_fields = ("logo_thumbnail",)
@admin.register(Tag)
class TagAdmin(admin.ModelAdmin):
readonly_fields = ('slug',)
list_display = ('name', 'slug')
readonly_fields = ("slug",)
list_display = ("name", "slug")
@admin.register(RollingStockType)
class RollingStockTypeAdmin(admin.ModelAdmin):
list_display = ('__str__',)
list_filter = ('type', 'category')
list_display = ("__str__",)
list_filter = ("type", "category")

View File

@@ -2,5 +2,5 @@ from django.apps import AppConfig
class MetadataConfig(AppConfig):
default_auto_field = 'django.db.models.BigAutoField'
name = 'metadata'
default_auto_field = "django.db.models.BigAutoField"
name = "metadata"

View File

@@ -9,16 +9,14 @@ from dcc.utils import get_image_preview, slugify
class Manufacturer(models.Model):
name = models.CharField(max_length=128, unique=True)
website = models.URLField(blank=True)
logo = models.ImageField(
upload_to='images/',
null=True,
blank=True)
logo = models.ImageField(upload_to="images/", null=True, blank=True)
def __str__(self):
return self.name
def logo_thumbnail(self):
return get_image_preview(self.logo.url)
logo_thumbnail.short_description = "Preview"
@@ -27,45 +25,37 @@ class Company(models.Model):
extended_name = models.CharField(max_length=128, blank=True)
country = CountryField()
freelance = models.BooleanField(default=False)
logo = models.ImageField(
upload_to='images/',
null=True,
blank=True)
logo = models.ImageField(upload_to="images/", null=True, blank=True)
class Meta:
verbose_name_plural = "Companies"
ordering = ['name']
ordering = ["name"]
def __str__(self):
return self.name
def logo_thumbnail(self):
return get_image_preview(self.logo.url)
logo_thumbnail.short_description = "Preview"
class Decoder(models.Model):
name = models.CharField(max_length=128, unique=True)
manufacturer = models.ForeignKey(
Manufacturer,
on_delete=models.CASCADE)
manufacturer = models.ForeignKey(Manufacturer, on_delete=models.CASCADE)
version = models.CharField(max_length=64, blank=True)
interface = models.PositiveSmallIntegerField(
choices=settings.DECODER_INTERFACES,
null=True,
blank=True
choices=settings.DECODER_INTERFACES, null=True, blank=True
)
sound = models.BooleanField(default=False)
image = models.ImageField(
upload_to='images/',
null=True,
blank=True)
image = models.ImageField(upload_to="images/", null=True, blank=True)
def __str__(self):
return "{0} - {1}".format(self.manufacturer, self.name)
def image_thumbnail(self):
return get_image_preview(self.image.url)
image_thumbnail.short_description = "Preview"
@@ -75,7 +65,7 @@ class Scale(models.Model):
gauge = models.CharField(max_length=16, blank=True)
class Meta:
ordering = ['scale']
ordering = ["scale"]
def __str__(self):
return str(self.scale)
@@ -97,10 +87,11 @@ def tag_pre_save(sender, instance, **kwargs):
class RollingStockType(models.Model):
type = models.CharField(max_length=64)
category = models.CharField(
max_length=64, choices=settings.ROLLING_STOCK_TYPES)
max_length=64, choices=settings.ROLLING_STOCK_TYPES
)
class Meta(object):
unique_together = ('category', 'type')
unique_together = ("category", "type")
def __str__(self):
return "{0} {1}".format(self.type, self.category)

View File

@@ -1,7 +1,12 @@
from rest_framework import serializers
from metadata.models import (
RollingStockType, Scale, Manufacturer,
Company, Decoder, Tag)
RollingStockType,
Scale,
Manufacturer,
Company,
Decoder,
Tag,
)
class RollingStockTypeSerializer(serializers.ModelSerializer):