carom/carom-server
6
1
Fork 0
Code Issues Pull Requests Releases 2 Activity

update to bootstrap 4

Browse Source
This commit is contained in:
Robert Einsle
2018-02-10 13:44:14 +01:00
parent 9036e4b59a
commit e1d96b9b76
54 changed files with 2739 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
billard/models.py
View File

@@ -48,8 +48,8 @@ class Location(models.Model):
class Client(models.Model):
uuid = models.UUIDField(unique=True, default=uuid.uuid4, verbose_name="Identifier")
location = models.ForeignKey(Location, related_name="clients", verbose_name="Standort")
report_user = models.ForeignKey(User, blank=True, null=True, verbose_name="Reporting Benutzer", related_name='reporting_clients')
location = models.ForeignKey(Location, related_name="clients", verbose_name="Standort", on_delete=models.DO_NOTHING)
report_user = models.ForeignKey(User, blank=True, null=True, verbose_name="Reporting Benutzer", related_name='reporting_clients', on_delete=models.DO_NOTHING)
def __str__(self):
return '{}, {}'.format(self.location.name, self.uuid)
@@ -60,7 +60,7 @@ class Client(models.Model):
class Desk(models.Model):
client = models.ForeignKey(Client, verbose_name='Client', related_name='desks')
client = models.ForeignKey(Client, verbose_name='Client', related_name='desks', on_delete=models.DO_NOTHING)
desk_no = models.IntegerField(verbose_name='Tischnummer')
name = models.CharField(max_length=32, blank=True, null=True, verbose_name='Tischbezeichnung')
enabled = models.BooleanField(verbose_name='Tisch aktiv')
@@ -77,7 +77,7 @@ class Desk(models.Model):
class Accounting(models.Model):
desk = models.ForeignKey(Desk, verbose_name="Tisch")
desk = models.ForeignKey(Desk, verbose_name="Tisch", on_delete=models.DO_NOTHING)
time_from = models.DateTimeField(verbose_name="Beginn")
time_to = models.DateTimeField(blank=True, null=True, verbose_name="Ende")
prize = models.DecimalField(max_digits=6, decimal_places=2, blank=True, null=True, verbose_name="Preis")