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

17
dcc/consist/models.py
View File

@@ -14,11 +14,12 @@ class Consist(models.Model):
Tag,
related_name='consist',
blank=True)
address = models.SmallIntegerField(default=None, null=True, blank=True)
consist_address = models.SmallIntegerField(
default=None, null=True, blank=True)
company = models.ForeignKey(
Company, on_delete=models.CASCADE,
null=True, blank=True)
epoch = models.CharField(max_length=32, blank=True)
era = models.CharField(max_length=32, blank=True)
notes = models.TextField(blank=True)
creation_time = models.DateTimeField(auto_now_add=True)
updated_time = models.DateTimeField(auto_now=True)
@@ -38,16 +39,16 @@ class ConsistItem(models.Model):
ordering = ['order']
def __str__(self):
return "{0}".format(self.rolling_stock.identifier)
return "{0}".format(self.rolling_stock)
# def type(self):
# return self.rolling_stock.type
def type(self):
return self.rolling_stock.rolling_class.type
def address(self):
return self.rolling_stock.address
def company(self):
return self.rolling_stock.company
return self.rolling_stock.company()
def epoch(self):
return self.rolling_stock.epoch
def era(self):
return self.rolling_stock.era