From f7ea468b1234cecfba607bb162f2a83e07da7d6b Mon Sep 17 00:00:00 2001 From: gw3000 Date: Sun, 17 Sep 2023 23:09:46 +0200 Subject: [PATCH] versions new --- app/Dockerfile | 2 +- app/bird/migrations/0001_initial.py | 192 ++++-------------- ...alter_bird_options_alter_fallenbird_age.py | 22 -- .../migrations/0003_fallenbird_comment.py | 18 -- .../0004_alter_fallenbird_comment.py | 18 -- .../migrations/0005_alter_bird_description.py | 20 -- app/costs/migrations/0001_initial.py | 62 +----- docker-compose.yaml | 2 +- 8 files changed, 53 insertions(+), 283 deletions(-) delete mode 100644 app/bird/migrations/0002_alter_bird_options_alter_fallenbird_age.py delete mode 100644 app/bird/migrations/0003_fallenbird_comment.py delete mode 100644 app/bird/migrations/0004_alter_fallenbird_comment.py delete mode 100644 app/bird/migrations/0005_alter_bird_description.py diff --git a/app/Dockerfile b/app/Dockerfile index b174d63..8da7685 100644 --- a/app/Dockerfile +++ b/app/Dockerfile @@ -1,7 +1,7 @@ # app/Dockerfile # pull the official docker image -FROM python:3.11.2-slim +FROM python:3.11.5-slim # set work directory WORKDIR /app diff --git a/app/bird/migrations/0001_initial.py b/app/bird/migrations/0001_initial.py index 62629bf..b4618a1 100644 --- a/app/bird/migrations/0001_initial.py +++ b/app/bird/migrations/0001_initial.py @@ -1,6 +1,5 @@ -# Generated by Django 4.2.3 on 2023-07-28 14:09 +# Generated by Django 4.2.5 on 2023-09-17 21:04 -import ckeditor.fields from django.conf import settings from django.db import migrations, models import django.db.models.deletion @@ -12,182 +11,71 @@ class Migration(migrations.Migration): initial = True dependencies = [ + ('rescuer', '0002_alter_rescuer_options'), + ('aviary', '0001_initial'), migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ("rescuer", "0001_initial"), - ("aviary", "0001_initial"), ] operations = [ migrations.CreateModel( - name="Bird", + name='Bird', fields=[ - ("id", models.BigAutoField(primary_key=True, serialize=False)), - ( - "name", - models.CharField( - max_length=256, unique=True, verbose_name="Bezeichnung" - ), - ), - ("description", ckeditor.fields.RichTextField(blank=True, null=True)), + ('id', models.BigAutoField(primary_key=True, serialize=False)), + ('name', models.CharField(max_length=256, unique=True, verbose_name='Bezeichnung')), + ('description', models.CharField(blank=True, max_length=256, null=True, verbose_name='Beschreibung')), ], options={ - "verbose_name": "Vogel", - "verbose_name_plural": "Vögel", + 'verbose_name': 'Vogel', + 'verbose_name_plural': 'Vögel', + 'ordering': ['name'], }, ), migrations.CreateModel( - name="BirdStatus", + name='BirdStatus', fields=[ - ("id", models.BigAutoField(primary_key=True, serialize=False)), - ( - "description", - models.CharField( - max_length=256, unique=True, verbose_name="Bezeichnung" - ), - ), + ('id', models.BigAutoField(primary_key=True, serialize=False)), + ('description', models.CharField(max_length=256, unique=True, verbose_name='Bezeichnung')), ], options={ - "verbose_name": "Patientenstatus", - "verbose_name_plural": "Patientenstatus", + 'verbose_name': 'Patientenstatus', + 'verbose_name_plural': 'Patientenstatus', }, ), migrations.CreateModel( - name="Circumstance", + name='Circumstance', fields=[ - ("id", models.BigAutoField(primary_key=True, serialize=False)), - ( - "description", - models.CharField(max_length=256, verbose_name="Bezeichnung"), - ), + ('id', models.BigAutoField(primary_key=True, serialize=False)), + ('description', models.CharField(max_length=256, verbose_name='Bezeichnung')), ], options={ - "verbose_name": "Fundumstand", - "verbose_name_plural": "Fundumstände", + 'verbose_name': 'Fundumstand', + 'verbose_name_plural': 'Fundumstände', }, ), migrations.CreateModel( - name="FallenBird", + name='FallenBird', fields=[ - ( - "id", - models.UUIDField( - default=uuid.uuid4, - editable=False, - primary_key=True, - serialize=False, - ), - ), - ( - "bird_identifier", - models.CharField(max_length=256, verbose_name="Patienten Alias"), - ), - ( - "age", - models.CharField( - choices=[ - ("Ei", "Ei"), - ("Nestling", "Nestling"), - ("Ästling", "Ästling"), - ("Adult", "Adult"), - ], - max_length=15, - verbose_name="Alter", - ), - ), - ( - "sex", - models.CharField( - choices=[ - ("Weiblich", "Weiblich"), - ("Männlich", "Männlich"), - ("Unbekannt", "Unbekannt"), - ], - max_length=15, - verbose_name="Geschlecht", - ), - ), - ("date_found", models.DateField(verbose_name="Datum des Fundes")), - ( - "place", - models.CharField(max_length=256, verbose_name="Ort des Fundes"), - ), - ( - "created", - models.DateTimeField(auto_now_add=True, verbose_name="angelegt am"), - ), - ( - "updated", - models.DateTimeField(auto_now=True, verbose_name="geändert am"), - ), - ( - "diagnostic_finding", - models.CharField(max_length=256, verbose_name="Diagnose bei Fund"), - ), - ( - "sent_to", - models.CharField( - blank=True, - max_length=256, - null=True, - verbose_name="Übersandt nach", - ), - ), - ( - "aviary", - models.ForeignKey( - blank=True, - null=True, - on_delete=django.db.models.deletion.SET_NULL, - to="aviary.aviary", - verbose_name="Voliere", - ), - ), - ( - "bird", - models.ForeignKey( - on_delete=django.db.models.deletion.CASCADE, - to="bird.bird", - verbose_name="Vogel", - ), - ), - ( - "find_circumstances", - models.ForeignKey( - on_delete=django.db.models.deletion.CASCADE, - to="bird.circumstance", - verbose_name="Fundumstände", - ), - ), - ( - "rescuer", - models.ForeignKey( - blank=True, - null=True, - on_delete=django.db.models.deletion.SET_NULL, - to="rescuer.rescuer", - verbose_name="Finder", - ), - ), - ( - "status", - models.ForeignKey( - default=1, - on_delete=django.db.models.deletion.CASCADE, - to="bird.birdstatus", - ), - ), - ( - "user", - models.ForeignKey( - on_delete=django.db.models.deletion.CASCADE, - to=settings.AUTH_USER_MODEL, - verbose_name="Benutzer", - ), - ), + ('id', models.UUIDField(default=uuid.uuid4, editable=False, primary_key=True, serialize=False)), + ('bird_identifier', models.CharField(max_length=256, verbose_name='Patienten Alias')), + ('age', models.CharField(choices=[('unbekannt', 'unbekannt'), ('Ei', 'Ei'), ('Nestling', 'Nestling'), ('Ästling', 'Ästling'), ('Juvenil', 'Juvenil'), ('Adult', 'Adult')], max_length=15, verbose_name='Alter')), + ('sex', models.CharField(choices=[('Weiblich', 'Weiblich'), ('Männlich', 'Männlich'), ('Unbekannt', 'Unbekannt')], max_length=15, verbose_name='Geschlecht')), + ('date_found', models.DateField(verbose_name='Datum des Fundes')), + ('place', models.CharField(max_length=256, verbose_name='Ort des Fundes')), + ('created', models.DateTimeField(auto_now_add=True, verbose_name='angelegt am')), + ('updated', models.DateTimeField(auto_now=True, verbose_name='geändert am')), + ('diagnostic_finding', models.CharField(max_length=256, verbose_name='Diagnose bei Fund')), + ('sent_to', models.CharField(blank=True, max_length=256, null=True, verbose_name='Übersandt nach')), + ('comment', models.TextField(blank=True, null=True, verbose_name='Bemerkung')), + ('aviary', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='aviary.aviary', verbose_name='Voliere')), + ('bird', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='bird.bird', verbose_name='Vogel')), + ('find_circumstances', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='bird.circumstance', verbose_name='Fundumstände')), + ('rescuer', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='rescuer.rescuer', verbose_name='Finder')), + ('status', models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, to='bird.birdstatus')), + ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='Benutzer')), ], options={ - "verbose_name": "Patient", - "verbose_name_plural": "Patienten", + 'verbose_name': 'Patient', + 'verbose_name_plural': 'Patienten', }, ), ] diff --git a/app/bird/migrations/0002_alter_bird_options_alter_fallenbird_age.py b/app/bird/migrations/0002_alter_bird_options_alter_fallenbird_age.py deleted file mode 100644 index 0cd2f5c..0000000 --- a/app/bird/migrations/0002_alter_bird_options_alter_fallenbird_age.py +++ /dev/null @@ -1,22 +0,0 @@ -# Generated by Django 4.2.4 on 2023-08-12 12:57 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('bird', '0001_initial'), - ] - - operations = [ - migrations.AlterModelOptions( - name='bird', - options={'ordering': ['name'], 'verbose_name': 'Vogel', 'verbose_name_plural': 'Vögel'}, - ), - migrations.AlterField( - model_name='fallenbird', - name='age', - field=models.CharField(choices=[('unbekannt', 'unbekannt'), ('Ei', 'Ei'), ('Nestling', 'Nestling'), ('Ästling', 'Ästling'), ('Juvenil', 'Juvenil'), ('Adult', 'Adult')], max_length=15, verbose_name='Alter'), - ), - ] diff --git a/app/bird/migrations/0003_fallenbird_comment.py b/app/bird/migrations/0003_fallenbird_comment.py deleted file mode 100644 index d83c18d..0000000 --- a/app/bird/migrations/0003_fallenbird_comment.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 4.2.4 on 2023-08-16 19:52 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('bird', '0002_alter_bird_options_alter_fallenbird_age'), - ] - - operations = [ - migrations.AddField( - model_name='fallenbird', - name='comment', - field=models.TextField(null=True), - ), - ] diff --git a/app/bird/migrations/0004_alter_fallenbird_comment.py b/app/bird/migrations/0004_alter_fallenbird_comment.py deleted file mode 100644 index 3c1f5da..0000000 --- a/app/bird/migrations/0004_alter_fallenbird_comment.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 4.2.4 on 2023-08-26 08:28 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('bird', '0003_fallenbird_comment'), - ] - - operations = [ - migrations.AlterField( - model_name='fallenbird', - name='comment', - field=models.TextField(blank=True, null=True, verbose_name='Bemerkung'), - ), - ] diff --git a/app/bird/migrations/0005_alter_bird_description.py b/app/bird/migrations/0005_alter_bird_description.py deleted file mode 100644 index 5583be2..0000000 --- a/app/bird/migrations/0005_alter_bird_description.py +++ /dev/null @@ -1,20 +0,0 @@ -# Generated by Django 4.2.5 on 2023-09-10 09:47 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ("bird", "0004_alter_fallenbird_comment"), - ] - - operations = [ - migrations.AlterField( - model_name="bird", - name="description", - field=models.CharField( - blank=True, max_length=256, null=True, verbose_name="Beschreibung" - ), - ), - ] diff --git a/app/costs/migrations/0001_initial.py b/app/costs/migrations/0001_initial.py index 77c1467..f6298de 100644 --- a/app/costs/migrations/0001_initial.py +++ b/app/costs/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 4.2.3 on 2023-07-28 14:09 +# Generated by Django 4.2.5 on 2023-09-17 21:04 from django.conf import settings from django.db import migrations, models @@ -11,64 +11,24 @@ class Migration(migrations.Migration): initial = True dependencies = [ - ("bird", "0001_initial"), + ('bird', '0001_initial'), migrations.swappable_dependency(settings.AUTH_USER_MODEL), ] operations = [ migrations.CreateModel( - name="Costs", + name='Costs', fields=[ - ( - "id", - models.UUIDField( - default=uuid.uuid4, - editable=False, - primary_key=True, - serialize=False, - ), - ), - ( - "costs", - models.DecimalField( - decimal_places=2, - default="0.00", - max_digits=5, - verbose_name="Betrag", - ), - ), - ("created", models.DateField(verbose_name="Gebucht am")), - ( - "comment", - models.CharField( - blank=True, - max_length=512, - null=True, - verbose_name="Bemerkungen", - ), - ), - ( - "id_bird", - models.ForeignKey( - blank=True, - null=True, - on_delete=django.db.models.deletion.SET_NULL, - to="bird.fallenbird", - verbose_name="Patient", - ), - ), - ( - "user", - models.ForeignKey( - on_delete=django.db.models.deletion.CASCADE, - to=settings.AUTH_USER_MODEL, - verbose_name="Benutzer", - ), - ), + ('id', models.UUIDField(default=uuid.uuid4, editable=False, primary_key=True, serialize=False)), + ('costs', models.DecimalField(decimal_places=2, default='0.00', max_digits=5, verbose_name='Betrag')), + ('created', models.DateField(verbose_name='Gebucht am')), + ('comment', models.CharField(blank=True, max_length=512, null=True, verbose_name='Bemerkungen')), + ('id_bird', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='bird.fallenbird', verbose_name='Patient')), + ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='Benutzer')), ], options={ - "verbose_name": "Kosten", - "verbose_name_plural": "Kosten", + 'verbose_name': 'Kosten', + 'verbose_name_plural': 'Kosten', }, ), ] diff --git a/docker-compose.yaml b/docker-compose.yaml index c8cbd9c..1c16c54 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -49,7 +49,7 @@ services: - "POSTGRES_DB=${DB_NAME}" traefik: - image: traefik:v2.9.6 + image: traefik:v2.10.4 container_name: django_fbf_traefik_1 ports: - 8008:80