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

reformat code

Browse Source
This commit is contained in:
Robert Einsle
2018-02-11 10:56:44 +01:00
parent 076808f183
commit d9d78a969f
43 changed files with 265 additions and 248 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
billard/migrations/0001_initial.py
View File

@@ -6,7 +6,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
initial = True
dependencies = [

1
billard/migrations/0002_location.py
View File

@@ -7,7 +7,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
('billard', '0001_initial'),

6
billard/migrations/0003_client.py
View File

@@ -2,13 +2,13 @@
# Generated by Django 1.10.5 on 2017-02-04 05:48
from __future__ import unicode_literals
from django.db import migrations, models
import django.db.models.deletion
import uuid
import django.db.models.deletion
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('billard', '0002_location'),
]

3
billard/migrations/0004_accounting.py
View File

@@ -2,12 +2,11 @@
# Generated by Django 1.10.5 on 2017-02-04 10:17
from __future__ import unicode_literals
from django.db import migrations, models
import django.db.models.deletion
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('billard', '0003_client'),
]

1
billard/migrations/0005_auto_20170206_1926.py
View File

@@ -6,7 +6,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('billard', '0004_accounting'),
]

18
billard/migrations/0006_auto_20170206_2031.py
View File

@@ -2,14 +2,14 @@
# Generated by Django 1.10.5 on 2017-02-06 19:31
from __future__ import unicode_literals
import uuid
import django.db.models.deletion
from django.conf import settings
from django.db import migrations, models
import django.db.models.deletion
import uuid
class Migration(migrations.Migration):
dependencies = [
('billard', '0005_auto_20170206_1926'),
]
@@ -17,7 +17,8 @@ class Migration(migrations.Migration):
operations = [
migrations.AlterModelOptions(
name='accounting',
options={'ordering': ['-time_from'], 'verbose_name': 'Buchhaltungseintrag', 'verbose_name_plural': 'Buchhaltungseinträge'},
options={'ordering': ['-time_from'], 'verbose_name': 'Buchhaltungseintrag',
'verbose_name_plural': 'Buchhaltungseinträge'},
),
migrations.AlterModelOptions(
name='client',
@@ -34,7 +35,8 @@ class Migration(migrations.Migration):
migrations.AlterField(
model_name='accounting',
name='client',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='billard.Client', verbose_name='Client'),
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='billard.Client',
verbose_name='Client'),
),
migrations.AlterField(
model_name='accounting',
@@ -59,7 +61,8 @@ class Migration(migrations.Migration):
migrations.AlterField(
model_name='client',
name='location',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='billard.Location', verbose_name='Standort'),
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='billard.Location',
verbose_name='Standort'),
),
migrations.AlterField(
model_name='client',
@@ -109,7 +112,8 @@ class Migration(migrations.Migration):
migrations.AlterField(
model_name='location',
name='users',
field=models.ManyToManyField(related_name='locations', to=settings.AUTH_USER_MODEL, verbose_name='Benutzer'),
field=models.ManyToManyField(related_name='locations', to=settings.AUTH_USER_MODEL,
verbose_name='Benutzer'),
),
migrations.AlterField(
model_name='locationdata',

12
billard/migrations/0007_desk.py
View File

@@ -2,12 +2,11 @@
# Generated by Django 1.10.5 on 2017-02-10 18:30
from __future__ import unicode_literals
from django.db import migrations, models
import django.db.models.deletion
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('billard', '0006_auto_20170206_2031'),
]
@@ -20,9 +19,12 @@ class Migration(migrations.Migration):
('desk_no', models.IntegerField(verbose_name='Tischnummer')),
('name', models.CharField(blank=True, max_length=32, null=True, verbose_name='Tischbezeichnung')),
('enabled', models.BooleanField(verbose_name='Tisch aktiv')),
('prize', models.DecimalField(blank=True, decimal_places=2, max_digits=5, null=True, verbose_name='Normelpreis')),
('prize_hh', models.DecimalField(blank=True, decimal_places=2, max_digits=5, null=True, verbose_name='Preis Happy Hour')),
('client', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='billard.Client', verbose_name='Client')),
('prize', models.DecimalField(blank=True, decimal_places=2, max_digits=5, null=True,
verbose_name='Normelpreis')),
('prize_hh', models.DecimalField(blank=True, decimal_places=2, max_digits=5, null=True,
verbose_name='Preis Happy Hour')),
('client', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='billard.Client',
verbose_name='Client')),
],
options={
'verbose_name_plural': 'Tische',

6
billard/migrations/0008_auto_20170210_1947.py
View File

@@ -2,12 +2,11 @@
# Generated by Django 1.10.5 on 2017-02-10 19:47
from __future__ import unicode_literals
from django.db import migrations, models
import django.db.models.deletion
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('billard', '0007_desk'),
]
@@ -48,6 +47,7 @@ class Migration(migrations.Migration):
migrations.AlterField(
model_name='desk',
name='client',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='desks', to='billard.Client', verbose_name='Client'),
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='desks',
to='billard.Client', verbose_name='Client'),
),
]

1
billard/migrations/0009_auto_20170210_1955.py
View File

@@ -6,7 +6,6 @@ from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
('billard', '0008_auto_20170210_1947'),
]

1
billard/migrations/0010_auto_20170210_2040.py
View File

@@ -6,7 +6,6 @@ from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
('billard', '0009_auto_20170210_1955'),
]

1
billard/migrations/0011_auto_20170210_2122.py
View File

@@ -6,7 +6,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('billard', '0010_auto_20170210_2040'),
]

1
billard/migrations/0012_auto_20170211_1003.py
View File

@@ -6,7 +6,6 @@ from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
('billard', '0011_auto_20170210_2122'),
]

9
billard/migrations/0013_accounting.py
View File

@@ -2,12 +2,11 @@
# Generated by Django 1.10.5 on 2017-02-11 09:03
from __future__ import unicode_literals
from django.db import migrations, models
import django.db.models.deletion
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('billard', '0012_auto_20170211_1003'),
]
@@ -19,9 +18,11 @@ class Migration(migrations.Migration):
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('time_from', models.DateTimeField(verbose_name='Beginn')),
('time_to', models.DateTimeField(blank=True, null=True, verbose_name='Ende')),
('prize', models.DecimalField(blank=True, decimal_places=2, max_digits=5, null=True, verbose_name='Preis')),
('prize',
models.DecimalField(blank=True, decimal_places=2, max_digits=5, null=True, verbose_name='Preis')),
('billed', models.BooleanField(default=False, verbose_name='Abgerechnet')),
('desk', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='billard.Desk', verbose_name='Tisch')),
('desk', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='billard.Desk',
verbose_name='Tisch')),
],
options={
'verbose_name_plural': 'Buchhaltungseinträge',

1
billard/migrations/0014_auto_20170211_2008.py
View File

@@ -6,7 +6,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('billard', '0013_accounting'),
]

1
billard/migrations/0015_auto_20170222_1023.py
View File

@@ -6,7 +6,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('billard', '0014_auto_20170211_2008'),
]

1
billard/migrations/0016_auto_20170225_1822.py
View File

@@ -6,7 +6,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('billard', '0015_auto_20170222_1023'),
]

1
billard/migrations/0017_accounting_reporter_uuid.py
View File

@@ -6,7 +6,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('billard', '0016_auto_20170225_1822'),
]

1
billard/migrations/0017_auto_20170302_1610.py
View File

@@ -6,7 +6,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('billard', '0016_auto_20170225_1822'),
]

13
billard/migrations/0018_auto_20170302_2058.py
View File

@@ -2,13 +2,12 @@
# Generated by Django 1.10.5 on 2017-03-02 20:58
from __future__ import unicode_literals
import django.db.models.deletion
from django.conf import settings
from django.db import migrations, models
import django.db.models.deletion
class Migration(migrations.Migration):
dependencies = [
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
('billard', '0017_accounting_reporter_uuid'),
@@ -18,16 +17,20 @@ class Migration(migrations.Migration):
migrations.AddField(
model_name='accounting',
name='prize_hh',
field=models.DecimalField(blank=True, decimal_places=2, max_digits=5, null=True, verbose_name='Preis Happy Hour'),
field=models.DecimalField(blank=True, decimal_places=2, max_digits=5, null=True,
verbose_name='Preis Happy Hour'),
),
migrations.AddField(
model_name='accounting',
name='prize_normal',
field=models.DecimalField(blank=True, decimal_places=2, max_digits=5, null=True, verbose_name='Preis Normalzeit'),
field=models.DecimalField(blank=True, decimal_places=2, max_digits=5, null=True,
verbose_name='Preis Normalzeit'),
),
migrations.AddField(
model_name='client',
name='report_user',
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='reporting_clients', to=settings.AUTH_USER_MODEL, verbose_name='Reporting Benutzer'),
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE,
related_name='reporting_clients', to=settings.AUTH_USER_MODEL,
verbose_name='Reporting Benutzer'),
),
]

1
billard/migrations/0019_merge_20170310_1941.py
View File

@@ -6,7 +6,6 @@ from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
('billard', '0018_auto_20170302_2058'),
('billard', '0017_auto_20170302_1610'),

3
billard/migrations/0020_auto_20170410_1853.py
View File

@@ -4,6 +4,7 @@ from __future__ import unicode_literals
from django.db import migrations
def create_default_groups_permissions(apps, schema_editor):
# We can't import the Person model directly as it may be a newer
# version than this migration expects. We use the historical version.
@@ -16,6 +17,7 @@ def create_default_groups_permissions(apps, schema_editor):
ag.save()
ag.permissions.add(Permission.objects.get(codename="change_accounting"))
def delete_default_groups_permissions(apps, schema_editor):
Group = apps.get_model("auth", "Group")
Group.objects.get(name='Location').delete()
@@ -23,7 +25,6 @@ def delete_default_groups_permissions(apps, schema_editor):
class Migration(migrations.Migration):
dependencies = [
('billard', '0019_merge_20170310_1941'),
('sessions', '0001_initial'),

1
billard/migrations/0021_accounting_account_user.py
View File

@@ -6,7 +6,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('billard', '0020_auto_20170410_1853'),
]

6
billard/migrations/0022_auto_20170427_0835.py
View File

@@ -2,12 +2,11 @@
# Generated by Django 1.11 on 2017-04-27 08:35
from __future__ import unicode_literals
from django.db import migrations, models
import django.db.models.deletion
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('billard', '0021_accounting_account_user'),
]
@@ -16,6 +15,7 @@ class Migration(migrations.Migration):
migrations.AlterField(
model_name='client',
name='location',
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='clients', to='billard.Location', verbose_name='Standort'),
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='clients',
to='billard.Location', verbose_name='Standort'),
),
]

1
billard/migrations/0023_accounting_account_tst.py
View File

@@ -6,7 +6,6 @@ from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('billard', '0022_auto_20170427_0835'),
]

16
billard/migrations/0024_auto_20180210_1105.py
View File

@@ -1,12 +1,11 @@
# Generated by Django 2.0.2 on 2018-02-10 11:05
import django.db.models.deletion
from django.conf import settings
from django.db import migrations, models
import django.db.models.deletion
class Migration(migrations.Migration):
dependencies = [
('billard', '0023_accounting_account_tst'),
]
@@ -15,21 +14,26 @@ class Migration(migrations.Migration):
migrations.AlterField(
model_name='accounting',
name='desk',
field=models.ForeignKey(on_delete=django.db.models.deletion.DO_NOTHING, to='billard.Desk', verbose_name='Tisch'),
field=models.ForeignKey(on_delete=django.db.models.deletion.DO_NOTHING, to='billard.Desk',
verbose_name='Tisch'),
),
migrations.AlterField(
model_name='client',
name='location',
field=models.ForeignKey(on_delete=django.db.models.deletion.DO_NOTHING, related_name='clients', to='billard.Location', verbose_name='Standort'),
field=models.ForeignKey(on_delete=django.db.models.deletion.DO_NOTHING, related_name='clients',
to='billard.Location', verbose_name='Standort'),
),
migrations.AlterField(
model_name='client',
name='report_user',
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='reporting_clients', to=settings.AUTH_USER_MODEL, verbose_name='Reporting Benutzer'),
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.DO_NOTHING,
related_name='reporting_clients', to=settings.AUTH_USER_MODEL,
verbose_name='Reporting Benutzer'),
),
migrations.AlterField(
model_name='desk',
name='client',
field=models.ForeignKey(on_delete=django.db.models.deletion.DO_NOTHING, related_name='desks', to='billard.Client', verbose_name='Client'),
field=models.ForeignKey(on_delete=django.db.models.deletion.DO_NOTHING, related_name='desks',
to='billard.Client', verbose_name='Client'),
),
]