Compare commits
5 Commits
494170e2ab
...
new-regist
| Author | SHA1 | Date | |
|---|---|---|---|
| c8500a4337 | |||
| 03d823c713 | |||
| 773f8ad2b6 | |||
| 3291fbf6a0 | |||
| 84f128806c |
2
.gitignore
vendored
2
.gitignore
vendored
@@ -1,5 +1,5 @@
|
|||||||
config.php
|
config.php
|
||||||
test.php
|
test.php
|
||||||
melly-to-grist/.env
|
melly-to-grist/.env
|
||||||
*/__pycache__
|
**/__pycache__
|
||||||
new-registration-app/database.db
|
new-registration-app/database.db
|
||||||
@@ -1,19 +0,0 @@
|
|||||||
[project]
|
|
||||||
name = "new-registration-app"
|
|
||||||
version = "0.1.0"
|
|
||||||
description = "Add your description here"
|
|
||||||
readme = "README.md"
|
|
||||||
requires-python = "~=3.13.0"
|
|
||||||
dependencies = [
|
|
||||||
"fastapi[standard]>=0.116.0",
|
|
||||||
"sqlalchemy>=2.0.44",
|
|
||||||
"uvicorn[standard]>=0.35.0",
|
|
||||||
]
|
|
||||||
|
|
||||||
[dependency-groups]
|
|
||||||
dev = [
|
|
||||||
"black>=25.1.0",
|
|
||||||
"isort>=6.0.1",
|
|
||||||
]
|
|
||||||
[tool.isort]
|
|
||||||
profile = "black"
|
|
||||||
42
pyproject.toml
Normal file
42
pyproject.toml
Normal file
@@ -0,0 +1,42 @@
|
|||||||
|
[project]
|
||||||
|
name = "meal-manager"
|
||||||
|
version = "0.1.0"
|
||||||
|
description = "Add your description here"
|
||||||
|
readme = "README.md"
|
||||||
|
requires-python = "~=3.13.0"
|
||||||
|
dependencies = [
|
||||||
|
"alembic>=1.17.0",
|
||||||
|
"fastapi[standard]>=0.116.0",
|
||||||
|
"sqlalchemy>=2.0.44",
|
||||||
|
"uvicorn[standard]>=0.35.0",
|
||||||
|
]
|
||||||
|
[build-system]
|
||||||
|
requires = ["uv_build>=0.9.0,<0.10.0"]
|
||||||
|
build-backend = "uv_build"
|
||||||
|
|
||||||
|
[dependency-groups]
|
||||||
|
dev = [
|
||||||
|
"black>=25.1.0",
|
||||||
|
"isort>=6.0.1",
|
||||||
|
]
|
||||||
|
[tool.isort]
|
||||||
|
profile = "black"
|
||||||
|
|
||||||
|
[tool.alembic]
|
||||||
|
|
||||||
|
# path to migration scripts.
|
||||||
|
# this is typically a path given in POSIX (e.g. forward slashes)
|
||||||
|
# format, relative to the token %(here)s which refers to the location of this
|
||||||
|
# ini file
|
||||||
|
script_location = "%(here)s/alembic"
|
||||||
|
|
||||||
|
# template used to generate migration file names; The default value is %%(rev)s_%%(slug)s
|
||||||
|
# Uncomment the line below if you want the files to be prepended with date and time
|
||||||
|
# see https://alembic.sqlalchemy.org/en/latest/tutorial.html#editing-the-ini-file
|
||||||
|
# for all available tokens
|
||||||
|
file_template = "%%(year)d_%%(month).2d_%%(day).2d_%%(hour).2d%%(minute).2d-%%(rev)s_%%(slug)s"
|
||||||
|
|
||||||
|
# additional paths to be prepended to sys.path. defaults to the current working directory.
|
||||||
|
prepend_sys_path = [
|
||||||
|
"."
|
||||||
|
]
|
||||||
BIN
signup/Logo.png
BIN
signup/Logo.png
Binary file not shown.
|
Before Width: | Height: | Size: 21 KiB |
@@ -1,98 +0,0 @@
|
|||||||
<!DOCTYPE html>
|
|
||||||
<html lang="en">
|
|
||||||
<head>
|
|
||||||
<meta charset="UTF-8">
|
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
|
||||||
<title>Termin hinzufügen</title>
|
|
||||||
<link rel="stylesheet" href="style.css"> <!-- Link to the CSS file -->
|
|
||||||
</head>
|
|
||||||
<body>
|
|
||||||
<header>
|
|
||||||
<div class="container">
|
|
||||||
<div id="branding">
|
|
||||||
<img src="Logo.png" alt="Logo">
|
|
||||||
<h1>Termin hinzufügen</h1>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</header>
|
|
||||||
|
|
||||||
<div class="container">
|
|
||||||
<h2>Neuen Termin hinzufügen</h2>
|
|
||||||
<form action="add.php" method="POST">
|
|
||||||
<label for="title">Title:</label>
|
|
||||||
<input type="text" id="title" name="title" required>
|
|
||||||
|
|
||||||
<label for="melly">Melly Link:</label>
|
|
||||||
<input type="text" id="melly" name="melly" required>
|
|
||||||
|
|
||||||
<label for="date">Event Date:</label>
|
|
||||||
<input type="date" id="date" name="date" required>
|
|
||||||
|
|
||||||
<label for="signup_deadline">Anmeldung bis:</label>
|
|
||||||
<input type="datetime-local" id="signup_deadline" name="signup_deadline" required>
|
|
||||||
|
|
||||||
<label for="password">Password:</label>
|
|
||||||
<input type="password" id="password" name="password" required>
|
|
||||||
|
|
||||||
<button type="submit" class="btn">Hinzfügen</button>
|
|
||||||
</form>
|
|
||||||
|
|
||||||
<?php
|
|
||||||
ini_set('display_errors', 1);
|
|
||||||
ini_set('display_startup_errors', 1);
|
|
||||||
error_reporting(E_ALL);
|
|
||||||
|
|
||||||
$config = require 'config.php';
|
|
||||||
|
|
||||||
// Database connection parameters
|
|
||||||
$host = $config['db']['host'];
|
|
||||||
$dbname = $config['db']['dbname'];
|
|
||||||
$username = $config['db']['username'];
|
|
||||||
$password = $config['db']['password'];
|
|
||||||
|
|
||||||
if ($_SERVER["REQUEST_METHOD"] == "POST") {
|
|
||||||
// Retrieve form data
|
|
||||||
$title = $_POST['title'];
|
|
||||||
$melly = $_POST['melly'];
|
|
||||||
$date = $_POST['date'];
|
|
||||||
$deadline = $_POST['signup_deadline'];
|
|
||||||
|
|
||||||
$webform_password = $_POST['password'];
|
|
||||||
|
|
||||||
if($webform_password != $config['webform_password']) {
|
|
||||||
echo 'Invalid Password!';
|
|
||||||
} else {
|
|
||||||
|
|
||||||
try {
|
|
||||||
// Create connection
|
|
||||||
$dsn = "pgsql:host=$host;dbname=$dbname";
|
|
||||||
$pdo = new PDO($dsn, $username, $password);
|
|
||||||
|
|
||||||
// Set error mode to exception for easier debugging
|
|
||||||
$pdo->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
|
|
||||||
|
|
||||||
// SQL query to insert a new dinner option
|
|
||||||
$sql = "INSERT INTO meals (title, link, event_date, registration_closes) VALUES (:title, :melly, :date, :deadline)";
|
|
||||||
$stmt = $pdo->prepare($sql);
|
|
||||||
|
|
||||||
// Bind parameters
|
|
||||||
$stmt->bindParam(':title', $title);
|
|
||||||
$stmt->bindParam(':melly', $melly);
|
|
||||||
$stmt->bindParam(':date', $date);
|
|
||||||
$stmt->bindParam(':deadline', $deadline);
|
|
||||||
|
|
||||||
// Execute the statement
|
|
||||||
$stmt->execute();
|
|
||||||
|
|
||||||
echo '<p class="success">Dinner option added successfully!</p>';
|
|
||||||
|
|
||||||
} catch (PDOException $e) {
|
|
||||||
// Handle connection or query error
|
|
||||||
echo "Error: " . $e->getMessage();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
?>
|
|
||||||
</div>
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
@@ -1,13 +0,0 @@
|
|||||||
CREATE TABLE meals (
|
|
||||||
id SERIAL PRIMARY KEY,
|
|
||||||
title TEXT NOT NULL,
|
|
||||||
link TEXT NOT NULL,
|
|
||||||
event_date DATE NOT NULL,
|
|
||||||
registration_closes TIMESTAMP NOT NULL
|
|
||||||
);
|
|
||||||
|
|
||||||
|
|
||||||
INSERT INTO meals (title, link, event_date, registration_closes)
|
|
||||||
VALUES ('Kidneybohnen Burger mit veganem Coleslaw','https://melly.de/plan/2ZSNYWR37VB8','2025-03-05', '2025-03-02T17:30:30'),
|
|
||||||
('Gemüselasagne mit Salat','hhttps://melly.de/plan/M4XU9XMVM2HP','2025-02-28', '2025-02-23T17:30:30'),
|
|
||||||
RETURNING *;
|
|
||||||
108
signup/index.php
108
signup/index.php
@@ -1,108 +0,0 @@
|
|||||||
<!DOCTYPE html>
|
|
||||||
<html lang="de">
|
|
||||||
<head>
|
|
||||||
<meta charset="UTF-8">
|
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
|
||||||
<title>Allmende-Essen</title>
|
|
||||||
<link rel="stylesheet" href="style.css">
|
|
||||||
</head>
|
|
||||||
<body>
|
|
||||||
<header>
|
|
||||||
<div class="container">
|
|
||||||
<div id="branding">
|
|
||||||
<img src="Logo.png" alt="Logo"/>
|
|
||||||
<h1>Gemeinsames Essen in der Allmende</h1>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</header>
|
|
||||||
<?php
|
|
||||||
|
|
||||||
ini_set('display_errors', 1);
|
|
||||||
ini_set('display_startup_errors', 1);
|
|
||||||
error_reporting(E_ALL);
|
|
||||||
|
|
||||||
$config = require 'config.php';
|
|
||||||
|
|
||||||
// Database connection parameters
|
|
||||||
$host = $config['db']['host'];
|
|
||||||
$dbname = $config['db']['dbname'];
|
|
||||||
$username = $config['db']['username'];
|
|
||||||
$password = $config['db']['password'];
|
|
||||||
|
|
||||||
// Create connection
|
|
||||||
$dsn = "pgsql:host=$host;dbname=$dbname";
|
|
||||||
$pdo = new PDO($dsn, $username, $password);
|
|
||||||
|
|
||||||
// Query to fetch future dinner options
|
|
||||||
$sql = "SELECT id, title, link, event_date, registration_closes FROM meals WHERE event_date >= now()::date order by registration_closes < now(), event_date";
|
|
||||||
$stmt = $pdo->prepare($sql);
|
|
||||||
$stmt->execute();
|
|
||||||
|
|
||||||
$result = $stmt->fetchAll(PDO::FETCH_ASSOC);
|
|
||||||
|
|
||||||
$days = ["Sonntag", "Montag", "Dienstag", "Mittwoch", "Donnerstag", "Freitag", "Samstag"];
|
|
||||||
|
|
||||||
$today = strtotime(date('Y-m-d'));
|
|
||||||
$now = strtotime(date("Y-m-d H:i:s"));
|
|
||||||
?>
|
|
||||||
|
|
||||||
<div class="container">
|
|
||||||
<?php // Display dinner options
|
|
||||||
for($i = 0; $i < sizeof($result); $i++) {
|
|
||||||
$row = $result[$i];
|
|
||||||
|
|
||||||
$event_date = strtotime($row["event_date"]);
|
|
||||||
|
|
||||||
$weekday = date("w", $event_date);
|
|
||||||
$date = new DateTimeImmutable($row["event_date"]);
|
|
||||||
|
|
||||||
$end_of_registration = strtotime($row["registration_closes"]);
|
|
||||||
echo '<div class="dinner-option">';
|
|
||||||
echo '<h2>' . $days[$weekday] . " " . $date->format('d.m.Y') .'</h2>';
|
|
||||||
echo '<p>' . htmlspecialchars($row["title"]) . '</p>';
|
|
||||||
if ($end_of_registration > $now) {
|
|
||||||
echo '<a href="' . $row["link"] . '" class="btn">Zur Anmeldung</a>';
|
|
||||||
} else {
|
|
||||||
echo '<a href="' . $row["link"] . '" class="btn btn-grey">Anmeldungen ansehen</a>';
|
|
||||||
}
|
|
||||||
echo '</div>';
|
|
||||||
}
|
|
||||||
// close container
|
|
||||||
echo '</div>';
|
|
||||||
|
|
||||||
// Query to fetch past dinner options
|
|
||||||
$sql = "SELECT id, title, link, event_date FROM meals WHERE event_date < now()::date order by event_date";
|
|
||||||
$stmt = $pdo->prepare($sql);
|
|
||||||
$stmt->execute();
|
|
||||||
|
|
||||||
$result = $stmt->fetchAll(PDO::FETCH_ASSOC);
|
|
||||||
|
|
||||||
if(sizeof($result) > 0) {
|
|
||||||
?>
|
|
||||||
|
|
||||||
<div class="container">
|
|
||||||
<h2>Vergangene Essen</h2>
|
|
||||||
|
|
||||||
<?php
|
|
||||||
for($i = 0; $i < sizeof($result); $i++) {
|
|
||||||
$row = $result[$i];
|
|
||||||
|
|
||||||
$event_date = strtotime($row["event_date"]);
|
|
||||||
|
|
||||||
$weekday = date("w", $event_date);
|
|
||||||
$date = new DateTimeImmutable($row["event_date"]);
|
|
||||||
|
|
||||||
echo '<div class="dinner-option">';
|
|
||||||
echo '<h2>' . $days[$weekday] . " " . $date->format('d.m.Y') .'</h2>';
|
|
||||||
echo '<p>' . htmlspecialchars($row["title"]) . '</p>';
|
|
||||||
echo '<a href="' . $row["link"] . '" class="btn btn-grey">Anmeldungen ansehen</a>';
|
|
||||||
echo '</div>';
|
|
||||||
}
|
|
||||||
// close container
|
|
||||||
echo '</div>';
|
|
||||||
}
|
|
||||||
?>
|
|
||||||
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
|
|
||||||
@@ -1,75 +0,0 @@
|
|||||||
body {
|
|
||||||
font-family: Arial, sans-serif;
|
|
||||||
margin: 0;
|
|
||||||
padding: 0;
|
|
||||||
background-color: #f4f4f4;
|
|
||||||
color: #333;
|
|
||||||
}
|
|
||||||
.container {
|
|
||||||
width: 80%;
|
|
||||||
margin: auto;
|
|
||||||
overflow: hidden;
|
|
||||||
}
|
|
||||||
header {
|
|
||||||
background: #333;
|
|
||||||
color: #fff;
|
|
||||||
padding-top: 30px;
|
|
||||||
min-height: 70px;
|
|
||||||
border-bottom: #77aaff 3px solid;
|
|
||||||
}
|
|
||||||
header a {
|
|
||||||
color: #fff;
|
|
||||||
text-decoration: none;
|
|
||||||
text-transform: uppercase;
|
|
||||||
font-size: 16px;
|
|
||||||
}
|
|
||||||
header ul {
|
|
||||||
padding: 0;
|
|
||||||
list-style: none;
|
|
||||||
}
|
|
||||||
header li {
|
|
||||||
float: left;
|
|
||||||
display: inline;
|
|
||||||
padding: 0 20px 0 20px;
|
|
||||||
}
|
|
||||||
header #branding {
|
|
||||||
float: left;
|
|
||||||
}
|
|
||||||
header #branding img {
|
|
||||||
height: 50px;
|
|
||||||
width: 40px;
|
|
||||||
margin-right: 10px;
|
|
||||||
}
|
|
||||||
header #branding h1 {
|
|
||||||
margin: 0;
|
|
||||||
}
|
|
||||||
header nav {
|
|
||||||
float: right;
|
|
||||||
margin-top: 10px;
|
|
||||||
}
|
|
||||||
.dinner-option {
|
|
||||||
background: #fff;
|
|
||||||
padding: 20px;
|
|
||||||
margin: 20px 0;
|
|
||||||
border-radius: 5px;
|
|
||||||
box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
|
|
||||||
}
|
|
||||||
.dinner-option h2 {
|
|
||||||
margin-top: 0;
|
|
||||||
}
|
|
||||||
.btn {
|
|
||||||
background: #77aaff;
|
|
||||||
color: #fff;
|
|
||||||
padding: 10px 20px;
|
|
||||||
text-decoration: none;
|
|
||||||
border-radius: 5px;
|
|
||||||
display: inline-block;
|
|
||||||
margin-top: 10px;
|
|
||||||
}
|
|
||||||
.btn-grey {
|
|
||||||
background: #ccc;
|
|
||||||
color: #333;
|
|
||||||
}
|
|
||||||
.btn:hover {
|
|
||||||
background: #5a99d0;
|
|
||||||
}
|
|
||||||
0
src/meal_manager/__init__.py
Normal file
0
src/meal_manager/__init__.py
Normal file
43
src/meal_manager/alembic.ini
Normal file
43
src/meal_manager/alembic.ini
Normal file
@@ -0,0 +1,43 @@
|
|||||||
|
# A generic, single database configuration.
|
||||||
|
|
||||||
|
[alembic]
|
||||||
|
|
||||||
|
# database URL. This is consumed by the user-maintained env.py script only.
|
||||||
|
# other means of configuring database URLs may be customized within the env.py
|
||||||
|
# file.
|
||||||
|
sqlalchemy.url = sqlite:///database.db
|
||||||
|
|
||||||
|
# Logging configuration
|
||||||
|
[loggers]
|
||||||
|
keys = root,sqlalchemy,alembic
|
||||||
|
|
||||||
|
[handlers]
|
||||||
|
keys = console
|
||||||
|
|
||||||
|
[formatters]
|
||||||
|
keys = generic
|
||||||
|
|
||||||
|
[logger_root]
|
||||||
|
level = WARNING
|
||||||
|
handlers = console
|
||||||
|
qualname =
|
||||||
|
|
||||||
|
[logger_sqlalchemy]
|
||||||
|
level = WARNING
|
||||||
|
handlers =
|
||||||
|
qualname = sqlalchemy.engine
|
||||||
|
|
||||||
|
[logger_alembic]
|
||||||
|
level = INFO
|
||||||
|
handlers =
|
||||||
|
qualname = alembic
|
||||||
|
|
||||||
|
[handler_console]
|
||||||
|
class = StreamHandler
|
||||||
|
args = (sys.stderr,)
|
||||||
|
level = NOTSET
|
||||||
|
formatter = generic
|
||||||
|
|
||||||
|
[formatter_generic]
|
||||||
|
format = %(levelname)-5.5s [%(name)s] %(message)s
|
||||||
|
datefmt = %H:%M:%S
|
||||||
1
src/meal_manager/alembic/README
Normal file
1
src/meal_manager/alembic/README
Normal file
@@ -0,0 +1 @@
|
|||||||
|
pyproject configuration, based on the generic configuration.
|
||||||
76
src/meal_manager/alembic/env.py
Normal file
76
src/meal_manager/alembic/env.py
Normal file
@@ -0,0 +1,76 @@
|
|||||||
|
from logging.config import fileConfig
|
||||||
|
|
||||||
|
from alembic import context
|
||||||
|
from sqlalchemy import engine_from_config, pool
|
||||||
|
|
||||||
|
# this is the Alembic Config object, which provides
|
||||||
|
# access to the values within the .ini file in use.
|
||||||
|
config = context.config
|
||||||
|
|
||||||
|
# Interpret the config file for Python logging.
|
||||||
|
# This line sets up loggers basically.
|
||||||
|
if config.config_file_name is not None:
|
||||||
|
fileConfig(config.config_file_name)
|
||||||
|
|
||||||
|
# add your model's MetaData object here
|
||||||
|
# for 'autogenerate' support
|
||||||
|
# from myapp import mymodel
|
||||||
|
# target_metadata = mymodel.Base.metadata
|
||||||
|
from meal_manager.models import Base
|
||||||
|
|
||||||
|
target_metadata = Base.metadata
|
||||||
|
|
||||||
|
# other values from the config, defined by the needs of env.py,
|
||||||
|
# can be acquired:
|
||||||
|
# my_important_option = config.get_main_option("my_important_option")
|
||||||
|
# ... etc.
|
||||||
|
|
||||||
|
|
||||||
|
def run_migrations_offline() -> None:
|
||||||
|
"""Run migrations in 'offline' mode.
|
||||||
|
|
||||||
|
This configures the context with just a URL
|
||||||
|
and not an Engine, though an Engine is acceptable
|
||||||
|
here as well. By skipping the Engine creation
|
||||||
|
we don't even need a DBAPI to be available.
|
||||||
|
|
||||||
|
Calls to context.execute() here emit the given string to the
|
||||||
|
script output.
|
||||||
|
|
||||||
|
"""
|
||||||
|
url = config.get_main_option("sqlalchemy.url")
|
||||||
|
context.configure(
|
||||||
|
url=url,
|
||||||
|
target_metadata=target_metadata,
|
||||||
|
literal_binds=True,
|
||||||
|
dialect_opts={"paramstyle": "named"},
|
||||||
|
)
|
||||||
|
|
||||||
|
with context.begin_transaction():
|
||||||
|
context.run_migrations()
|
||||||
|
|
||||||
|
|
||||||
|
def run_migrations_online() -> None:
|
||||||
|
"""Run migrations in 'online' mode.
|
||||||
|
|
||||||
|
In this scenario we need to create an Engine
|
||||||
|
and associate a connection with the context.
|
||||||
|
|
||||||
|
"""
|
||||||
|
connectable = engine_from_config(
|
||||||
|
config.get_section(config.config_ini_section, {}),
|
||||||
|
prefix="sqlalchemy.",
|
||||||
|
poolclass=pool.NullPool,
|
||||||
|
)
|
||||||
|
|
||||||
|
with connectable.connect() as connection:
|
||||||
|
context.configure(connection=connection, target_metadata=target_metadata)
|
||||||
|
|
||||||
|
with context.begin_transaction():
|
||||||
|
context.run_migrations()
|
||||||
|
|
||||||
|
|
||||||
|
if context.is_offline_mode():
|
||||||
|
run_migrations_offline()
|
||||||
|
else:
|
||||||
|
run_migrations_online()
|
||||||
28
src/meal_manager/alembic/script.py.mako
Normal file
28
src/meal_manager/alembic/script.py.mako
Normal file
@@ -0,0 +1,28 @@
|
|||||||
|
"""${message}
|
||||||
|
|
||||||
|
Revision ID: ${up_revision}
|
||||||
|
Revises: ${down_revision | comma,n}
|
||||||
|
Create Date: ${create_date}
|
||||||
|
|
||||||
|
"""
|
||||||
|
from typing import Sequence, Union
|
||||||
|
|
||||||
|
from alembic import op
|
||||||
|
import sqlalchemy as sa
|
||||||
|
${imports if imports else ""}
|
||||||
|
|
||||||
|
# revision identifiers, used by Alembic.
|
||||||
|
revision: str = ${repr(up_revision)}
|
||||||
|
down_revision: Union[str, Sequence[str], None] = ${repr(down_revision)}
|
||||||
|
branch_labels: Union[str, Sequence[str], None] = ${repr(branch_labels)}
|
||||||
|
depends_on: Union[str, Sequence[str], None] = ${repr(depends_on)}
|
||||||
|
|
||||||
|
|
||||||
|
def upgrade() -> None:
|
||||||
|
"""Upgrade schema."""
|
||||||
|
${upgrades if upgrades else "pass"}
|
||||||
|
|
||||||
|
|
||||||
|
def downgrade() -> None:
|
||||||
|
"""Downgrade schema."""
|
||||||
|
${downgrades if downgrades else "pass"}
|
||||||
@@ -0,0 +1,110 @@
|
|||||||
|
"""inital revision
|
||||||
|
|
||||||
|
Revision ID: 299a83240036
|
||||||
|
Revises:
|
||||||
|
Create Date: 2025-10-12 20:46:13.452705
|
||||||
|
|
||||||
|
"""
|
||||||
|
|
||||||
|
from typing import Sequence, Union
|
||||||
|
|
||||||
|
import sqlalchemy as sa
|
||||||
|
from alembic import op
|
||||||
|
|
||||||
|
# revision identifiers, used by Alembic.
|
||||||
|
revision: str = "299a83240036"
|
||||||
|
down_revision: Union[str, Sequence[str], None] = None
|
||||||
|
branch_labels: Union[str, Sequence[str], None] = None
|
||||||
|
depends_on: Union[str, Sequence[str], None] = None
|
||||||
|
|
||||||
|
|
||||||
|
def upgrade() -> None:
|
||||||
|
"""Upgrade schema."""
|
||||||
|
# ### commands auto generated by Alembic - please adjust! ###
|
||||||
|
op.create_table(
|
||||||
|
"event",
|
||||||
|
sa.Column("id", sa.Integer(), autoincrement=True, nullable=False),
|
||||||
|
sa.Column("title", sa.String(), nullable=False),
|
||||||
|
sa.Column("event_time", sa.DateTime(), nullable=False),
|
||||||
|
sa.Column("registration_deadline", sa.DateTime(), nullable=False),
|
||||||
|
sa.Column("description", sa.String(), nullable=False),
|
||||||
|
sa.Column("recipe_link", sa.String(), nullable=False),
|
||||||
|
sa.Column("team_cooking_min", sa.Integer(), nullable=False),
|
||||||
|
sa.Column("team_cooking_max", sa.Integer(), nullable=False),
|
||||||
|
sa.Column("team_dishes_min", sa.Integer(), nullable=False),
|
||||||
|
sa.Column("team_dishes_max", sa.Integer(), nullable=False),
|
||||||
|
sa.Column("team_prep_min", sa.Integer(), nullable=False),
|
||||||
|
sa.Column("team_prep_max", sa.Integer(), nullable=False),
|
||||||
|
sa.PrimaryKeyConstraint("id"),
|
||||||
|
)
|
||||||
|
op.create_table(
|
||||||
|
"household",
|
||||||
|
sa.Column("id", sa.Integer(), autoincrement=True, nullable=False),
|
||||||
|
sa.Column("name", sa.String(), nullable=False),
|
||||||
|
sa.PrimaryKeyConstraint("id"),
|
||||||
|
)
|
||||||
|
op.create_table(
|
||||||
|
"registration",
|
||||||
|
sa.Column("event_id", sa.Integer(), nullable=False),
|
||||||
|
sa.Column("household_id", sa.Integer(), nullable=False),
|
||||||
|
sa.Column("num_adult_meals", sa.Integer(), nullable=False),
|
||||||
|
sa.Column("num_children_meals", sa.Integer(), nullable=False),
|
||||||
|
sa.Column("num_small_children_meals", sa.Integer(), nullable=False),
|
||||||
|
sa.Column("comment", sa.String(), nullable=True),
|
||||||
|
sa.ForeignKeyConstraint(
|
||||||
|
["event_id"],
|
||||||
|
["event.id"],
|
||||||
|
),
|
||||||
|
sa.ForeignKeyConstraint(
|
||||||
|
["household_id"],
|
||||||
|
["household.id"],
|
||||||
|
),
|
||||||
|
sa.PrimaryKeyConstraint("event_id", "household_id"),
|
||||||
|
)
|
||||||
|
|
||||||
|
op.create_table(
|
||||||
|
"subscription",
|
||||||
|
sa.Column("household_id", sa.Integer(), nullable=False),
|
||||||
|
sa.Column("num_adult_meals", sa.Integer(), nullable=False),
|
||||||
|
sa.Column("num_children_meals", sa.Integer(), nullable=False),
|
||||||
|
sa.Column("num_small_children_meals", sa.Integer(), nullable=False),
|
||||||
|
sa.Column("comment", sa.String(), nullable=True),
|
||||||
|
sa.Column("last_modified", sa.DateTime(), nullable=False),
|
||||||
|
sa.Column("monday", sa.Boolean(), nullable=False),
|
||||||
|
sa.Column("tuesday", sa.Boolean(), nullable=False),
|
||||||
|
sa.Column("wednesday", sa.Boolean(), nullable=False),
|
||||||
|
sa.Column("thursday", sa.Boolean(), nullable=False),
|
||||||
|
sa.Column("friday", sa.Boolean(), nullable=False),
|
||||||
|
sa.Column("saturday", sa.Boolean(), nullable=False),
|
||||||
|
sa.Column("sunday", sa.Boolean(), nullable=False),
|
||||||
|
sa.ForeignKeyConstraint(
|
||||||
|
["household_id"],
|
||||||
|
["household.id"],
|
||||||
|
),
|
||||||
|
sa.PrimaryKeyConstraint("household_id"),
|
||||||
|
)
|
||||||
|
op.create_table(
|
||||||
|
"team_registration",
|
||||||
|
sa.Column("id", sa.Integer(), autoincrement=True, nullable=False),
|
||||||
|
sa.Column("event_id", sa.Integer(), nullable=False),
|
||||||
|
sa.Column("person_name", sa.String(), nullable=False),
|
||||||
|
sa.Column("work_type", sa.Text(), nullable=False),
|
||||||
|
sa.Column("comment", sa.String(), nullable=True),
|
||||||
|
sa.ForeignKeyConstraint(
|
||||||
|
["event_id"],
|
||||||
|
["event.id"],
|
||||||
|
),
|
||||||
|
sa.PrimaryKeyConstraint("id"),
|
||||||
|
)
|
||||||
|
# ### end Alembic commands ###
|
||||||
|
|
||||||
|
|
||||||
|
def downgrade() -> None:
|
||||||
|
"""Downgrade schema."""
|
||||||
|
# ### commands auto generated by Alembic - please adjust! ###
|
||||||
|
op.drop_table("team_registration")
|
||||||
|
op.drop_table("subscription")
|
||||||
|
op.drop_table("registration")
|
||||||
|
op.drop_table("household")
|
||||||
|
op.drop_table("event")
|
||||||
|
# ### end Alembic commands ###
|
||||||
@@ -11,7 +11,14 @@ from fastapi.templating import Jinja2Templates
|
|||||||
from sqlalchemy import create_engine, select
|
from sqlalchemy import create_engine, select
|
||||||
from sqlalchemy.orm import Session
|
from sqlalchemy.orm import Session
|
||||||
|
|
||||||
from models import Base, Event, Household, Registration, Subscription, TeamRegistration
|
from meal_manager.models import (
|
||||||
|
Base,
|
||||||
|
Event,
|
||||||
|
Household,
|
||||||
|
Registration,
|
||||||
|
Subscription,
|
||||||
|
TeamRegistration,
|
||||||
|
)
|
||||||
|
|
||||||
sqlite_file_name = "database.db"
|
sqlite_file_name = "database.db"
|
||||||
sqlite_url = f"sqlite:///{sqlite_file_name}"
|
sqlite_url = f"sqlite:///{sqlite_file_name}"
|
||||||
@@ -38,9 +45,9 @@ async def on_startup(app_: FastAPI):
|
|||||||
|
|
||||||
|
|
||||||
app = FastAPI(lifespan=on_startup)
|
app = FastAPI(lifespan=on_startup)
|
||||||
app.mount("/static", StaticFiles(directory="static"), name="static")
|
app.mount("/static", StaticFiles(directory="src/meal_manager/static"), name="static")
|
||||||
|
|
||||||
templates = Jinja2Templates(directory="templates")
|
templates = Jinja2Templates(directory="src/meal_manager/templates")
|
||||||
|
|
||||||
SessionDep = Annotated[Session, Depends(get_session)]
|
SessionDep = Annotated[Session, Depends(get_session)]
|
||||||
|
|
||||||
@@ -223,6 +230,7 @@ async def add_registration(request: Request, event_id: int, session: SessionDep)
|
|||||||
num_adult_meals=num_adult_meals,
|
num_adult_meals=num_adult_meals,
|
||||||
num_children_meals=num_children_meals,
|
num_children_meals=num_children_meals,
|
||||||
num_small_children_meals=num_small_children_meals,
|
num_small_children_meals=num_small_children_meals,
|
||||||
|
comment=form_data["comment"],
|
||||||
)
|
)
|
||||||
session.add(registration)
|
session.add(registration)
|
||||||
session.commit()
|
session.commit()
|
||||||
|
Before Width: | Height: | Size: 21 KiB After Width: | Height: | Size: 21 KiB |
@@ -104,6 +104,7 @@
|
|||||||
<th scope="col">Erwachsene</th>
|
<th scope="col">Erwachsene</th>
|
||||||
<th scope="col">Kinder</th>
|
<th scope="col">Kinder</th>
|
||||||
<th scope="col">Kleinkinder</th>
|
<th scope="col">Kleinkinder</th>
|
||||||
|
<th scope="col">Kommentar</th>
|
||||||
<th scope="col">Löschen</th>
|
<th scope="col">Löschen</th>
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
@@ -114,6 +115,7 @@
|
|||||||
<td>{{ reg.num_adult_meals }}</td>
|
<td>{{ reg.num_adult_meals }}</td>
|
||||||
<td>{{ reg.num_children_meals }}</td>
|
<td>{{ reg.num_children_meals }}</td>
|
||||||
<td>{{ reg.num_small_children_meals }}</td>
|
<td>{{ reg.num_small_children_meals }}</td>
|
||||||
|
<td>{{ reg.comment }}</td>
|
||||||
<td><a href="/event/{{event.id}}/registration/{{reg.household_id}}/delete"><i class="bi bi-trash"></i></a></td>
|
<td><a href="/event/{{event.id}}/registration/{{reg.household_id}}/delete"><i class="bi bi-trash"></i></a></td>
|
||||||
</tr>
|
</tr>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
@@ -133,18 +135,22 @@
|
|||||||
</a>
|
</a>
|
||||||
</div>
|
</div>
|
||||||
<div class="row mt-3">
|
<div class="row mt-3">
|
||||||
<div class="col-4 text-center">
|
<div class="col-3 text-center">
|
||||||
<div class="text-muted small">Erwachsene</div>
|
<div class="text-muted small">Erwachsene</div>
|
||||||
<div class="fw-bold">{{ reg.num_adult_meals }}</div>
|
<div class="fw-bold">{{ reg.num_adult_meals }}</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-4 text-center">
|
<div class="col-3 text-center">
|
||||||
<div class="text-muted small">Kinder</div>
|
<div class="text-muted small">Kinder</div>
|
||||||
<div class="fw-bold">{{ reg.num_children_meals }}</div>
|
<div class="fw-bold">{{ reg.num_children_meals }}</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-4 text-center">
|
<div class="col-3 text-center">
|
||||||
<div class="text-muted small">Kleinkinder</div>
|
<div class="text-muted small">Kleinkinder</div>
|
||||||
<div class="fw-bold">{{ reg.num_small_children_meals }}</div>
|
<div class="fw-bold">{{ reg.num_small_children_meals }}</div>
|
||||||
</div>
|
</div>
|
||||||
|
<div class="col-3 text-center">
|
||||||
|
<div class="text-muted small">Kommentar</div>
|
||||||
|
<div class="small">{{ reg.comment }}</div>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -188,6 +194,11 @@
|
|||||||
<input name="numSmallKids" id="InputSmallKids" type="number" class="form-control"
|
<input name="numSmallKids" id="InputSmallKids" type="number" class="form-control"
|
||||||
aria-label="Anzahl Kinder <7" min="0" step="1" inputmode="numeric">
|
aria-label="Anzahl Kinder <7" min="0" step="1" inputmode="numeric">
|
||||||
</div>
|
</div>
|
||||||
|
<div class="mb-3 mt-3">
|
||||||
|
<label for="InputComment" class="form-label">Kommentar</label>
|
||||||
|
<input name="comment" id="InputComment" class="form-control"
|
||||||
|
aria-label="Kommentar">
|
||||||
|
</div>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
50
new-registration-app/uv.lock → uv.lock
generated
50
new-registration-app/uv.lock → uv.lock
generated
@@ -2,6 +2,20 @@ version = 1
|
|||||||
revision = 3
|
revision = 3
|
||||||
requires-python = "==3.13.*"
|
requires-python = "==3.13.*"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "alembic"
|
||||||
|
version = "1.17.0"
|
||||||
|
source = { registry = "https://pypi.org/simple" }
|
||||||
|
dependencies = [
|
||||||
|
{ name = "mako" },
|
||||||
|
{ name = "sqlalchemy" },
|
||||||
|
{ name = "typing-extensions" },
|
||||||
|
]
|
||||||
|
sdist = { url = "https://files.pythonhosted.org/packages/6b/45/6f4555f2039f364c3ce31399529dcf48dd60726ff3715ad67f547d87dfd2/alembic-1.17.0.tar.gz", hash = "sha256:4652a0b3e19616b57d652b82bfa5e38bf5dbea0813eed971612671cb9e90c0fe", size = 1975526, upload-time = "2025-10-11T18:40:13.585Z" }
|
||||||
|
wheels = [
|
||||||
|
{ url = "https://files.pythonhosted.org/packages/44/1f/38e29b06bfed7818ebba1f84904afdc8153ef7b6c7e0d8f3bc6643f5989c/alembic-1.17.0-py3-none-any.whl", hash = "sha256:80523bc437d41b35c5db7e525ad9d908f79de65c27d6a5a5eab6df348a352d99", size = 247449, upload-time = "2025-10-11T18:40:16.288Z" },
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "annotated-types"
|
name = "annotated-types"
|
||||||
version = "0.7.0"
|
version = "0.7.0"
|
||||||
@@ -257,6 +271,18 @@ wheels = [
|
|||||||
{ url = "https://files.pythonhosted.org/packages/62/a1/3d680cbfd5f4b8f15abc1d571870c5fc3e594bb582bc3b64ea099db13e56/jinja2-3.1.6-py3-none-any.whl", hash = "sha256:85ece4451f492d0c13c5dd7c13a64681a86afae63a5f347908daf103ce6d2f67", size = 134899, upload-time = "2025-03-05T20:05:00.369Z" },
|
{ url = "https://files.pythonhosted.org/packages/62/a1/3d680cbfd5f4b8f15abc1d571870c5fc3e594bb582bc3b64ea099db13e56/jinja2-3.1.6-py3-none-any.whl", hash = "sha256:85ece4451f492d0c13c5dd7c13a64681a86afae63a5f347908daf103ce6d2f67", size = 134899, upload-time = "2025-03-05T20:05:00.369Z" },
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "mako"
|
||||||
|
version = "1.3.10"
|
||||||
|
source = { registry = "https://pypi.org/simple" }
|
||||||
|
dependencies = [
|
||||||
|
{ name = "markupsafe" },
|
||||||
|
]
|
||||||
|
sdist = { url = "https://files.pythonhosted.org/packages/9e/38/bd5b78a920a64d708fe6bc8e0a2c075e1389d53bef8413725c63ba041535/mako-1.3.10.tar.gz", hash = "sha256:99579a6f39583fa7e5630a28c3c1f440e4e97a414b80372649c0ce338da2ea28", size = 392474, upload-time = "2025-04-10T12:44:31.16Z" }
|
||||||
|
wheels = [
|
||||||
|
{ url = "https://files.pythonhosted.org/packages/87/fb/99f81ac72ae23375f22b7afdb7642aba97c00a713c217124420147681a2f/mako-1.3.10-py3-none-any.whl", hash = "sha256:baef24a52fc4fc514a0887ac600f9f1cff3d82c61d4d700a1fa84d597b88db59", size = 78509, upload-time = "2025-04-10T12:50:53.297Z" },
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "markdown-it-py"
|
name = "markdown-it-py"
|
||||||
version = "4.0.0"
|
version = "4.0.0"
|
||||||
@@ -307,19 +333,11 @@ wheels = [
|
|||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "mypy-extensions"
|
name = "meal-manager"
|
||||||
version = "1.1.0"
|
|
||||||
source = { registry = "https://pypi.org/simple" }
|
|
||||||
sdist = { url = "https://files.pythonhosted.org/packages/a2/6e/371856a3fb9d31ca8dac321cda606860fa4548858c0cc45d9d1d4ca2628b/mypy_extensions-1.1.0.tar.gz", hash = "sha256:52e68efc3284861e772bbcd66823fde5ae21fd2fdb51c62a211403730b916558", size = 6343, upload-time = "2025-04-22T14:54:24.164Z" }
|
|
||||||
wheels = [
|
|
||||||
{ url = "https://files.pythonhosted.org/packages/79/7b/2c79738432f5c924bef5071f933bcc9efd0473bac3b4aa584a6f7c1c8df8/mypy_extensions-1.1.0-py3-none-any.whl", hash = "sha256:1be4cccdb0f2482337c4743e60421de3a356cd97508abadd57d47403e94f5505", size = 4963, upload-time = "2025-04-22T14:54:22.983Z" },
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "new-registration-app"
|
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
source = { virtual = "." }
|
source = { editable = "." }
|
||||||
dependencies = [
|
dependencies = [
|
||||||
|
{ name = "alembic" },
|
||||||
{ name = "fastapi", extra = ["standard"] },
|
{ name = "fastapi", extra = ["standard"] },
|
||||||
{ name = "sqlalchemy" },
|
{ name = "sqlalchemy" },
|
||||||
{ name = "uvicorn", extra = ["standard"] },
|
{ name = "uvicorn", extra = ["standard"] },
|
||||||
@@ -333,6 +351,7 @@ dev = [
|
|||||||
|
|
||||||
[package.metadata]
|
[package.metadata]
|
||||||
requires-dist = [
|
requires-dist = [
|
||||||
|
{ name = "alembic", specifier = ">=1.17.0" },
|
||||||
{ name = "fastapi", extras = ["standard"], specifier = ">=0.116.0" },
|
{ name = "fastapi", extras = ["standard"], specifier = ">=0.116.0" },
|
||||||
{ name = "sqlalchemy", specifier = ">=2.0.44" },
|
{ name = "sqlalchemy", specifier = ">=2.0.44" },
|
||||||
{ name = "uvicorn", extras = ["standard"], specifier = ">=0.35.0" },
|
{ name = "uvicorn", extras = ["standard"], specifier = ">=0.35.0" },
|
||||||
@@ -344,6 +363,15 @@ dev = [
|
|||||||
{ name = "isort", specifier = ">=6.0.1" },
|
{ name = "isort", specifier = ">=6.0.1" },
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "mypy-extensions"
|
||||||
|
version = "1.1.0"
|
||||||
|
source = { registry = "https://pypi.org/simple" }
|
||||||
|
sdist = { url = "https://files.pythonhosted.org/packages/a2/6e/371856a3fb9d31ca8dac321cda606860fa4548858c0cc45d9d1d4ca2628b/mypy_extensions-1.1.0.tar.gz", hash = "sha256:52e68efc3284861e772bbcd66823fde5ae21fd2fdb51c62a211403730b916558", size = 6343, upload-time = "2025-04-22T14:54:24.164Z" }
|
||||||
|
wheels = [
|
||||||
|
{ url = "https://files.pythonhosted.org/packages/79/7b/2c79738432f5c924bef5071f933bcc9efd0473bac3b4aa584a6f7c1c8df8/mypy_extensions-1.1.0-py3-none-any.whl", hash = "sha256:1be4cccdb0f2482337c4743e60421de3a356cd97508abadd57d47403e94f5505", size = 4963, upload-time = "2025-04-22T14:54:22.983Z" },
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "packaging"
|
name = "packaging"
|
||||||
version = "25.0"
|
version = "25.0"
|
||||||
Reference in New Issue
Block a user