Compare commits
39 Commits
Author | SHA1 | Date | |
---|---|---|---|
1cf8fbb91d | |||
16bd7ec544 | |||
4d5a7b4f5e | |||
9922c0ae9d | |||
93314424d9 | |||
d14ac5d9af | |||
b4939147c4 | |||
2a33fc45de | |||
3a317de8f0 | |||
f626cd52fd | |||
6283ccff6d | |||
3893e148ab | |||
65fbde845e | |||
57d3a05a5a | |||
dfd50d5e78 | |||
73541796f6 | |||
e3e9900482 | |||
156078ff3a | |||
5d56c7128e | |||
98f887f51e | |||
f46947b6d4 | |||
c1b55c3579 | |||
6a2e290d54 | |||
7263464b89 | |||
7b88e62de0 | |||
d50ea60af9 | |||
ec559f5c72 | |||
c454620ae1 | |||
94c381fbfc | |||
06576b08d9 | |||
465a6f058a | |||
daf7499b4e | |||
fade9b8d62 | |||
611a5dd906 | |||
35645fc671 | |||
fab869eb58 | |||
6cd8f199c4 | |||
948a17b739 | |||
f2290cf77f |
20
.gitignore
vendored
20
.gitignore
vendored
@@ -17,6 +17,7 @@ pip-delete-this-directory.txt
|
||||
.vscode/
|
||||
*.swp
|
||||
*.swo
|
||||
*.bak
|
||||
|
||||
# Logs
|
||||
*.log
|
||||
@@ -43,10 +44,21 @@ coverage.xml
|
||||
|
||||
# Docker
|
||||
.docker/
|
||||
docker-compose.yml
|
||||
|
||||
# Daten
|
||||
spezexpo.csv
|
||||
data/
|
||||
|
||||
# Database
|
||||
*.db
|
||||
data/customers.db
|
||||
# Virtual Environment
|
||||
develop-eggs/
|
||||
downloads/
|
||||
eggs/
|
||||
.eggs/
|
||||
lib/
|
||||
lib64/
|
||||
parts/
|
||||
sdist/
|
||||
var/
|
||||
wheels/
|
||||
.installed.cfg
|
||||
*.egg
|
||||
|
133
CHANGELOG.md
133
CHANGELOG.md
@@ -5,6 +5,139 @@ 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.17] - 2024-03-19
|
||||
### Geändert
|
||||
- Optimierte Datenbankverbindungen für bessere Thread-Sicherheit
|
||||
- Verbesserte Datenbankindizes für schnellere Suchen
|
||||
- Verbesserte Fehlerbehandlung bei Datenbankoperationen
|
||||
|
||||
## [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
|
||||
- Neue API-Route für Fachrichtungsvorschläge
|
||||
- Optimierte SQL-Abfragen für die Fachrichtungssuche
|
||||
|
||||
## [1.2.13] - 2024-03-20
|
||||
### Fixed
|
||||
- Korrektur der Parameteranzahl in der SQL-Abfrage für die allgemeine Suche
|
||||
- Behebung des Fehlers bei der Suche in allen Datenbankfeldern
|
||||
|
||||
## [v1.2.12] - 2024-03-19
|
||||
### Geändert
|
||||
- Performance-Optimierung der Suchfunktion durch Reduzierung der Suchfelder
|
||||
- Verbesserte Suchgeschwindigkeit durch LIMIT in SQL-Abfragen
|
||||
- Optimiertes Debounce-Intervall für Live-Suche
|
||||
- Verbessertes Highlighting für Teilstrings in Suchergebnissen
|
||||
|
||||
## [v1.2.11] - 2024-03-19
|
||||
### Geändert
|
||||
- Einträge mit der Fachrichtung "intern" werden aus den Suchergebnissen gefiltert
|
||||
- Verbesserte SQL-Abfrage für die Suchergebnisse
|
||||
|
||||
## [v1.2.10] - 2024-03-19
|
||||
### Geändert
|
||||
- Verbesserte Darstellung der Adress-Links mit Location- und Route-Icons
|
||||
- Korrektur des Docker-Port-Mappings für bessere Erreichbarkeit
|
||||
|
||||
## [v1.2.9] - 2024-03-19
|
||||
### Geändert
|
||||
- Verbesserte Darstellung der Adress-Links mit Location- und Route-Icons
|
||||
- Korrektur des Docker-Port-Mappings für bessere Erreichbarkeit
|
||||
|
||||
## [v1.2.8] - 2024-03-19
|
||||
### Geändert
|
||||
- Verbesserte Tag-Anzeige: Badge neben dem Teilen-Button mit farblicher Hervorhebung (blau für MEDISOFT, orange für MEDICONSULT)
|
||||
|
||||
## [v1.2.7] - 2024-03-19
|
||||
### Geändert
|
||||
- Korrektur der Feldreihenfolge in den Suchergebnissen
|
||||
- Verbesserung der Tag-Anzeige
|
||||
|
||||
## [v1.2.6] - 2024-03-19
|
||||
### Geändert
|
||||
- Verbesserte Darstellung der Kundennummern in den Suchergebnissen
|
||||
- Optimierte Anzeige der Kundennummern in der Detailansicht
|
||||
- Anpassung der Kundennummernberechnung für die MEDISOFT-Integration
|
||||
- Verbesserte Formatierung der Kundennummern in der Benutzeroberfläche
|
||||
|
||||
## [v1.2.5] - 2024-03-19
|
||||
### Geändert
|
||||
- Verbesserte Darstellung der Kundennummern in den Suchergebnissen
|
||||
- Optimierte Anzeige der Kundennummern in der Detailansicht
|
||||
- Anpassung der Kundennummernberechnung für die MEDISOFT-Integration
|
||||
- Verbesserte Formatierung der Kundennummern in der Benutzeroberfläche
|
||||
|
||||
## [v1.2.4] - 2024-03-19
|
||||
### Geändert
|
||||
- Verbesserte Darstellung der Kundennummern in den Suchergebnissen
|
||||
- Optimierte Anzeige der Kundennummern in der Detailansicht
|
||||
- Anpassung der Kundennummernberechnung für die MEDISOFT-Integration
|
||||
- Verbesserte Formatierung der Kundennummern in der Benutzeroberfläche
|
||||
|
||||
## [v1.2.3] - 2024-03-19
|
||||
### Geändert
|
||||
- Verbesserte Darstellung der Kundennummern in den Suchergebnissen
|
||||
- Optimierte Anzeige der Kundennummern in der Detailansicht
|
||||
- Anpassung der Kundennummernberechnung für die MEDISOFT-Integration
|
||||
- Verbesserte Formatierung der Kundennummern in der Benutzeroberfläche
|
||||
|
||||
## [v1.2.2] - 2024-03-19
|
||||
### Geändert
|
||||
- Verbesserte Darstellung der Kundennummern in den Suchergebnissen
|
||||
- Optimierte Anzeige der Kundennummern in der Detailansicht
|
||||
- Anpassung der Kundennummernberechnung für die MEDISOFT-Integration
|
||||
- Verbesserte Formatierung der Kundennummern in der Benutzeroberfläche
|
||||
|
||||
## [v1.2.1] - 2024-03-19
|
||||
### Geändert
|
||||
- Verbesserte Darstellung der Kundennummern in den Suchergebnissen
|
||||
- Optimierte Anzeige der Kundennummern in der Detailansicht
|
||||
- Anpassung der Kundennummernberechnung für die MEDISOFT-Integration
|
||||
- Verbesserte Formatierung der Kundennummern in der Benutzeroberfläche
|
||||
|
||||
## [v1.2.0] - 2024-03-19
|
||||
### Hinzugefügt
|
||||
- Neue Spalte "Tag" in der Kundendatenbank
|
||||
- Unterscheidung zwischen MEDISOFT und MEDICONSULT Kunden
|
||||
- Filteroption für die Anzeige von MEDISOFT oder MEDICONSULT Kunden
|
||||
- Verbesserte Darstellung der Kundennummern in den Suchergebnissen
|
||||
- Optimierte Anzeige der Kundennummern in der Detailansicht
|
||||
- Anpassung der Kundennummernberechnung für die MEDISOFT-Integration
|
||||
- Verbesserte Formatierung der Kundennummern in der Benutzeroberfläche
|
||||
|
||||
## [v1.1.0] - 2024-03-19
|
||||
### Hinzugefügt
|
||||
- Neue Spalte "Tag" in der Kundendatenbank
|
||||
- Unterscheidung zwischen MEDISOFT und MEDICONSULT Kunden
|
||||
- Filteroption für die Anzeige von MEDISOFT oder MEDICONSULT Kunden
|
||||
|
||||
## [v1.0.0] - 2024-03-19
|
||||
### Hinzugefügt
|
||||
- Erste Version der Anwendung
|
||||
- Grundlegende Suchfunktionalität
|
||||
- Anzeige von Kundendetails
|
||||
- Integration mit MEDISOFT
|
||||
- Responsive Design
|
||||
- IP-basierte Zugriffskontrolle
|
||||
|
||||
## [1.2.6] - 2024-03-19
|
||||
### Geändert
|
||||
- Verbesserte Suchfunktion: Keine Ergebnisse mehr bei leeren Suchfeldern
|
||||
|
69
README.md
69
README.md
@@ -1,35 +1,49 @@
|
||||
# Medi-Customers
|
||||
# medisoftware Kundensuche
|
||||
|
||||
Eine Flask-basierte Webanwendung zur Verwaltung von Kundenkontakten für medizinische Einrichtungen.
|
||||
Eine einfache und effiziente Kundensuche für medisoftware Kunden.
|
||||
|
||||
## Features
|
||||
|
||||
- Kundensuche nach verschiedenen Kriterien (Name, Ort, Kundennummer, etc.)
|
||||
- Direkte Links zu Kundendaten in medisoftware (für autorisierte IPs)
|
||||
- Telefonnummern-Links für autorisierte IPs
|
||||
- Adress-Links mit Google Maps Integration
|
||||
- IP-basierte Zugriffssteuerung
|
||||
- Responsive Design
|
||||
- 🔍 Echtzeit-Suche über alle Kundendaten
|
||||
- 📱 Responsive Design für alle Geräte
|
||||
- 🔒 IP-basierte Zugriffskontrolle
|
||||
- 🔗 Direkte Integration mit 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
|
||||
|
||||
## Version
|
||||
|
||||
Aktuelle Version: 1.2.16
|
||||
|
||||
## Installation
|
||||
|
||||
1. Repository klonen:
|
||||
1. Klonen Sie das Repository:
|
||||
```bash
|
||||
git clone https://gitea.elpatron.me/elpatron/medi-customers.git
|
||||
cd medi-customers
|
||||
```
|
||||
|
||||
2. Umgebungsvariablen einrichten:
|
||||
2. Erstellen Sie die erforderlichen Verzeichnisse:
|
||||
```bash
|
||||
cp .env.example .env
|
||||
# Bearbeiten Sie die .env-Datei mit Ihren Einstellungen
|
||||
mkdir -p data
|
||||
```
|
||||
|
||||
3. Docker Container starten:
|
||||
3. Starten Sie die Anwendung mit Docker Compose:
|
||||
```bash
|
||||
docker-compose up -d
|
||||
docker-compose up --build
|
||||
```
|
||||
|
||||
Die Anwendung ist dann unter `http://localhost:5000` erreichbar.
|
||||
|
||||
## Entwicklung
|
||||
|
||||
Die Anwendung ist in Python mit Flask entwickelt und verwendet SQLite als Datenbank. Das Frontend wurde mit HTML, CSS und JavaScript implementiert.
|
||||
|
||||
## Lizenz
|
||||
|
||||
Alle Rechte vorbehalten. © 2024 medisoftware
|
||||
|
||||
## Konfiguration
|
||||
|
||||
Die Anwendung kann über folgende Umgebungsvariablen konfiguriert werden:
|
||||
@@ -49,14 +63,6 @@ Die Anwendung unterstützt CIDR-Notation für IP-Bereiche. Beispiele:
|
||||
- Subnetz: 192.168.1.0/24
|
||||
- Größeres Netzwerk: 10.0.0.0/8
|
||||
|
||||
## Version
|
||||
|
||||
Aktuelle Version: v1.2.6
|
||||
|
||||
## Lizenz
|
||||
|
||||
Alle Rechte vorbehalten. © 2025 medisoftware
|
||||
|
||||
## API-Beispiele
|
||||
|
||||
### Suche nach Name
|
||||
@@ -103,4 +109,21 @@ curl "http://localhost:5001/search?fachrichtung=Zahnarzt&ort=Berlin&name=Schmidt
|
||||
|
||||
## Version
|
||||
|
||||
Aktuelle Version: [v1.2.4](CHANGELOG.md#v124---2024-03-19)
|
||||
Aktuelle Version: [v1.2.4](CHANGELOG.md#v124---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
|
||||
Dockerfile|1|8|9|11
|
||||
Text|1|0|0|5
|
||||
--------|--------|--------|--------|--------
|
||||
SUM:|10|232|113|1171
|
||||
|
||||
## Lizenz
|
||||
Alle Rechte vorbehalten. © 2025 medisoftware
|
604
app.py
604
app.py
@@ -5,243 +5,197 @@ 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
|
||||
|
||||
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.17'
|
||||
app.config['DATABASE'] = 'data/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.1"
|
||||
# Thread-lokaler Speicher für Datenbankverbindungen
|
||||
thread_local = threading.local()
|
||||
|
||||
# Pfad zur CSV-Datei
|
||||
CSV_FILE = 'data/customers.csv'
|
||||
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
|
||||
|
||||
# Pfad zur Datenbank
|
||||
DB_FILE = 'data/customers.db'
|
||||
|
||||
# Lade Umgebungsvariablen
|
||||
load_dotenv()
|
||||
|
||||
# Statisches Passwort aus der .env Datei
|
||||
STATIC_PASSWORD = os.getenv('LOGIN_PASSWORD', 'default-password')
|
||||
ALLOWED_IP_RANGES = os.getenv('ALLOWED_IP_RANGES', '').split(',')
|
||||
@contextmanager
|
||||
def get_db():
|
||||
"""Context Manager für Datenbankverbindungen"""
|
||||
conn = get_db_connection()
|
||||
try:
|
||||
yield conn
|
||||
except Exception:
|
||||
conn.rollback()
|
||||
raise
|
||||
finally:
|
||||
conn.commit()
|
||||
|
||||
def init_db():
|
||||
"""Initialisiert die SQLite-Datenbank mit der notwendigen Tabelle."""
|
||||
conn = sqlite3.connect(DB_FILE)
|
||||
c = conn.cursor()
|
||||
|
||||
# Erstelle die Tabelle mit Indizes
|
||||
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
|
||||
)
|
||||
''')
|
||||
|
||||
# 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)')
|
||||
|
||||
# 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()
|
||||
conn.close()
|
||||
logger.info('Datenbank initialisiert')
|
||||
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."""
|
||||
try:
|
||||
# Teile die IP und das Subnetz in ihre Komponenten
|
||||
subnet_ip, bits = subnet.split('/')
|
||||
ip_parts = [int(x) for x in ip.split('.')]
|
||||
subnet_parts = [int(x) for x in subnet_ip.split('.')]
|
||||
|
||||
# Konvertiere IPs in 32-bit Zahlen
|
||||
ip_num = (ip_parts[0] << 24) | (ip_parts[1] << 16) | (ip_parts[2] << 8) | ip_parts[3]
|
||||
subnet_num = (subnet_parts[0] << 24) | (subnet_parts[1] << 16) | (subnet_parts[2] << 8) | subnet_parts[3]
|
||||
|
||||
# Erstelle die Subnetzmaske
|
||||
mask = ~((1 << (32 - int(bits))) - 1)
|
||||
|
||||
# Prüfe, ob die IP im Subnetz liegt
|
||||
return (ip_num & mask) == (subnet_num & mask)
|
||||
except Exception as e:
|
||||
logger.error(f"Fehler bei der IP-Überprüfung: {str(e)}")
|
||||
return False
|
||||
|
||||
def import_csv():
|
||||
"""Importiert die Daten aus der CSV-Datei in die SQLite-Datenbank."""
|
||||
conn = sqlite3.connect(DB_FILE)
|
||||
c = conn.cursor()
|
||||
|
||||
# Lösche bestehende Daten
|
||||
c.execute('DELETE FROM customers')
|
||||
|
||||
"""Importiert die CSV-Datei in die Datenbank"""
|
||||
try:
|
||||
# Lese die CSV-Datei mit pandas
|
||||
df = pd.read_csv(CSV_FILE, sep=',', encoding='utf-8', quotechar='"')
|
||||
|
||||
# Entferne Anführungszeichen aus den Spaltennamen
|
||||
df.columns = df.columns.str.strip('"')
|
||||
|
||||
# Entferne Anführungszeichen aus den Werten
|
||||
for col in df.columns:
|
||||
if df[col].dtype == 'object':
|
||||
df[col] = df[col].str.strip('"')
|
||||
|
||||
# Kombiniere Vorname und Nachname
|
||||
df['name'] = df['Vorname'] + ' ' + df['Nachname']
|
||||
|
||||
# Importiere die Daten
|
||||
for _, row in df.iterrows():
|
||||
c.execute('''
|
||||
INSERT INTO customers (nummer, name, strasse, plz, ort, telefon, mobil, email, bemerkung, fachrichtung)
|
||||
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
|
||||
''', (
|
||||
row['Nummer'],
|
||||
row['name'],
|
||||
row['Strasse'],
|
||||
row['PLZ'],
|
||||
row['Ort'],
|
||||
row['Tel'],
|
||||
row['Handy'],
|
||||
row['mail'],
|
||||
f"Fachrichtung: {row['Fachrichtung']}",
|
||||
row['Fachrichtung']
|
||||
))
|
||||
|
||||
conn.commit()
|
||||
logger.info('CSV-Daten erfolgreich in die Datenbank importiert')
|
||||
except Exception as e:
|
||||
logger.error(f'Fehler beim Import der CSV-Daten: {str(e)}')
|
||||
raise
|
||||
finally:
|
||||
conn.close()
|
||||
|
||||
def search_customers(search_params):
|
||||
"""Sucht nach Kunden basierend auf den Suchparametern."""
|
||||
conn = sqlite3.connect(DB_FILE)
|
||||
c = conn.cursor()
|
||||
|
||||
try:
|
||||
# Baue die SQL-Abfrage dynamisch auf
|
||||
query = "SELECT * FROM customers WHERE 1=1"
|
||||
params = []
|
||||
|
||||
# Allgemeine Suche über alle Felder
|
||||
if search_params.get('q'):
|
||||
search_term = f"%{search_params['q']}%"
|
||||
query += " AND (name LIKE ? OR ort LIKE ? OR nummer LIKE ? OR telefon LIKE ? OR mobil LIKE ? OR email LIKE ? OR bemerkung LIKE ? OR fachrichtung LIKE ?)"
|
||||
params.extend([search_term] * 8)
|
||||
|
||||
# Spezifische Suche für einzelne Felder
|
||||
if search_params.get('name'):
|
||||
query += " AND name LIKE ?"
|
||||
params.append(f"%{search_params['name']}%")
|
||||
|
||||
if search_params.get('ort'):
|
||||
query += " AND ort LIKE ?"
|
||||
params.append(f"%{search_params['ort']}%")
|
||||
|
||||
if search_params.get('nummer'):
|
||||
query += " AND nummer LIKE ?"
|
||||
params.append(f"%{search_params['nummer']}%")
|
||||
|
||||
if search_params.get('plz'):
|
||||
query += " AND plz LIKE ?"
|
||||
params.append(f"%{search_params['plz']}%")
|
||||
|
||||
# Führe die Abfrage aus
|
||||
c.execute(query, params)
|
||||
results = c.fetchall()
|
||||
|
||||
# Formatiere die Ergebnisse
|
||||
customers = []
|
||||
for row in results:
|
||||
customer = {
|
||||
'id': row[0],
|
||||
'nummer': row[1],
|
||||
'name': row[2],
|
||||
'strasse': row[3],
|
||||
'plz': row[4],
|
||||
'ort': row[5],
|
||||
'telefon': row[6],
|
||||
'mobil': row[7],
|
||||
'email': row[8],
|
||||
'bemerkung': row[9],
|
||||
'fachrichtung': row[10]
|
||||
}
|
||||
customers.append(customer)
|
||||
|
||||
return customers
|
||||
except Exception as e:
|
||||
logger.error(f"Fehler bei der Kundensuche: {str(e)}")
|
||||
raise
|
||||
finally:
|
||||
conn.close()
|
||||
|
||||
def clean_dataframe(df):
|
||||
"""Konvertiert NaN-Werte in None für JSON-Kompatibilität"""
|
||||
return df.replace({np.nan: None})
|
||||
|
||||
# CSV-Datei laden
|
||||
def load_data():
|
||||
try:
|
||||
logger.info("Versuche CSV-Datei zu laden...")
|
||||
if not os.path.exists(CSV_FILE):
|
||||
logger.error(f"CSV-Datei '{CSV_FILE}' nicht gefunden!")
|
||||
return None
|
||||
with get_db() as conn:
|
||||
c = conn.cursor()
|
||||
|
||||
# Lade CSV mit Komma als Trennzeichen
|
||||
df = pd.read_csv(CSV_FILE, sep=',', encoding='utf-8', quotechar='"')
|
||||
# Entferne Anführungszeichen aus den Spaltennamen
|
||||
df.columns = df.columns.str.strip('"')
|
||||
# Entferne Anführungszeichen aus den Werten
|
||||
for col in df.columns:
|
||||
if df[col].dtype == 'object':
|
||||
df[col] = df[col].str.strip('"')
|
||||
df = clean_dataframe(df)
|
||||
logger.info(f"CSV-Datei erfolgreich geladen. {len(df)} Einträge gefunden.")
|
||||
return df
|
||||
# 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']
|
||||
) 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']
|
||||
) 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 Laden der CSV-Datei: {str(e)}")
|
||||
return None
|
||||
logger.error(f"Fehler beim Importieren der CSV-Datei: {str(e)}")
|
||||
raise
|
||||
|
||||
@app.route('/login', methods=['GET', 'POST'])
|
||||
def login():
|
||||
# Versuche, die tatsächliche Client-IP aus dem X-Forwarded-For-Header zu erhalten
|
||||
# Überprüfe, ob die Client-IP in einem der erlaubten Bereiche liegt
|
||||
client_ip = request.headers.get('X-Forwarded-For', request.remote_addr)
|
||||
allowed_ip_ranges = os.getenv('ALLOWED_IP_RANGES', '').split(',')
|
||||
|
||||
logger.info(f"Client-IP: {client_ip}")
|
||||
logger.info(f"Erlaubte IP-Bereiche: {allowed_ip_ranges}")
|
||||
logger.info(f"Session Status: {session}")
|
||||
|
||||
# Überprüfen, ob die IP-Adresse in einem der erlaubten Subnetze liegt
|
||||
client_ip_obj = ipaddress.ip_address(client_ip)
|
||||
for ip_range in allowed_ip_ranges:
|
||||
try:
|
||||
network = ipaddress.ip_network(ip_range.strip(), strict=False)
|
||||
logger.info(f"Überprüfe Netzwerk: {network}")
|
||||
if client_ip_obj in network:
|
||||
logger.info("Client-IP ist im erlaubten Bereich.")
|
||||
session['logged_in'] = True
|
||||
session.permanent = True # Session bleibt bestehen
|
||||
return redirect(url_for('index'))
|
||||
except ValueError:
|
||||
logger.error(f"Ungültiges Netzwerkformat: {ip_range}")
|
||||
|
||||
|
||||
# Überprüfe, ob die Client-IP in einem der erlaubten Bereichen liegt
|
||||
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")
|
||||
session['logged_in'] = True
|
||||
return redirect(url_for('index'))
|
||||
|
||||
if request.method == 'POST':
|
||||
password = request.form.get('password')
|
||||
logger.info(f"Login-Versuch mit Passwort: {'*' * len(password) if password else 'None'}")
|
||||
if password == STATIC_PASSWORD:
|
||||
session['logged_in'] = True
|
||||
session.permanent = True # Session bleibt bestehen
|
||||
logger.info("Login erfolgreich, Session gesetzt")
|
||||
logger.info("Erfolgreicher Login")
|
||||
return redirect(url_for('index'))
|
||||
else:
|
||||
logger.warning("Falsches Passwort eingegeben")
|
||||
@@ -257,46 +211,212 @@ def index():
|
||||
logger.info("Benutzer nicht eingeloggt, Weiterleitung zum Login")
|
||||
return redirect(url_for('login'))
|
||||
|
||||
allowed_ip_ranges = os.getenv('ALLOWED_IP_RANGES', '')
|
||||
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=allowed_ip_ranges)
|
||||
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')
|
||||
@app.route('/search', methods=['GET', 'POST'])
|
||||
def search():
|
||||
if not session.get('logged_in'):
|
||||
return jsonify({'error': 'Nicht eingeloggt'}), 401
|
||||
|
||||
try:
|
||||
# Hole die Suchparameter aus der Anfrage
|
||||
search_params = {
|
||||
'name': request.args.get('name', ''),
|
||||
'ort': request.args.get('ort', ''),
|
||||
'nummer': request.args.get('nummer', ''),
|
||||
'plz': request.args.get('plz', ''),
|
||||
'telefon': request.args.get('telefon', ''),
|
||||
'email': request.args.get('email', ''),
|
||||
'q': request.args.get('q', ''),
|
||||
'fachrichtung': request.args.get('fachrichtung', '')
|
||||
}
|
||||
|
||||
# Führe die Suche in der Datenbank durch
|
||||
results = search_customers(search_params)
|
||||
|
||||
# Protokolliere die Anzahl der gefundenen Ergebnisse
|
||||
logger.info(f'Suchergebnisse gefunden: {len(results)}')
|
||||
|
||||
return jsonify(results)
|
||||
if request.method == 'POST':
|
||||
data = request.get_json()
|
||||
search_query = data.get('query', '')
|
||||
tag = data.get('tag', 'medisoft')
|
||||
else:
|
||||
search_query = request.args.get('q', '')
|
||||
name = request.args.get('name', '')
|
||||
ort = request.args.get('ort', '')
|
||||
nummer = request.args.get('nummer', '')
|
||||
plz = request.args.get('plz', '')
|
||||
fachrichtung = request.args.get('fachrichtung', '')
|
||||
tag = request.args.get('tag', 'medisoft')
|
||||
|
||||
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)
|
||||
|
||||
except Exception as e:
|
||||
logger.error(f'Fehler bei der Suche: {str(e)}')
|
||||
return jsonify({"error": str(e)}), 500
|
||||
logger.error(f"Fehler bei der Suche: {str(e)}")
|
||||
return jsonify({'error': str(e)}), 500
|
||||
|
||||
@app.route('/api/fachrichtungen')
|
||||
def get_fachrichtungen():
|
||||
try:
|
||||
search_term = request.args.get('q', '').lower()
|
||||
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([])
|
||||
|
||||
def init_app(app):
|
||||
"""Initialisiert die Anwendung mit allen notwendigen Einstellungen."""
|
||||
with app.app_context():
|
||||
# Initialisiere die Datenbank
|
||||
init_db()
|
||||
# Importiere die CSV-Daten
|
||||
import_csv()
|
||||
logger.info("Anwendung erfolgreich initialisiert")
|
||||
try:
|
||||
# Stelle sicher, dass der data-Ordner existiert
|
||||
os.makedirs('data', exist_ok=True)
|
||||
|
||||
# Lösche die alte Datenbank, falls sie existiert
|
||||
if os.path.exists(app.config['DATABASE']):
|
||||
try:
|
||||
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)}")
|
||||
|
||||
# Initialisiere die Datenbank
|
||||
init_db()
|
||||
# Importiere die CSV-Daten
|
||||
import_csv()
|
||||
logger.info("Anwendung erfolgreich initialisiert")
|
||||
except Exception as e:
|
||||
logger.error(f"Fehler bei der Initialisierung: {str(e)}")
|
||||
raise
|
||||
|
||||
# Initialisiere die App
|
||||
init_app(app)
|
||||
|
1172
data/customers.csv
1172
data/customers.csv
File diff suppressed because it is too large
Load Diff
@@ -8,7 +8,6 @@ services:
|
||||
environment:
|
||||
- FLASK_APP=app.py
|
||||
- FLASK_ENV=production
|
||||
- SECRET_KEY=your-super-secret-key-here
|
||||
- LOGIN_PASSWORD=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
|
@@ -151,6 +151,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;
|
||||
@@ -182,18 +212,78 @@ body {
|
||||
.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-card:last-child {
|
||||
border-bottom: none;
|
||||
}
|
||||
|
||||
.customer-info {
|
||||
box-shadow: 0 2px 4px rgba(0,0,0,0.1);
|
||||
margin-bottom: 1rem;
|
||||
padding: 1rem;
|
||||
}
|
||||
|
||||
.customer-header {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: flex-start;
|
||||
margin-bottom: 0.5rem;
|
||||
}
|
||||
|
||||
.customer-name {
|
||||
margin: 0;
|
||||
font-size: 1.2rem;
|
||||
color: #333;
|
||||
}
|
||||
|
||||
.customer-actions {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 0.5rem;
|
||||
}
|
||||
|
||||
.customer-details {
|
||||
font-size: 0.9rem;
|
||||
color: #666;
|
||||
}
|
||||
|
||||
.customer-details p {
|
||||
margin: 0.25rem 0;
|
||||
}
|
||||
|
||||
.customer-details strong {
|
||||
color: #333;
|
||||
}
|
||||
|
||||
.phone-link, .email-link, .customer-link {
|
||||
color: #007bff;
|
||||
text-decoration: none;
|
||||
}
|
||||
|
||||
.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;
|
||||
}
|
||||
|
||||
.footer-content {
|
||||
@@ -235,4 +325,63 @@ body {
|
||||
.general-search .reset-icon {
|
||||
font-size: 1.2rem;
|
||||
padding: 0 1rem;
|
||||
}
|
||||
|
||||
.search-options {
|
||||
font-size: 0.9em;
|
||||
color: #666;
|
||||
}
|
||||
|
||||
.search-options .form-check {
|
||||
margin-right: 1rem;
|
||||
}
|
||||
|
||||
.search-options .form-check-input {
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.search-options .form-check-label {
|
||||
cursor: pointer;
|
||||
user-select: none;
|
||||
}
|
||||
|
||||
.result-tag {
|
||||
padding: 4px 8px;
|
||||
border-radius: 4px;
|
||||
font-size: 0.9em;
|
||||
font-weight: 500;
|
||||
text-transform: uppercase;
|
||||
color: white;
|
||||
}
|
||||
|
||||
.tag-medisoft {
|
||||
background-color: #1976d2;
|
||||
}
|
||||
|
||||
.tag-mediconsult {
|
||||
background-color: #ff9800;
|
||||
}
|
||||
|
||||
.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);
|
||||
}
|
||||
|
||||
.autocomplete-items div {
|
||||
padding: 8px 12px;
|
||||
cursor: pointer;
|
||||
background-color: white;
|
||||
}
|
||||
|
||||
.autocomplete-items div:hover {
|
||||
background-color: #f8f9fa;
|
||||
}
|
512
static/js/main.js
Normal file
512
static/js/main.js
Normal file
@@ -0,0 +1,512 @@
|
||||
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 = '';
|
||||
searchCustomers();
|
||||
}
|
||||
|
||||
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,20 @@
|
||||
<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 }}">
|
||||
<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">
|
||||
</head>
|
||||
<body>
|
||||
<div class="main-content">
|
||||
<div class="container">
|
||||
<div class="text-center mb-4">
|
||||
<img src="{{ url_for('static', filename='medisoftware_logo_rb_200.png') }}" alt="medisoftware Logo" class="img-fluid" style="max-width: 200px;">
|
||||
<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>
|
||||
<div class="search-container">
|
||||
<h1 class="text-center mb-4">Kundensuche</h1>
|
||||
@@ -66,10 +69,23 @@
|
||||
<i class="fas fa-search search-icon"></i>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="search-field">
|
||||
<div class="input-group">
|
||||
<select id="tagFilter" class="form-select" onchange="searchCustomers()">
|
||||
<option value="medisoft" selected>MEDISOFT</option>
|
||||
<option value="mediconsult">MEDICONSULT</option>
|
||||
<option value="all">Alle</option>
|
||||
</select>
|
||||
</div>
|
||||
</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">
|
||||
@@ -90,279 +106,10 @@
|
||||
<footer class="footer">
|
||||
<div class="footer-content">
|
||||
Proudly made with ❤️ and 🍺 by <a href="https://www.medisoftware.de" target="_blank" class="footer-link">medisoftware</a>
|
||||
<div style="font-size: 0.8em;">Version: v1.2.6</div>
|
||||
<div style="font-size: 0.8em;">Version: {{ version }}</div>
|
||||
</div>
|
||||
</footer>
|
||||
|
||||
<script>
|
||||
let searchTimeout;
|
||||
let lastResults = [];
|
||||
|
||||
function createPhoneLink(phone) {
|
||||
if (!phone) return 'N/A';
|
||||
|
||||
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, '');
|
||||
|
||||
// Füge eine führende 0 hinzu, wenn isAllowed true ist
|
||||
if (isAllowed) {
|
||||
cleanNumber = '0' + cleanNumber;
|
||||
}
|
||||
|
||||
// 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 'N/A';
|
||||
return `<a href="mailto:${email}" class="email-link">${email}</a>`;
|
||||
}
|
||||
|
||||
function highlightText(text, searchTerm) {
|
||||
if (!searchTerm) return text;
|
||||
const regex = new RegExp(`(${searchTerm})`, 'gi');
|
||||
return text.replace(regex, '<mark>$1</mark>');
|
||||
}
|
||||
|
||||
function createAddressLink(street, plz, city) {
|
||||
if (!street || !plz || !city) return 'N/A';
|
||||
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-pin 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-car 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);
|
||||
});
|
||||
|
||||
const adjustedNumber = adjustCustomerNumber(nummer);
|
||||
if (isAllowed) {
|
||||
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');
|
||||
resultsDiv.innerHTML = '';
|
||||
|
||||
if (results.length === 0) {
|
||||
resultsDiv.innerHTML = '<p>Keine Ergebnisse gefunden.</p>';
|
||||
return;
|
||||
}
|
||||
|
||||
// Hole alle Suchbegriffe
|
||||
const searchTerms = {
|
||||
general: document.getElementById('q').value,
|
||||
name: document.getElementById('nameInput').value,
|
||||
ort: document.getElementById('ortInput').value,
|
||||
nummer: document.getElementById('nummerInput').value,
|
||||
plz: document.getElementById('plzInput').value,
|
||||
fachrichtung: document.getElementById('fachrichtungInput').value
|
||||
};
|
||||
|
||||
results.forEach(customer => {
|
||||
const card = document.createElement('div');
|
||||
card.className = 'customer-card';
|
||||
card.innerHTML = `
|
||||
<div class="customer-info">
|
||||
<h5 class="mb-1">${highlightText(customer.name, searchTerms.general || searchTerms.name)}</h5>
|
||||
<p class="mb-1 customer-number">${createCustomerLink(customer.nummer)}</p>
|
||||
<p class="mb-1">${createAddressLink(
|
||||
customer.strasse,
|
||||
highlightText(customer.plz, searchTerms.general || searchTerms.plz),
|
||||
highlightText(customer.ort, searchTerms.general || searchTerms.ort)
|
||||
)}</p>
|
||||
<p class="mb-1">Tel: ${createPhoneLink(customer.telefon)}</p>
|
||||
${customer.mobil ? `<p class="mb-1">Mobil: ${createPhoneLink(customer.mobil)}</p>` : ''}
|
||||
${customer.email ? `<p class="mb-1">E-Mail: ${createEmailLink(customer.email)}</p>` : ''}
|
||||
${customer.bemerkung ? `<p class="mb-1">Bemerkung: ${customer.bemerkung}</p>` : ''}
|
||||
${customer.fachrichtung ? `<p class="mb-1">Fachrichtung: ${highlightText(customer.fachrichtung, searchTerms.general || searchTerms.fachrichtung)}</p>` : ''}
|
||||
</div>
|
||||
<div class="card-actions">
|
||||
<button class="share-button" onclick="copyCustomerLink('${customer.nummer}')">
|
||||
<i class="fas fa-share-alt"></i> Teilen
|
||||
</button>
|
||||
</div>
|
||||
`;
|
||||
resultsDiv.appendChild(card);
|
||||
});
|
||||
}
|
||||
|
||||
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;
|
||||
|
||||
// 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);
|
||||
|
||||
// Führe die Suche durch
|
||||
fetch('/search?' + params.toString())
|
||||
.then(response => response.json())
|
||||
.then(data => {
|
||||
// Verstecke das Lade-Icon
|
||||
document.getElementById('loading').style.display = 'none';
|
||||
|
||||
if (data.error) {
|
||||
return;
|
||||
}
|
||||
|
||||
lastResults = data;
|
||||
updateResultCounts();
|
||||
displayResults(data);
|
||||
})
|
||||
.catch(error => {
|
||||
document.getElementById('loading').style.display = 'none';
|
||||
});
|
||||
}
|
||||
|
||||
// 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);
|
||||
searchTimeout = setTimeout(searchCustomers, 300);
|
||||
|
||||
// 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();
|
||||
});
|
||||
});
|
||||
|
||||
// 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();
|
||||
}
|
||||
});
|
||||
</script>
|
||||
<script src="{{ url_for('static', filename='js/main.js') }}"></script>
|
||||
</body>
|
||||
</html>
|
Reference in New Issue
Block a user