Compare commits
21 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| ecf4c0ee0c | |||
| 10aeef2283 | |||
| d891ba62bc | |||
| 5549c64735 | |||
| 392eb9de32 | |||
| 41dfe566c6 | |||
| db4b0cdee2 | |||
| b0a6a7e7ca | |||
| 9e531b3f7c | |||
| 99bf2fa1f4 | |||
| cd4db22e72 | |||
| 1cf8fbb91d | |||
| 16bd7ec544 | |||
| 4d5a7b4f5e | |||
| 9922c0ae9d | |||
| 93314424d9 | |||
| d14ac5d9af | |||
| b4939147c4 | |||
| 2a33fc45de | |||
| 3a317de8f0 | |||
| f626cd52fd |
33
CHANGELOG.md
33
CHANGELOG.md
@@ -5,6 +5,24 @@ Alle wichtigen Änderungen an diesem Projekt werden in dieser Datei dokumentiert
|
||||
Das Format basiert auf [Keep a Changelog](https://keepachangelog.com/de/1.0.0/),
|
||||
und dieses Projekt adhäriert zu [Semantic Versioning](https://semver.org/lang/de/).
|
||||
|
||||
## [Unreleased]
|
||||
### Hinzugefügt
|
||||
- CSV-Export-Funktion für Suchergebnisse
|
||||
- Export-Button in der Benutzeroberfläche
|
||||
- Automatische Formatierung der CSV-Datei mit allen relevanten Kundendaten
|
||||
|
||||
## [1.2.16] - 2024-03-21
|
||||
### Geändert
|
||||
- Verbesserte Suchfunktion: Highlighting für allgemeine Suche in allen Feldern
|
||||
- Optimierte Reset-Buttons in den Suchfeldern
|
||||
- Verbesserte CSS-Styles für die Suchfeld-Icons
|
||||
|
||||
## [1.2.15] - 2024-03-20
|
||||
### Hinzugefügt
|
||||
- Autovervollständigung für das Ort-Feld
|
||||
- Neue API-Route für Ortsvorschläge
|
||||
- Optimierte SQL-Abfragen für die Ortssuche
|
||||
|
||||
## [1.2.14] - 2024-03-20
|
||||
### Hinzugefügt
|
||||
- Autovervollständigung für das Fachrichtungsfeld
|
||||
@@ -193,4 +211,17 @@ und dieses Projekt adhäriert zu [Semantic Versioning](https://semver.org/lang/d
|
||||
- Echtzeit-Suche über Kundendaten
|
||||
- Hervorhebung von Suchbegriffen in den Ergebnissen
|
||||
- Klickbare Links für Telefonnummern, E-Mail-Adressen und Adressen
|
||||
- Docker-Container für einfache Installation und Deployment
|
||||
- Docker-Container für einfache Installation und Deployment
|
||||
|
||||
## [1.2.19] - 2024-03-19
|
||||
### Geändert
|
||||
- Version auf 1.2.19 aktualisiert
|
||||
|
||||
## [1.2.18] - 2024-03-19
|
||||
# ... existing code ...
|
||||
|
||||
## [v1.2.20] - 2024-03-19
|
||||
### Hinzugefügt
|
||||
- Dunkles Theme für bessere Lesbarkeit bei schlechten Lichtverhältnissen
|
||||
- Theme-Switcher im Hamburger-Menü
|
||||
- Automatische Speicherung der Theme-Präferenz
|
||||
54
README.md
54
README.md
@@ -1,6 +1,6 @@
|
||||
# Medi-Customers
|
||||
# medisoftware Kundensuche
|
||||
|
||||
Eine moderne Webanwendung zur Suche und Verwaltung von Kundendaten, die MEDISOFT und MEDICONSULT Daten kombiniert.
|
||||
Eine einfache und effiziente Kundensuche für medisoftware Kunden.
|
||||
|
||||
## Features
|
||||
|
||||
@@ -11,10 +11,15 @@ Eine moderne Webanwendung zur Suche und Verwaltung von Kundendaten, die MEDISOFT
|
||||
- 🏥 Unterscheidung zwischen MEDISOFT und MEDICONSULT Kunden
|
||||
- 🎨 Farbliche Hervorhebung der Kundentypen (blau für MEDISOFT, orange für MEDICONSULT)
|
||||
- 📍 Verbesserte Adress-Links mit Location- und Route-Icons
|
||||
- 📤 CSV-Export der Suchergebnisse
|
||||
- 📥 CSV-Import für Kundendaten
|
||||
- 📖 Integrierte README-Anzeige
|
||||
- 🍔 Intuitives Hamburger-Menü
|
||||
- 📱 VCF-Export für Kontakte
|
||||
|
||||
## Version
|
||||
|
||||
Aktuelle Version: 1.2.14
|
||||
Aktuelle Version: 1.2.20
|
||||
|
||||
## Installation
|
||||
|
||||
@@ -52,7 +57,8 @@ Die Anwendung kann über folgende Umgebungsvariablen konfiguriert werden:
|
||||
- `FLASK_ENV`: Die Flask-Umgebung (development/production)
|
||||
- `SECRET_KEY`: Der geheime Schlüssel für Flask-Sessions
|
||||
- `DATABASE_URL`: Die URL zur SQLite-Datenbank
|
||||
- `STATIC_PASSWORD`: Das Passwort für die Login-Seite
|
||||
- `LOGIN_PASSWORD`: Das Passwort für die Login-Seite
|
||||
- `UPLOAD_PASSWORD`: Das Passwort für den CSV-Upload
|
||||
- `ALLOWED_IP_RANGES`: Komma-getrennte Liste von IP-Bereichen, die direkten Zugriff haben
|
||||
- `LOG_LEVEL`: Das Logging-Level (INFO/DEBUG)
|
||||
|
||||
@@ -107,23 +113,47 @@ curl "http://localhost:5001/search?name=Mustermann&telefon=030"
|
||||
curl "http://localhost:5001/search?fachrichtung=Zahnarzt&ort=Berlin&name=Schmidt"
|
||||
```
|
||||
|
||||
## Benutzeroberfläche
|
||||
|
||||
### Hauptmenü
|
||||
- Home: Zurück zur Hauptseite
|
||||
- CSV-Dateien hochladen: Import neuer Kundendaten
|
||||
- README: Anzeige der Dokumentation
|
||||
|
||||
### Suchfunktionen
|
||||
- Allgemeine Suche über alle Felder
|
||||
- Spezifische Suche nach:
|
||||
- Name
|
||||
- Ort
|
||||
- Kundennummer
|
||||
- PLZ
|
||||
- Fachrichtung
|
||||
- Filterung nach Kundentyp (MEDISOFT/MEDICONSULT)
|
||||
|
||||
### Export
|
||||
- CSV-Export der Suchergebnisse
|
||||
- VCF-Export für Kontakte
|
||||
- Direkte Links zu Kundendetails
|
||||
- Teilen von Suchergebnissen
|
||||
|
||||
## Version
|
||||
|
||||
Aktuelle Version: [v1.2.4](CHANGELOG.md#v124---2024-03-19)
|
||||
Aktuelle Version: [v1.2.17](CHANGELOG.md#v1217---2024-03-19)
|
||||
|
||||
## Code-Statistiken
|
||||
|
||||
Language|files|blank|comment|code
|
||||
:-------|-------:|-------:|-------:|-------:
|
||||
HTML|2|56|0|416
|
||||
CSS|2|51|1|265
|
||||
Markdown|2|66|0|236
|
||||
Python|1|51|103|225
|
||||
YAML|1|0|0|13
|
||||
HTML|4|13|37|436
|
||||
JavaScript|1|67|28|420
|
||||
CSS|1|72|16|353
|
||||
Markdown|2|79|0|300
|
||||
Python|1|71|126|280
|
||||
YAML|1|0|0|14
|
||||
Dockerfile|1|8|9|11
|
||||
Text|1|0|0|5
|
||||
Text|1|0|0|6
|
||||
--------|--------|--------|--------|--------
|
||||
SUM:|10|232|113|1171
|
||||
SUM:|12|310|216|1820
|
||||
|
||||
## Lizenz
|
||||
Alle Rechte vorbehalten. © 2025 medisoftware
|
||||
582
app.py
582
app.py
@@ -5,30 +5,88 @@ import logging
|
||||
import numpy as np
|
||||
from datetime import datetime, timedelta
|
||||
from dotenv import load_dotenv
|
||||
import requests
|
||||
from collections import defaultdict
|
||||
import ipaddress
|
||||
import csv
|
||||
import sqlite3
|
||||
from functools import wraps
|
||||
from contextlib import contextmanager
|
||||
import time
|
||||
import threading
|
||||
import markdown2
|
||||
|
||||
app = Flask(__name__, static_folder='static')
|
||||
app.secret_key = os.getenv('SECRET_KEY', 'default-secret-key')
|
||||
app.config['SECRET_KEY'] = os.environ.get('SECRET_KEY', 'dev')
|
||||
app.config['ALLOWED_IP_RANGES'] = os.getenv('ALLOWED_IP_RANGES', '192.168.0.0/16,10.0.0.0/8').split(',')
|
||||
app.config['VERSION'] = '1.2.20'
|
||||
app.config['DATABASE'] = os.path.join(app.instance_path, 'customers.db')
|
||||
app.config['DATABASE_TIMEOUT'] = 20
|
||||
app.config['DATABASE_POOL_SIZE'] = 5
|
||||
|
||||
logging.basicConfig(level=logging.INFO)
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
# Version der Anwendung
|
||||
VERSION = "1.2.14"
|
||||
# Thread-lokaler Speicher für Datenbankverbindungen
|
||||
thread_local = threading.local()
|
||||
|
||||
# Pfad zur Datenbank
|
||||
DB_FILE = 'data/customers.db'
|
||||
def get_db_connection():
|
||||
"""Erstellt eine neue Datenbankverbindung für den aktuellen Thread"""
|
||||
if not hasattr(thread_local, "connection"):
|
||||
thread_local.connection = sqlite3.connect(app.config['DATABASE'], timeout=app.config['DATABASE_TIMEOUT'])
|
||||
thread_local.connection.row_factory = sqlite3.Row
|
||||
return thread_local.connection
|
||||
|
||||
# Lade Umgebungsvariablen
|
||||
load_dotenv()
|
||||
@contextmanager
|
||||
def get_db():
|
||||
"""Context Manager für Datenbankverbindungen"""
|
||||
conn = get_db_connection()
|
||||
try:
|
||||
yield conn
|
||||
except Exception:
|
||||
conn.rollback()
|
||||
raise
|
||||
finally:
|
||||
conn.commit()
|
||||
|
||||
# Statisches Passwort aus der .env Datei
|
||||
STATIC_PASSWORD = os.getenv('LOGIN_PASSWORD', 'default-password')
|
||||
ALLOWED_IP_RANGES = os.getenv('ALLOWED_IP_RANGES', '').split(',')
|
||||
def init_db():
|
||||
"""Initialisiert die SQLite-Datenbank mit der notwendigen Tabelle."""
|
||||
with get_db() as conn:
|
||||
c = conn.cursor()
|
||||
|
||||
try:
|
||||
# Erstelle die Kunden-Tabelle
|
||||
c.execute('''
|
||||
CREATE TABLE IF NOT EXISTS customers (
|
||||
id INTEGER PRIMARY KEY AUTOINCREMENT,
|
||||
nummer TEXT,
|
||||
name TEXT,
|
||||
strasse TEXT,
|
||||
plz TEXT,
|
||||
ort TEXT,
|
||||
telefon TEXT,
|
||||
mobil TEXT,
|
||||
email TEXT,
|
||||
bemerkung TEXT,
|
||||
fachrichtung TEXT,
|
||||
tag TEXT,
|
||||
handy TEXT,
|
||||
tele_firma TEXT,
|
||||
kontakt1 TEXT,
|
||||
kontakt2 TEXT,
|
||||
kontakt3 TEXT
|
||||
)
|
||||
''')
|
||||
|
||||
# Optimierte Indizes für die häufigsten Suchanfragen
|
||||
c.execute('CREATE INDEX IF NOT EXISTS idx_customers_name_ort ON customers(name, ort)')
|
||||
c.execute('CREATE INDEX IF NOT EXISTS idx_customers_fachrichtung ON customers(fachrichtung)')
|
||||
c.execute('CREATE INDEX IF NOT EXISTS idx_customers_tag ON customers(tag)')
|
||||
c.execute('CREATE INDEX IF NOT EXISTS idx_customers_plz ON customers(plz)')
|
||||
|
||||
# Zusammengesetzter Index für die häufigste Suchkombination
|
||||
c.execute('CREATE INDEX IF NOT EXISTS idx_customers_search ON customers(name, ort, fachrichtung, tag)')
|
||||
|
||||
logger.info('Datenbank initialisiert')
|
||||
except Exception as e:
|
||||
logger.error(f'Fehler bei der Datenbankinitialisierung: {str(e)}')
|
||||
raise
|
||||
|
||||
def isIPInSubnet(ip, subnet):
|
||||
"""Überprüft, ob eine IP-Adresse in einem Subnetz liegt."""
|
||||
@@ -51,132 +109,75 @@ def isIPInSubnet(ip, subnet):
|
||||
logger.error(f"Fehler bei der IP-Überprüfung: {str(e)}")
|
||||
return False
|
||||
|
||||
def get_db_connection():
|
||||
"""Erstellt eine neue Datenbankverbindung mit Timeout"""
|
||||
conn = sqlite3.connect(DB_FILE, timeout=20)
|
||||
conn.row_factory = sqlite3.Row
|
||||
return conn
|
||||
|
||||
def init_db():
|
||||
"""Initialisiert die SQLite-Datenbank mit der notwendigen Tabelle."""
|
||||
conn = get_db_connection()
|
||||
c = conn.cursor()
|
||||
|
||||
try:
|
||||
# Erstelle die Kunden-Tabelle
|
||||
c.execute('''
|
||||
CREATE TABLE IF NOT EXISTS customers (
|
||||
id INTEGER PRIMARY KEY AUTOINCREMENT,
|
||||
nummer TEXT,
|
||||
name TEXT,
|
||||
strasse TEXT,
|
||||
plz TEXT,
|
||||
ort TEXT,
|
||||
telefon TEXT,
|
||||
mobil TEXT,
|
||||
email TEXT,
|
||||
bemerkung TEXT,
|
||||
fachrichtung TEXT,
|
||||
tag TEXT,
|
||||
handy TEXT,
|
||||
tele_firma TEXT,
|
||||
kontakt1 TEXT,
|
||||
kontakt2 TEXT,
|
||||
kontakt3 TEXT
|
||||
)
|
||||
''')
|
||||
|
||||
# Erstelle Indizes für alle Suchfelder
|
||||
c.execute('CREATE INDEX IF NOT EXISTS idx_customers_nummer ON customers(nummer)')
|
||||
c.execute('CREATE INDEX IF NOT EXISTS idx_customers_name ON customers(name)')
|
||||
c.execute('CREATE INDEX IF NOT EXISTS idx_customers_strasse ON customers(strasse)')
|
||||
c.execute('CREATE INDEX IF NOT EXISTS idx_customers_plz ON customers(plz)')
|
||||
c.execute('CREATE INDEX IF NOT EXISTS idx_customers_ort ON customers(ort)')
|
||||
c.execute('CREATE INDEX IF NOT EXISTS idx_customers_telefon ON customers(telefon)')
|
||||
c.execute('CREATE INDEX IF NOT EXISTS idx_customers_mobil ON customers(mobil)')
|
||||
c.execute('CREATE INDEX IF NOT EXISTS idx_customers_email ON customers(email)')
|
||||
c.execute('CREATE INDEX IF NOT EXISTS idx_customers_fachrichtung ON customers(fachrichtung)')
|
||||
c.execute('CREATE INDEX IF NOT EXISTS idx_customers_tag ON customers(tag)')
|
||||
c.execute('CREATE INDEX IF NOT EXISTS idx_customers_handy ON customers(handy)')
|
||||
c.execute('CREATE INDEX IF NOT EXISTS idx_customers_tele_firma ON customers(tele_firma)')
|
||||
|
||||
# Erstelle einen zusammengesetzten Index für die häufigste Suchkombination
|
||||
c.execute('CREATE INDEX IF NOT EXISTS idx_customers_name_ort ON customers(name, ort)')
|
||||
|
||||
conn.commit()
|
||||
logger.info('Datenbank initialisiert')
|
||||
except Exception as e:
|
||||
logger.error(f'Fehler bei der Datenbankinitialisierung: {str(e)}')
|
||||
raise
|
||||
finally:
|
||||
conn.close()
|
||||
|
||||
def import_csv():
|
||||
"""Importiert die CSV-Datei in die Datenbank"""
|
||||
conn = None
|
||||
try:
|
||||
conn = get_db_connection()
|
||||
c = conn.cursor()
|
||||
|
||||
# Lösche bestehende Daten
|
||||
c.execute('DELETE FROM customers')
|
||||
|
||||
# Importiere MEDISOFT-Daten
|
||||
if os.path.exists('data/customers.csv'):
|
||||
logger.info("Importiere MEDISOFT-Daten...")
|
||||
df = pd.read_csv('data/customers.csv', encoding='iso-8859-1')
|
||||
df.columns = df.columns.str.strip().str.replace('"', '')
|
||||
df = df.apply(lambda x: x.str.strip().str.replace('"', '') if x.dtype == "object" else x)
|
||||
with get_db() as conn:
|
||||
c = conn.cursor()
|
||||
|
||||
for _, row in df.iterrows():
|
||||
c.execute('''
|
||||
INSERT INTO customers (
|
||||
name, nummer, strasse, plz, ort, telefon, mobil, email,
|
||||
fachrichtung, tag, handy, tele_firma, kontakt1, kontakt2, kontakt3
|
||||
)
|
||||
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
|
||||
''', (
|
||||
# Lösche bestehende Daten
|
||||
c.execute('DELETE FROM customers')
|
||||
|
||||
# Importiere MEDISOFT-Daten
|
||||
if os.path.exists('data/customers.csv'):
|
||||
logger.info("Importiere MEDISOFT-Daten...")
|
||||
df = pd.read_csv('data/customers.csv', encoding='iso-8859-1')
|
||||
df.columns = df.columns.str.strip().str.replace('"', '')
|
||||
df = df.apply(lambda x: x.str.strip().str.replace('"', '') if x.dtype == "object" else x)
|
||||
|
||||
# Filtere Datensätze mit Fachrichtung "intern"
|
||||
df = df[df['Fachrichtung'].str.lower() != 'intern']
|
||||
|
||||
# Bereite die Daten für den Batch-Insert vor
|
||||
data = [(
|
||||
row['VorNachname'], row['Nummer'], row['Strasse'], row['PLZ'], row['Ort'],
|
||||
row['Tel'], row['Tel'], row['mail'], row['Fachrichtung'], 'medisoft',
|
||||
row['Handy'], row['Tele Firma'], row['Kontakt1'], row['Kontakt2'], row['Kontakt3']
|
||||
))
|
||||
else:
|
||||
logger.warning("MEDISOFT CSV-Datei nicht gefunden")
|
||||
|
||||
# Importiere MEDICONSULT-Daten
|
||||
if os.path.exists('data/customers_snk.csv'):
|
||||
logger.info("Importiere MEDICONSULT-Daten...")
|
||||
df_snk = pd.read_csv('data/customers_snk.csv', encoding='iso-8859-1')
|
||||
df_snk.columns = df_snk.columns.str.strip().str.replace('"', '')
|
||||
df_snk = df_snk.apply(lambda x: x.str.strip().str.replace('"', '') if x.dtype == "object" else x)
|
||||
|
||||
for _, row in df_snk.iterrows():
|
||||
c.execute('''
|
||||
) for _, row in df.iterrows()]
|
||||
|
||||
# Führe Batch-Insert durch
|
||||
c.executemany('''
|
||||
INSERT INTO customers (
|
||||
name, nummer, strasse, plz, ort, telefon, mobil, email,
|
||||
fachrichtung, tag, handy, tele_firma, kontakt1, kontakt2, kontakt3
|
||||
)
|
||||
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
|
||||
''', (
|
||||
''', data)
|
||||
else:
|
||||
logger.warning("MEDISOFT CSV-Datei nicht gefunden")
|
||||
|
||||
# Importiere MEDICONSULT-Daten
|
||||
if os.path.exists('data/customers_snk.csv'):
|
||||
logger.info("Importiere MEDICONSULT-Daten...")
|
||||
df_snk = pd.read_csv('data/customers_snk.csv', encoding='iso-8859-1')
|
||||
df_snk.columns = df_snk.columns.str.strip().str.replace('"', '')
|
||||
df_snk = df_snk.apply(lambda x: x.str.strip().str.replace('"', '') if x.dtype == "object" else x)
|
||||
|
||||
# Filtere Datensätze mit Fachrichtung "intern"
|
||||
df_snk = df_snk[df_snk['Fachrichtung'].str.lower() != 'intern']
|
||||
|
||||
# Bereite die Daten für den Batch-Insert vor
|
||||
data = [(
|
||||
row['VorNachname'], row['Nummer'], row['Strasse'], row['PLZ'], row['Ort'],
|
||||
row['Tel'], row['Tel'], row['mail'], row['Fachrichtung'], 'mediconsult',
|
||||
row['Handy'], row['Tele Firma'], row['Kontakt1'], row['Kontakt2'], row['Kontakt3']
|
||||
))
|
||||
else:
|
||||
logger.warning("MEDICONSULT CSV-Datei nicht gefunden")
|
||||
|
||||
conn.commit()
|
||||
logger.info("CSV-Daten erfolgreich in die Datenbank importiert")
|
||||
) for _, row in df_snk.iterrows()]
|
||||
|
||||
# Führe Batch-Insert durch
|
||||
c.executemany('''
|
||||
INSERT INTO customers (
|
||||
name, nummer, strasse, plz, ort, telefon, mobil, email,
|
||||
fachrichtung, tag, handy, tele_firma, kontakt1, kontakt2, kontakt3
|
||||
)
|
||||
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
|
||||
''', data)
|
||||
else:
|
||||
logger.warning("MEDICONSULT CSV-Datei nicht gefunden")
|
||||
|
||||
logger.info("CSV-Daten erfolgreich in die Datenbank importiert")
|
||||
except Exception as e:
|
||||
logger.error(f"Fehler beim Importieren der CSV-Datei: {str(e)}")
|
||||
raise
|
||||
finally:
|
||||
if conn:
|
||||
conn.close()
|
||||
|
||||
def clean_dataframe(df):
|
||||
"""Konvertiert NaN-Werte in None für JSON-Kompatibilität"""
|
||||
return df.replace({np.nan: None})
|
||||
|
||||
@app.route('/login', methods=['GET', 'POST'])
|
||||
def login():
|
||||
@@ -184,7 +185,7 @@ def login():
|
||||
client_ip = request.headers.get('X-Forwarded-For', request.remote_addr)
|
||||
|
||||
# Überprüfe, ob die Client-IP in einem der erlaubten Bereichen liegt
|
||||
is_allowed = any(isIPInSubnet(client_ip, range.strip()) for range in ALLOWED_IP_RANGES if range.strip())
|
||||
is_allowed = any(isIPInSubnet(client_ip, range.strip()) for range in app.config['ALLOWED_IP_RANGES'] if range.strip())
|
||||
|
||||
if is_allowed:
|
||||
logger.info(f"Client-IP {client_ip} ist in einem erlaubten Bereich, automatischer Login")
|
||||
@@ -193,7 +194,7 @@ def login():
|
||||
|
||||
if request.method == 'POST':
|
||||
password = request.form.get('password')
|
||||
if password == STATIC_PASSWORD:
|
||||
if password == os.environ.get('LOGIN_PASSWORD'):
|
||||
session['logged_in'] = True
|
||||
logger.info("Erfolgreicher Login")
|
||||
return redirect(url_for('index'))
|
||||
@@ -213,8 +214,8 @@ def index():
|
||||
|
||||
client_ip = request.headers.get('X-Forwarded-For', request.remote_addr)
|
||||
logger.info(f"Client-IP: {client_ip}")
|
||||
logger.info(f"Erlaubte IP-Bereiche: {ALLOWED_IP_RANGES}")
|
||||
return render_template('index.html', allowed_ip_ranges=','.join(ALLOWED_IP_RANGES), version=VERSION)
|
||||
logger.info(f"Erlaubte IP-Bereiche: {app.config['ALLOWED_IP_RANGES']}")
|
||||
return render_template('index.html', allowed_ip_ranges=','.join(app.config['ALLOWED_IP_RANGES']), version=app.config['VERSION'])
|
||||
|
||||
@app.route('/search', methods=['GET', 'POST'])
|
||||
def search():
|
||||
@@ -235,115 +236,113 @@ def search():
|
||||
fachrichtung = request.args.get('fachrichtung', '')
|
||||
tag = request.args.get('tag', 'medisoft')
|
||||
|
||||
conn = get_db_connection()
|
||||
c = conn.cursor()
|
||||
|
||||
# Baue die SQL-Abfrage
|
||||
sql_query = '''
|
||||
SELECT
|
||||
nummer,
|
||||
name,
|
||||
strasse,
|
||||
plz,
|
||||
ort,
|
||||
telefon,
|
||||
mobil,
|
||||
email,
|
||||
fachrichtung,
|
||||
tag,
|
||||
handy,
|
||||
tele_firma,
|
||||
kontakt1,
|
||||
kontakt2,
|
||||
kontakt3
|
||||
FROM customers
|
||||
WHERE 1=1
|
||||
'''
|
||||
params = []
|
||||
|
||||
# Füge die Suchbedingungen hinzu
|
||||
if search_query:
|
||||
# Optimierte Suche mit FTS (Full Text Search)
|
||||
sql_query += """
|
||||
AND (
|
||||
name LIKE ? OR
|
||||
nummer LIKE ? OR
|
||||
fachrichtung LIKE ? OR
|
||||
ort LIKE ? OR
|
||||
plz LIKE ? OR
|
||||
strasse LIKE ? OR
|
||||
telefon LIKE ? OR
|
||||
mobil LIKE ? OR
|
||||
email LIKE ? OR
|
||||
bemerkung LIKE ? OR
|
||||
tag LIKE ? OR
|
||||
handy LIKE ? OR
|
||||
tele_firma LIKE ? OR
|
||||
kontakt1 LIKE ? OR
|
||||
kontakt2 LIKE ? OR
|
||||
kontakt3 LIKE ?
|
||||
)
|
||||
"""
|
||||
search_term = f"%{search_query}%"
|
||||
params.extend([search_term] * 16) # 16 Felder für die allgemeine Suche
|
||||
|
||||
if name:
|
||||
sql_query += " AND name LIKE ?"
|
||||
params.append(f"%{name}%")
|
||||
|
||||
if ort:
|
||||
sql_query += " AND ort LIKE ?"
|
||||
params.append(f"%{ort}%")
|
||||
|
||||
if nummer:
|
||||
sql_query += " AND nummer LIKE ?"
|
||||
params.append(f"%{nummer}%")
|
||||
|
||||
if plz:
|
||||
sql_query += " AND plz LIKE ?"
|
||||
params.append(f"%{plz}%")
|
||||
|
||||
if fachrichtung:
|
||||
sql_query += " AND fachrichtung LIKE ?"
|
||||
params.append(f"%{fachrichtung}%")
|
||||
|
||||
# Filter nach Tag
|
||||
if tag != 'all':
|
||||
sql_query += " AND tag = ?"
|
||||
params.append(tag)
|
||||
|
||||
# Füge LIMIT hinzu und optimiere die Sortierung
|
||||
sql_query += " ORDER BY name LIMIT 100"
|
||||
|
||||
# Führe die Abfrage aus
|
||||
cursor = conn.cursor()
|
||||
cursor.execute(sql_query, params)
|
||||
results = cursor.fetchall()
|
||||
|
||||
formatted_results = []
|
||||
for row in results:
|
||||
customer = {
|
||||
'nummer': row[0],
|
||||
'name': row[1],
|
||||
'strasse': row[2],
|
||||
'plz': row[3],
|
||||
'ort': row[4],
|
||||
'telefon': row[5],
|
||||
'mobil': row[6],
|
||||
'email': row[7],
|
||||
'fachrichtung': row[8],
|
||||
'tag': row[9],
|
||||
'handy': row[10],
|
||||
'tele_firma': row[11],
|
||||
'kontakt1': row[12],
|
||||
'kontakt2': row[13],
|
||||
'kontakt3': row[14]
|
||||
}
|
||||
formatted_results.append(customer)
|
||||
with get_db() as conn:
|
||||
c = conn.cursor()
|
||||
|
||||
# Baue die SQL-Abfrage
|
||||
sql_query = '''
|
||||
SELECT
|
||||
nummer,
|
||||
name,
|
||||
strasse,
|
||||
plz,
|
||||
ort,
|
||||
telefon,
|
||||
mobil,
|
||||
email,
|
||||
fachrichtung,
|
||||
tag,
|
||||
handy,
|
||||
tele_firma,
|
||||
kontakt1,
|
||||
kontakt2,
|
||||
kontakt3
|
||||
FROM customers
|
||||
WHERE 1=1
|
||||
'''
|
||||
params = []
|
||||
|
||||
# Füge die Suchbedingungen hinzu
|
||||
if search_query:
|
||||
# Optimierte Suche mit FTS (Full Text Search)
|
||||
sql_query += """
|
||||
AND (
|
||||
name LIKE ? OR
|
||||
nummer LIKE ? OR
|
||||
fachrichtung LIKE ? OR
|
||||
ort LIKE ? OR
|
||||
plz LIKE ? OR
|
||||
strasse LIKE ? OR
|
||||
telefon LIKE ? OR
|
||||
mobil LIKE ? OR
|
||||
email LIKE ? OR
|
||||
bemerkung LIKE ? OR
|
||||
tag LIKE ? OR
|
||||
handy LIKE ? OR
|
||||
tele_firma LIKE ? OR
|
||||
kontakt1 LIKE ? OR
|
||||
kontakt2 LIKE ? OR
|
||||
kontakt3 LIKE ?
|
||||
)
|
||||
"""
|
||||
search_term = f"%{search_query}%"
|
||||
params.extend([search_term] * 16) # 16 Felder für die allgemeine Suche
|
||||
|
||||
if name:
|
||||
sql_query += " AND name LIKE ?"
|
||||
params.append(f"%{name}%")
|
||||
|
||||
if ort:
|
||||
sql_query += " AND ort LIKE ?"
|
||||
params.append(f"%{ort}%")
|
||||
|
||||
if nummer:
|
||||
sql_query += " AND nummer LIKE ?"
|
||||
params.append(f"%{nummer}%")
|
||||
|
||||
if plz:
|
||||
sql_query += " AND plz LIKE ?"
|
||||
params.append(f"%{plz}%")
|
||||
|
||||
if fachrichtung:
|
||||
sql_query += " AND fachrichtung LIKE ?"
|
||||
params.append(f"%{fachrichtung}%")
|
||||
|
||||
# Filter nach Tag
|
||||
if tag != 'all':
|
||||
sql_query += " AND tag = ?"
|
||||
params.append(tag)
|
||||
|
||||
# Füge LIMIT hinzu und optimiere die Sortierung
|
||||
sql_query += " ORDER BY name LIMIT 100"
|
||||
|
||||
# Führe die Abfrage aus
|
||||
c.execute(sql_query, params)
|
||||
results = c.fetchall()
|
||||
|
||||
formatted_results = []
|
||||
for row in results:
|
||||
customer = {
|
||||
'nummer': row[0],
|
||||
'name': row[1],
|
||||
'strasse': row[2],
|
||||
'plz': row[3],
|
||||
'ort': row[4],
|
||||
'telefon': row[5],
|
||||
'mobil': row[6],
|
||||
'email': row[7],
|
||||
'fachrichtung': row[8],
|
||||
'tag': row[9],
|
||||
'handy': row[10],
|
||||
'tele_firma': row[11],
|
||||
'kontakt1': row[12],
|
||||
'kontakt2': row[13],
|
||||
'kontakt3': row[14]
|
||||
}
|
||||
formatted_results.append(customer)
|
||||
|
||||
return jsonify(formatted_results)
|
||||
|
||||
conn.close()
|
||||
return jsonify(formatted_results)
|
||||
|
||||
except Exception as e:
|
||||
logger.error(f"Fehler bei der Suche: {str(e)}")
|
||||
return jsonify({'error': str(e)}), 500
|
||||
@@ -352,28 +351,101 @@ def search():
|
||||
def get_fachrichtungen():
|
||||
try:
|
||||
search_term = request.args.get('q', '').lower()
|
||||
conn = get_db_connection()
|
||||
c = conn.cursor()
|
||||
|
||||
# Hole alle eindeutigen Fachrichtungen, die mit dem Suchbegriff übereinstimmen
|
||||
c.execute('''
|
||||
SELECT DISTINCT fachrichtung
|
||||
FROM customers
|
||||
WHERE fachrichtung IS NOT NULL
|
||||
AND fachrichtung != ''
|
||||
AND LOWER(fachrichtung) LIKE ?
|
||||
ORDER BY fachrichtung
|
||||
LIMIT 10
|
||||
''', (f'%{search_term}%',))
|
||||
|
||||
fachrichtungen = [row[0] for row in c.fetchall()]
|
||||
conn.close()
|
||||
|
||||
return jsonify(fachrichtungen)
|
||||
with get_db() as conn:
|
||||
c = conn.cursor()
|
||||
|
||||
# Hole alle eindeutigen Fachrichtungen, die mit dem Suchbegriff übereinstimmen
|
||||
c.execute('''
|
||||
SELECT DISTINCT fachrichtung
|
||||
FROM customers
|
||||
WHERE fachrichtung IS NOT NULL
|
||||
AND fachrichtung != ''
|
||||
AND LOWER(fachrichtung) LIKE ?
|
||||
ORDER BY fachrichtung
|
||||
LIMIT 10
|
||||
''', (f'%{search_term}%',))
|
||||
|
||||
fachrichtungen = [row[0] for row in c.fetchall()]
|
||||
return jsonify(fachrichtungen)
|
||||
except Exception as e:
|
||||
logger.error(f"Fehler beim Abrufen der Fachrichtungen: {str(e)}")
|
||||
return jsonify([])
|
||||
|
||||
@app.route('/api/orte')
|
||||
def get_orte():
|
||||
try:
|
||||
search_term = request.args.get('q', '').lower()
|
||||
with get_db() as conn:
|
||||
c = conn.cursor()
|
||||
|
||||
# Hole alle eindeutigen Orte, die mit dem Suchbegriff übereinstimmen
|
||||
c.execute('''
|
||||
SELECT DISTINCT ort
|
||||
FROM customers
|
||||
WHERE ort IS NOT NULL
|
||||
AND ort != ''
|
||||
AND LOWER(ort) LIKE ?
|
||||
ORDER BY ort
|
||||
LIMIT 10
|
||||
''', (f'%{search_term}%',))
|
||||
|
||||
orte = [row[0] for row in c.fetchall()]
|
||||
return jsonify(orte)
|
||||
except Exception as e:
|
||||
logger.error(f"Fehler beim Abrufen der Orte: {str(e)}")
|
||||
return jsonify([])
|
||||
|
||||
@app.route('/upload', methods=['GET', 'POST'])
|
||||
def upload():
|
||||
if not session.get('logged_in'):
|
||||
return redirect(url_for('login'))
|
||||
|
||||
if request.method == 'POST':
|
||||
if request.form.get('password') != os.environ.get('UPLOAD_PASSWORD'):
|
||||
return render_template('upload.html', error="Falsches Passwort", version=app.config['VERSION'])
|
||||
|
||||
if 'customers_snk' not in request.files or 'customers' not in request.files:
|
||||
return render_template('upload.html', error="Bitte beide CSV-Dateien auswählen", version=app.config['VERSION'])
|
||||
|
||||
customers_snk = request.files['customers_snk']
|
||||
customers = request.files['customers']
|
||||
|
||||
if customers_snk.filename == '' or customers.filename == '':
|
||||
return render_template('upload.html', error="Keine Datei ausgewählt", version=app.config['VERSION'])
|
||||
|
||||
if not customers_snk.filename.endswith('.csv') or not customers.filename.endswith('.csv'):
|
||||
return render_template('upload.html', error="Nur CSV-Dateien sind erlaubt", version=app.config['VERSION'])
|
||||
|
||||
try:
|
||||
# Speichere die Dateien
|
||||
customers_snk.save('data/customers_snk.csv')
|
||||
customers.save('data/customers.csv')
|
||||
|
||||
# Importiere die Daten in die Datenbank
|
||||
import_csv('data/customers_snk.csv', 'snk')
|
||||
import_csv('data/customers.csv', 'medisoft')
|
||||
|
||||
return render_template('upload.html', success="Dateien erfolgreich hochgeladen und importiert", version=app.config['VERSION'])
|
||||
except Exception as e:
|
||||
logger.error(f"Fehler beim Upload: {str(e)}")
|
||||
return render_template('upload.html', error=f"Fehler beim Upload: {str(e)}", version=app.config['VERSION'])
|
||||
|
||||
return render_template('upload.html', version=app.config['VERSION'])
|
||||
|
||||
@app.route('/readme')
|
||||
def readme():
|
||||
if not session.get('logged_in'):
|
||||
return redirect(url_for('login'))
|
||||
|
||||
try:
|
||||
with open('README.md', 'r', encoding='utf-8') as f:
|
||||
content = f.read()
|
||||
html_content = markdown2.markdown(content, extras=['fenced-code-blocks', 'tables'])
|
||||
return render_template('readme.html', content=html_content, version=app.config['VERSION'])
|
||||
except Exception as e:
|
||||
logger.error(f"Fehler beim Lesen der README: {str(e)}")
|
||||
return render_template('readme.html', error="Fehler beim Lesen der README", version=app.config['VERSION'])
|
||||
|
||||
def init_app(app):
|
||||
"""Initialisiert die Anwendung mit allen notwendigen Einstellungen."""
|
||||
with app.app_context():
|
||||
@@ -382,10 +454,10 @@ def init_app(app):
|
||||
os.makedirs('data', exist_ok=True)
|
||||
|
||||
# Lösche die alte Datenbank, falls sie existiert
|
||||
if os.path.exists(DB_FILE):
|
||||
if os.path.exists(app.config['DATABASE']):
|
||||
try:
|
||||
os.remove(DB_FILE)
|
||||
logger.info(f"Alte Datenbank {DB_FILE} wurde gelöscht")
|
||||
os.remove(app.config['DATABASE'])
|
||||
logger.info(f"Alte Datenbank {app.config['DATABASE']} wurde gelöscht")
|
||||
except Exception as e:
|
||||
logger.error(f"Fehler beim Löschen der alten Datenbank: {str(e)}")
|
||||
|
||||
|
||||
@@ -9,5 +9,6 @@ services:
|
||||
- FLASK_APP=app.py
|
||||
- FLASK_ENV=production
|
||||
- LOGIN_PASSWORD=changeme
|
||||
- UPLOAD_PASSWORD=upload_changeme
|
||||
- ALLOWED_IP_RANGES=213.178.68.218/29,192.168.0.0/24,192.168.177.0/24
|
||||
command: flask run --host=0.0.0.0
|
||||
@@ -2,4 +2,5 @@ flask==3.0.2
|
||||
pandas==2.2.1
|
||||
numpy==1.26.4
|
||||
python-dotenv==1.0.1
|
||||
requests==2.32.3
|
||||
requests==2.32.3
|
||||
markdown2==2.4.12
|
||||
@@ -1,24 +1,87 @@
|
||||
.result-header {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
margin-bottom: 10px;
|
||||
:root {
|
||||
--primary-color: #007bff;
|
||||
--secondary-color: #6c757d;
|
||||
--background-color: #ffffff;
|
||||
--text-color: #212529;
|
||||
--card-bg: #ffffff;
|
||||
--border-color: #dee2e6;
|
||||
--hover-bg: #f8f9fa;
|
||||
--shadow-color: rgba(0, 0, 0, 0.1);
|
||||
}
|
||||
|
||||
.result-tag {
|
||||
padding: 4px 8px;
|
||||
border-radius: 4px;
|
||||
font-size: 0.9em;
|
||||
font-weight: 500;
|
||||
text-transform: uppercase;
|
||||
[data-theme="dark"] {
|
||||
--primary-color: #0d6efd;
|
||||
--secondary-color: #adb5bd;
|
||||
--background-color: #212529;
|
||||
--text-color: #f8f9fa;
|
||||
--card-bg: #343a40;
|
||||
--border-color: #495057;
|
||||
--hover-bg: #495057;
|
||||
--shadow-color: rgba(0, 0, 0, 0.3);
|
||||
}
|
||||
|
||||
.tag-medisoft {
|
||||
background-color: #e3f2fd;
|
||||
color: #1976d2;
|
||||
body {
|
||||
font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif;
|
||||
background-color: var(--background-color);
|
||||
color: var(--text-color);
|
||||
transition: background-color 0.3s, color 0.3s;
|
||||
}
|
||||
|
||||
.tag-mediconsult {
|
||||
background-color: #f3e5f5;
|
||||
color: #7b1fa2;
|
||||
.card {
|
||||
background-color: var(--card-bg);
|
||||
border: 1px solid var(--border-color);
|
||||
box-shadow: 0 2px 4px var(--shadow-color);
|
||||
}
|
||||
|
||||
.table {
|
||||
color: var(--text-color);
|
||||
}
|
||||
|
||||
.table thead th {
|
||||
background-color: var(--card-bg);
|
||||
border-bottom-color: var(--border-color);
|
||||
color: var(--text-color);
|
||||
}
|
||||
|
||||
.table td {
|
||||
border-color: var(--border-color);
|
||||
}
|
||||
|
||||
.table-hover tbody tr:hover {
|
||||
background-color: var(--hover-bg);
|
||||
}
|
||||
|
||||
.modal-content {
|
||||
background-color: var(--card-bg);
|
||||
color: var(--text-color);
|
||||
border-color: var(--border-color);
|
||||
}
|
||||
|
||||
.modal-header {
|
||||
border-bottom-color: var(--border-color);
|
||||
}
|
||||
|
||||
.modal-footer {
|
||||
border-top-color: var(--border-color);
|
||||
}
|
||||
|
||||
.form-control {
|
||||
background-color: var(--card-bg);
|
||||
border-color: var(--border-color);
|
||||
color: var(--text-color);
|
||||
}
|
||||
|
||||
.form-control:focus {
|
||||
background-color: var(--card-bg);
|
||||
color: var(--text-color);
|
||||
}
|
||||
|
||||
.btn-outline-secondary {
|
||||
color: var(--text-color);
|
||||
border-color: var(--border-color);
|
||||
}
|
||||
|
||||
.btn-outline-secondary:hover {
|
||||
background-color: var(--hover-bg);
|
||||
color: var(--text-color);
|
||||
}
|
||||
@@ -1,20 +1,121 @@
|
||||
/*
|
||||
medisoftware Kundensuche - Hauptstyles
|
||||
Version: 1.2.19
|
||||
Entwickler: medisoftware GmbH
|
||||
Letzte Änderung: 2024-03-19
|
||||
*/
|
||||
|
||||
/* Allgemeine Styles */
|
||||
body {
|
||||
min-height: 100vh;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
background-color: #f8f9fa;
|
||||
}
|
||||
|
||||
/* Hauptcontainer */
|
||||
.main-content {
|
||||
flex: 1 0 auto;
|
||||
padding: 2rem 0;
|
||||
margin-bottom: 4rem; /* Platz für die fixierte Fußzeile */
|
||||
margin-bottom: 4rem;
|
||||
}
|
||||
|
||||
/* Suchcontainer */
|
||||
.search-container {
|
||||
max-width: 800px;
|
||||
background-color: white;
|
||||
padding: 2rem;
|
||||
border-radius: 10px;
|
||||
box-shadow: 0 0 10px rgba(0,0,0,0.1);
|
||||
}
|
||||
|
||||
/* Suchergebnisse */
|
||||
#searchResults {
|
||||
margin-top: 2rem;
|
||||
}
|
||||
|
||||
/* Kundenkarte */
|
||||
.customer-card {
|
||||
background-color: white;
|
||||
border-radius: 8px;
|
||||
padding: 1.5rem;
|
||||
margin-bottom: 1rem;
|
||||
box-shadow: 0 2px 4px rgba(0,0,0,0.05);
|
||||
transition: transform 0.2s, box-shadow 0.2s;
|
||||
}
|
||||
|
||||
.customer-card:hover {
|
||||
transform: translateY(-2px);
|
||||
box-shadow: 0 4px 8px rgba(0,0,0,0.1);
|
||||
}
|
||||
|
||||
/* Kundenname */
|
||||
.customer-name {
|
||||
font-size: 1.25rem;
|
||||
font-weight: 600;
|
||||
color: #333;
|
||||
margin-bottom: 0.5rem;
|
||||
}
|
||||
|
||||
/* Kundeninformationen */
|
||||
.customer-info {
|
||||
color: #666;
|
||||
margin-bottom: 0.5rem;
|
||||
}
|
||||
|
||||
/* Klickbare Links */
|
||||
.customer-info a {
|
||||
color: #0d6efd;
|
||||
text-decoration: none;
|
||||
}
|
||||
|
||||
.customer-info a:hover {
|
||||
text-decoration: underline;
|
||||
}
|
||||
|
||||
/* Footer */
|
||||
.footer {
|
||||
flex-shrink: 0;
|
||||
text-align: center;
|
||||
padding: 1rem;
|
||||
background-color: #f8f9fa;
|
||||
border-top: 1px solid #dee2e6;
|
||||
width: 100%;
|
||||
position: fixed;
|
||||
bottom: 0;
|
||||
left: 0;
|
||||
z-index: 100;
|
||||
}
|
||||
|
||||
.footer-content {
|
||||
max-width: 1200px;
|
||||
margin: 0 auto;
|
||||
padding: 0 1rem;
|
||||
}
|
||||
|
||||
.footer-link {
|
||||
color: #0d6efd;
|
||||
text-decoration: none;
|
||||
}
|
||||
|
||||
.footer-link:hover {
|
||||
text-decoration: underline;
|
||||
}
|
||||
|
||||
/* Responsive Anpassungen */
|
||||
@media (max-width: 768px) {
|
||||
.main-content {
|
||||
padding: 1rem 0;
|
||||
}
|
||||
|
||||
.search-container {
|
||||
padding: 1rem;
|
||||
}
|
||||
|
||||
.customer-card {
|
||||
padding: 1rem;
|
||||
}
|
||||
}
|
||||
|
||||
.result-card {
|
||||
@@ -73,19 +174,6 @@ body {
|
||||
font-size: 0.9em;
|
||||
}
|
||||
|
||||
.footer {
|
||||
flex-shrink: 0;
|
||||
text-align: center;
|
||||
padding: 1rem;
|
||||
background-color: #f8f9fa;
|
||||
border-top: 1px solid #dee2e6;
|
||||
width: 100%;
|
||||
position: fixed;
|
||||
bottom: 0;
|
||||
left: 0;
|
||||
z-index: 100;
|
||||
}
|
||||
|
||||
.share-feedback {
|
||||
position: fixed;
|
||||
bottom: 20px;
|
||||
@@ -151,6 +239,36 @@ body {
|
||||
position: relative;
|
||||
}
|
||||
|
||||
.reset-icon {
|
||||
position: absolute;
|
||||
right: 40px;
|
||||
top: 50%;
|
||||
transform: translateY(-50%);
|
||||
cursor: pointer;
|
||||
color: #6c757d;
|
||||
z-index: 10;
|
||||
padding: 0.375rem;
|
||||
display: none;
|
||||
}
|
||||
|
||||
.input-group input:not(:placeholder-shown) + .reset-icon {
|
||||
display: block;
|
||||
}
|
||||
|
||||
.reset-icon:hover {
|
||||
color: #dc3545;
|
||||
}
|
||||
|
||||
.search-icon {
|
||||
position: absolute;
|
||||
right: 10px;
|
||||
top: 50%;
|
||||
transform: translateY(-50%);
|
||||
color: #6c757d;
|
||||
z-index: 10;
|
||||
padding: 0.375rem;
|
||||
}
|
||||
|
||||
.result-counts {
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
@@ -179,43 +297,69 @@ body {
|
||||
font-size: 1.2em;
|
||||
}
|
||||
|
||||
.customer-card {
|
||||
background: white;
|
||||
border-radius: 8px;
|
||||
padding: 1.5rem;
|
||||
margin-bottom: 1.5rem;
|
||||
box-shadow: 0 2px 4px rgba(0,0,0,0.05);
|
||||
border-bottom: 1px solid #e9ecef;
|
||||
.customer-header {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: flex-start;
|
||||
margin-bottom: 0.5rem;
|
||||
}
|
||||
|
||||
.customer-card:last-child {
|
||||
border-bottom: none;
|
||||
.customer-actions {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 0.5rem;
|
||||
}
|
||||
|
||||
.customer-info {
|
||||
margin-bottom: 1rem;
|
||||
.customer-details {
|
||||
font-size: 0.9rem;
|
||||
color: #666;
|
||||
}
|
||||
|
||||
.footer-content {
|
||||
padding: 1rem;
|
||||
background-color: #f8f9fa;
|
||||
border-top: 1px solid #dee2e6;
|
||||
width: 100%;
|
||||
position: fixed;
|
||||
bottom: 0;
|
||||
left: 0;
|
||||
z-index: 100;
|
||||
.customer-details p {
|
||||
margin: 0.25rem 0;
|
||||
}
|
||||
|
||||
.footer-link {
|
||||
color: #0d6efd;
|
||||
.customer-details strong {
|
||||
color: #333;
|
||||
}
|
||||
|
||||
.phone-link, .email-link, .customer-link {
|
||||
color: #007bff;
|
||||
text-decoration: none;
|
||||
}
|
||||
|
||||
.footer-link:hover {
|
||||
.phone-link:hover, .email-link:hover, .customer-link:hover {
|
||||
text-decoration: underline;
|
||||
}
|
||||
|
||||
.address-text {
|
||||
margin-right: 0.5rem;
|
||||
}
|
||||
|
||||
.address-link, .route-link {
|
||||
color: #6c757d;
|
||||
text-decoration: none;
|
||||
margin-left: 0.5rem;
|
||||
}
|
||||
|
||||
.address-link:hover, .route-link:hover {
|
||||
color: #343a40;
|
||||
}
|
||||
|
||||
.location-pin, .route-pin {
|
||||
font-size: 0.9rem;
|
||||
}
|
||||
|
||||
.badge {
|
||||
font-size: 0.8rem;
|
||||
padding: 0.35em 0.65em;
|
||||
}
|
||||
|
||||
.btn-sm {
|
||||
padding: 0.25rem 0.5rem;
|
||||
font-size: 0.875rem;
|
||||
}
|
||||
|
||||
.general-search {
|
||||
max-width: 800px;
|
||||
margin: 0 auto;
|
||||
@@ -272,22 +416,26 @@ body {
|
||||
background-color: #ff9800;
|
||||
}
|
||||
|
||||
/* Adress-Links */
|
||||
.address-text {
|
||||
margin-right: 5px;
|
||||
.autocomplete-items {
|
||||
position: absolute;
|
||||
border: 1px solid #d4d4d4;
|
||||
border-top: none;
|
||||
z-index: 99;
|
||||
top: 100%;
|
||||
left: 0;
|
||||
right: 0;
|
||||
background-color: white;
|
||||
max-height: 200px;
|
||||
overflow-y: auto;
|
||||
box-shadow: 0 2px 4px rgba(0,0,0,0.1);
|
||||
}
|
||||
|
||||
.address-link, .route-link {
|
||||
color: #666;
|
||||
text-decoration: none;
|
||||
margin-left: 5px;
|
||||
transition: color 0.2s;
|
||||
.autocomplete-items div {
|
||||
padding: 8px 12px;
|
||||
cursor: pointer;
|
||||
background-color: white;
|
||||
}
|
||||
|
||||
.address-link:hover, .route-link:hover {
|
||||
color: #0d6efd;
|
||||
}
|
||||
|
||||
.location-pin, .route-pin {
|
||||
font-size: 1.1em;
|
||||
.autocomplete-items div:hover {
|
||||
background-color: #f8f9fa;
|
||||
}
|
||||
515
static/js/main.js
Normal file
515
static/js/main.js
Normal file
@@ -0,0 +1,515 @@
|
||||
let searchTimeout;
|
||||
let lastResults = [];
|
||||
let fachrichtungTimeout;
|
||||
let ortTimeout;
|
||||
let currentPage = 1;
|
||||
let totalPages = 1;
|
||||
let currentResults = [];
|
||||
let currentSearchQuery = '';
|
||||
let currentFilters = {
|
||||
fachrichtung: '',
|
||||
plz: '',
|
||||
ort: ''
|
||||
};
|
||||
|
||||
function createPhoneLink(phone) {
|
||||
if (!phone) return '';
|
||||
|
||||
const clientIP = document.querySelector('meta[name="client-ip"]').content;
|
||||
const allowedIPRanges = document.querySelector('meta[name="allowed-ip-ranges"]').content.split(',');
|
||||
|
||||
// Überprüfen, ob die Client-IP in einem der erlaubten Bereiche liegt
|
||||
const isAllowed = allowedIPRanges.some(range => isIPInSubnet(clientIP, range.trim()));
|
||||
|
||||
// Entferne alle nicht-numerischen Zeichen
|
||||
let cleanNumber = phone.replace(/\D/g, '');
|
||||
|
||||
// Formatiere die Nummer
|
||||
let formattedNumber = cleanNumber;
|
||||
if (cleanNumber.length === 11) {
|
||||
formattedNumber = cleanNumber.replace(/(\d{4})(\d{7})/, '$1-$2');
|
||||
} else if (cleanNumber.length === 10) {
|
||||
formattedNumber = cleanNumber.replace(/(\d{3})(\d{7})/, '$1-$2');
|
||||
}
|
||||
|
||||
// Erstelle den Link
|
||||
return `<a href="tel:${cleanNumber}" class="phone-link">${formattedNumber}</a>`;
|
||||
}
|
||||
|
||||
function createEmailLink(email) {
|
||||
if (!email) return '';
|
||||
return `<a href="mailto:${email}" class="email-link">${email}</a>`;
|
||||
}
|
||||
|
||||
function highlightText(text, searchTerm) {
|
||||
if (!searchTerm || !text) return text;
|
||||
|
||||
// Teile den Suchbegriff in einzelne Wörter
|
||||
const searchWords = searchTerm.split(/\s+/).filter(word => word.length > 0);
|
||||
|
||||
// Wenn keine Wörter gefunden wurden, gebe den ursprünglichen Text zurück
|
||||
if (searchWords.length === 0) return text;
|
||||
|
||||
// Erstelle einen regulären Ausdruck für alle Suchwörter
|
||||
const regexPattern = searchWords
|
||||
.map(word => word.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'))
|
||||
.join('|');
|
||||
|
||||
// Erstelle den regulären Ausdruck
|
||||
const regex = new RegExp(`(${regexPattern})`, 'gi');
|
||||
|
||||
// Ersetze alle Übereinstimmungen mit mark-Tags
|
||||
return text.replace(regex, '<mark>$1</mark>');
|
||||
}
|
||||
|
||||
function createAddressLink(street, plz, city) {
|
||||
if (!street || !plz || !city) return '';
|
||||
const address = `${street}, ${plz} ${city}`;
|
||||
const searchQuery = encodeURIComponent(address);
|
||||
const routeQuery = encodeURIComponent(address);
|
||||
return `<span class="address-text">${address}</span>
|
||||
<a href="https://www.google.com/maps/search/?api=1&query=${searchQuery}"
|
||||
class="address-link" target="_blank" rel="noopener noreferrer">
|
||||
<i class="fa-solid fa-location-dot location-pin"></i>
|
||||
</a>
|
||||
<a href="https://www.google.com/maps/dir/?api=1&destination=${routeQuery}"
|
||||
class="route-link" target="_blank" rel="noopener noreferrer">
|
||||
<i class="fa-solid fa-route route-pin"></i>
|
||||
</a>`;
|
||||
}
|
||||
|
||||
function adjustCustomerNumber(number) {
|
||||
return number - 12000;
|
||||
}
|
||||
|
||||
function isIPInSubnet(ip, subnet) {
|
||||
// Teile die IP und das Subnetz in ihre Komponenten
|
||||
const [subnetIP, bits] = subnet.split('/');
|
||||
const ipParts = ip.split('.').map(Number);
|
||||
const subnetParts = subnetIP.split('.').map(Number);
|
||||
|
||||
// Konvertiere IPs in 32-bit Zahlen
|
||||
const ipNum = (ipParts[0] << 24) | (ipParts[1] << 16) | (ipParts[2] << 8) | ipParts[3];
|
||||
const subnetNum = (subnetParts[0] << 24) | (subnetParts[1] << 16) | (subnetParts[2] << 8) | subnetParts[3];
|
||||
|
||||
// Erstelle die Subnetzmaske
|
||||
const mask = ~((1 << (32 - bits)) - 1);
|
||||
|
||||
// Prüfe, ob die IP im Subnetz liegt
|
||||
return (ipNum & mask) === (subnetNum & mask);
|
||||
}
|
||||
|
||||
function createCustomerLink(nummer) {
|
||||
const clientIP = document.querySelector('meta[name="client-ip"]').content;
|
||||
const allowedIPRanges = document.querySelector('meta[name="allowed-ip-ranges"]').content.split(',');
|
||||
|
||||
// Überprüfe, ob die Client-IP in einem der erlaubten Bereiche liegt
|
||||
const isAllowed = allowedIPRanges.some(range => {
|
||||
const trimmedRange = range.trim();
|
||||
return isIPInSubnet(clientIP, trimmedRange);
|
||||
});
|
||||
|
||||
if (isAllowed) {
|
||||
const adjustedNumber = adjustCustomerNumber(nummer);
|
||||
return `<a href="medisw:openkkbefe/P${adjustedNumber}?NetGrp=4" class="customer-link">${nummer}</a>`;
|
||||
} else {
|
||||
return nummer;
|
||||
}
|
||||
}
|
||||
|
||||
function showCopyFeedback() {
|
||||
const feedback = document.getElementById('shareFeedback');
|
||||
feedback.style.display = 'block';
|
||||
feedback.style.opacity = '1';
|
||||
|
||||
feedback.addEventListener('animationend', () => {
|
||||
feedback.style.display = 'none';
|
||||
}, { once: true });
|
||||
}
|
||||
|
||||
async function copyCustomerLink(customerNumber) {
|
||||
const url = new URL(window.location.href);
|
||||
url.searchParams.set('kundennummer', customerNumber);
|
||||
|
||||
try {
|
||||
await navigator.clipboard.writeText(url.toString());
|
||||
showCopyFeedback();
|
||||
} catch (err) {
|
||||
// Fehlerbehandlung ohne console.log
|
||||
}
|
||||
}
|
||||
|
||||
function updateResultCounts() {
|
||||
const resultCount = document.getElementById('result-count');
|
||||
const exportButton = document.getElementById('exportButton');
|
||||
|
||||
if (lastResults && lastResults.length > 0) {
|
||||
resultCount.textContent = `${lastResults.length} Ergebnisse gefunden`;
|
||||
resultCount.style.display = 'inline';
|
||||
exportButton.style.display = 'inline-block';
|
||||
} else {
|
||||
resultCount.textContent = '';
|
||||
resultCount.style.display = 'none';
|
||||
exportButton.style.display = 'none';
|
||||
}
|
||||
}
|
||||
|
||||
function exportToCSV() {
|
||||
if (!lastResults || lastResults.length === 0) return;
|
||||
|
||||
// CSV-Header definieren
|
||||
const headers = [
|
||||
'Nummer',
|
||||
'Name',
|
||||
'Fachrichtung',
|
||||
'Straße',
|
||||
'PLZ',
|
||||
'Ort',
|
||||
'Telefon',
|
||||
'Mobil',
|
||||
'Handy',
|
||||
'Telefon Firma',
|
||||
'E-Mail',
|
||||
'Kontakt 1',
|
||||
'Kontakt 2',
|
||||
'Kontakt 3',
|
||||
'Tags'
|
||||
];
|
||||
|
||||
// CSV-Daten erstellen
|
||||
const csvRows = [headers];
|
||||
|
||||
lastResults.forEach(customer => {
|
||||
const row = [
|
||||
customer.nummer,
|
||||
customer.name,
|
||||
customer.fachrichtung,
|
||||
customer.strasse,
|
||||
customer.plz,
|
||||
customer.ort,
|
||||
customer.telefon,
|
||||
customer.mobil,
|
||||
customer.handy,
|
||||
customer.tele_firma,
|
||||
customer.email,
|
||||
customer.kontakt1,
|
||||
customer.kontakt2,
|
||||
customer.kontakt3,
|
||||
(customer.tags || []).join(';')
|
||||
].map(value => {
|
||||
// Werte mit Kommas oder Anführungszeichen in Anführungszeichen setzen
|
||||
if (value && (value.includes(',') || value.includes('"') || value.includes('\n'))) {
|
||||
return `"${value.replace(/"/g, '""')}"`;
|
||||
}
|
||||
return value || '';
|
||||
});
|
||||
|
||||
csvRows.push(row);
|
||||
});
|
||||
|
||||
// CSV-String erstellen
|
||||
const csvContent = csvRows.map(row => row.join(',')).join('\n');
|
||||
|
||||
// Blob erstellen und Download starten
|
||||
const blob = new Blob([csvContent], { type: 'text/csv;charset=utf-8;' });
|
||||
const link = document.createElement('a');
|
||||
const url = URL.createObjectURL(blob);
|
||||
|
||||
link.setAttribute('href', url);
|
||||
link.setAttribute('download', `kundensuche_${new Date().toISOString().split('T')[0]}.csv`);
|
||||
link.style.visibility = 'hidden';
|
||||
document.body.appendChild(link);
|
||||
link.click();
|
||||
document.body.removeChild(link);
|
||||
}
|
||||
|
||||
function exportToVCF(customer) {
|
||||
if (!customer) return;
|
||||
|
||||
const vcfData = [
|
||||
'BEGIN:VCARD',
|
||||
'VERSION:3.0',
|
||||
`FN:${customer.name || ''}`,
|
||||
`N:${customer.name || ''};;;`,
|
||||
`TEL;TYPE=CELL:${customer.telefon || ''}`,
|
||||
`TEL;TYPE=HOME:${customer.mobil || ''}`,
|
||||
`EMAIL:${customer.email || ''}`,
|
||||
`ADR;TYPE=HOME:;;${customer.strasse || ''};${customer.plz || ''};${customer.ort || ''};`,
|
||||
`ORG:${customer.fachrichtung || ''}`,
|
||||
'END:VCARD'
|
||||
].join('\n');
|
||||
|
||||
const blob = new Blob([vcfData], { type: 'text/vcard;charset=utf-8' });
|
||||
const url = window.URL.createObjectURL(blob);
|
||||
const a = document.createElement('a');
|
||||
a.href = url;
|
||||
a.download = `kontakt_${customer.name || ''}_${new Date().toISOString().split('T')[0]}.vcf`;
|
||||
document.body.appendChild(a);
|
||||
a.click();
|
||||
window.URL.revokeObjectURL(url);
|
||||
document.body.removeChild(a);
|
||||
}
|
||||
|
||||
function displayResults(results) {
|
||||
const resultsDiv = document.getElementById('results');
|
||||
const resultCount = document.getElementById('result-count');
|
||||
const generalSearchTerm = document.getElementById('q').value;
|
||||
const nameSearchTerm = document.getElementById('nameInput').value;
|
||||
const fachrichtungSearchTerm = document.getElementById('fachrichtungInput').value;
|
||||
|
||||
if (!results || results.length === 0) {
|
||||
resultsDiv.innerHTML = '<p>Keine Ergebnisse gefunden.</p>';
|
||||
resultCount.textContent = '';
|
||||
return;
|
||||
}
|
||||
|
||||
resultCount.textContent = `${results.length} Ergebnisse`;
|
||||
lastResults = results;
|
||||
|
||||
const resultsHTML = results.map(customer => {
|
||||
// Hilfsfunktion zum Erstellen von Feldern nur wenn sie Werte haben
|
||||
const createFieldIfValue = (label, value, formatter = (v) => v) => {
|
||||
if (!value || value === 'N/A' || value === 'n/a' || value === 'N/a' || (typeof value === 'string' && value.trim() === '')) return '';
|
||||
const formattedValue = formatter(value);
|
||||
return `<p class="mb-1"><strong>${label}:</strong> ${formattedValue}</p>`;
|
||||
};
|
||||
|
||||
// Highlighting für alle Felder
|
||||
const highlightField = (value) => {
|
||||
if (!value) return value;
|
||||
let highlighted = value;
|
||||
if (nameSearchTerm) {
|
||||
highlighted = highlightText(highlighted, nameSearchTerm);
|
||||
}
|
||||
if (fachrichtungSearchTerm) {
|
||||
highlighted = highlightText(highlighted, fachrichtungSearchTerm);
|
||||
}
|
||||
if (generalSearchTerm) {
|
||||
highlighted = highlightText(highlighted, generalSearchTerm);
|
||||
}
|
||||
return highlighted;
|
||||
};
|
||||
|
||||
return `
|
||||
<div class="customer-card">
|
||||
<div class="customer-header">
|
||||
<h3 class="customer-name">${highlightField(customer.name)}</h3>
|
||||
<div class="customer-actions">
|
||||
<span class="badge ${(customer.tag || 'medisoft') === 'medisoft' ? 'bg-primary' : 'bg-warning text-dark'}">${(customer.tag || 'medisoft').toUpperCase()}</span>
|
||||
<button class="btn btn-sm btn-outline-primary" onclick="copyCustomerLink('${customer.nummer}')" title="Link kopieren">
|
||||
<i class="fas fa-link"></i>
|
||||
</button>
|
||||
<button class="btn btn-sm btn-outline-primary" onclick='exportToVCF(${JSON.stringify(customer).replace(/'/g, "\\'")})' title="Als VCF exportieren">
|
||||
<i class="bi bi-person-vcard"></i>
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
<div class="customer-details">
|
||||
${createFieldIfValue('Nummer', highlightField(customer.nummer), createCustomerLink)}
|
||||
${createFieldIfValue('Adresse', (customer.strasse && customer.plz && customer.ort) ? true : false,
|
||||
() => createAddressLink(
|
||||
customer.strasse,
|
||||
highlightField(customer.plz),
|
||||
highlightField(customer.ort)
|
||||
))}
|
||||
${createFieldIfValue('Telefon', highlightField(customer.telefon), createPhoneLink)}
|
||||
${createFieldIfValue('Mobil', highlightField(customer.mobil), createPhoneLink)}
|
||||
${createFieldIfValue('Handy', highlightField(customer.handy), createPhoneLink)}
|
||||
${createFieldIfValue('E-Mail', highlightField(customer.email), createEmailLink)}
|
||||
${createFieldIfValue('Fachrichtung', highlightField(customer.fachrichtung))}
|
||||
${createFieldIfValue('Kontakt 1', highlightField(customer.kontakt1), createPhoneLink)}
|
||||
${createFieldIfValue('Kontakt 2', highlightField(customer.kontakt2), createPhoneLink)}
|
||||
${createFieldIfValue('Kontakt 3', highlightField(customer.kontakt3), createPhoneLink)}
|
||||
${customer.tags && customer.tags.length > 0 ? `
|
||||
<p class="mb-0"><strong>Tags:</strong>
|
||||
${customer.tags.map(tag => `<span class="badge bg-primary me-1">${tag}</span>`).join('')}
|
||||
</p>
|
||||
` : ''}
|
||||
</div>
|
||||
</div>
|
||||
`;
|
||||
}).join('');
|
||||
|
||||
resultsDiv.innerHTML = resultsHTML;
|
||||
updateResultCounts();
|
||||
}
|
||||
|
||||
function clearInput(inputId) {
|
||||
document.getElementById(inputId).value = '';
|
||||
document.getElementById('results').innerHTML = '';
|
||||
document.getElementById('result-count').textContent = '';
|
||||
document.getElementById('exportButton').style.display = 'none';
|
||||
lastResults = [];
|
||||
}
|
||||
|
||||
async function searchCustomers() {
|
||||
let searchTimeout;
|
||||
const loading = document.getElementById('loading');
|
||||
const results = document.getElementById('results');
|
||||
const generalSearch = document.getElementById('q').value;
|
||||
const nameSearch = document.getElementById('nameInput').value;
|
||||
const ortSearch = document.getElementById('ortInput').value;
|
||||
const nummerSearch = document.getElementById('nummerInput').value;
|
||||
const plzSearch = document.getElementById('plzInput').value;
|
||||
const fachrichtungSearch = document.getElementById('fachrichtungInput').value;
|
||||
const tagFilter = document.getElementById('tagFilter').value;
|
||||
currentSearchQuery = generalSearch;
|
||||
currentPage = 1;
|
||||
|
||||
// Zeige Ladeanimation
|
||||
loading.style.display = 'block';
|
||||
results.innerHTML = '';
|
||||
|
||||
// Setze Timeout zurück
|
||||
clearTimeout(searchTimeout);
|
||||
|
||||
// Verzögerte Suche
|
||||
searchTimeout = setTimeout(async () => {
|
||||
try {
|
||||
// Baue die Suchanfrage
|
||||
const params = new URLSearchParams();
|
||||
if (generalSearch) params.append('q', generalSearch);
|
||||
if (nameSearch) params.append('name', nameSearch);
|
||||
if (ortSearch) params.append('ort', ortSearch);
|
||||
if (nummerSearch) params.append('nummer', nummerSearch);
|
||||
if (plzSearch) params.append('plz', plzSearch);
|
||||
if (fachrichtungSearch) params.append('fachrichtung', fachrichtungSearch);
|
||||
if (tagFilter) params.append('tag', tagFilter);
|
||||
|
||||
const response = await fetch('/search?' + params.toString());
|
||||
|
||||
if (!response.ok) {
|
||||
throw new Error('Netzwerkantwort war nicht ok');
|
||||
}
|
||||
|
||||
const data = await response.json();
|
||||
displayResults(data);
|
||||
} catch (error) {
|
||||
results.innerHTML = '<p>Ein Fehler ist aufgetreten. Bitte versuchen Sie es später erneut.</p>';
|
||||
} finally {
|
||||
loading.style.display = 'none';
|
||||
}
|
||||
}, 300);
|
||||
}
|
||||
|
||||
function setupFachrichtungAutocomplete() {
|
||||
const fachrichtungInput = document.getElementById('fachrichtungInput');
|
||||
const autocompleteList = document.createElement('div');
|
||||
autocompleteList.className = 'autocomplete-items';
|
||||
fachrichtungInput.parentNode.appendChild(autocompleteList);
|
||||
|
||||
fachrichtungInput.addEventListener('input', function() {
|
||||
clearTimeout(fachrichtungTimeout);
|
||||
const searchTerm = this.value;
|
||||
|
||||
if (searchTerm.length < 2) {
|
||||
autocompleteList.style.display = 'none';
|
||||
return;
|
||||
}
|
||||
|
||||
fachrichtungTimeout = setTimeout(() => {
|
||||
fetch(`/api/fachrichtungen?q=${encodeURIComponent(searchTerm)}`)
|
||||
.then(response => response.json())
|
||||
.then(data => {
|
||||
autocompleteList.innerHTML = '';
|
||||
if (data.length > 0) {
|
||||
data.forEach(item => {
|
||||
const div = document.createElement('div');
|
||||
div.textContent = item;
|
||||
div.addEventListener('click', () => {
|
||||
fachrichtungInput.value = item;
|
||||
autocompleteList.style.display = 'none';
|
||||
searchCustomers();
|
||||
});
|
||||
autocompleteList.appendChild(div);
|
||||
});
|
||||
autocompleteList.style.display = 'block';
|
||||
} else {
|
||||
autocompleteList.style.display = 'none';
|
||||
}
|
||||
});
|
||||
}, 300);
|
||||
});
|
||||
|
||||
document.addEventListener('click', function(e) {
|
||||
if (!fachrichtungInput.contains(e.target) && !autocompleteList.contains(e.target)) {
|
||||
autocompleteList.style.display = 'none';
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
function setupOrtAutocomplete() {
|
||||
const ortInput = document.getElementById('ortInput');
|
||||
const autocompleteList = document.createElement('div');
|
||||
autocompleteList.className = 'autocomplete-items';
|
||||
ortInput.parentNode.appendChild(autocompleteList);
|
||||
|
||||
ortInput.addEventListener('input', function() {
|
||||
clearTimeout(ortTimeout);
|
||||
const searchTerm = this.value;
|
||||
|
||||
if (searchTerm.length < 2) {
|
||||
autocompleteList.style.display = 'none';
|
||||
return;
|
||||
}
|
||||
|
||||
ortTimeout = setTimeout(() => {
|
||||
fetch(`/api/orte?q=${encodeURIComponent(searchTerm)}`)
|
||||
.then(response => response.json())
|
||||
.then(data => {
|
||||
autocompleteList.innerHTML = '';
|
||||
if (data.length > 0) {
|
||||
data.forEach(item => {
|
||||
const div = document.createElement('div');
|
||||
div.textContent = item;
|
||||
div.addEventListener('click', () => {
|
||||
ortInput.value = item;
|
||||
autocompleteList.style.display = 'none';
|
||||
searchCustomers();
|
||||
});
|
||||
autocompleteList.appendChild(div);
|
||||
});
|
||||
autocompleteList.style.display = 'block';
|
||||
} else {
|
||||
autocompleteList.style.display = 'none';
|
||||
}
|
||||
});
|
||||
}, 300);
|
||||
});
|
||||
|
||||
document.addEventListener('click', function(e) {
|
||||
if (!ortInput.contains(e.target) && !autocompleteList.contains(e.target)) {
|
||||
autocompleteList.style.display = 'none';
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
// Event-Listener für die URL-Parameter und Autocomplete-Setup
|
||||
document.addEventListener('DOMContentLoaded', function() {
|
||||
const urlParams = new URLSearchParams(window.location.search);
|
||||
const kundennummer = urlParams.get('kundennummer');
|
||||
const name = urlParams.get('name');
|
||||
const ort = urlParams.get('ort');
|
||||
const plz = urlParams.get('plz');
|
||||
|
||||
if (kundennummer) {
|
||||
document.getElementById('nummerInput').value = kundennummer;
|
||||
searchCustomers();
|
||||
}
|
||||
if (name) {
|
||||
document.getElementById('nameInput').value = name;
|
||||
searchCustomers();
|
||||
}
|
||||
if (ort) {
|
||||
document.getElementById('ortInput').value = ort;
|
||||
searchCustomers();
|
||||
}
|
||||
if (plz) {
|
||||
document.getElementById('plzInput').value = plz;
|
||||
searchCustomers();
|
||||
}
|
||||
|
||||
// Setup Autocomplete
|
||||
setupFachrichtungAutocomplete();
|
||||
setupOrtAutocomplete();
|
||||
});
|
||||
@@ -3,17 +3,63 @@
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
<meta name="client-ip" content="{{ request.headers.get('X-Forwarded-For', request.remote_addr) }}">
|
||||
<meta name="allowed-ip-ranges" content="{{ allowed_ip_ranges }}">
|
||||
<!--
|
||||
medisoftware Kundensuche
|
||||
Version: {{ version }}
|
||||
Entwickler: medisoftware GmbH
|
||||
Letzte Änderung: 2024-03-19
|
||||
-->
|
||||
<title>medisoftware Kundensuche</title>
|
||||
<link rel="icon" type="image/x-icon" href="{{ url_for('static', filename='favicon.ico') }}">
|
||||
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/css/bootstrap.min.css" rel="stylesheet">
|
||||
<link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.5.1/css/all.min.css" rel="stylesheet">
|
||||
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.11.3/font/bootstrap-icons.min.css">
|
||||
<link href="{{ url_for('static', filename='css/styles.css') }}" rel="stylesheet">
|
||||
<style>
|
||||
/*
|
||||
Inline-Styles für spezifische Anpassungen
|
||||
Diese Styles sind nur für diese Seite gültig
|
||||
*/
|
||||
.logo {
|
||||
width: 200px;
|
||||
height: auto;
|
||||
margin: 0 auto;
|
||||
display: block;
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<div class="main-content">
|
||||
<div class="container">
|
||||
<div class="text-center mb-4">
|
||||
<a href="https://medisoftware.de" target="_blank" rel="noopener noreferrer"><img src="{{ url_for('static', filename='medisoftware_logo_rb_200.png') }}" alt="medisoftware Logo" class="img-fluid" style="max-width: 200px;"></a>
|
||||
<div class="position-relative mb-4">
|
||||
<div class="dropdown position-absolute start-0">
|
||||
<button class="btn btn-link text-dark" type="button" id="menuButton" data-bs-toggle="dropdown" aria-expanded="false">
|
||||
<i class="bi bi-list fs-4"></i>
|
||||
</button>
|
||||
<div class="dropdown-menu">
|
||||
<a class="dropdown-item" href="{{ url_for('index') }}">
|
||||
<i class="bi bi-house"></i> Home
|
||||
</a>
|
||||
<a class="dropdown-item" href="{{ url_for('upload') }}">
|
||||
<i class="bi bi-cloud-upload"></i> CSV-Dateien hochladen
|
||||
</a>
|
||||
<a class="dropdown-item" href="{{ url_for('readme') }}">
|
||||
<i class="bi bi-book"></i> README
|
||||
</a>
|
||||
<li>
|
||||
<button class="dropdown-item theme-toggle" id="themeToggle">
|
||||
<i class="bi bi-moon-stars"></i> Theme wechseln
|
||||
</button>
|
||||
</li>
|
||||
</div>
|
||||
</div>
|
||||
<div class="text-center">
|
||||
<a href="https://medisoftware.de" target="_blank" rel="noopener noreferrer">
|
||||
<img src="{{ url_for('static', filename='medisoftware_logo_rb_200.png') }}" alt="medisoftware Logo" class="img-fluid logo">
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
<div class="search-container">
|
||||
<h1 class="text-center mb-4">Kundensuche</h1>
|
||||
@@ -78,8 +124,11 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="result-counts">
|
||||
<span id="resultCount" class="result-count"></span>
|
||||
<div id="result-counts" class="mt-2">
|
||||
<span id="result-count"></span>
|
||||
<button id="exportButton" class="btn btn-sm btn-outline-primary ms-2" onclick="exportToCSV()" style="display: none;">
|
||||
<i class="bi bi-file-earmark-spreadsheet"></i> Als CSV exportieren
|
||||
</button>
|
||||
</div>
|
||||
|
||||
<div id="loading" class="loading">
|
||||
@@ -104,309 +153,30 @@
|
||||
</div>
|
||||
</footer>
|
||||
|
||||
<script src="{{ url_for('static', filename='js/main.js') }}"></script>
|
||||
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/js/bootstrap.bundle.min.js"></script>
|
||||
<script>
|
||||
let searchTimeout;
|
||||
let lastResults = [];
|
||||
// Theme Switcher
|
||||
const themeToggle = document.getElementById('themeToggle');
|
||||
const icon = themeToggle.querySelector('i');
|
||||
|
||||
// Theme aus dem localStorage laden
|
||||
const savedTheme = localStorage.getItem('theme') || 'light';
|
||||
document.documentElement.setAttribute('data-theme', savedTheme);
|
||||
updateThemeIcon(savedTheme);
|
||||
|
||||
function createPhoneLink(phone) {
|
||||
if (!phone) return '';
|
||||
themeToggle.addEventListener('click', () => {
|
||||
const currentTheme = document.documentElement.getAttribute('data-theme');
|
||||
const newTheme = currentTheme === 'light' ? 'dark' : 'light';
|
||||
|
||||
const clientIP = '{{ request.headers.get("X-Forwarded-For", request.remote_addr) }}';
|
||||
const allowedIPRanges = '{{ allowed_ip_ranges }}'.split(',');
|
||||
|
||||
// Überprüfen, ob die Client-IP in einem der erlaubten Bereiche liegt
|
||||
const isAllowed = allowedIPRanges.some(range => isIPInSubnet(clientIP, range.trim()));
|
||||
|
||||
// Entferne alle nicht-numerischen Zeichen
|
||||
let cleanNumber = phone.replace(/\D/g, '');
|
||||
|
||||
// Formatiere die Nummer
|
||||
let formattedNumber = cleanNumber;
|
||||
if (cleanNumber.length === 11) {
|
||||
formattedNumber = cleanNumber.replace(/(\d{4})(\d{7})/, '$1-$2');
|
||||
} else if (cleanNumber.length === 10) {
|
||||
formattedNumber = cleanNumber.replace(/(\d{3})(\d{7})/, '$1-$2');
|
||||
}
|
||||
|
||||
// Erstelle den Link
|
||||
return `<a href="tel:${cleanNumber}" class="phone-link">${formattedNumber}</a>`;
|
||||
}
|
||||
|
||||
function createEmailLink(email) {
|
||||
if (!email) return '';
|
||||
return `<a href="mailto:${email}" class="email-link">${email}</a>`;
|
||||
}
|
||||
|
||||
function highlightText(text, searchTerm) {
|
||||
if (!searchTerm || !text) return text;
|
||||
// Escapen von Sonderzeichen im Suchbegriff
|
||||
const escapedSearchTerm = searchTerm.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
|
||||
// Erstelle einen regulären Ausdruck ohne Wortgrenzen
|
||||
const regex = new RegExp(escapedSearchTerm, 'gi');
|
||||
return text.replace(regex, '<mark>$&</mark>');
|
||||
}
|
||||
|
||||
function createAddressLink(street, plz, city) {
|
||||
if (!street || !plz || !city) return '';
|
||||
const address = `${street}, ${plz} ${city}`;
|
||||
const searchQuery = encodeURIComponent(address);
|
||||
const routeQuery = encodeURIComponent(address);
|
||||
const clientIP = '{{ request.headers.get("X-Forwarded-For", request.remote_addr) }}';
|
||||
return `<span class="address-text">${address}</span>
|
||||
<a href="https://www.google.com/maps/search/?api=1&query=${searchQuery}"
|
||||
class="address-link" target="_blank" rel="noopener noreferrer">
|
||||
<i class="fa-solid fa-location-dot location-pin"></i>
|
||||
</a>
|
||||
<a href="https://www.google.com/maps/dir/?api=1&destination=${routeQuery}"
|
||||
class="route-link" target="_blank" rel="noopener noreferrer">
|
||||
<i class="fa-solid fa-route route-pin"></i>
|
||||
</a>`;
|
||||
}
|
||||
|
||||
function adjustCustomerNumber(number) {
|
||||
return number - 12000;
|
||||
}
|
||||
|
||||
function isIPInSubnet(ip, subnet) {
|
||||
// Teile die IP und das Subnetz in ihre Komponenten
|
||||
const [subnetIP, bits] = subnet.split('/');
|
||||
const ipParts = ip.split('.').map(Number);
|
||||
const subnetParts = subnetIP.split('.').map(Number);
|
||||
|
||||
// Konvertiere IPs in 32-bit Zahlen
|
||||
const ipNum = (ipParts[0] << 24) | (ipParts[1] << 16) | (ipParts[2] << 8) | ipParts[3];
|
||||
const subnetNum = (subnetParts[0] << 24) | (subnetParts[1] << 16) | (subnetParts[2] << 8) | subnetParts[3];
|
||||
|
||||
// Erstelle die Subnetzmaske
|
||||
const mask = ~((1 << (32 - bits)) - 1);
|
||||
|
||||
// Prüfe, ob die IP im Subnetz liegt
|
||||
return (ipNum & mask) === (subnetNum & mask);
|
||||
}
|
||||
|
||||
function createCustomerLink(nummer) {
|
||||
const clientIP = '{{ request.headers.get("X-Forwarded-For", request.remote_addr) }}';
|
||||
const allowedIPRanges = '{{ allowed_ip_ranges }}'.split(',');
|
||||
|
||||
// Überprüfe, ob die Client-IP in einem der erlaubten Bereiche liegt
|
||||
const isAllowed = allowedIPRanges.some(range => {
|
||||
const trimmedRange = range.trim();
|
||||
return isIPInSubnet(clientIP, trimmedRange);
|
||||
});
|
||||
|
||||
if (isAllowed) {
|
||||
const adjustedNumber = adjustCustomerNumber(nummer);
|
||||
return `<a href="medisw:openkkbefe/P${adjustedNumber}?NetGrp=4" class="customer-link">${nummer}</a>`;
|
||||
} else {
|
||||
return nummer;
|
||||
}
|
||||
}
|
||||
|
||||
function showCopyFeedback() {
|
||||
const feedback = document.getElementById('shareFeedback');
|
||||
feedback.style.display = 'block';
|
||||
feedback.style.opacity = '1';
|
||||
|
||||
feedback.addEventListener('animationend', () => {
|
||||
feedback.style.display = 'none';
|
||||
}, { once: true });
|
||||
}
|
||||
|
||||
async function copyCustomerLink(customerNumber) {
|
||||
const url = new URL(window.location.href);
|
||||
url.searchParams.set('kundennummer', customerNumber);
|
||||
|
||||
try {
|
||||
await navigator.clipboard.writeText(url.toString());
|
||||
showCopyFeedback();
|
||||
} catch (err) {
|
||||
// Fehlerbehandlung ohne console.log
|
||||
}
|
||||
}
|
||||
|
||||
function updateResultCounts() {
|
||||
// Nur Gesamtzahl anzeigen
|
||||
const generalCount = lastResults.length;
|
||||
document.getElementById('resultCount').textContent =
|
||||
generalCount > 0 ? `${generalCount} Treffer gefunden` : '';
|
||||
document.getElementById('resultCount').classList.toggle('visible', generalCount > 0);
|
||||
}
|
||||
|
||||
function displayResults(results) {
|
||||
const resultsDiv = document.getElementById('results');
|
||||
const resultCount = document.getElementById('resultCount');
|
||||
const generalSearchTerm = document.getElementById('q').value;
|
||||
const nameSearchTerm = document.getElementById('nameInput').value;
|
||||
const fachrichtungSearchTerm = document.getElementById('fachrichtungInput').value;
|
||||
|
||||
if (!results || results.length === 0) {
|
||||
resultsDiv.innerHTML = '<p>Keine Ergebnisse gefunden.</p>';
|
||||
resultCount.textContent = '0 Ergebnisse';
|
||||
return;
|
||||
}
|
||||
|
||||
resultCount.textContent = `${results.length} Ergebnisse`;
|
||||
|
||||
const resultsList = results.map(customer => {
|
||||
// Hilfsfunktion zum Erstellen von Feldern nur wenn sie Werte haben
|
||||
const createFieldIfValue = (label, value, formatter = (v) => v) => {
|
||||
if (!value || value === 'N/A' || value === 'n/a' || value === 'N/a' || (typeof value === 'string' && value.trim() === '')) return '';
|
||||
const formattedValue = formatter(value);
|
||||
return `<p class="mb-1"><strong>${label}:</strong> ${formattedValue}</p>`;
|
||||
};
|
||||
|
||||
return `
|
||||
<div class="card mb-1">
|
||||
<div class="card-body py-1">
|
||||
<div class="d-flex justify-content-between align-items-start">
|
||||
<h5 class="card-title mb-1">${highlightText(customer.name, generalSearchTerm || nameSearchTerm)}</h5>
|
||||
<div class="d-flex align-items-center gap-2">
|
||||
<span class="badge ${(customer.tag || 'medisoft') === 'medisoft' ? 'bg-primary' : 'bg-warning text-dark'}">${(customer.tag || 'medisoft').toUpperCase()}</span>
|
||||
<button class="btn btn-sm btn-outline-primary" onclick="copyCustomerLink('${customer.nummer}')">
|
||||
<i class="fas fa-share-alt"></i> Teilen
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
<div class="card-text">
|
||||
${createFieldIfValue('Nummer', highlightText(customer.nummer, generalSearchTerm), createCustomerLink)}
|
||||
${createFieldIfValue('Adresse', (customer.strasse && customer.plz && customer.ort) ? true : false,
|
||||
() => createAddressLink(
|
||||
highlightText(customer.strasse, generalSearchTerm),
|
||||
highlightText(customer.plz, generalSearchTerm),
|
||||
highlightText(customer.ort, generalSearchTerm)
|
||||
))}
|
||||
${createFieldIfValue('Telefon', highlightText(customer.telefon, generalSearchTerm), createPhoneLink)}
|
||||
${createFieldIfValue('Mobil', highlightText(customer.mobil, generalSearchTerm), createPhoneLink)}
|
||||
${createFieldIfValue('Handy', highlightText(customer.handy, generalSearchTerm), createPhoneLink)}
|
||||
${createFieldIfValue('Telefon Firma', highlightText(customer.tele_firma, generalSearchTerm), createPhoneLink)}
|
||||
${createFieldIfValue('E-Mail', highlightText(customer.email, generalSearchTerm), createEmailLink)}
|
||||
${createFieldIfValue('Fachrichtung', highlightText(customer.fachrichtung, generalSearchTerm || fachrichtungSearchTerm))}
|
||||
${createFieldIfValue('Kontakt 1', highlightText(customer.kontakt1, generalSearchTerm), createPhoneLink)}
|
||||
${createFieldIfValue('Kontakt 2', highlightText(customer.kontakt2, generalSearchTerm), createPhoneLink)}
|
||||
${createFieldIfValue('Kontakt 3', highlightText(customer.kontakt3, generalSearchTerm), createPhoneLink)}
|
||||
${customer.tags && customer.tags.length > 0 ? `
|
||||
<p class="mb-0"><strong>Tags:</strong>
|
||||
${customer.tags.map(tag => `<span class="badge bg-primary me-1">${tag}</span>`).join('')}
|
||||
</p>
|
||||
` : ''}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
`}).join('');
|
||||
|
||||
resultsDiv.innerHTML = resultsList;
|
||||
}
|
||||
|
||||
function searchCustomers() {
|
||||
const q = document.getElementById('q').value;
|
||||
const name = document.getElementById('nameInput').value;
|
||||
const ort = document.getElementById('ortInput').value;
|
||||
const nummer = document.getElementById('nummerInput').value;
|
||||
const plz = document.getElementById('plzInput').value;
|
||||
const fachrichtung = document.getElementById('fachrichtungInput').value;
|
||||
const selectedTag = document.getElementById('tagFilter').value;
|
||||
|
||||
// Prüfe, ob mindestens ein Suchfeld einen Wert hat
|
||||
if (!q && !name && !ort && !nummer && !plz && !fachrichtung) {
|
||||
document.getElementById('results').innerHTML = '';
|
||||
document.getElementById('resultCount').textContent = '';
|
||||
return;
|
||||
}
|
||||
|
||||
// Zeige das Lade-Icon
|
||||
document.getElementById('loading').style.display = 'block';
|
||||
|
||||
// Baue die Suchanfrage
|
||||
const params = new URLSearchParams();
|
||||
if (q) params.append('q', q);
|
||||
if (name) params.append('name', name);
|
||||
if (ort) params.append('ort', ort);
|
||||
if (nummer) params.append('nummer', nummer);
|
||||
if (plz) params.append('plz', plz);
|
||||
if (fachrichtung) params.append('fachrichtung', fachrichtung);
|
||||
if (selectedTag) params.append('tag', selectedTag);
|
||||
|
||||
// Führe die Suche durch
|
||||
fetch('/search?' + params.toString())
|
||||
.then(response => {
|
||||
if (!response.ok) {
|
||||
throw new Error('Netzwerk-Antwort war nicht ok');
|
||||
}
|
||||
return response.json();
|
||||
})
|
||||
.then(data => {
|
||||
// Verstecke das Lade-Icon
|
||||
document.getElementById('loading').style.display = 'none';
|
||||
|
||||
if (data.error) {
|
||||
console.error('Fehler bei der Suche:', data.error);
|
||||
return;
|
||||
}
|
||||
|
||||
lastResults = data;
|
||||
updateResultCounts();
|
||||
displayResults(data);
|
||||
})
|
||||
.catch(error => {
|
||||
document.getElementById('loading').style.display = 'none';
|
||||
console.error('Fehler bei der Suche:', error);
|
||||
document.getElementById('results').innerHTML = '<p>Ein Fehler ist aufgetreten. Bitte versuchen Sie es später erneut.</p>';
|
||||
});
|
||||
}
|
||||
|
||||
// Event-Listener für die Live-Suche
|
||||
const searchInputs = [
|
||||
document.getElementById('q'),
|
||||
document.getElementById('nameInput'),
|
||||
document.getElementById('ortInput'),
|
||||
document.getElementById('nummerInput'),
|
||||
document.getElementById('plzInput'),
|
||||
document.getElementById('fachrichtungInput')
|
||||
];
|
||||
|
||||
const resetIcons = [
|
||||
document.querySelector('.reset-icon[onclick="clearInput(\'q\')"]'),
|
||||
document.querySelector('.reset-icon[onclick="clearInput(\'nameInput\')"]'),
|
||||
document.querySelector('.reset-icon[onclick="clearInput(\'ortInput\')"]'),
|
||||
document.querySelector('.reset-icon[onclick="clearInput(\'nummerInput\')"]'),
|
||||
document.querySelector('.reset-icon[onclick="clearInput(\'plzInput\')"]'),
|
||||
document.querySelector('.reset-icon[onclick="clearInput(\'fachrichtungInput\')"]')
|
||||
];
|
||||
|
||||
searchInputs.forEach((input, index) => {
|
||||
input.addEventListener('input', function() {
|
||||
clearTimeout(searchTimeout);
|
||||
// Erhöhe das Debounce-Intervall auf 500ms
|
||||
searchTimeout = setTimeout(searchCustomers, 500);
|
||||
|
||||
// Reset-Icon anzeigen/verstecken
|
||||
resetIcons[index].classList.toggle('visible', this.value.length > 0);
|
||||
});
|
||||
|
||||
// Reset-Funktionalität
|
||||
resetIcons[index].addEventListener('click', function() {
|
||||
searchInputs[index].value = '';
|
||||
searchCustomers();
|
||||
});
|
||||
document.documentElement.setAttribute('data-theme', newTheme);
|
||||
localStorage.setItem('theme', newTheme);
|
||||
updateThemeIcon(newTheme);
|
||||
});
|
||||
|
||||
// URL-Parameter beim Laden der Seite prüfen
|
||||
window.addEventListener('load', function() {
|
||||
const urlParams = new URLSearchParams(window.location.search);
|
||||
const name = urlParams.get('name');
|
||||
const ort = urlParams.get('ort');
|
||||
const kundennummer = urlParams.get('kundennummer');
|
||||
const plz = urlParams.get('plz');
|
||||
|
||||
if (name) document.getElementById('nameInput').value = name;
|
||||
if (ort) document.getElementById('ortInput').value = ort;
|
||||
if (kundennummer) document.getElementById('nummerInput').value = kundennummer;
|
||||
if (plz) document.getElementById('plzInput').value = plz;
|
||||
|
||||
if (name || ort || kundennummer || plz) {
|
||||
searchCustomers();
|
||||
}
|
||||
});
|
||||
function updateThemeIcon(theme) {
|
||||
icon.className = theme === 'light' ? 'bi bi-moon-stars' : 'bi bi-sun';
|
||||
}
|
||||
</script>
|
||||
</body>
|
||||
</html>
|
||||
143
templates/readme.html
Normal file
143
templates/readme.html
Normal file
@@ -0,0 +1,143 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="de">
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
<!--
|
||||
medisoftware Kundensuche - README
|
||||
Version: {{ version }}
|
||||
Entwickler: medisoftware GmbH
|
||||
Letzte Änderung: 2024-03-19
|
||||
-->
|
||||
<title>medisoftware Kundensuche - README</title>
|
||||
<!-- Bootstrap CSS -->
|
||||
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/css/bootstrap.min.css" rel="stylesheet">
|
||||
<!-- Bootstrap Icons für die Menü-Symbole -->
|
||||
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.11.3/font/bootstrap-icons.min.css">
|
||||
<style>
|
||||
/*
|
||||
Inline-Styles für die README-Seite
|
||||
Diese Styles sind nur für diese Seite gültig
|
||||
*/
|
||||
body {
|
||||
background-color: #f8f9fa;
|
||||
}
|
||||
.main-content {
|
||||
padding: 2rem 0;
|
||||
}
|
||||
.logo {
|
||||
width: 200px;
|
||||
height: auto;
|
||||
margin: 0 auto;
|
||||
display: block;
|
||||
}
|
||||
.readme-container {
|
||||
background-color: white;
|
||||
padding: 2rem;
|
||||
border-radius: 10px;
|
||||
box-shadow: 0 0 10px rgba(0,0,0,0.1);
|
||||
}
|
||||
.readme-content {
|
||||
max-width: 800px;
|
||||
margin: 0 auto;
|
||||
}
|
||||
.readme-content h1 {
|
||||
color: #333;
|
||||
margin-bottom: 1.5rem;
|
||||
}
|
||||
.readme-content h2 {
|
||||
color: #444;
|
||||
margin-top: 2rem;
|
||||
margin-bottom: 1rem;
|
||||
}
|
||||
.readme-content p {
|
||||
line-height: 1.6;
|
||||
margin-bottom: 1rem;
|
||||
}
|
||||
.readme-content code {
|
||||
background-color: #f8f9fa;
|
||||
padding: 0.2rem 0.4rem;
|
||||
border-radius: 3px;
|
||||
font-family: monospace;
|
||||
}
|
||||
.readme-content pre {
|
||||
background-color: #f8f9fa;
|
||||
padding: 1rem;
|
||||
border-radius: 5px;
|
||||
overflow-x: auto;
|
||||
}
|
||||
.readme-content ul, .readme-content ol {
|
||||
margin-bottom: 1rem;
|
||||
padding-left: 2rem;
|
||||
}
|
||||
.readme-content li {
|
||||
margin-bottom: 0.5rem;
|
||||
}
|
||||
.readme-content blockquote {
|
||||
border-left: 4px solid #dee2e6;
|
||||
padding-left: 1rem;
|
||||
margin-left: 0;
|
||||
color: #6c757d;
|
||||
}
|
||||
.readme-content table {
|
||||
width: 100%;
|
||||
margin-bottom: 1rem;
|
||||
border-collapse: collapse;
|
||||
}
|
||||
.readme-content th, .readme-content td {
|
||||
padding: 0.5rem;
|
||||
border: 1px solid #dee2e6;
|
||||
}
|
||||
.readme-content th {
|
||||
background-color: #f8f9fa;
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<!-- Hauptcontainer für den Inhalt -->
|
||||
<div class="main-content">
|
||||
<div class="container">
|
||||
<!-- Header mit Logo und Menü -->
|
||||
<div class="position-relative mb-4">
|
||||
<!-- Dropdown-Menü -->
|
||||
<div class="dropdown position-absolute start-0">
|
||||
<button class="btn btn-link text-dark" type="button" id="menuButton" data-bs-toggle="dropdown" aria-expanded="false">
|
||||
<i class="bi bi-list fs-4"></i>
|
||||
</button>
|
||||
<ul class="dropdown-menu" aria-labelledby="menuButton">
|
||||
<li>
|
||||
<a class="dropdown-item" href="{{ url_for('index') }}">
|
||||
<i class="bi bi-house"></i> Home
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a class="dropdown-item" href="{{ url_for('upload') }}">
|
||||
<i class="bi bi-cloud-upload"></i> CSV-Dateien hochladen
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a class="dropdown-item" href="{{ url_for('readme') }}">
|
||||
<i class="bi bi-book"></i> README
|
||||
</a>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
<!-- Logo -->
|
||||
<div class="text-center">
|
||||
<a href="https://medisoftware.de" target="_blank" rel="noopener noreferrer">
|
||||
<img src="{{ url_for('static', filename='medisoftware_logo_rb_200.png') }}" alt="medisoftware Logo" class="img-fluid logo">
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
<!-- README-Container -->
|
||||
<div class="readme-container">
|
||||
<div class="readme-content">
|
||||
{{ readme_content | safe }}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<!-- Bootstrap JavaScript -->
|
||||
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/js/bootstrap.bundle.min.js"></script>
|
||||
</body>
|
||||
</html>
|
||||
123
templates/upload.html
Normal file
123
templates/upload.html
Normal file
@@ -0,0 +1,123 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="de">
|
||||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
<!--
|
||||
medisoftware Kundensuche - CSV Upload
|
||||
Version: {{ version }}
|
||||
Entwickler: medisoftware GmbH
|
||||
Letzte Änderung: 2024-03-19
|
||||
-->
|
||||
<title>medisoftware Kundensuche - CSV Upload</title>
|
||||
<!-- Bootstrap CSS -->
|
||||
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/css/bootstrap.min.css" rel="stylesheet">
|
||||
<!-- Bootstrap Icons für die Menü-Symbole -->
|
||||
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.11.3/font/bootstrap-icons.min.css">
|
||||
<style>
|
||||
/*
|
||||
Inline-Styles für die Upload-Seite
|
||||
Diese Styles sind nur für diese Seite gültig
|
||||
*/
|
||||
body {
|
||||
background-color: #f8f9fa;
|
||||
}
|
||||
.main-content {
|
||||
padding: 2rem 0;
|
||||
}
|
||||
.logo {
|
||||
width: 200px;
|
||||
height: auto;
|
||||
margin: 0 auto;
|
||||
display: block;
|
||||
}
|
||||
.upload-container {
|
||||
background-color: white;
|
||||
padding: 2rem;
|
||||
border-radius: 10px;
|
||||
box-shadow: 0 0 10px rgba(0,0,0,0.1);
|
||||
}
|
||||
.form-label {
|
||||
font-weight: 500;
|
||||
}
|
||||
.alert {
|
||||
margin-bottom: 1rem;
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<!-- Hauptcontainer für den Inhalt -->
|
||||
<div class="main-content">
|
||||
<div class="container">
|
||||
<!-- Header mit Logo und Menü -->
|
||||
<div class="position-relative mb-4">
|
||||
<!-- Dropdown-Menü -->
|
||||
<div class="dropdown position-absolute start-0">
|
||||
<button class="btn btn-link text-dark" type="button" id="menuButton" data-bs-toggle="dropdown" aria-expanded="false">
|
||||
<i class="bi bi-list fs-4"></i>
|
||||
</button>
|
||||
<ul class="dropdown-menu" aria-labelledby="menuButton">
|
||||
<li>
|
||||
<a class="dropdown-item" href="{{ url_for('index') }}">
|
||||
<i class="bi bi-house"></i> Home
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a class="dropdown-item" href="{{ url_for('upload') }}">
|
||||
<i class="bi bi-cloud-upload"></i> CSV-Dateien hochladen
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a class="dropdown-item" href="{{ url_for('readme') }}">
|
||||
<i class="bi bi-book"></i> README
|
||||
</a>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
<!-- Logo -->
|
||||
<div class="text-center">
|
||||
<a href="https://medisoftware.de" target="_blank" rel="noopener noreferrer">
|
||||
<img src="{{ url_for('static', filename='medisoftware_logo_rb_200.png') }}" alt="medisoftware Logo" class="img-fluid logo">
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
<!-- Upload-Container -->
|
||||
<div class="upload-container">
|
||||
<div class="row justify-content-center">
|
||||
<div class="col-md-6">
|
||||
<h2 class="text-center mb-4">CSV-Dateien hochladen</h2>
|
||||
<!-- Fehlermeldungen -->
|
||||
{% if error %}
|
||||
<div class="alert alert-danger">{{ error }}</div>
|
||||
{% endif %}
|
||||
<!-- Erfolgsmeldungen -->
|
||||
{% if success %}
|
||||
<div class="alert alert-success">{{ success }}</div>
|
||||
{% endif %}
|
||||
<!-- Upload-Formular -->
|
||||
<form method="POST" enctype="multipart/form-data">
|
||||
<div class="mb-3">
|
||||
<label for="medisoft_file" class="form-label">MEDISOFT CSV-Datei</label>
|
||||
<input type="file" class="form-control" id="medisoft_file" name="medisoft_file" accept=".csv">
|
||||
</div>
|
||||
<div class="mb-3">
|
||||
<label for="mediconsult_file" class="form-label">MEDICONSULT CSV-Datei</label>
|
||||
<input type="file" class="form-control" id="mediconsult_file" name="mediconsult_file" accept=".csv">
|
||||
</div>
|
||||
<div class="mb-3">
|
||||
<label for="password" class="form-label">Passwort</label>
|
||||
<input type="password" class="form-control" id="password" name="password" required>
|
||||
</div>
|
||||
<div class="d-grid">
|
||||
<button type="submit" class="btn btn-primary">Dateien hochladen</button>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<!-- Bootstrap JavaScript -->
|
||||
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/js/bootstrap.bundle.min.js"></script>
|
||||
</body>
|
||||
</html>
|
||||
Reference in New Issue
Block a user