nabujena/FallenBirdyForm
1
0
Fork 0
Code Issues 3 Pull requests Projects Releases Packages Wiki Activity Actions

versions new

Browse source
This commit is contained in:
gw3000 2023-09-17 23:09:46 +02:00
parent ef84e6d137
commit f7ea468b12
8 changed files with 53 additions and 283 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/Dockerfile
View file

@ -1,7 +1,7 @@
# app/Dockerfile # app/Dockerfile
# pull the official docker image # pull the official docker image
FROM python:3.11.2-slim FROM python:3.11.5-slim
# set work directory # set work directory
WORKDIR /app WORKDIR /app

192
app/bird/migrations/0001_initial.py
View file

@ -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.conf import settings
from django.db import migrations, models from django.db import migrations, models
import django.db.models.deletion import django.db.models.deletion
@ -12,182 +11,71 @@ class Migration(migrations.Migration):
initial = True initial = True
dependencies = [ dependencies = [
('rescuer', '0002_alter_rescuer_options'),
('aviary', '0001_initial'),
migrations.swappable_dependency(settings.AUTH_USER_MODEL), migrations.swappable_dependency(settings.AUTH_USER_MODEL),
("rescuer", "0001_initial"),
("aviary", "0001_initial"),
] ]
operations = [ operations = [
migrations.CreateModel( migrations.CreateModel(
name="Bird", name='Bird',
fields=[ fields=[
("id", models.BigAutoField(primary_key=True, serialize=False)), ('id', models.BigAutoField(primary_key=True, serialize=False)),
( ('name', models.CharField(max_length=256, unique=True, verbose_name='Bezeichnung')),
"name", ('description', models.CharField(blank=True, max_length=256, null=True, verbose_name='Beschreibung')),
models.CharField(
max_length=256, unique=True, verbose_name="Bezeichnung"
),
),
("description", ckeditor.fields.RichTextField(blank=True, null=True)),
], ],
options={ options={
"verbose_name": "Vogel", 'verbose_name': 'Vogel',
"verbose_name_plural": "Vögel", 'verbose_name_plural': 'Vögel',
'ordering': ['name'],
}, },
), ),
migrations.CreateModel( migrations.CreateModel(
name="BirdStatus", name='BirdStatus',
fields=[ fields=[
("id", models.BigAutoField(primary_key=True, serialize=False)), ('id', models.BigAutoField(primary_key=True, serialize=False)),
( ('description', models.CharField(max_length=256, unique=True, verbose_name='Bezeichnung')),
"description",
models.CharField(
max_length=256, unique=True, verbose_name="Bezeichnung"
),
),
], ],
options={ options={
"verbose_name": "Patientenstatus", 'verbose_name': 'Patientenstatus',
"verbose_name_plural": "Patientenstatus", 'verbose_name_plural': 'Patientenstatus',
}, },
), ),
migrations.CreateModel( migrations.CreateModel(
name="Circumstance", name='Circumstance',
fields=[ fields=[
("id", models.BigAutoField(primary_key=True, serialize=False)), ('id', models.BigAutoField(primary_key=True, serialize=False)),
( ('description', models.CharField(max_length=256, verbose_name='Bezeichnung')),
"description",
models.CharField(max_length=256, verbose_name="Bezeichnung"),
),
], ],
options={ options={
"verbose_name": "Fundumstand", 'verbose_name': 'Fundumstand',
"verbose_name_plural": "Fundumstände", 'verbose_name_plural': 'Fundumstände',
}, },
), ),
migrations.CreateModel( migrations.CreateModel(
name="FallenBird", name='FallenBird',
fields=[ fields=[
( ('id', models.UUIDField(default=uuid.uuid4, editable=False, primary_key=True, serialize=False)),
"id", ('bird_identifier', models.CharField(max_length=256, verbose_name='Patienten Alias')),
models.UUIDField( ('age', models.CharField(choices=[('unbekannt', 'unbekannt'), ('Ei', 'Ei'), ('Nestling', 'Nestling'), ('Ästling', 'Ästling'), ('Juvenil', 'Juvenil'), ('Adult', 'Adult')], max_length=15, verbose_name='Alter')),
default=uuid.uuid4, ('sex', models.CharField(choices=[('Weiblich', 'Weiblich'), ('Männlich', 'Männlich'), ('Unbekannt', 'Unbekannt')], max_length=15, verbose_name='Geschlecht')),
editable=False, ('date_found', models.DateField(verbose_name='Datum des Fundes')),
primary_key=True, ('place', models.CharField(max_length=256, verbose_name='Ort des Fundes')),
serialize=False, ('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')),
"bird_identifier", ('comment', models.TextField(blank=True, null=True, verbose_name='Bemerkung')),
models.CharField(max_length=256, verbose_name="Patienten Alias"), ('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')),
"age", ('rescuer', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='rescuer.rescuer', verbose_name='Finder')),
models.CharField( ('status', models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, to='bird.birdstatus')),
choices=[ ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='Benutzer')),
("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",
),
),
], ],
options={ options={
"verbose_name": "Patient", 'verbose_name': 'Patient',
"verbose_name_plural": "Patienten", 'verbose_name_plural': 'Patienten',
}, },
), ),
] ]

22
app/bird/migrations/0002_alter_bird_options_alter_fallenbird_age.py
View file

@ -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'),
),
]

18
app/bird/migrations/0003_fallenbird_comment.py
View file

@ -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),
),
]

18
app/bird/migrations/0004_alter_fallenbird_comment.py
View file

@ -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'),
),
]

20
app/bird/migrations/0005_alter_bird_description.py
View file

@ -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"
),
),
]

62
app/costs/migrations/0001_initial.py
View file

@ -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.conf import settings
from django.db import migrations, models from django.db import migrations, models
@ -11,64 +11,24 @@ class Migration(migrations.Migration):
initial = True initial = True
dependencies = [ dependencies = [
("bird", "0001_initial"), ('bird', '0001_initial'),
migrations.swappable_dependency(settings.AUTH_USER_MODEL), migrations.swappable_dependency(settings.AUTH_USER_MODEL),
] ]
operations = [ operations = [
migrations.CreateModel( migrations.CreateModel(
name="Costs", name='Costs',
fields=[ fields=[
( ('id', models.UUIDField(default=uuid.uuid4, editable=False, primary_key=True, serialize=False)),
"id", ('costs', models.DecimalField(decimal_places=2, default='0.00', max_digits=5, verbose_name='Betrag')),
models.UUIDField( ('created', models.DateField(verbose_name='Gebucht am')),
default=uuid.uuid4, ('comment', models.CharField(blank=True, max_length=512, null=True, verbose_name='Bemerkungen')),
editable=False, ('id_bird', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='bird.fallenbird', verbose_name='Patient')),
primary_key=True, ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='Benutzer')),
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={ options={
"verbose_name": "Kosten", 'verbose_name': 'Kosten',
"verbose_name_plural": "Kosten", 'verbose_name_plural': 'Kosten',
}, },
), ),
] ]

2
docker-compose.yaml
View file

@ -49,7 +49,7 @@ services:
- "POSTGRES_DB=${DB_NAME}" - "POSTGRES_DB=${DB_NAME}"
traefik: traefik:
image: traefik:v2.9.6 image: traefik:v2.10.4
container_name: django_fbf_traefik_1 container_name: django_fbf_traefik_1
ports: ports:
- 8008:80 - 8008:80