Refactor appointment system: remove appointments.html, update navigation to link to preise.html, and create new preise.html with pricing details and booking options.
This commit is contained in:
+6
-179
@@ -1790,48 +1790,12 @@ def register():
|
||||
return render_template("register.html")
|
||||
|
||||
|
||||
@app.route('/appointments', methods=['GET'])
|
||||
def appointments():
|
||||
software_packages = [
|
||||
{
|
||||
"slug": "normal",
|
||||
"name": "Normal",
|
||||
"headline": "Stabiler Einstieg für den Schulalltag",
|
||||
"features": [
|
||||
"Inventarverwaltung mit Rollenrechten",
|
||||
"Basis-Support und Ticketing",
|
||||
"Schulweite Übersichten",
|
||||
],
|
||||
},
|
||||
{
|
||||
"slug": "pro",
|
||||
"name": "Pro",
|
||||
"headline": "Für Schulen mit erweitertem Bedarf",
|
||||
"features": [
|
||||
"Erweiterte Instanzverwaltung",
|
||||
"Detailberichte und Admin-Insights",
|
||||
"Priorisierter Support",
|
||||
],
|
||||
},
|
||||
{
|
||||
"slug": "buecherei",
|
||||
"name": "Bücherei",
|
||||
"headline": "Optimiert für Bibliothek und Medien",
|
||||
"features": [
|
||||
"Ausleih- und Rückgabeprozesse",
|
||||
"Bestandsübersichten für Medien",
|
||||
"Transparente Historie pro Medium",
|
||||
],
|
||||
},
|
||||
]
|
||||
|
||||
return render_template(
|
||||
"appointments.html",
|
||||
software_packages=software_packages,
|
||||
)
|
||||
@app.route('/preise', methods=['GET'])
|
||||
def preise():
|
||||
return render_template("preise.html")
|
||||
|
||||
|
||||
@app.route('/appointments/book-option', methods=['POST'])
|
||||
@app.route('/preise/book-option', methods=['POST'])
|
||||
@login_required
|
||||
def book_option_package():
|
||||
package_raw = _sanitize_text(request.form.get("package") or "", 40).lower()
|
||||
@@ -1844,7 +1808,7 @@ def book_option_package():
|
||||
selected_package = package_map.get(package_raw)
|
||||
if not selected_package:
|
||||
flash("Ungültige Buchungsoption ausgewählt.", "error")
|
||||
return redirect(url_for("appointments"))
|
||||
return redirect(url_for("preise"))
|
||||
|
||||
message = (
|
||||
f"Ich möchte das Paket {selected_package} buchen. "
|
||||
@@ -1865,7 +1829,7 @@ def book_option_package():
|
||||
)
|
||||
except PyMongoError:
|
||||
flash("Buchungsanfrage konnte nicht gesendet werden.", "error")
|
||||
return redirect(url_for("appointments"))
|
||||
return redirect(url_for("preise"))
|
||||
finally:
|
||||
if client:
|
||||
client.close()
|
||||
@@ -1874,49 +1838,6 @@ def book_option_package():
|
||||
return redirect(url_for("user_chat"))
|
||||
|
||||
|
||||
@app.route('/admin/dashboard')
|
||||
@admin_required
|
||||
def admin_dashboard():
|
||||
all_appointments = []
|
||||
client = None
|
||||
try:
|
||||
client, col = _get_collection("appointments")
|
||||
all_appointments = list(col.find().sort([("date", -1), ("time", -1)]))
|
||||
for item in all_appointments:
|
||||
_with_public_id(item)
|
||||
except PyMongoError:
|
||||
flash("Buchungsanfragen konnten nicht geladen werden.", "error")
|
||||
finally:
|
||||
if client:
|
||||
client.close()
|
||||
|
||||
blocked_days = _get_blocked_days()
|
||||
|
||||
status_counts = {
|
||||
"Angefragt": len([a for a in all_appointments if a.get("status") == "Angefragt"]),
|
||||
"Bestaetigt": len([a for a in all_appointments if a.get("status") == "Bestaetigt"]),
|
||||
"Abgelehnt": len([a for a in all_appointments if a.get("status") == "Abgelehnt"]),
|
||||
}
|
||||
|
||||
total_posts = 0
|
||||
client = None
|
||||
try:
|
||||
client, col = _get_collection("posts")
|
||||
total_posts = col.count_documents({})
|
||||
except PyMongoError:
|
||||
total_posts = 0
|
||||
finally:
|
||||
if client:
|
||||
client.close()
|
||||
|
||||
return render_template(
|
||||
"admin_dashboard.html",
|
||||
appointments=all_appointments,
|
||||
blocked_days=blocked_days,
|
||||
status_counts=status_counts,
|
||||
total_posts=total_posts,
|
||||
)
|
||||
|
||||
|
||||
@app.route('/admin/instances', methods=['GET', 'POST'])
|
||||
@admin_required
|
||||
@@ -2357,100 +2278,6 @@ def admin_import_instance_backup(subdomain):
|
||||
return redirect(url_for("admin_system_tools"))
|
||||
|
||||
|
||||
@app.route('/admin/appointments/block-day', methods=['POST'])
|
||||
@admin_required
|
||||
def admin_block_day():
|
||||
action = _sanitize_text(request.form.get("action") or "", 30)
|
||||
block_date = (request.form.get("block_date") or "").strip()
|
||||
reason = _sanitize_text(request.form.get("reason") or "", 200)
|
||||
|
||||
client = None
|
||||
try:
|
||||
client, col = _get_collection("blocked_days")
|
||||
|
||||
if action == "add":
|
||||
try:
|
||||
date.fromisoformat(block_date)
|
||||
except ValueError:
|
||||
flash("Bitte ein gültiges Datum zum Sperren wählen.", "error")
|
||||
return redirect(url_for("admin_dashboard"))
|
||||
|
||||
if col.find_one({"date": block_date}):
|
||||
flash("Der Tag ist bereits gesperrt.", "error")
|
||||
return redirect(url_for("admin_dashboard"))
|
||||
|
||||
col.insert_one(
|
||||
{
|
||||
"date": block_date,
|
||||
"reason": reason,
|
||||
"blocked_by": session.get("username") or "admin",
|
||||
"created_at": _utc_now_iso(),
|
||||
}
|
||||
)
|
||||
flash("Tag im Kalender gesperrt.", "success")
|
||||
elif action == "remove":
|
||||
result = col.delete_one({"date": block_date})
|
||||
if not result.deleted_count:
|
||||
flash("Sperrtag nicht gefunden.", "error")
|
||||
return redirect(url_for("admin_dashboard"))
|
||||
flash("Sperrtag entfernt.", "success")
|
||||
else:
|
||||
flash("Ungültige Aktion für Kalendersperre.", "error")
|
||||
return redirect(url_for("admin_dashboard"))
|
||||
except PyMongoError:
|
||||
flash("Kalendersperre konnte nicht gespeichert werden.", "error")
|
||||
finally:
|
||||
if client:
|
||||
client.close()
|
||||
|
||||
return redirect(url_for("admin_dashboard"))
|
||||
|
||||
|
||||
@app.route('/admin/appointment/<appointment_id>', methods=['POST'])
|
||||
@admin_required
|
||||
def update_appointment(appointment_id):
|
||||
action = request.form.get("action", "").strip()
|
||||
response_text = _sanitize_text(request.form.get("response") or "", 5000)
|
||||
|
||||
if action not in ["confirm", "reject"]:
|
||||
flash("Ungültige Aktion.", "error")
|
||||
return redirect(url_for("admin_dashboard"))
|
||||
|
||||
query = _appointment_query_from_id(appointment_id)
|
||||
if not query:
|
||||
flash("Buchung nicht gefunden.", "error")
|
||||
return redirect(url_for("admin_dashboard"))
|
||||
|
||||
new_status = "Bestaetigt" if action == "confirm" else "Abgelehnt"
|
||||
|
||||
client = None
|
||||
try:
|
||||
client, col = _get_collection("appointments")
|
||||
result = col.update_one(
|
||||
query,
|
||||
{
|
||||
"$set": {
|
||||
"status": new_status,
|
||||
"response": response_text,
|
||||
"responded_at": datetime.utcnow().isoformat(timespec="seconds") + "Z",
|
||||
"responded_by": session.get("username"),
|
||||
}
|
||||
},
|
||||
)
|
||||
if result.matched_count == 0:
|
||||
flash("Buchung nicht gefunden.", "error")
|
||||
return redirect(url_for("admin_dashboard"))
|
||||
except PyMongoError:
|
||||
flash("Buchung konnte nicht aktualisiert werden.", "error")
|
||||
return redirect(url_for("admin_dashboard"))
|
||||
finally:
|
||||
if client:
|
||||
client.close()
|
||||
|
||||
flash(f"Buchung wurde {('bestaetigt' if action == 'confirm' else 'abgelehnt')}.", "success")
|
||||
return redirect(url_for("admin_dashboard"))
|
||||
|
||||
|
||||
@app.route('/admin/blog', methods=['GET', 'POST'])
|
||||
@admin_required
|
||||
def admin_blog():
|
||||
|
||||
Reference in New Issue
Block a user