Compare commits
14 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| f5944bf090 | |||
| 4e68da2368 | |||
| 0d6aca4e8c | |||
| 2bb0cbe599 | |||
| 339487b4d4 | |||
| 3f90e2d4f1 | |||
| b238b52fbf | |||
| 545dd7783c | |||
| f4ce1cf3b4 | |||
| 7bd12bddaa | |||
| b8e23b94d2 | |||
| 06b32b4a3d | |||
| d24bd6ba56 | |||
| d1f48cf184 |
+142
-4
@@ -25,6 +25,7 @@ from werkzeug.routing import BuildError
|
|||||||
from jinja2 import TemplateNotFound
|
from jinja2 import TemplateNotFound
|
||||||
import os
|
import os
|
||||||
import sys
|
import sys
|
||||||
|
from bs4 import BeautifulSoup
|
||||||
|
|
||||||
# Ensure imports work regardless of whether gunicorn starts in /app or /app/Web.
|
# Ensure imports work regardless of whether gunicorn starts in /app or /app/Web.
|
||||||
_CURRENT_DIR = os.path.dirname(os.path.abspath(__file__))
|
_CURRENT_DIR = os.path.dirname(os.path.abspath(__file__))
|
||||||
@@ -1995,7 +1996,7 @@ def _upload_student_cards_excel():
|
|||||||
synonyms = {
|
synonyms = {
|
||||||
'ausweis_id': ['ausweis_id', 'ausweisid', 'ausweis-id', 'karte', 'kartennummer', 'card_id', 'id'],
|
'ausweis_id': ['ausweis_id', 'ausweisid', 'ausweis-id', 'karte', 'kartennummer', 'card_id', 'id'],
|
||||||
'student_name': ['student_name', 'schuelername', 'schülername', 'schueler', 'schüler', 'name', 'vollname', 'vorname_nachname', 'nachname_vorname'],
|
'student_name': ['student_name', 'schuelername', 'schülername', 'schueler', 'schüler', 'name', 'vollname', 'vorname_nachname', 'nachname_vorname'],
|
||||||
'first_name': ['vorname', 'first_name', 'firstname'],
|
'first_name': ['vorname', 'first_name', 'firstname', 'rufname'],
|
||||||
'last_name': ['nachname', 'last_name', 'lastname'],
|
'last_name': ['nachname', 'last_name', 'lastname'],
|
||||||
'class_name': ['klasse', 'class', 'class_name', 'jahrgang', 'jahrgangsstufe', 'stufe', 'gruppe', 'asv_klasse'],
|
'class_name': ['klasse', 'class', 'class_name', 'jahrgang', 'jahrgangsstufe', 'stufe', 'gruppe', 'asv_klasse'],
|
||||||
'notes': ['notizen', 'notes', 'bemerkungen', 'bemerkung', 'hinweis', 'hinweise'],
|
'notes': ['notizen', 'notes', 'bemerkungen', 'bemerkung', 'hinweis', 'hinweise'],
|
||||||
@@ -4123,10 +4124,13 @@ def student_card_barcode_download():
|
|||||||
c.setLineWidth(2)
|
c.setLineWidth(2)
|
||||||
c.line(x_pos, y_pos - 10*mm, x_pos + card_width, y_pos - 10*mm)
|
c.line(x_pos, y_pos - 10*mm, x_pos + card_width, y_pos - 10*mm)
|
||||||
|
|
||||||
|
|
||||||
|
school_name = cfg.get_school_info()
|
||||||
|
school_name = school_name["name"]
|
||||||
# "SCHÜLERAUSWEIS" text in header
|
# "SCHÜLERAUSWEIS" text in header
|
||||||
c.setFont("Helvetica-Bold", 9)
|
c.setFont("Helvetica-Bold", 9)
|
||||||
c.setFillColor(white)
|
c.setFillColor(white)
|
||||||
c.drawString(x_pos + 3*mm, y_pos - 6.5*mm, "SCHÜLERAUSWEIS")
|
c.drawString(x_pos + 3*mm, y_pos - 6.5*mm, f"SCHÜLERAUSWEIS - {str(school_name)}")
|
||||||
|
|
||||||
# Student name - large and bold
|
# Student name - large and bold
|
||||||
c.setFillColor(text_dark)
|
c.setFillColor(text_dark)
|
||||||
@@ -4150,7 +4154,7 @@ def student_card_barcode_download():
|
|||||||
c.setFillColor(text_dark)
|
c.setFillColor(text_dark)
|
||||||
c.setFont("Helvetica-Bold", 9)
|
c.setFont("Helvetica-Bold", 9)
|
||||||
c.drawString(x_pos + 3*mm, y_pos - 28*mm, card['Klasse'])
|
c.drawString(x_pos + 3*mm, y_pos - 28*mm, card['Klasse'])
|
||||||
|
|
||||||
# Right barcode section with border highlight
|
# Right barcode section with border highlight
|
||||||
barcode_x_start = x_pos + info_width + 1*mm
|
barcode_x_start = x_pos + info_width + 1*mm
|
||||||
c.setFillColor(accent_color)
|
c.setFillColor(accent_color)
|
||||||
@@ -4290,10 +4294,12 @@ def student_card_single_barcode_download(card_id):
|
|||||||
c.setLineWidth(2.5)
|
c.setLineWidth(2.5)
|
||||||
c.line(x_pos, y_pos - 10*mm, x_pos + card_width, y_pos - 10*mm)
|
c.line(x_pos, y_pos - 10*mm, x_pos + card_width, y_pos - 10*mm)
|
||||||
|
|
||||||
|
school_name = cfg.get_school_info()
|
||||||
|
school_name = school_name["name"]
|
||||||
# "SCHÜLERAUSWEIS" text in header
|
# "SCHÜLERAUSWEIS" text in header
|
||||||
c.setFont("Helvetica-Bold", 11)
|
c.setFont("Helvetica-Bold", 11)
|
||||||
c.setFillColor(white)
|
c.setFillColor(white)
|
||||||
c.drawString(x_pos + 4*mm, y_pos - 6.5*mm, "SCHÜLERAUSWEIS")
|
c.drawString(x_pos + 4*mm, y_pos - 6.5*mm, f"SCHÜLERAUSWEIS - {str(school_name)}")
|
||||||
|
|
||||||
# Student name - large and prominent
|
# Student name - large and prominent
|
||||||
c.setFillColor(text_dark)
|
c.setFillColor(text_dark)
|
||||||
@@ -5106,6 +5112,7 @@ def upload_item():
|
|||||||
upload_mode = sanitize_form_value(request.form.get('upload_mode', 'item'))
|
upload_mode = sanitize_form_value(request.form.get('upload_mode', 'item'))
|
||||||
individual_codes_raw = sanitize_form_value(request.form.get('individual_codes', ''))
|
individual_codes_raw = sanitize_form_value(request.form.get('individual_codes', ''))
|
||||||
item_count_raw = sanitize_form_value(request.form.get('item_count', '1'))
|
item_count_raw = sanitize_form_value(request.form.get('item_count', '1'))
|
||||||
|
item_type_input = sanitize_form_value(request.form.get('item_type_input', ''))
|
||||||
|
|
||||||
try:
|
try:
|
||||||
item_count = int(item_count_raw) if item_count_raw else 1
|
item_count = int(item_count_raw) if item_count_raw else 1
|
||||||
@@ -5185,6 +5192,8 @@ def upload_item():
|
|||||||
item_isbn = isbn_raw
|
item_isbn = isbn_raw
|
||||||
if upload_mode == 'library':
|
if upload_mode == 'library':
|
||||||
item_type = 'book'
|
item_type = 'book'
|
||||||
|
if item_type_input != "":
|
||||||
|
item_type = item_type_input
|
||||||
|
|
||||||
if upload_mode == 'library':
|
if upload_mode == 'library':
|
||||||
if not cfg.MODULES.is_enabled('library'):
|
if not cfg.MODULES.is_enabled('library'):
|
||||||
@@ -9539,6 +9548,134 @@ def _fetch_from_open_library(clean_isbn):
|
|||||||
print(f"OpenLibrary Search error: {e}")
|
print(f"OpenLibrary Search error: {e}")
|
||||||
return None
|
return None
|
||||||
|
|
||||||
|
def _fetch_from_isbn_de(clean_isbn):
|
||||||
|
"""
|
||||||
|
Source 4: isbn.de (Maßgeschneidertes Scraping basierend auf realem HTML)
|
||||||
|
Extrahiert alle Buchdaten inklusive Preise aus den Meta-Tags und der Sidebar.
|
||||||
|
"""
|
||||||
|
try:
|
||||||
|
url = f"https://www.isbn.de/buch/{clean_isbn}"
|
||||||
|
headers = {
|
||||||
|
'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.124 Safari/537.36'
|
||||||
|
}
|
||||||
|
|
||||||
|
response = requests.get(url, headers=headers, timeout=5)
|
||||||
|
if response.status_code != 200:
|
||||||
|
return None
|
||||||
|
|
||||||
|
soup = BeautifulSoup(response.text, 'html.parser')
|
||||||
|
|
||||||
|
# 1. Titel aus Meta-Tags extrahieren (extrem zuverlässig)
|
||||||
|
title_meta = soup.find('meta', property='og:title')
|
||||||
|
title = title_meta.get('content', '').strip() if title_meta else None
|
||||||
|
if not title:
|
||||||
|
h1_elem = soup.find('h1')
|
||||||
|
title = h1_elem.text.strip() if h1_elem else "Unknown Title"
|
||||||
|
|
||||||
|
# Falls Fehler- oder Suchseite
|
||||||
|
if "nicht gefunden" in title.lower() or "suche" in title.lower():
|
||||||
|
return None
|
||||||
|
|
||||||
|
# --- Hilfsfunktion zum Parsen der .infotab-Sidebar-Struktur ---
|
||||||
|
def get_sidebar_value(keyword):
|
||||||
|
infotab = soup.find(class_='infotab')
|
||||||
|
if infotab:
|
||||||
|
for d in infotab.find_all('div'):
|
||||||
|
if d.text.strip().lower() == keyword.lower():
|
||||||
|
parent = d.parent
|
||||||
|
# Label vom Gesamttext abziehen, um nur den Wert zu erhalten
|
||||||
|
return parent.text.replace(d.text, '', 1).strip()
|
||||||
|
return None
|
||||||
|
|
||||||
|
# 2. Verlag holen
|
||||||
|
publisher = get_sidebar_value('verlag')
|
||||||
|
if not publisher:
|
||||||
|
publisher = "Unknown Publisher"
|
||||||
|
|
||||||
|
# 3. Erscheinungsdatum (Aus Meta-Tag oder Sidebar)
|
||||||
|
date_meta = soup.find('meta', property='og:book:release_date')
|
||||||
|
if date_meta and date_meta.get('content'):
|
||||||
|
published_date = date_meta.get('content', '').strip()
|
||||||
|
else:
|
||||||
|
published_date = get_sidebar_value('erschienen am')
|
||||||
|
|
||||||
|
if not published_date:
|
||||||
|
published_date = "Unknown Date"
|
||||||
|
|
||||||
|
# 4. Autor (Da Schulbuch-Workbooks oft keinen Einzelautor haben, kluger Fallback)
|
||||||
|
author_meta = soup.find('meta', property='og:book:author')
|
||||||
|
author = author_meta.get('content', '').strip() if author_meta else ""
|
||||||
|
if not author:
|
||||||
|
author = get_sidebar_value('autor') or get_sidebar_value('herausgeber')
|
||||||
|
|
||||||
|
if not author:
|
||||||
|
author = f"{publisher} Redaktion" if publisher != "Unknown Publisher" else "Unknown Author"
|
||||||
|
|
||||||
|
# 5. Seitenanzahl
|
||||||
|
page_count = get_sidebar_value('seiten') or get_sidebar_value('umfang')
|
||||||
|
if page_count:
|
||||||
|
match = re.search(r'\d+', page_count)
|
||||||
|
page_count = match.group(0) if match else "Unknown"
|
||||||
|
else:
|
||||||
|
page_count = "Unknown"
|
||||||
|
|
||||||
|
# 6. Beschreibung aus ID 'bookdesc' holen und Whitespace-Fluss säubern
|
||||||
|
description = "Keine Beschreibung verfügbar"
|
||||||
|
desc_div = soup.find(id='bookdesc')
|
||||||
|
if desc_div:
|
||||||
|
# Holt den Text inklusive aller Listenpunkte (li) und formatiert ihn sauber
|
||||||
|
description = " ".join(desc_div.text.split())
|
||||||
|
|
||||||
|
# 7. Cover-Bild (Nutzt hochauflösenden Link aus den Metas)
|
||||||
|
thumbnail = ""
|
||||||
|
img_meta = soup.find('meta', property='og:image')
|
||||||
|
if img_meta:
|
||||||
|
thumbnail = img_meta.get('content', '').strip()
|
||||||
|
else:
|
||||||
|
img_tag = soup.find('img', id='ISBNcover')
|
||||||
|
if img_tag:
|
||||||
|
thumbnail = img_tag.get('data-big') or img_tag.get('src')
|
||||||
|
|
||||||
|
if thumbnail and thumbnail.startswith('/'):
|
||||||
|
thumbnail = "https://www.isbn.de" + thumbnail
|
||||||
|
|
||||||
|
# 8. PREIS EXTRAHIEREN (Neu integriert)
|
||||||
|
price = None
|
||||||
|
# Option A: Aus dem standardisierten Meta-Tag extrahieren (Ergibt z.B. 12.25)
|
||||||
|
price_meta = soup.find('meta', property='product:price:amount')
|
||||||
|
if price_meta and price_meta.get('content'):
|
||||||
|
try:
|
||||||
|
price = float(price_meta.get('content').strip())
|
||||||
|
except ValueError:
|
||||||
|
pass
|
||||||
|
|
||||||
|
# Option B: Fallback über die Infotab-Sidebar (Falls Meta fehlt, filtert "12,25 €*" zu Float)
|
||||||
|
if price is None:
|
||||||
|
price_str = get_sidebar_value('preis')
|
||||||
|
if price_str:
|
||||||
|
# Findet Zahlen wie "12,25" oder "12.25"
|
||||||
|
match = re.search(r'\d+([.,]\d+)?', price_str)
|
||||||
|
if match:
|
||||||
|
try:
|
||||||
|
price = float(match.group(0).replace(',', '.'))
|
||||||
|
except ValueError:
|
||||||
|
pass
|
||||||
|
|
||||||
|
return {
|
||||||
|
"title": title,
|
||||||
|
"authors": author,
|
||||||
|
"publisher": publisher,
|
||||||
|
"publishedDate": published_date,
|
||||||
|
"description": description,
|
||||||
|
"pageCount": page_count,
|
||||||
|
"price": price, # Gibt nun z.B. 12.25 als float zurück
|
||||||
|
"thumbnail": thumbnail,
|
||||||
|
"source": "isbn-de"
|
||||||
|
}
|
||||||
|
except Exception as e:
|
||||||
|
print(f"isbn.de Scraping error: {e}")
|
||||||
|
return None
|
||||||
|
|
||||||
@app.route('/fetch_book_info/<isbn>')
|
@app.route('/fetch_book_info/<isbn>')
|
||||||
def fetch_book_info(isbn):
|
def fetch_book_info(isbn):
|
||||||
"""
|
"""
|
||||||
@@ -9562,6 +9699,7 @@ def fetch_book_info(isbn):
|
|||||||
providers = [
|
providers = [
|
||||||
_fetch_from_google_books,
|
_fetch_from_google_books,
|
||||||
_fetch_from_lobid_germany,
|
_fetch_from_lobid_germany,
|
||||||
|
_fetch_from_isbn_de,
|
||||||
_fetch_from_open_library
|
_fetch_from_open_library
|
||||||
]
|
]
|
||||||
|
|
||||||
|
|||||||
@@ -38,7 +38,7 @@ def _active_record_query(extra_query=None):
|
|||||||
return base_query
|
return base_query
|
||||||
|
|
||||||
|
|
||||||
def add(date_start: str, date_end: str, time_span: list, slots: int, slot_lenght: int, user: str, mail: list=[], note:str="", calendar_enabled: bool=False):
|
def add(date_start: str, date_end: str, time_span: list, slots: int, slot_lenght: int, user: str, mail: list=[], note:str="", calendar_enabled: bool=False, title: str=""):
|
||||||
try:
|
try:
|
||||||
client = MongoClient(cfg.MONGODB_HOST, cfg.MONGODB_PORT)
|
client = MongoClient(cfg.MONGODB_HOST, cfg.MONGODB_PORT)
|
||||||
db = _get_tenant_db(client)
|
db = _get_tenant_db(client)
|
||||||
@@ -53,6 +53,7 @@ def add(date_start: str, date_end: str, time_span: list, slots: int, slot_lenght
|
|||||||
'user': user,
|
'user': user,
|
||||||
'mail': mail,
|
'mail': mail,
|
||||||
'note': note,
|
'note': note,
|
||||||
|
'title': title,
|
||||||
'calendar_enabled': bool(calendar_enabled),
|
'calendar_enabled': bool(calendar_enabled),
|
||||||
'slots_booked': [], # -> [(start_time, name), ...]the list gets there indexes as the slot 1-defined so is can be counted without an extra variable
|
'slots_booked': [], # -> [(start_time, name), ...]the list gets there indexes as the slot 1-defined so is can be counted without an extra variable
|
||||||
'Created': datetime.datetime.now(),
|
'Created': datetime.datetime.now(),
|
||||||
|
|||||||
@@ -146,9 +146,10 @@ def build_client_slot_ics(appointment_id: str, slot_start: str, client_name: str
|
|||||||
return None
|
return None
|
||||||
|
|
||||||
try:
|
try:
|
||||||
slot_minutes = int(item.get('slot_lenght') or 0)
|
slot_minutes = int(item.get('slot_length') or item.get('slot_lenght') or 0)
|
||||||
except Exception:
|
except Exception:
|
||||||
slot_minutes = 0
|
slot_minutes = 0
|
||||||
|
|
||||||
if slot_minutes <= 0:
|
if slot_minutes <= 0:
|
||||||
slot_minutes = 45
|
slot_minutes = 45
|
||||||
|
|
||||||
@@ -197,23 +198,24 @@ def build_client_slot_ics(appointment_id: str, slot_start: str, client_name: str
|
|||||||
return '\r\n'.join(ics_lines)
|
return '\r\n'.join(ics_lines)
|
||||||
|
|
||||||
|
|
||||||
def new(date_start: str, date_end: str, time_span: list, slots: int, slot_lenght: int, user: str, mail: list=[], note:str="", calendar_enabled: bool=False, title: str="") -> dict:
|
def new(date_start: str, date_end: str, time_span: list, slots, slot_length, user: str, mail: list=None, note:str="", calendar_enabled: bool=False, title: str="") -> dict:
|
||||||
"""
|
"""
|
||||||
Generates a link for the executive to send to his clients to book a time Slot
|
Generates a link for the executive to send to his clients to book a time Slot
|
||||||
|
|
||||||
Input:
|
|
||||||
- date_start: start of the time frae area
|
|
||||||
- date_end: end of the time frame area
|
|
||||||
- time_span: Time window for the days as a list [(first day Time Frame), (second day Time frame), (third etc.)]
|
|
||||||
- slots: amount of slots that are available
|
|
||||||
- slot_lenght: the lenght of a slot in minutes
|
|
||||||
|
|
||||||
Output:
|
|
||||||
- link: The link for the user to send to the clients
|
|
||||||
"""
|
"""
|
||||||
|
try:
|
||||||
|
slots_int = int(slots)
|
||||||
|
except (ValueError, TypeError):
|
||||||
|
slots_int = 0
|
||||||
|
|
||||||
|
try:
|
||||||
|
slot_length_int = int(slot_length)
|
||||||
|
except (ValueError, TypeError):
|
||||||
|
slot_length_int = 45
|
||||||
|
|
||||||
normalized_time_span = _normalize_time_span(time_span)
|
normalized_time_span = _normalize_time_span(time_span)
|
||||||
normalized_mail = _normalize_mail_list(mail)
|
normalized_mail = _normalize_mail_list(mail or [])
|
||||||
id = termin.add(date_start, date_end, normalized_time_span, slots, slot_lenght, user, normalized_mail, note, calendar_enabled=calendar_enabled, title=title)
|
|
||||||
|
id = termin.add(date_start, date_end, normalized_time_span, slots_int, slot_length_int, user, normalized_mail, note, calendar_enabled=calendar_enabled, title=title)
|
||||||
id_str = str(id)
|
id_str = str(id)
|
||||||
tenant_id = _current_tenant_id()
|
tenant_id = _current_tenant_id()
|
||||||
|
|
||||||
@@ -224,9 +226,11 @@ def new(date_start: str, date_end: str, time_span: list, slots: int, slot_lenght
|
|||||||
link = host + "/terminplaner/client/" + id_str
|
link = host + "/terminplaner/client/" + id_str
|
||||||
if tenant_id:
|
if tenant_id:
|
||||||
link += f"?tenant={tenant_id}"
|
link += f"?tenant={tenant_id}"
|
||||||
|
|
||||||
subject = f"{title} - Bitte Termin vereinbaren" if title else f"Terminanfrage von {user} - Bitte Termin vereinbaren"
|
subject = f"{title} - Bitte Termin vereinbaren" if title else f"Terminanfrage von {user} - Bitte Termin vereinbaren"
|
||||||
note_link = note + f"Bitte klicken sie auf den folgenden Link um einen Termin zu vereinbaren: {link}"
|
note_link = note + f"Bitte klicken sie auf den folgenden Link um einen Termin zu vereinbaren: {link}"
|
||||||
calendar_link = None
|
calendar_link = None
|
||||||
|
|
||||||
if calendar_enabled:
|
if calendar_enabled:
|
||||||
try:
|
try:
|
||||||
calendar_link = url_for('terminplaner.calendar_export', appointment_id=id_str, tenant=tenant_id or None, _external=True)
|
calendar_link = url_for('terminplaner.calendar_export', appointment_id=id_str, tenant=tenant_id or None, _external=True)
|
||||||
@@ -251,19 +255,7 @@ def new(date_start: str, date_end: str, time_span: list, slots: int, slot_lenght
|
|||||||
|
|
||||||
|
|
||||||
def book_slot(id, date_start_time, name):
|
def book_slot(id, date_start_time, name):
|
||||||
"""
|
|
||||||
Updates slot for the booking per a id
|
|
||||||
|
|
||||||
Input:
|
|
||||||
- id: the id is the id you get from the
|
|
||||||
- date_start_time: the date of the booking that was selected with date and time
|
|
||||||
- name: name that the client gave himself
|
|
||||||
|
|
||||||
Output:
|
|
||||||
- bool: if worked or not
|
|
||||||
"""
|
|
||||||
try:
|
try:
|
||||||
# Retrieve the current appointment
|
|
||||||
item = termin.get_item(id)
|
item = termin.get_item(id)
|
||||||
if not item:
|
if not item:
|
||||||
return False
|
return False
|
||||||
@@ -281,10 +273,7 @@ def book_slot(id, date_start_time, name):
|
|||||||
if existing[0] == date_start_time and existing[1] == name:
|
if existing[0] == date_start_time and existing[1] == name:
|
||||||
return False
|
return False
|
||||||
|
|
||||||
# Append the new booking as a tuple (start_time, name)
|
|
||||||
slots.append((date_start_time, name))
|
slots.append((date_start_time, name))
|
||||||
|
|
||||||
# Update the appointment in the database
|
|
||||||
success = termin.update(id, slots)
|
success = termin.update(id, slots)
|
||||||
return bool(success)
|
return bool(success)
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
@@ -293,19 +282,12 @@ def book_slot(id, date_start_time, name):
|
|||||||
|
|
||||||
|
|
||||||
def remove_slot(id, date_start_time, name):
|
def remove_slot(id, date_start_time, name):
|
||||||
"""
|
|
||||||
Remove a booked slot for an appointment.
|
|
||||||
|
|
||||||
Returns True if the removal succeeded, False otherwise.
|
|
||||||
"""
|
|
||||||
try:
|
try:
|
||||||
# Prefer DB-level remove if available
|
|
||||||
if hasattr(termin, 'remove_slot'):
|
if hasattr(termin, 'remove_slot'):
|
||||||
removed = termin.remove_slot(id, date_start_time, name)
|
removed = termin.remove_slot(id, date_start_time, name)
|
||||||
if removed:
|
if removed:
|
||||||
return True
|
return True
|
||||||
|
|
||||||
# Fallback: fetch, filter, and replace the slot list
|
|
||||||
item = termin.get_item(id)
|
item = termin.get_item(id)
|
||||||
if not item:
|
if not item:
|
||||||
return False
|
return False
|
||||||
@@ -314,7 +296,6 @@ def remove_slot(id, date_start_time, name):
|
|||||||
new_slots = []
|
new_slots = []
|
||||||
for s in slots:
|
for s in slots:
|
||||||
try:
|
try:
|
||||||
# s may be list or tuple like [start_time, name]
|
|
||||||
if isinstance(s, (list, tuple)) and len(s) >= 2 and s[0] == date_start_time and s[1] == name:
|
if isinstance(s, (list, tuple)) and len(s) >= 2 and s[0] == date_start_time and s[1] == name:
|
||||||
continue
|
continue
|
||||||
except Exception:
|
except Exception:
|
||||||
@@ -329,9 +310,6 @@ def remove_slot(id, date_start_time, name):
|
|||||||
|
|
||||||
|
|
||||||
def remove_appointment(id):
|
def remove_appointment(id):
|
||||||
"""
|
|
||||||
Remove an entire appointment by id.
|
|
||||||
"""
|
|
||||||
try:
|
try:
|
||||||
return bool(termin.remove(id))
|
return bool(termin.remove(id))
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
@@ -339,17 +317,6 @@ def remove_appointment(id):
|
|||||||
return False
|
return False
|
||||||
|
|
||||||
def get_available(id):
|
def get_available(id):
|
||||||
"""
|
|
||||||
Gets the available time slots -> more over it returns the time frame and the allready booked slots also the lenght.
|
|
||||||
And checks if there are slots left.
|
|
||||||
|
|
||||||
Input:
|
|
||||||
- id: id of the appointment
|
|
||||||
|
|
||||||
Output:
|
|
||||||
- dict: all the needet information -> [Start_date, End_date, (first day Time Frame,
|
|
||||||
second day Time frame, third etc.), slot lenght, (bookedslots -> list)]
|
|
||||||
"""
|
|
||||||
try:
|
try:
|
||||||
termin_range = termin.get_item(id)
|
termin_range = termin.get_item(id)
|
||||||
if not termin_range:
|
if not termin_range:
|
||||||
@@ -358,22 +325,19 @@ def get_available(id):
|
|||||||
date_start = termin_range.get('date_start')
|
date_start = termin_range.get('date_start')
|
||||||
date_end = termin_range.get('date_end')
|
date_end = termin_range.get('date_end')
|
||||||
time_span = termin_range.get('time_span', [])
|
time_span = termin_range.get('time_span', [])
|
||||||
slot_lenght = termin_range.get('slot_lenght')
|
|
||||||
total_slots = termin_range.get('slots', 0)
|
|
||||||
# Ensure numeric fields are cast to int when stored as strings
|
|
||||||
try:
|
try:
|
||||||
total_slots = int(termin_range.get('slots', 0) or 0)
|
total_slots = int(termin_range.get('slots', 0) or 0)
|
||||||
except Exception:
|
except Exception:
|
||||||
total_slots = 0
|
total_slots = 0
|
||||||
|
|
||||||
try:
|
try:
|
||||||
slot_lenght = int(termin_range.get('slot_lenght') or 0)
|
slot_length = int(termin_range.get('slot_length') or termin_range.get('slot_lenght') or 0)
|
||||||
except Exception:
|
except Exception:
|
||||||
slot_lenght = termin_range.get('slot_lenght')
|
slot_length = termin_range.get('slot_length') or termin_range.get('slot_lenght')
|
||||||
|
|
||||||
booked = termin_range.get('slots_booked', []) or []
|
booked = termin_range.get('slots_booked', []) or []
|
||||||
|
|
||||||
# Normalize booked entries to dicts for easier consumption
|
|
||||||
normalized = []
|
normalized = []
|
||||||
for s in booked:
|
for s in booked:
|
||||||
if isinstance(s, (list, tuple)) and len(s) >= 2:
|
if isinstance(s, (list, tuple)) and len(s) >= 2:
|
||||||
@@ -393,7 +357,8 @@ def get_available(id):
|
|||||||
'date_start': date_start,
|
'date_start': date_start,
|
||||||
'date_end': date_end,
|
'date_end': date_end,
|
||||||
'time_span': time_span,
|
'time_span': time_span,
|
||||||
'slot_lenght': slot_lenght,
|
'slot_length': slot_length,
|
||||||
|
'slot_lenght': slot_length,
|
||||||
'slots_total': total_slots,
|
'slots_total': total_slots,
|
||||||
'slots_booked': normalized,
|
'slots_booked': normalized,
|
||||||
'slots_left': slots_left,
|
'slots_left': slots_left,
|
||||||
@@ -403,22 +368,10 @@ def get_available(id):
|
|||||||
return {}
|
return {}
|
||||||
|
|
||||||
def get_available_user(id):
|
def get_available_user(id):
|
||||||
"""
|
|
||||||
Gets the available time slots -> more over it returns the time frame and the allready booked slots also the lenght.
|
|
||||||
And checks if there are slots left.
|
|
||||||
|
|
||||||
Input:
|
|
||||||
- id: id of the appointment
|
|
||||||
|
|
||||||
Output:
|
|
||||||
- dict: all the needet information -> [Start_date, End_date, (first day Time Frame,
|
|
||||||
second day Time frame, third etc.), slot lenght, (bookedslots -> list)]
|
|
||||||
"""
|
|
||||||
return get_available(id)
|
return get_available(id)
|
||||||
|
|
||||||
|
|
||||||
def get_user_upcoming_events(user: str, limit: int = 25) -> list[dict]:
|
def get_user_upcoming_events(user: str, limit: int = 25) -> list[dict]:
|
||||||
"""Return upcoming appointment plans for overview display."""
|
|
||||||
user_name = str(user or '').strip()
|
user_name = str(user or '').strip()
|
||||||
if not user_name:
|
if not user_name:
|
||||||
return []
|
return []
|
||||||
|
|||||||
@@ -169,13 +169,14 @@ def configure():
|
|||||||
end = request.form.get('end_date')
|
end = request.form.get('end_date')
|
||||||
time = request.form.get('time_frame')
|
time = request.form.get('time_frame')
|
||||||
slots_amount = request.form.get('slots_amounts')
|
slots_amount = request.form.get('slots_amounts')
|
||||||
slot_lenght = request.form.get('slot_lenght')
|
slot_length = request.form.get('slot_length') # Korrigiert: slot_length
|
||||||
mail = request.form.get('mail', '')
|
mail = request.form.get('mail', '')
|
||||||
note = request.form.get('note', '')
|
note = request.form.get('note', '')
|
||||||
add_to_calendar = request.form.get('add_to_calendar') == 'on'
|
add_to_calendar = request.form.get('add_to_calendar') == 'on'
|
||||||
titel = request.form.get('titel', '').strip()
|
title = request.form.get('title', '').strip() # Korrigiert: title statt titel
|
||||||
|
|
||||||
if not start or not end or not time or not slots_amount or not slot_lenght or not titel:
|
# Abfrage ebenfalls auf title und slot_length angepasst
|
||||||
|
if not start or not end or not time or not slots_amount or not slot_length or not title:
|
||||||
flash('Bitte alle Pflichtfelder ausfüllen.', 'error')
|
flash('Bitte alle Pflichtfelder ausfüllen.', 'error')
|
||||||
return render_template(
|
return render_template(
|
||||||
'termin_configure.html',
|
'termin_configure.html',
|
||||||
@@ -184,7 +185,8 @@ def configure():
|
|||||||
email_service_enabled=cfg.EMAIL_ENABLED,
|
email_service_enabled=cfg.EMAIL_ENABLED,
|
||||||
)
|
)
|
||||||
|
|
||||||
result = appointment_service.new(start, end, time, slots_amount, slot_lenght, session["username"], mail, note, calendar_enabled=add_to_calendar, title=titel)
|
# Variablen im Funktionsaufruf aktualisiert
|
||||||
|
result = appointment_service.new(start, end, time, slots_amount, slot_length, session["username"], mail, note, calendar_enabled=add_to_calendar, title=title)
|
||||||
flash('Der Terminplan wurde angelegt.', 'success')
|
flash('Der Terminplan wurde angelegt.', 'success')
|
||||||
return render_template(
|
return render_template(
|
||||||
'termin_configure.html',
|
'termin_configure.html',
|
||||||
@@ -193,7 +195,7 @@ def configure():
|
|||||||
calendar_link=result.get('calendar_link'),
|
calendar_link=result.get('calendar_link'),
|
||||||
add_to_calendar=add_to_calendar,
|
add_to_calendar=add_to_calendar,
|
||||||
email_service_enabled=cfg.EMAIL_ENABLED,
|
email_service_enabled=cfg.EMAIL_ENABLED,
|
||||||
title=titel,
|
title=title,
|
||||||
)
|
)
|
||||||
elif request.method == "GET":
|
elif request.method == "GET":
|
||||||
return render_template(
|
return render_template(
|
||||||
|
|||||||
@@ -15,3 +15,4 @@ openpyxl
|
|||||||
cryptography>=42.0.0
|
cryptography>=42.0.0
|
||||||
pywebpush
|
pywebpush
|
||||||
py-vapid>=1.9.0
|
py-vapid>=1.9.0
|
||||||
|
beautifulsoup4
|
||||||
@@ -28,11 +28,10 @@
|
|||||||
<li class="nav-item" role="presentation">
|
<li class="nav-item" role="presentation">
|
||||||
<button class="nav-link" id="tab-legal" data-bs-toggle="tab" data-bs-target="#pane-legal"
|
<button class="nav-link" id="tab-legal" data-bs-toggle="tab" data-bs-target="#pane-legal"
|
||||||
type="button" role="tab">Rechtsgrundlage</button>
|
type="button" role="tab">Rechtsgrundlage</button>
|
||||||
</li>
|
|
||||||
</ul>
|
</ul>
|
||||||
|
|
||||||
<!-- ── NOTICE ────────────────────────────────────────────────────── -->
|
<!-- ── NOTICE ────────────────────────────────────────────────────── -->
|
||||||
<div class="tab-pane fade" id="pane-notice" role="tabpanel">
|
<div class="tab-pane" id="pane-notice" role="tabpanel">
|
||||||
<div class="license-content">
|
<div class="license-content">
|
||||||
<h2>NOTICE – Urheberrechtliche Hinweise</h2>
|
<h2>NOTICE – Urheberrechtliche Hinweise</h2>
|
||||||
<p><strong>Invario Modul Suite</strong><br>Copyright © 2026 Invario UG</p>
|
<p><strong>Invario Modul Suite</strong><br>Copyright © 2026 Invario UG</p>
|
||||||
@@ -59,14 +58,14 @@
|
|||||||
|
|
||||||
<h4>Frontend / Laufzeit-Assets</h4>
|
<h4>Frontend / Laufzeit-Assets</h4>
|
||||||
<ul>
|
<ul>
|
||||||
<li>html5-qrcode (MIT) © 2020-2025 Manoj Brahmbhatt (mebjas)</li>
|
<li>quagga2 (MIT) © 2014 Christoph Oberhofer, © 2019 Eric Blade and contributors</li>
|
||||||
</ul>
|
</ul>
|
||||||
<hr>
|
<hr>
|
||||||
</div>
|
</div>
|
||||||
</div><!-- /#pane-notice -->
|
</div><!-- /#pane-notice -->
|
||||||
|
|
||||||
<!-- ── DATENSCHUTZ ───────────────────────────────────────────────── -->
|
<!-- ── DATENSCHUTZ ───────────────────────────────────────────────── -->
|
||||||
<div class="tab-pane fade" id="pane-privacy" role="tabpanel">
|
<div class="tab-pane" id="pane-privacy" role="tabpanel">
|
||||||
<div class="license-content">
|
<div class="license-content">
|
||||||
<h2>Datenschutzerklärung (Privacy Policy)</h2>
|
<h2>Datenschutzerklärung (Privacy Policy)</h2>
|
||||||
|
|
||||||
@@ -108,7 +107,7 @@
|
|||||||
</div><!-- /#pane-privacy -->
|
</div><!-- /#pane-privacy -->
|
||||||
|
|
||||||
<!-- ── SICHERHEIT ────────────────────────────────────────────────── -->
|
<!-- ── SICHERHEIT ────────────────────────────────────────────────── -->
|
||||||
<div class="tab-pane fade" id="pane-security" role="tabpanel">
|
<div class="tab-pane" id="pane-security" role="tabpanel">
|
||||||
<div class="license-content">
|
<div class="license-content">
|
||||||
<h2>Sicherheitsrichtlinie (Security Policy)</h2>
|
<h2>Sicherheitsrichtlinie (Security Policy)</h2>
|
||||||
|
|
||||||
@@ -129,7 +128,7 @@
|
|||||||
</div><!-- /#pane-security -->
|
</div><!-- /#pane-security -->
|
||||||
|
|
||||||
<!-- ── DATENVERARBEITUNG ─────────────────────────────────────────── -->
|
<!-- ── DATENVERARBEITUNG ─────────────────────────────────────────── -->
|
||||||
<div class="tab-pane fade" id="pane-data" role="tabpanel">
|
<div class="tab-pane" id="pane-data" role="tabpanel">
|
||||||
<div class="license-content">
|
<div class="license-content">
|
||||||
<h2>Dokumentation der Datenverarbeitung (VVT)</h2>
|
<h2>Dokumentation der Datenverarbeitung (VVT)</h2>
|
||||||
|
|
||||||
@@ -157,7 +156,7 @@
|
|||||||
</div><!-- /#pane-data -->
|
</div><!-- /#pane-data -->
|
||||||
|
|
||||||
<!-- ── RECHTSGRUNDLAGE ───────────────────────────────────────────── -->
|
<!-- ── RECHTSGRUNDLAGE ───────────────────────────────────────────── -->
|
||||||
<div class="tab-pane fade" id="pane-legal" role="tabpanel">
|
<div class="tab-pane" id="pane-legal" role="tabpanel">
|
||||||
<div class="license-content">
|
<div class="license-content">
|
||||||
<h2>Rechtsgrundlage der Nutzung</h2>
|
<h2>Rechtsgrundlage der Nutzung</h2>
|
||||||
<p>Um das Inventarsystem DSGVO-konform zu betreiben, muss der Betreiber eine der folgenden Grundlagen festlegen:</p>
|
<p>Um das Inventarsystem DSGVO-konform zu betreiben, muss der Betreiber eine der folgenden Grundlagen festlegen:</p>
|
||||||
@@ -170,9 +169,6 @@
|
|||||||
Einwilligung vorliegen (Art. 6 Abs. 1 lit. a DSGVO).</li>
|
Einwilligung vorliegen (Art. 6 Abs. 1 lit. a DSGVO).</li>
|
||||||
</ol>
|
</ol>
|
||||||
</div>
|
</div>
|
||||||
</div><!-- /#pane-legal -->
|
|
||||||
|
|
||||||
</div><!-- /.tab-content -->
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|||||||
@@ -43,7 +43,7 @@
|
|||||||
<div class="card border-0 shadow-lg rounded-4 h-100">
|
<div class="card border-0 shadow-lg rounded-4 h-100">
|
||||||
<div class="card-body p-4 p-md-5">
|
<div class="card-body p-4 p-md-5">
|
||||||
<p class="text-uppercase text-muted fw-semibold mb-2">Terminplaner</p>
|
<p class="text-uppercase text-muted fw-semibold mb-2">Terminplaner</p>
|
||||||
<h1 class="h3 fw-bold mb-3">Termin buchen</h1>
|
<h1 class="h3 fw-bold mb-3">Termin buchen - {{ available.title }}</h1>
|
||||||
<p class="text-muted mb-4">Wählen Sie im Kalender einen freien Slot aus. Den gewählten Termin können Sie danach direkt wie in einem Kalender-Block verschieben.</p>
|
<p class="text-muted mb-4">Wählen Sie im Kalender einen freien Slot aus. Den gewählten Termin können Sie danach direkt wie in einem Kalender-Block verschieben.</p>
|
||||||
|
|
||||||
<div class="p-3 rounded-3 bg-light mb-3">
|
<div class="p-3 rounded-3 bg-light mb-3">
|
||||||
|
|||||||
@@ -793,6 +793,18 @@
|
|||||||
<input type="text" name="library_category" id="library_category" placeholder="z.B. Belletristik, Sachbücher, Nachschlagewerke, etc.">
|
<input type="text" name="library_category" id="library_category" placeholder="z.B. Belletristik, Sachbücher, Nachschlagewerke, etc.">
|
||||||
<small style="display:block; color:#666;">Geben Sie hier eine beliebige Kategorie ein zur freien Klassifizierung.</small>
|
<small style="display:block; color:#666;">Geben Sie hier eine beliebige Kategorie ein zur freien Klassifizierung.</small>
|
||||||
</div>
|
</div>
|
||||||
|
<h3>Typ</h3>
|
||||||
|
<div class="form-group">
|
||||||
|
<select name="item_type_input" id="item_type_input">
|
||||||
|
<option value="" disabled selected>Medientyp auswählen...</option>
|
||||||
|
<option value="Buch">Buch</option>
|
||||||
|
<option value="Schulbuch">Schulbuch</option>
|
||||||
|
<option value="CD">CD</option>
|
||||||
|
<option value="DVD">DVD</option>
|
||||||
|
<option value="Sonstiges">Sonstiges</option>
|
||||||
|
</select>
|
||||||
|
<small style="display:block; color:#666;">Wählen Sie einen Medientyp aus zur Klassifizierung.</small>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
{% else %}
|
{% else %}
|
||||||
<!-- Normal Item Mode: Standard Filters -->
|
<!-- Normal Item Mode: Standard Filters -->
|
||||||
@@ -1563,6 +1575,7 @@
|
|||||||
// Get form fields
|
// Get form fields
|
||||||
const nameField = document.getElementById('name');
|
const nameField = document.getElementById('name');
|
||||||
const descriptionField = document.getElementById('beschreibung');
|
const descriptionField = document.getElementById('beschreibung');
|
||||||
|
const priceField = document.getElementById('anschaffungskosten'); // <-- NEU
|
||||||
|
|
||||||
if (!nameField || !descriptionField) {
|
if (!nameField || !descriptionField) {
|
||||||
alert('Fehler: Formularfelder nicht gefunden.');
|
alert('Fehler: Formularfelder nicht gefunden.');
|
||||||
@@ -1600,6 +1613,13 @@
|
|||||||
nameField.value = bookTitle;
|
nameField.value = bookTitle;
|
||||||
descriptionField.value = description;
|
descriptionField.value = description;
|
||||||
|
|
||||||
|
// Preis in das Formularfeld eintragen
|
||||||
|
if (priceField && currentBookData.price !== null && currentBookData.price !== undefined) {
|
||||||
|
// Wandelt den Float (z.B. 12.25) in einen String mit Komma (12,25) um
|
||||||
|
let formattedPrice = currentBookData.price.toString().replace('.', ',');
|
||||||
|
priceField.value = formattedPrice;
|
||||||
|
}
|
||||||
|
|
||||||
// Download and import book cover image if available
|
// Download and import book cover image if available
|
||||||
if (currentBookData.thumbnail) {
|
if (currentBookData.thumbnail) {
|
||||||
downloadBookCover(currentBookData.thumbnail);
|
downloadBookCover(currentBookData.thumbnail);
|
||||||
|
|||||||
@@ -15,3 +15,4 @@ openpyxl
|
|||||||
cryptography>=42.0.0
|
cryptography>=42.0.0
|
||||||
pywebpush
|
pywebpush
|
||||||
py-vapid>=1.9.0
|
py-vapid>=1.9.0
|
||||||
|
beautifulsoup4
|
||||||
Reference in New Issue
Block a user