flo/gaehsnitz
1
0
Fork 0
Code Issues 1 Pull Requests 1 Projects Releases Wiki Activity

Compare commits

base: flo:renovate/ruff-0.x
Branches Tags
flo:main flo:renovate/ruff-0.x
..
compare: flo:3d714934bc5ba93e83a5ad8c31dbcc705b93b69c
Branches Tags
flo:renovate/ruff-0.x flo:main

1 Commits
renovate/r ... 3d714934bc

Author SHA1 Message Date
Flo Ha
3d714934bc Update dependency gunicorn to v25 2026-02-13 12:01:03 +00:00
16 changed files with 331 additions and 530 deletions
Expand all files Collapse all files

10
.editorconfig
View File

@@ -1,10 +0,0 @@
root = true
[*]
charset = utf-8
end_of_line = lf
indent_size = 4
indent_style = space
insert_final_newline = true
max_line_length = 120
trim_trailing_whitespace = true

10
Dockerfile
View File

@@ -1,10 +1,8 @@
FROM python:3.14-alpine FROM python:3.14-alpine
ENV PYTHONUNBUFFERED=1 ENV PYTHONUNBUFFERED=1
COPY --from=ghcr.io/astral-sh/uv:latest /uv /uvx /usr/local/bin/ WORKDIR /code/
WORKDIR /app COPY requirements.txt .
COPY pyproject.toml . RUN pip install --upgrade pip && \
ENV VIRTUAL_ENV=/opt/venv pip install --no-cache-dir --requirement requirements.txt
RUN uv venv $VIRTUAL_ENV && uv pip install -r pyproject.toml
ENV PATH="/opt/venv/bin:$PATH"
COPY . . COPY . .
ENTRYPOINT ["./entrypoint.sh"] ENTRYPOINT ["./entrypoint.sh"]

55
docker-compose.yml
View File

@@ -1,29 +1,30 @@
services: services:
db:
image: postgres:18-alpine
init: true
environment:
POSTGRES_DB: "gaehsnitzdb"
POSTGRES_USER: "gaehsnitzuser"
POSTGRES_PASSWORD: "SCKL97ukwICPpjJ9rXyhdljZ86T29A"
expose:
- "5432"
volumes:
- ./volumes/db/data:/var/lib/postgresql/data:rw
web: db:
build: image: postgres:18-alpine
context: . init: true
init: true environment:
environment: POSTGRES_DB: "gaehsnitzdb"
DB_HOST: "db" POSTGRES_USER: "gaehsnitzuser"
DB_PORT: "5432" POSTGRES_PASSWORD: "SCKL97ukwICPpjJ9rXyhdljZ86T29A"
DB_NAME: "gaehsnitzdb" expose:
DB_USER: "gaehsnitzuser" - "5432"
DB_PASSWORD: "SCKL97ukwICPpjJ9rXyhdljZ86T29A" volumes:
depends_on: - ./volumes/db/data:/var/lib/postgresql/data:rw
- db
ports: web:
- "80:8000" build:
volumes: context: .
- .:/app init: true
environment:
DB_HOST: "db"
DB_PORT: "5432"
DB_NAME: "gaehsnitzdb"
DB_USER: "gaehsnitzuser"
DB_PASSWORD: "SCKL97ukwICPpjJ9rXyhdljZ86T29A"
depends_on:
- db
ports:
- "80:8000"
volumes:
- .:/code:rw

145
gaehsnitz/admin.py
View File

@@ -20,18 +20,17 @@ class CustomUserAdmin(UserAdmin):
ordering = ("username",) ordering = ("username",)
list_filter = [] list_filter = []
fieldsets = ( fieldsets = (
( (None, {"fields": (
None, "username",
{ "password",
"fields": ( )}),
"username", ("BALANCE", {"fields": (
"password", "consumed_drinks_price",
) )}),
}, )
), readonly_fields = (
("BALANCE", {"fields": ("consumed_drinks_price",)}), "consumed_drinks_price",
) )
readonly_fields = ("consumed_drinks_price",)
inlines = (ConsumptionInline,) inlines = (ConsumptionInline,)
def consumed_drinks_price(self, user: User): def consumed_drinks_price(self, user: User):
@@ -62,88 +61,52 @@ class PaymentAdmin(admin.ModelAdmin):
class DrinkAdmin(admin.ModelAdmin): class DrinkAdmin(admin.ModelAdmin):
list_display = ("name", "purchase_price_per_crate", "crates_purchased", "purchase_price_total") list_display = ("name", "purchase_price_per_crate", "crates_purchased", "purchase_price_total")
fieldsets = ( fieldsets = (
(None, {"fields": ("name",)}), (None, {"fields": (
( "name",
"crates", )}),
{ ("crates", {"fields": (
"fields": ( "crates_ordered",
"crates_ordered", "crates_purchased",
"crates_purchased", "crates_returned",
"crates_returned", )}),
) ("bottles", {"fields": (
}, "bottles_per_crate",
), "bottles_total",
( "bottles_returned",
"bottles", )}),
{ ("amount", {"fields": (
"fields": ( "bottle_size",
"bottles_per_crate", "amount_per_crate",
"bottles_total", "amount_total",
"bottles_returned", )}),
) ("purchase", {"fields": (
}, "purchase_price_per_crate",
), "purchase_price_per_bottle",
( "purchase_price_total",
"amount", )}),
{ ("deposit", {"fields": (
"fields": ( "deposit_per_crate",
"bottle_size", "deposit_total",
"amount_per_crate", "deposit_refund",
"amount_total", "deposit_kept",
) )}),
}, ("sales", {"fields": (
), "sale_price_per_bottle",
( "bottles_sold",
"purchase", "sales_purchase_value",
{ "sale_price_total",
"fields": ( "bottles_given_away",
"purchase_price_per_crate", "giveaway_purchase_value",
"purchase_price_per_bottle", "balance",
"purchase_price_total", )}),
)
},
),
(
"deposit",
{
"fields": (
"deposit_per_crate",
"deposit_total",
"deposit_refund",
"deposit_kept",
)
},
),
(
"sales",
{
"fields": (
"sale_price_per_bottle",
"bottles_sold",
"sales_purchase_value",
"sale_price_total",
"bottles_given_away",
"giveaway_purchase_value",
"balance",
)
},
),
) )
readonly_fields = ( readonly_fields = (
"bottles_total", "bottles_total", "bottles_returned",
"bottles_returned", "amount_per_crate", "amount_total",
"amount_per_crate", "purchase_price_per_bottle", "purchase_price_total",
"amount_total", "deposit_total", "deposit_refund", "deposit_kept",
"purchase_price_per_bottle", "bottles_sold", "sales_purchase_value", "sale_price_total",
"purchase_price_total", "bottles_given_away", "giveaway_purchase_value",
"deposit_total",
"deposit_refund",
"deposit_kept",
"bottles_sold",
"sales_purchase_value",
"sale_price_total",
"bottles_given_away",
"giveaway_purchase_value",
"balance", "balance",
) )

166
gaehsnitz/management/commands/fill_data_2022.py
View File

@@ -46,14 +46,16 @@ def payback(user, day, month, amount, note):
def consumption(day: int, for_free: bool, drink_dict: Dict[User, List[Tuple[int, Drink]]]): def consumption(day: int, for_free: bool, drink_dict: Dict[User, List[Tuple[int, Drink]]]):
for user, drink_list in drink_dict.items(): for user, drink_list in drink_dict.items():
for amount, drink in drink_list: for amount, drink in drink_list:
Consumption.objects.create(user=user, drink=drink, amount=amount, day=day, for_free=for_free) Consumption.objects.create(
user=user, drink=drink, amount=amount, day=day, for_free=for_free)
class Command(BaseCommand): class Command(BaseCommand):
@transaction.atomic() @transaction.atomic()
def handle(self, *args, **options): def handle(self, *args, **options):
if any(model.objects.exists() for model in [Donation, Payment, Drink, Consumption]): if any(model.objects.exists() for model in [Donation, Payment, Drink, Consumption]):
raise CommandError("clear all donation, payment, drink and consumption objects before running this command") raise CommandError(
"clear all donation, payment, drink and consumption objects before running this command")
# --------------- PEOPLE --------------- # --------------- PEOPLE ---------------
@@ -222,106 +224,82 @@ class Command(BaseCommand):
# --------------- THURSDAY --------------- # --------------- THURSDAY ---------------
consumption( consumption(day=1, for_free=False, drink_dict={
day=1, robert: [(2, mate), (2, radler), (1, wasser)],
for_free=False, thure: [(4, sterni), (1, krosti), (2, radler)],
drink_dict={ tobi: [(7, sterni), (2, krosti)],
robert: [(2, mate), (2, radler), (1, wasser)], herald: [(1, radler), (2, wasser), (4, wein)],
thure: [(4, sterni), (1, krosti), (2, radler)], annemarie: [(1, sterni), (1, wasser), (2, wein)],
tobi: [(7, sterni), (2, krosti)], cathi_clemens: [(1, sterni), (2, radler)],
herald: [(1, radler), (2, wasser), (4, wein)], flo: [(6, sterni), (1, wasser)],
annemarie: [(1, sterni), (1, wasser), (2, wein)], josi: [(4, sterni)],
cathi_clemens: [(1, sterni), (2, radler)], aimee: [(5, sterni)],
flo: [(6, sterni), (1, wasser)], lutz: [(1, sterni), (1, wasser)],
josi: [(4, sterni)], lasse: [(2, sterni), (1, wasser)],
aimee: [(5, sterni)], domi: [(1, sterni), (1, radler)],
lutz: [(1, sterni), (1, wasser)], })
lasse: [(2, sterni), (1, wasser)], consumption(day=1, for_free=True, drink_dict={
domi: [(1, sterni), (1, radler)], seth_family: [(1, krosti), (1, radler)],
}, })
)
consumption(
day=1,
for_free=True,
drink_dict={
seth_family: [(1, krosti), (1, radler)],
},
)
# --------------- FRIDAY --------------- # --------------- FRIDAY ---------------
consumption( consumption(day=2, for_free=False, drink_dict={
day=2, robert: [(2, mate), (1, radler)],
for_free=False, thure: [(8, sterni), (2, krosti), (1, wasser)],
drink_dict={ tobi: [(2, mate), (5, sterni), (5, krosti), (3, radler), (1, cola)],
robert: [(2, mate), (1, radler)], herald: [(1, mate), (1, sterni), (2, radler), (1, cola), (4, wasser), (7, wein)],
thure: [(8, sterni), (2, krosti), (1, wasser)], annemarie: [(2, mate), (9, sterni), (1, krosti), (2, radler), (3, wasser)],
tobi: [(2, mate), (5, sterni), (5, krosti), (3, radler), (1, cola)], cathi_clemens: [(3, sterni), (3, radler)],
herald: [(1, mate), (1, sterni), (2, radler), (1, cola), (4, wasser), (7, wein)], flo: [(1, mate), (6, sterni), (3, wasser)],
annemarie: [(2, mate), (9, sterni), (1, krosti), (2, radler), (3, wasser)], josi: [(8, sterni), (1, krosti), (2, radler)],
cathi_clemens: [(3, sterni), (3, radler)], andrew: [(4, sterni)],
flo: [(1, mate), (6, sterni), (3, wasser)], peter: [(7, sterni), (1, krosti), (2, wasser)],
josi: [(8, sterni), (1, krosti), (2, radler)], fiddi_melli: [(6, sterni), (3, radler), (1, wasser)],
andrew: [(4, sterni)], suse: [(1, krosti), (1, radler)],
peter: [(7, sterni), (1, krosti), (2, wasser)], lilly_simon: [(1, mate), (7, sterni), (3, wasser)]
fiddi_melli: [(6, sterni), (3, radler), (1, wasser)], })
suse: [(1, krosti), (1, radler)],
lilly_simon: [(1, mate), (7, sterni), (3, wasser)],
},
)
consumption( consumption(day=2, for_free=True, drink_dict={
day=2, seth_family: [(1, mate), (6, sterni), (3, wasser)],
for_free=True, aimee: [(1, mate), (9, sterni), (3, wasser)],
drink_dict={ lutz: [(1, mate), (9, sterni), (3, wasser)],
seth_family: [(1, mate), (6, sterni), (3, wasser)], lasse: [(7, sterni), (1, wasser)],
aimee: [(1, mate), (9, sterni), (3, wasser)], domi: [(1, mate), (4, sterni), (1, wasser)],
lutz: [(1, mate), (9, sterni), (3, wasser)], hans_welle: [(3, mate), (7, sterni), (7, krosti), (1, cola), (2, wasser)],
lasse: [(7, sterni), (1, wasser)], })
domi: [(1, mate), (4, sterni), (1, wasser)],
hans_welle: [(3, mate), (7, sterni), (7, krosti), (1, cola), (2, wasser)],
},
)
# --------------- SATURDAY --------------- # --------------- SATURDAY ---------------
consumption( consumption(day=3, for_free=False, drink_dict={
day=3, robert: [(4, mate), (1, cola), (4, wasser)],
for_free=False, tobi: [(9, sterni), (1, krosti), (2, radler), (1, cola)],
drink_dict={ herald: [(2, mate), (2, radler), (3, wasser), (5, wein)],
robert: [(4, mate), (1, cola), (4, wasser)], annemarie: [(2, mate), (6, sterni), (3, radler), (1, cola), (1, wasser)],
tobi: [(9, sterni), (1, krosti), (2, radler), (1, cola)], cathi_clemens: [(4, sterni), (8, radler), (1, wasser)],
herald: [(2, mate), (2, radler), (3, wasser), (5, wein)], flo: [(2, mate), (8, sterni), (1, radler), (3, wasser)],
annemarie: [(2, mate), (6, sterni), (3, radler), (1, cola), (1, wasser)], josi: [(9, sterni), (2, radler), (2, wasser)],
cathi_clemens: [(4, sterni), (8, radler), (1, wasser)], aimee: [(10, sterni), (2, radler)],
flo: [(2, mate), (8, sterni), (1, radler), (3, wasser)], lutz: [(1, krosti), (1, wasser)],
josi: [(9, sterni), (2, radler), (2, wasser)], lasse: [(1, mate), (8, sterni)],
aimee: [(10, sterni), (2, radler)], domi: [(6, sterni), (2, radler), (1, wasser)],
lutz: [(1, krosti), (1, wasser)], peter: [(3, sterni), (3, krosti), (2, radler)],
lasse: [(1, mate), (8, sterni)], fiddi_melli: [(1, mate), (1, wasser)],
domi: [(6, sterni), (2, radler), (1, wasser)], suse: [(1, mate), (1, sterni), (2, krosti), (4, radler)],
peter: [(3, sterni), (3, krosti), (2, radler)], lilly_simon: [(1, mate), (2, radler), (7, wasser)],
fiddi_melli: [(1, mate), (1, wasser)], kevin: [(1, mate), (1, radler)],
suse: [(1, mate), (1, sterni), (2, krosti), (4, radler)], rebecca: [(1, radler)],
lilly_simon: [(1, mate), (2, radler), (7, wasser)], resi_simon: [(8, sterni), (1, radler), (1, wasser)],
kevin: [(1, mate), (1, radler)], })
rebecca: [(1, radler)],
resi_simon: [(8, sterni), (1, radler), (1, wasser)],
},
)
consumption( consumption(day=3, for_free=True, drink_dict={
day=3, thure: [(1, mate), (4, sterni), (5, radler), (3, wasser)],
for_free=True, seth_family: [(1, mate), (2, sterni), (12, krosti), (1, wasser)],
drink_dict={ andrew: [(3, sterni), (2, krosti), (3, radler), (1, wasser)],
thure: [(1, mate), (4, sterni), (5, radler), (3, wasser)], robin: [(1, mate), (4, krosti), (2, radler)],
seth_family: [(1, mate), (2, sterni), (12, krosti), (1, wasser)], melokomplott: [(5, mate), (13, sterni), (1, krosti), (1, radler)],
andrew: [(3, sterni), (2, krosti), (3, radler), (1, wasser)], residudes: [(2, mate), (1, sterni), (15, krosti), (7, radler), (1, wasser)],
robin: [(1, mate), (4, krosti), (2, radler)], })
melokomplott: [(5, mate), (13, sterni), (1, krosti), (1, radler)],
residudes: [(2, mate), (1, sterni), (15, krosti), (7, radler), (1, wasser)],
},
)
# --------------- ADMIN STUFF --------------- # --------------- ADMIN STUFF ---------------

170
gaehsnitz/management/commands/fill_data_2024.py
View File

@@ -35,14 +35,16 @@ def payment(purpose, day, month, amount):
def consumption(day: int, for_free: bool, drink_dict: Dict[User, List[Tuple[int, Drink]]]): def consumption(day: int, for_free: bool, drink_dict: Dict[User, List[Tuple[int, Drink]]]):
for user, drink_list in drink_dict.items(): for user, drink_list in drink_dict.items():
for amount, drink in drink_list: for amount, drink in drink_list:
Consumption.objects.create(user=user, drink=drink, amount=amount, day=day, for_free=for_free) Consumption.objects.create(
user=user, drink=drink, amount=amount, day=day, for_free=for_free)
class Command(BaseCommand): class Command(BaseCommand):
@transaction.atomic() @transaction.atomic()
def handle(self, *args, **options): def handle(self, *args, **options):
if any(model.objects.exists() for model in [Donation, Payment, Drink, Consumption]): if any(model.objects.exists() for model in [Donation, Payment, Drink, Consumption]):
raise CommandError("clear all donation, payment, drink and consumption objects before running this command") raise CommandError(
"clear all donation, payment, drink and consumption objects before running this command")
# --------------- PEOPLE --------------- # --------------- PEOPLE ---------------
@@ -230,106 +232,86 @@ class Command(BaseCommand):
# --------------- THURSDAY --------------- # --------------- THURSDAY ---------------
consumption( consumption(day=1, for_free=False, drink_dict={
day=1, enni: [(2, wasser), (9, sterni)],
for_free=False, robert: [(2, wasser), (2, freiberger), (1, spezi), (2, mate)],
drink_dict={ josi: [(5, sterni), (1, radler)],
enni: [(2, wasser), (9, sterni)], tobi: [(5, sterni), (1, freiberger), (2, mate)],
robert: [(2, wasser), (2, freiberger), (1, spezi), (2, mate)], annemarie: [(1, wasser), (4, sterni), (1, radler)],
josi: [(5, sterni), (1, radler)], sandra: [(1, wasser), (3, sterni), (1, spezi), (1, mate)],
tobi: [(5, sterni), (1, freiberger), (2, mate)], flo: [(2, wasser), (5, sterni), (1, mate), (1, helles)],
annemarie: [(1, wasser), (4, sterni), (1, radler)], })
sandra: [(1, wasser), (3, sterni), (1, spezi), (1, mate)],
flo: [(2, wasser), (5, sterni), (1, mate), (1, helles)],
},
)
# --------------- FRIDAY --------------- # --------------- FRIDAY ---------------
consumption( consumption(day=2, for_free=False, drink_dict={
day=2, tobi: [(2, wasser), (9, sterni), (2, freiberger)],
for_free=False, annemarie: [(1, wasser), (5, sterni), (2, mate), (2, radler), (2, buddi), (3, sekt)],
drink_dict={ sandra: [(1, freiberger), (1, buddi), (1, spezi), (2, mate), (1, radler), (2, sekt)],
tobi: [(2, wasser), (9, sterni), (2, freiberger)], robert: [(2, wasser), (1, freiberger), (1, buddi), (1, spezi)],
annemarie: [(1, wasser), (5, sterni), (2, mate), (2, radler), (2, buddi), (3, sekt)], josi: [(2, wasser), (6, sterni), (1, freiberger), (2, radler)],
sandra: [(1, freiberger), (1, buddi), (1, spezi), (2, mate), (1, radler), (2, sekt)], enni: [(2, wasser), (10, sterni), (1, spezi)],
robert: [(2, wasser), (1, freiberger), (1, buddi), (1, spezi)], steven: [(1, sterni), (1, krosti), (1, radler), (5, helles)],
josi: [(2, wasser), (6, sterni), (1, freiberger), (2, radler)], marten: [(9, krosti)],
enni: [(2, wasser), (10, sterni), (1, spezi)], thure: [(4, sterni)],
steven: [(1, sterni), (1, krosti), (1, radler), (5, helles)], jona: [(2, freiberger), (10, krosti)],
marten: [(9, krosti)], benni: [(5, krosti), (1, helles)],
thure: [(4, sterni)], katha: [(1, krosti), (1, mate)],
jona: [(2, freiberger), (10, krosti)], diana: [(5, sterni), (1, radler)],
benni: [(5, krosti), (1, helles)], katz: [(3, krosti), (1, buddi)],
katha: [(1, krosti), (1, mate)], alexius: [(8, sterni)],
diana: [(5, sterni), (1, radler)], pauline: [(5, sterni), (1, radler)],
katz: [(3, krosti), (1, buddi)], herald: [(1, wasser), (2, sterni), (1, freiberger)],
alexius: [(8, sterni)], arthur: [(6, sterni), (1, radler)],
pauline: [(5, sterni), (1, radler)], matze: [(1, sterni), (1, freiberger)],
herald: [(1, wasser), (2, sterni), (1, freiberger)], dennis: [(1, sterni), (2, krosti)],
arthur: [(6, sterni), (1, radler)], marvin: [(3, sterni), (1, krosti), (1, mate)],
matze: [(1, sterni), (1, freiberger)], simon: [(1, sterni)],
dennis: [(1, sterni), (2, krosti)], })
marvin: [(3, sterni), (1, krosti), (1, mate)],
simon: [(1, sterni)],
},
)
consumption( consumption(day=2, for_free=True, drink_dict={
day=2, flo: [(2, wasser), (3, sterni), (1, freiberger), (3, helles)],
for_free=True, casi: [(6, sterni)],
drink_dict={ sepp: [(6, sterni)],
flo: [(2, wasser), (3, sterni), (1, freiberger), (3, helles)], ohli: [(4, sterni)],
casi: [(6, sterni)], marius: [(1, radler)],
sepp: [(6, sterni)], anonym: [(10, sterni), (10, krosti), (2, radler), (4, helles), (1, sekt)]
ohli: [(4, sterni)], })
marius: [(1, radler)],
anonym: [(10, sterni), (10, krosti), (2, radler), (4, helles), (1, sekt)],
},
)
# --------------- SATURDAY --------------- # --------------- SATURDAY ---------------
consumption( consumption(day=3, for_free=False, drink_dict={
day=3, herald: [(1, sterni), (2, freiberger), (2, radler), (1, buddi), (5, spezi), (2, wasser)],
for_free=False, thure: [(6, sterni), (1, krosti), (1, radler), (2, spezi)],
drink_dict={ sandra: [(6, sterni), (1, freiberger), (2, radler), (1, mate), (1, cola), (1, sekt)],
herald: [(1, sterni), (2, freiberger), (2, radler), (1, buddi), (5, spezi), (2, wasser)], marvin: [(1, sterni), (1, mate)],
thure: [(6, sterni), (1, krosti), (1, radler), (2, spezi)], simon: [(10, sterni), (1, radler), (1, mate)],
sandra: [(6, sterni), (1, freiberger), (2, radler), (1, mate), (1, cola), (1, sekt)], jona: [(6, sterni), (4, krosti)],
marvin: [(1, sterni), (1, mate)], robert: [(1, sterni), (1, freiberger), (1, buddi), (2, mate), (2, spezi), (3, wasser)],
simon: [(10, sterni), (1, radler), (1, mate)], steven: [(5, helles), (1, sterni), (2, radler), (1, mate)],
jona: [(6, sterni), (4, krosti)], flo: [(4, helles), (1, freiberger), (1, buddi), (2, mate)],
robert: [(1, sterni), (1, freiberger), (1, buddi), (2, mate), (2, spezi), (3, wasser)], matze: [(4, sterni), (2, radler), (3, buddi), (7, spezi)],
steven: [(5, helles), (1, sterni), (2, radler), (1, mate)], alexius: [(2, helles), (3, sterni), (1, radler), (1, cola)],
flo: [(4, helles), (1, freiberger), (1, buddi), (2, mate)], josi: [(5, sterni), (1, radler), (2, mate), (2, wasser), (1, sekt)],
matze: [(4, sterni), (2, radler), (3, buddi), (7, spezi)], benni: [(1, helles), (2, krosti), (2, radler), (1, wasser)],
alexius: [(2, helles), (3, sterni), (1, radler), (1, cola)], ohli: [(1, helles), (3, sterni), (2, krosti), (1, radler), (1, buddi), (1, mate)],
josi: [(5, sterni), (1, radler), (2, mate), (2, wasser), (1, sekt)], arthur: [(3, sterni), (1, krosti), (1, radler), (1, mate), (3, spezi), (2, sekt)],
benni: [(1, helles), (2, krosti), (2, radler), (1, wasser)], pauline: [(2, sterni), (2, radler), (1, mate), (1, cola)],
ohli: [(1, helles), (3, sterni), (2, krosti), (1, radler), (1, buddi), (1, mate)], enni: [(9, sterni), (1, spezi), (2, wasser), (1, sekt)],
arthur: [(3, sterni), (1, krosti), (1, radler), (1, mate), (3, spezi), (2, sekt)], annemarie: [(5, sterni), (4, radler), (2, buddi), (1, mate), (1, wasser), (2, sekt)],
pauline: [(2, sterni), (2, radler), (1, mate), (1, cola)], tobi: [(3, sterni), (1, radler), (1, mate), (1, wasser)],
enni: [(9, sterni), (1, spezi), (2, wasser), (1, sekt)], marten: [(4, helles), (1, krosti)],
annemarie: [(5, sterni), (4, radler), (2, buddi), (1, mate), (1, wasser), (2, sekt)], lukas: [(4, sterni), (1, spezi)],
tobi: [(3, sterni), (1, radler), (1, mate), (1, wasser)], lilly: [(5, sterni), (1, mate)],
marten: [(4, helles), (1, krosti)], andrea: [(1, buddi)],
lukas: [(4, sterni), (1, spezi)], lena: [(1, sterni)],
lilly: [(5, sterni), (1, mate)], anonym: [(2, helles), (3, sterni), (5, krosti), (2, radler), (1, cola), (2, sekt)]
andrea: [(1, buddi)], })
lena: [(1, sterni)],
anonym: [(2, helles), (3, sterni), (5, krosti), (2, radler), (1, cola), (2, sekt)],
},
)
consumption( consumption(day=3, for_free=True, drink_dict={
day=3, rockbert: [(8, krosti), (1, radler), (1, mate)],
for_free=True, anonym: [(8, sterni), (2, krosti), (2, mate), (1, cola)]
drink_dict={ })
rockbert: [(8, krosti), (1, radler), (1, mate)],
anonym: [(8, sterni), (2, krosti), (2, mate), (1, cola)],
},
)
# --------------- ADMIN STUFF --------------- # --------------- ADMIN STUFF ---------------

2
gaehsnitz/management/commands/user_stats.py
View File

@@ -20,4 +20,4 @@ class Command(BaseCommand):
name = id_to_name[drink_dict["drink_id"]] name = id_to_name[drink_dict["drink_id"]]
amount = drink_dict["amount"] amount = drink_dict["amount"]
drink_list.append(f"{amount}x {name}") drink_list.append(f"{amount}x {name}")
print(f"{user.username.capitalize()}: {euro(to_pay)} ({', '.join(drink_list)})") print(f"{user.username.capitalize()}: {euro(to_pay)} ({", ".join(drink_list)})")

207
gaehsnitz/migrations/0001_initial.py
View File

@@ -10,189 +10,94 @@ import gaehsnitz.models
class Migration(migrations.Migration): class Migration(migrations.Migration):
initial = True initial = True
dependencies = [ dependencies = [
("auth", "0012_alter_user_first_name_max_length"), ('auth', '0012_alter_user_first_name_max_length'),
] ]
operations = [ operations = [
migrations.CreateModel( migrations.CreateModel(
name="User", name='User',
fields=[ fields=[
("id", models.SmallAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name="ID")), ('id', models.SmallAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
("password", models.CharField(max_length=128, verbose_name="password")), ('password', models.CharField(max_length=128, verbose_name='password')),
("last_login", models.DateTimeField(blank=True, null=True, verbose_name="last login")), ('last_login', models.DateTimeField(blank=True, null=True, verbose_name='last login')),
( ('is_superuser', models.BooleanField(default=False, help_text='Designates that this user has all permissions without explicitly assigning them.', verbose_name='superuser status')),
"is_superuser", ('username', models.CharField(error_messages={'unique': 'A user with that username already exists.'}, help_text='Required. 150 characters or fewer. Letters, digits and @/./+/-/_ only.', max_length=150, unique=True, validators=[django.contrib.auth.validators.UnicodeUsernameValidator()], verbose_name='username')),
models.BooleanField( ('first_name', models.CharField(blank=True, max_length=150, verbose_name='first name')),
default=False, ('last_name', models.CharField(blank=True, max_length=150, verbose_name='last name')),
help_text="Designates that this user has all permissions without explicitly assigning them.", ('email', models.EmailField(blank=True, max_length=254, verbose_name='email address')),
verbose_name="superuser status", ('is_staff', models.BooleanField(default=False, help_text='Designates whether the user can log into this admin site.', verbose_name='staff status')),
), ('is_active', models.BooleanField(default=True, help_text='Designates whether this user should be treated as active. Unselect this instead of deleting accounts.', verbose_name='active')),
), ('date_joined', models.DateTimeField(default=django.utils.timezone.now, verbose_name='date joined')),
( ('groups', models.ManyToManyField(blank=True, help_text='The groups this user belongs to. A user will get all permissions granted to each of their groups.', related_name='user_set', related_query_name='user', to='auth.group', verbose_name='groups')),
"username", ('user_permissions', models.ManyToManyField(blank=True, help_text='Specific permissions for this user.', related_name='user_set', related_query_name='user', to='auth.permission', verbose_name='user permissions')),
models.CharField(
error_messages={"unique": "A user with that username already exists."},
help_text="Required. 150 characters or fewer. Letters, digits and @/./+/-/_ only.",
max_length=150,
unique=True,
validators=[django.contrib.auth.validators.UnicodeUsernameValidator()],
verbose_name="username",
),
),
("first_name", models.CharField(blank=True, max_length=150, verbose_name="first name")),
("last_name", models.CharField(blank=True, max_length=150, verbose_name="last name")),
("email", models.EmailField(blank=True, max_length=254, verbose_name="email address")),
(
"is_staff",
models.BooleanField(
default=False,
help_text="Designates whether the user can log into this admin site.",
verbose_name="staff status",
),
),
(
"is_active",
models.BooleanField(
default=True,
help_text="Designates whether this user should be treated as active. Unselect this instead of deleting accounts.",
verbose_name="active",
),
),
("date_joined", models.DateTimeField(default=django.utils.timezone.now, verbose_name="date joined")),
(
"groups",
models.ManyToManyField(
blank=True,
help_text="The groups this user belongs to. A user will get all permissions granted to each of their groups.",
related_name="user_set",
related_query_name="user",
to="auth.group",
verbose_name="groups",
),
),
(
"user_permissions",
models.ManyToManyField(
blank=True,
help_text="Specific permissions for this user.",
related_name="user_set",
related_query_name="user",
to="auth.permission",
verbose_name="user permissions",
),
),
], ],
options={ options={
"verbose_name": "user", 'verbose_name': 'user',
"verbose_name_plural": "users", 'verbose_name_plural': 'users',
"abstract": False, 'abstract': False,
}, },
managers=[ managers=[
("objects", django.contrib.auth.models.UserManager()), ('objects', django.contrib.auth.models.UserManager()),
], ],
), ),
migrations.CreateModel( migrations.CreateModel(
name="Drink", name='Drink',
fields=[ fields=[
("id", models.SmallAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name="ID")), ('id', models.SmallAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
("name", models.CharField(max_length=32, unique=True)), ('name', models.CharField(max_length=32, unique=True)),
( ('crates_ordered', models.PositiveSmallIntegerField(help_text='just informational to see how good we planned, not the actual consumed/paid drinks')),
"crates_ordered", ('crates_purchased', models.PositiveSmallIntegerField()),
models.PositiveSmallIntegerField( ('crates_returned', models.PositiveSmallIntegerField()),
help_text="just informational to see how good we planned, not the actual consumed/paid drinks" ('purchase_price_per_crate', gaehsnitz.models.PriceField(decimal_places=2, max_digits=6)),
), ('deposit_per_crate', gaehsnitz.models.PriceField(decimal_places=2, max_digits=6)),
), ('bottles_per_crate', models.PositiveSmallIntegerField()),
("crates_purchased", models.PositiveSmallIntegerField()), ('bottle_size', models.FloatField()),
("crates_returned", models.PositiveSmallIntegerField()), ('sale_price_per_bottle', gaehsnitz.models.PriceField(decimal_places=2, max_digits=6)),
("purchase_price_per_crate", gaehsnitz.models.PriceField(decimal_places=2, max_digits=6)),
("deposit_per_crate", gaehsnitz.models.PriceField(decimal_places=2, max_digits=6)),
("bottles_per_crate", models.PositiveSmallIntegerField()),
("bottle_size", models.FloatField()),
("sale_price_per_bottle", gaehsnitz.models.PriceField(decimal_places=2, max_digits=6)),
], ],
), ),
migrations.CreateModel( migrations.CreateModel(
name="Payment", name='Payment',
fields=[ fields=[
("id", models.SmallAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name="ID")), ('id', models.SmallAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
("purpose", models.CharField(max_length=64)), ('purpose', models.CharField(max_length=64)),
("date", models.DateField()), ('date', models.DateField()),
("amount", gaehsnitz.models.PriceField(decimal_places=2, max_digits=6)), ('amount', gaehsnitz.models.PriceField(decimal_places=2, max_digits=6)),
( ('from_user', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='payments', related_query_name='payment', to=settings.AUTH_USER_MODEL)),
"from_user",
models.ForeignKey(
on_delete=django.db.models.deletion.PROTECT,
related_name="payments",
related_query_name="payment",
to=settings.AUTH_USER_MODEL,
),
),
], ],
), ),
migrations.CreateModel( migrations.CreateModel(
name="Payback", name='Payback',
fields=[ fields=[
("id", models.SmallAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name="ID")), ('id', models.SmallAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
("date", models.DateField()), ('date', models.DateField()),
("amount", gaehsnitz.models.PriceField(decimal_places=2, max_digits=6)), ('amount', gaehsnitz.models.PriceField(decimal_places=2, max_digits=6)),
("note", models.CharField(blank=True, default="", max_length=64)), ('note', models.CharField(blank=True, default='', max_length=64)),
( ('to_user', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='paybacks', related_query_name='payback', to=settings.AUTH_USER_MODEL)),
"to_user",
models.ForeignKey(
on_delete=django.db.models.deletion.PROTECT,
related_name="paybacks",
related_query_name="payback",
to=settings.AUTH_USER_MODEL,
),
),
], ],
), ),
migrations.CreateModel( migrations.CreateModel(
name="Donation", name='Donation',
fields=[ fields=[
("id", models.SmallAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name="ID")), ('id', models.SmallAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
("date", models.DateField()), ('date', models.DateField()),
("amount", gaehsnitz.models.PriceField(decimal_places=2, max_digits=6)), ('amount', gaehsnitz.models.PriceField(decimal_places=2, max_digits=6)),
("note", models.CharField(blank=True, default="", max_length=64)), ('note', models.CharField(blank=True, default='', max_length=64)),
( ('from_user', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='donations', related_query_name='donation', to=settings.AUTH_USER_MODEL)),
"from_user",
models.ForeignKey(
on_delete=django.db.models.deletion.PROTECT,
related_name="donations",
related_query_name="donation",
to=settings.AUTH_USER_MODEL,
),
),
], ],
), ),
migrations.CreateModel( migrations.CreateModel(
name="Consumption", name='Consumption',
fields=[ fields=[
("id", models.SmallAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name="ID")), ('id', models.SmallAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
("amount", models.PositiveSmallIntegerField()), ('amount', models.PositiveSmallIntegerField()),
("day", models.PositiveSmallIntegerField(choices=[(1, "Do"), (2, "Fr"), (3, "Sa")])), ('day', models.PositiveSmallIntegerField(choices=[(1, 'Do'), (2, 'Fr'), (3, 'Sa')])),
("for_free", models.BooleanField(default=False)), ('for_free', models.BooleanField(default=False)),
( ('drink', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='consumption_list', related_query_name='consumption', to='gaehsnitz.drink')),
"drink", ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='consumption_list', related_query_name='consumption', to=settings.AUTH_USER_MODEL)),
models.ForeignKey(
on_delete=django.db.models.deletion.CASCADE,
related_name="consumption_list",
related_query_name="consumption",
to="gaehsnitz.drink",
),
),
(
"user",
models.ForeignKey(
on_delete=django.db.models.deletion.CASCADE,
related_name="consumption_list",
related_query_name="consumption",
to=settings.AUTH_USER_MODEL,
),
),
], ],
), ),
] ]

19
gaehsnitz/migrations/0002_remove_donation_from_user_remove_payment_from_user_and_more.py
View File

@@ -4,25 +4,26 @@ from django.db import migrations, models
class Migration(migrations.Migration): class Migration(migrations.Migration):
dependencies = [ dependencies = [
("gaehsnitz", "0001_initial"), ('gaehsnitz', '0001_initial'),
] ]
operations = [ operations = [
migrations.RemoveField( migrations.RemoveField(
model_name="donation", model_name='donation',
name="from_user", name='from_user',
), ),
migrations.RemoveField( migrations.RemoveField(
model_name="payment", model_name='payment',
name="from_user", name='from_user',
), ),
migrations.AlterField( migrations.AlterField(
model_name="consumption", model_name='consumption',
name="day", name='day',
field=models.PositiveSmallIntegerField(choices=[(1, "Do"), (2, "Fr"), (3, "Sa"), (4, "So")]), field=models.PositiveSmallIntegerField(choices=[(1, 'Do'), (2, 'Fr'), (3, 'Sa'), (4, 'So')]),
), ),
migrations.DeleteModel( migrations.DeleteModel(
name="Payback", name='Payback',
), ),
] ]

17
gaehsnitz/models.py
View File

@@ -4,12 +4,14 @@ from django.db.models import Sum, F
class PriceField(models.DecimalField): class PriceField(models.DecimalField):
def __init__(self, verbose_name=None, name=None, **kwargs): def __init__(self, verbose_name=None, name=None, **kwargs):
kwargs.update({"max_digits": 6, "decimal_places": 2}) kwargs.update({"max_digits": 6, "decimal_places": 2})
super().__init__(verbose_name, name, **kwargs) super().__init__(verbose_name, name, **kwargs)
class User(AbstractUser): class User(AbstractUser):
@property @property
def paid_drinks(self): def paid_drinks(self):
return self.consumption_list.filter(for_free=False) return self.consumption_list.filter(for_free=False)
@@ -20,9 +22,9 @@ class User(AbstractUser):
@property @property
def consumed_drinks_price(self): def consumed_drinks_price(self):
query = self.paid_drinks.annotate(cost=F("amount") * F("drink__sale_price_per_bottle")).aggregate( query = self.paid_drinks \
sum=Sum("cost") .annotate(cost=F("amount") * F("drink__sale_price_per_bottle")) \
) .aggregate(sum=Sum("cost"))
return query["sum"] or 0 return query["sum"] or 0
@@ -43,6 +45,7 @@ class Payment(models.Model):
amount = PriceField() amount = PriceField()
class Drink(models.Model): class Drink(models.Model):
name = models.CharField(max_length=32, unique=True) name = models.CharField(max_length=32, unique=True)
crates_ordered = models.PositiveSmallIntegerField( crates_ordered = models.PositiveSmallIntegerField(
@@ -124,11 +127,11 @@ class Drink(models.Model):
class Consumption(models.Model): class Consumption(models.Model):
user = models.ForeignKey( user = models.ForeignKey(
to=User, on_delete=models.CASCADE, related_name="consumption_list", related_query_name="consumption" to=User, on_delete=models.CASCADE,
) related_name="consumption_list", related_query_name="consumption")
drink = models.ForeignKey( drink = models.ForeignKey(
to=Drink, on_delete=models.CASCADE, related_name="consumption_list", related_query_name="consumption" to=Drink, on_delete=models.CASCADE,
) related_name="consumption_list", related_query_name="consumption")
amount = models.PositiveSmallIntegerField() amount = models.PositiveSmallIntegerField()
day = models.PositiveSmallIntegerField(choices=[(1, "Do"), (2, "Fr"), (3, "Sa"), (4, "So")]) day = models.PositiveSmallIntegerField(choices=[(1, "Do"), (2, "Fr"), (3, "Sa"), (4, "So")])
for_free = models.BooleanField(default=False) for_free = models.BooleanField(default=False)

22
gaehsnitz/views.py
View File

@@ -14,11 +14,9 @@ class GaehsnitzTemplateView(TemplateView):
context = super().get_context_data(**kwargs) context = super().get_context_data(**kwargs)
delta_til_start = festival_start_date - date.today() delta_til_start = festival_start_date - date.today()
days_til_start = max(delta_til_start.days, 0) days_til_start = max(delta_til_start.days, 0)
context.update( context.update({
{ "days_til_festival_start": days_til_start,
"days_til_festival_start": days_til_start, })
}
)
return context return context
@@ -57,14 +55,12 @@ class FinanceView(GaehsnitzTemplateView):
displayed_payments.append(Payment(purpose="Bands", amount=band_sum)) displayed_payments.append(Payment(purpose="Bands", amount=band_sum))
context.update( context.update({
{ "total_donations": total_donations,
"total_donations": total_donations, "total_payments": total_payments,
"total_payments": total_payments, "total_balance": total_balance,
"total_balance": total_balance, "payments": displayed_payments,
"payments": displayed_payments, })
}
)
return context return context

2
gaehsnitzproject/wsgi.py
View File

@@ -2,6 +2,6 @@ import os
from django.core.wsgi import get_wsgi_application from django.core.wsgi import get_wsgi_application
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "gaehsnitzproject.settings") os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'gaehsnitzproject.settings')
application = get_wsgi_application() application = get_wsgi_application()

5
manage.py
View File

@@ -1,12 +1,11 @@
#!/usr/bin/env python #!/usr/bin/env python
"""Django's command-line utility for administrative tasks.""" """Django's command-line utility for administrative tasks."""
import os import os
import sys import sys
def main(): def main():
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "gaehsnitzproject.settings") os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'gaehsnitzproject.settings')
try: try:
from django.core.management import execute_from_command_line from django.core.management import execute_from_command_line
except ImportError as exc: except ImportError as exc:
@@ -18,5 +17,5 @@ def main():
execute_from_command_line(sys.argv) execute_from_command_line(sys.argv)
if __name__ == "__main__": if __name__ == '__main__':
main() main()

21
pyproject.toml
View File

@@ -1,21 +0,0 @@
[project]
name = "gaehsnitz"
version = "0.1.0"
requires-python = ">=3.14"
dependencies = [
"django==6.0.3",
"gunicorn==25.1.0",
"psycopg[binary]==3.3.3",
]
[dependency-groups]
dev = [
"ruff==0.15.7",
]
[tool.ruff]
target-version = "py314"
line-length = 120
[tool.ruff.lint]
select = ["E", "F", "W", "I"]

7
renovate.json5
View File

@@ -1,4 +1,7 @@
{ {
$schema: "https://docs.renovatebot.com/renovate-schema.json", "$schema": "https://docs.renovatebot.com/renovate-schema.json",
extends: ["config:recommended", ":configMigration"], "extends": [
"config:recommended",
":configMigration"
]
} }

3
requirements.txt Normal file
View File

@@ -0,0 +1,3 @@
django==6.0.1
gunicorn==25.1.0
psycopg[binary]==3.3.2