feat: update terminology in calendar interface for clarity and consistency

This commit is contained in:
2026-05-30 14:54:40 +02:00
parent 725584a104
commit 788ec1db62
2 changed files with 100 additions and 8 deletions
+93 -1
View File
@@ -84,7 +84,7 @@ from Web.modules.terminplaner.blueprint import appoint_bp as terminplaner_bp
BASE_DIR = os.path.dirname(os.path.abspath(__file__))
import Web.modules.database.settings as cfg
from Web.modules.database.settings import MongoClient
from tenant import get_tenant_context, get_tenant_trial_status, purge_expired_trial_tenants
from tenant import get_tenant_context, get_tenant_db, get_tenant_trial_status, purge_expired_trial_tenants
app = Flask(__name__, static_folder='static') # Correctly set static folder
@@ -4803,6 +4803,98 @@ def get_bookings():
client.close()
@app.route('/get_user_appointments')
def get_user_appointments():
"""Return the current user's planned and active appointments for the calendar."""
if 'username' not in session:
return jsonify({'ok': False, 'error': 'unauthorized'}), 401
client = None
try:
username = session.get('username')
start = request.args.get('start')
end = request.args.get('end')
client = MongoClient(MONGODB_HOST, MONGODB_PORT)
db = get_tenant_db(client)
ausleihungen = db['ausleihungen']
items_col = db['items']
query = {
'User': username,
'Status': {'$in': ['planned', 'active', 'completed']},
}
if start and end:
try:
start_dt = datetime.datetime.fromisoformat(start.replace('Z', '+00:00'))
end_dt = datetime.datetime.fromisoformat(end.replace('Z', '+00:00'))
if start_dt.tzinfo is not None:
start_dt = start_dt.astimezone(datetime.timezone.utc).replace(tzinfo=None)
if end_dt.tzinfo is not None:
end_dt = end_dt.astimezone(datetime.timezone.utc).replace(tzinfo=None)
query['$or'] = [
{'Start': {'$lt': end_dt}, 'End': {'$gt': start_dt}},
{'Start': {'$lt': end_dt}, 'End': {'$exists': False}},
]
except Exception:
pass
bookings = list(ausleihungen.find(query).sort('Start', 1))
result = []
for booking in bookings:
start_dt = booking.get('Start')
if not start_dt:
continue
end_dt = booking.get('End')
if not end_dt and isinstance(start_dt, datetime.datetime):
end_dt = start_dt + datetime.timedelta(minutes=45)
elif not end_dt:
end_dt = start_dt
item_id = str(booking.get('Item') or '')
item_doc = None
if item_id:
try:
item_doc = items_col.find_one({'_id': ObjectId(item_id)})
except Exception:
item_doc = None
item_name = item_id or 'Termin'
if item_doc:
item_name = item_doc.get('Name') or item_doc.get('Code_4') or item_name
period = booking.get('Period')
title = item_name
if period:
title = f"{title} - {period}. Std"
status = booking.get('VerifiedStatus') or booking.get('Status') or 'unknown'
result.append({
'id': str(booking.get('_id')),
'title': title,
'start': start_dt.isoformat() if isinstance(start_dt, datetime.datetime) else str(start_dt),
'end': end_dt.isoformat() if isinstance(end_dt, datetime.datetime) else str(end_dt),
'status': status,
'itemId': item_id,
'userName': str(booking.get('User') or ''),
'notes': str(booking.get('Notes') or ''),
'period': period,
'isCurrentUser': True,
'itemBorrower': '',
})
return jsonify({'ok': True, 'bookings': result})
except Exception as e:
return jsonify({'ok': False, 'error': str(e), 'bookings': []}), 500
finally:
if client:
client.close()
@app.route('/api/booking_conflicts')
def api_booking_conflicts():
"""
+7 -7
View File
@@ -13,7 +13,7 @@
{% block content %}
<div class="calendar-container">
<div class="calendar-header">
<h1>Schulstunden-Terminplan für Ausleihen</h1>
<h1>Schulstunden-Terminplan für Termine</h1>
<div class="calendar-actions">
<button id="prev-day">Vorheriger Tag</button>
<span id="current-day-display"></span>
@@ -27,17 +27,17 @@
<button id="new-booking" class="primary-button">Neue Reservierung</button>
</div>
<div class="calendar-legend">
<span class="legend-item"><span class="legend-color current"></span> Aktuelle Ausleihungen</span>
<span class="legend-item"><span class="legend-color planned"></span> Geplante Ausleihungen</span>
<span class="legend-item"><span class="legend-color completed"></span> Abgeschlossene Ausleihungen</span>
<span class="legend-item"><span class="legend-color your-bookings"></span> Ihre Ausleihungen</span>
<span class="legend-item"><span class="legend-color current"></span> Aktuelle Termine</span>
<span class="legend-item"><span class="legend-color planned"></span> Geplante Termine</span>
<span class="legend-item"><span class="legend-color completed"></span> Abgeschlossene Termine</span>
<span class="legend-item"><span class="legend-color your-bookings"></span> Ihre Termine</span>
</div>
</div>
<div class="calendar-options">
<label class="checkbox-container">
<input type="checkbox" id="show-completed-bookings">
Abgeschlossene Ausleihungen anzeigen
Abgeschlossene Termine anzeigen
</label>
</div>
@@ -326,7 +326,7 @@ document.addEventListener('DOMContentLoaded', function() {
const endStr = info.endStr;
// Load events from the server
fetch('/get_bookings?start=' + startStr + '&end=' + endStr)
fetch('/get_user_appointments?start=' + startStr + '&end=' + endStr)
.then(response => {
if (!response.ok) {
throw new Error(`HTTP error! Status: ${response.status}`);