Compare commits
3 Commits
v1.2.15
...
feature/pw
Author | SHA1 | Date | |
---|---|---|---|
57d6daa298 | |||
80281d1c2c | |||
4c69478fa8 |
22
.gitignore
vendored
22
.gitignore
vendored
@@ -17,7 +17,6 @@ pip-delete-this-directory.txt
|
|||||||
.vscode/
|
.vscode/
|
||||||
*.swp
|
*.swp
|
||||||
*.swo
|
*.swo
|
||||||
*.bak
|
|
||||||
|
|
||||||
# Logs
|
# Logs
|
||||||
*.log
|
*.log
|
||||||
@@ -44,21 +43,12 @@ coverage.xml
|
|||||||
|
|
||||||
# Docker
|
# Docker
|
||||||
.docker/
|
.docker/
|
||||||
docker-compose.yml
|
|
||||||
|
|
||||||
# Daten
|
# Daten
|
||||||
data/
|
spezexpo.csv
|
||||||
|
|
||||||
# Virtual Environment
|
# Database
|
||||||
develop-eggs/
|
*.db
|
||||||
downloads/
|
data/customers.db
|
||||||
eggs/
|
data/customers.csv
|
||||||
.eggs/
|
docker-compose.yml
|
||||||
lib/
|
|
||||||
lib64/
|
|
||||||
parts/
|
|
||||||
sdist/
|
|
||||||
var/
|
|
||||||
wheels/
|
|
||||||
.installed.cfg
|
|
||||||
*.egg
|
|
115
CHANGELOG.md
115
CHANGELOG.md
@@ -5,121 +5,6 @@ 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/),
|
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/).
|
und dieses Projekt adhäriert zu [Semantic Versioning](https://semver.org/lang/de/).
|
||||||
|
|
||||||
## [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
|
## [1.2.6] - 2024-03-19
|
||||||
### Geändert
|
### Geändert
|
||||||
- Verbesserte Suchfunktion: Keine Ergebnisse mehr bei leeren Suchfeldern
|
- Verbesserte Suchfunktion: Keine Ergebnisse mehr bei leeren Suchfeldern
|
||||||
|
65
README.md
65
README.md
@@ -1,49 +1,35 @@
|
|||||||
# Medi-Customers
|
# Medi-Customers
|
||||||
|
|
||||||
Eine moderne Webanwendung zur Suche und Verwaltung von Kundendaten, die MEDISOFT und MEDICONSULT Daten kombiniert.
|
Eine Flask-basierte Webanwendung zur Verwaltung von Kundenkontakten für medizinische Einrichtungen.
|
||||||
|
|
||||||
## Features
|
## Features
|
||||||
|
|
||||||
- 🔍 Echtzeit-Suche über alle Kundendaten
|
- Kundensuche nach verschiedenen Kriterien (Name, Ort, Kundennummer, etc.)
|
||||||
- 📱 Responsive Design für alle Geräte
|
- Direkte Links zu Kundendaten in medisoftware (für autorisierte IPs)
|
||||||
- 🔒 IP-basierte Zugriffskontrolle
|
- Telefonnummern-Links für autorisierte IPs
|
||||||
- 🔗 Direkte Integration mit MEDISOFT
|
- Adress-Links mit Google Maps Integration
|
||||||
- 🏥 Unterscheidung zwischen MEDISOFT und MEDICONSULT Kunden
|
- IP-basierte Zugriffssteuerung
|
||||||
- 🎨 Farbliche Hervorhebung der Kundentypen (blau für MEDISOFT, orange für MEDICONSULT)
|
- Responsive Design
|
||||||
- 📍 Verbesserte Adress-Links mit Location- und Route-Icons
|
|
||||||
|
|
||||||
## Version
|
|
||||||
|
|
||||||
Aktuelle Version: 1.2.15
|
|
||||||
|
|
||||||
## Installation
|
## Installation
|
||||||
|
|
||||||
1. Klonen Sie das Repository:
|
1. Repository klonen:
|
||||||
```bash
|
```bash
|
||||||
git clone https://gitea.elpatron.me/elpatron/medi-customers.git
|
git clone https://gitea.elpatron.me/elpatron/medi-customers.git
|
||||||
cd medi-customers
|
cd medi-customers
|
||||||
```
|
```
|
||||||
|
|
||||||
2. Erstellen Sie die erforderlichen Verzeichnisse:
|
2. Umgebungsvariablen einrichten:
|
||||||
```bash
|
```bash
|
||||||
mkdir -p data
|
cp .env.example .env
|
||||||
|
# Bearbeiten Sie die .env-Datei mit Ihren Einstellungen
|
||||||
```
|
```
|
||||||
|
|
||||||
3. Starten Sie die Anwendung mit Docker Compose:
|
3. Docker Container starten:
|
||||||
```bash
|
```bash
|
||||||
docker-compose up --build
|
docker-compose up -d
|
||||||
```
|
```
|
||||||
|
|
||||||
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
|
## Konfiguration
|
||||||
|
|
||||||
Die Anwendung kann über folgende Umgebungsvariablen konfiguriert werden:
|
Die Anwendung kann über folgende Umgebungsvariablen konfiguriert werden:
|
||||||
@@ -63,6 +49,14 @@ Die Anwendung unterstützt CIDR-Notation für IP-Bereiche. Beispiele:
|
|||||||
- Subnetz: 192.168.1.0/24
|
- Subnetz: 192.168.1.0/24
|
||||||
- Größeres Netzwerk: 10.0.0.0/8
|
- Größeres Netzwerk: 10.0.0.0/8
|
||||||
|
|
||||||
|
## Version
|
||||||
|
|
||||||
|
Aktuelle Version: v1.2.6
|
||||||
|
|
||||||
|
## Lizenz
|
||||||
|
|
||||||
|
Alle Rechte vorbehalten. © 2025 medisoftware
|
||||||
|
|
||||||
## API-Beispiele
|
## API-Beispiele
|
||||||
|
|
||||||
### Suche nach Name
|
### Suche nach Name
|
||||||
@@ -110,20 +104,3 @@ curl "http://localhost:5001/search?fachrichtung=Zahnarzt&ort=Berlin&name=Schmidt
|
|||||||
## Version
|
## 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
|
|
582
app.py
582
app.py
@@ -1,4 +1,4 @@
|
|||||||
from flask import Flask, render_template, request, jsonify, url_for, redirect, session
|
from flask import Flask, render_template, request, jsonify, url_for, redirect, session, make_response, send_from_directory
|
||||||
import pandas as pd
|
import pandas as pd
|
||||||
import os
|
import os
|
||||||
import logging
|
import logging
|
||||||
@@ -18,7 +18,10 @@ logging.basicConfig(level=logging.INFO)
|
|||||||
logger = logging.getLogger(__name__)
|
logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
# Version der Anwendung
|
# Version der Anwendung
|
||||||
VERSION = "1.2.15"
|
VERSION = "1.2.1"
|
||||||
|
|
||||||
|
# Pfad zur CSV-Datei
|
||||||
|
CSV_FILE = 'data/customers.csv'
|
||||||
|
|
||||||
# Pfad zur Datenbank
|
# Pfad zur Datenbank
|
||||||
DB_FILE = 'data/customers.db'
|
DB_FILE = 'data/customers.db'
|
||||||
@@ -30,172 +33,245 @@ load_dotenv()
|
|||||||
STATIC_PASSWORD = os.getenv('LOGIN_PASSWORD', 'default-password')
|
STATIC_PASSWORD = os.getenv('LOGIN_PASSWORD', 'default-password')
|
||||||
ALLOWED_IP_RANGES = os.getenv('ALLOWED_IP_RANGES', '').split(',')
|
ALLOWED_IP_RANGES = os.getenv('ALLOWED_IP_RANGES', '').split(',')
|
||||||
|
|
||||||
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 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():
|
def init_db():
|
||||||
"""Initialisiert die SQLite-Datenbank mit der notwendigen Tabelle."""
|
"""Initialisiert die SQLite-Datenbank mit der notwendigen Tabelle."""
|
||||||
conn = get_db_connection()
|
conn = sqlite3.connect(DB_FILE)
|
||||||
c = conn.cursor()
|
c = conn.cursor()
|
||||||
|
|
||||||
|
# Erstelle die 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
|
||||||
|
)
|
||||||
|
''')
|
||||||
|
|
||||||
|
# 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')
|
||||||
|
|
||||||
|
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')
|
||||||
|
|
||||||
try:
|
try:
|
||||||
# Erstelle die Kunden-Tabelle
|
# Lese die CSV-Datei mit pandas
|
||||||
c.execute('''
|
df = pd.read_csv(CSV_FILE, sep=',', encoding='utf-8', quotechar='"')
|
||||||
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
|
# Entferne Anführungszeichen aus den Spaltennamen
|
||||||
c.execute('CREATE INDEX IF NOT EXISTS idx_customers_nummer ON customers(nummer)')
|
df.columns = df.columns.str.strip('"')
|
||||||
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
|
# Entferne Anführungszeichen aus den Werten
|
||||||
c.execute('CREATE INDEX IF NOT EXISTS idx_customers_name_ort ON customers(name, ort)')
|
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()
|
conn.commit()
|
||||||
logger.info('Datenbank initialisiert')
|
logger.info('CSV-Daten erfolgreich in die Datenbank importiert')
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
logger.error(f'Fehler bei der Datenbankinitialisierung: {str(e)}')
|
logger.error(f'Fehler beim Import der CSV-Daten: {str(e)}')
|
||||||
raise
|
raise
|
||||||
finally:
|
finally:
|
||||||
conn.close()
|
conn.close()
|
||||||
|
|
||||||
def import_csv():
|
def search_customers(search_params):
|
||||||
"""Importiert die CSV-Datei in die Datenbank"""
|
"""Sucht nach Kunden basierend auf den Suchparametern."""
|
||||||
conn = None
|
# Prüfe, ob alle Suchfelder leer sind
|
||||||
|
if not any([
|
||||||
|
search_params.get('q'),
|
||||||
|
search_params.get('name'),
|
||||||
|
search_params.get('ort'),
|
||||||
|
search_params.get('nummer'),
|
||||||
|
search_params.get('plz'),
|
||||||
|
search_params.get('telefon'),
|
||||||
|
search_params.get('email'),
|
||||||
|
search_params.get('fachrichtung')
|
||||||
|
]):
|
||||||
|
return []
|
||||||
|
|
||||||
|
conn = sqlite3.connect(DB_FILE)
|
||||||
|
c = conn.cursor()
|
||||||
|
|
||||||
try:
|
try:
|
||||||
conn = get_db_connection()
|
# Baue die SQL-Abfrage dynamisch auf
|
||||||
c = conn.cursor()
|
query = "SELECT * FROM customers WHERE 1=1"
|
||||||
|
params = []
|
||||||
|
|
||||||
# Lösche bestehende Daten
|
# Allgemeine Suche über alle Felder
|
||||||
c.execute('DELETE FROM customers')
|
if search_params.get('q'):
|
||||||
|
search_term = f"%{search_params['q']}%"
|
||||||
|
operator = search_params.get('operator', 'or').upper()
|
||||||
|
|
||||||
# Importiere MEDISOFT-Daten
|
if operator == 'AND':
|
||||||
if os.path.exists('data/customers.csv'):
|
# Bei UND-Verknüpfung müssen alle Begriffe in mindestens einem Feld vorkommen
|
||||||
logger.info("Importiere MEDISOFT-Daten...")
|
terms = search_params['q'].split()
|
||||||
df = pd.read_csv('data/customers.csv', encoding='iso-8859-1')
|
conditions = []
|
||||||
df.columns = df.columns.str.strip().str.replace('"', '')
|
for term in terms:
|
||||||
df = df.apply(lambda x: x.str.strip().str.replace('"', '') if x.dtype == "object" else x)
|
term = f"%{term}%"
|
||||||
|
conditions.append("(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([term] * 8)
|
||||||
|
query += " AND " + " AND ".join(conditions)
|
||||||
|
else:
|
||||||
|
# Bei ODER-Verknüpfung (Standard) muss mindestens ein Begriff in einem Feld vorkommen
|
||||||
|
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)
|
||||||
|
|
||||||
for _, row in df.iterrows():
|
# Spezifische Suche für einzelne Felder
|
||||||
c.execute('''
|
if search_params.get('name'):
|
||||||
INSERT INTO customers (
|
query += " AND name LIKE ?"
|
||||||
name, nummer, strasse, plz, ort, telefon, mobil, email,
|
params.append(f"%{search_params['name']}%")
|
||||||
fachrichtung, tag, handy, tele_firma, kontakt1, kontakt2, kontakt3
|
|
||||||
)
|
|
||||||
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
|
|
||||||
''', (
|
|
||||||
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 search_params.get('ort'):
|
||||||
if os.path.exists('data/customers_snk.csv'):
|
query += " AND ort LIKE ?"
|
||||||
logger.info("Importiere MEDICONSULT-Daten...")
|
params.append(f"%{search_params['ort']}%")
|
||||||
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():
|
if search_params.get('nummer'):
|
||||||
c.execute('''
|
query += " AND nummer LIKE ?"
|
||||||
INSERT INTO customers (
|
params.append(f"%{search_params['nummer']}%")
|
||||||
name, nummer, strasse, plz, ort, telefon, mobil, email,
|
|
||||||
fachrichtung, tag, handy, tele_firma, kontakt1, kontakt2, kontakt3
|
|
||||||
)
|
|
||||||
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
|
|
||||||
''', (
|
|
||||||
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()
|
if search_params.get('plz'):
|
||||||
logger.info("CSV-Daten erfolgreich in die Datenbank importiert")
|
query += " AND plz LIKE ?"
|
||||||
|
params.append(f"%{search_params['plz']}%")
|
||||||
|
|
||||||
|
if search_params.get('fachrichtung'):
|
||||||
|
query += " AND fachrichtung LIKE ?"
|
||||||
|
params.append(f"%{search_params['fachrichtung']}%")
|
||||||
|
|
||||||
|
# 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:
|
except Exception as e:
|
||||||
logger.error(f"Fehler beim Importieren der CSV-Datei: {str(e)}")
|
logger.error(f"Fehler bei der Kundensuche: {str(e)}")
|
||||||
raise
|
raise
|
||||||
finally:
|
finally:
|
||||||
if conn:
|
conn.close()
|
||||||
conn.close()
|
|
||||||
|
|
||||||
def clean_dataframe(df):
|
def clean_dataframe(df):
|
||||||
"""Konvertiert NaN-Werte in None für JSON-Kompatibilität"""
|
"""Konvertiert NaN-Werte in None für JSON-Kompatibilität"""
|
||||||
return df.replace({np.nan: None})
|
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
|
||||||
|
|
||||||
|
# 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
|
||||||
|
except Exception as e:
|
||||||
|
logger.error(f"Fehler beim Laden der CSV-Datei: {str(e)}")
|
||||||
|
return None
|
||||||
|
|
||||||
@app.route('/login', methods=['GET', 'POST'])
|
@app.route('/login', methods=['GET', 'POST'])
|
||||||
def login():
|
def login():
|
||||||
# Überprüfe, ob die Client-IP in einem der erlaubten Bereiche liegt
|
# Versuche, die tatsächliche Client-IP aus dem X-Forwarded-For-Header zu erhalten
|
||||||
client_ip = request.headers.get('X-Forwarded-For', request.remote_addr)
|
client_ip = request.headers.get('X-Forwarded-For', request.remote_addr)
|
||||||
|
allowed_ip_ranges = os.getenv('ALLOWED_IP_RANGES', '').split(',')
|
||||||
|
|
||||||
# Überprüfe, ob die Client-IP in einem der erlaubten Bereichen liegt
|
logger.info(f"Client-IP: {client_ip}")
|
||||||
is_allowed = any(isIPInSubnet(client_ip, range.strip()) for range in ALLOWED_IP_RANGES if range.strip())
|
logger.info(f"Erlaubte IP-Bereiche: {allowed_ip_ranges}")
|
||||||
|
logger.info(f"Session Status: {session}")
|
||||||
|
|
||||||
if is_allowed:
|
# Überprüfen, ob die IP-Adresse in einem der erlaubten Subnetze liegt
|
||||||
logger.info(f"Client-IP {client_ip} ist in einem erlaubten Bereich, automatischer Login")
|
client_ip_obj = ipaddress.ip_address(client_ip)
|
||||||
session['logged_in'] = True
|
for ip_range in allowed_ip_ranges:
|
||||||
return redirect(url_for('index'))
|
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}")
|
||||||
|
|
||||||
if request.method == 'POST':
|
if request.method == 'POST':
|
||||||
password = request.form.get('password')
|
password = request.form.get('password')
|
||||||
|
logger.info(f"Login-Versuch mit Passwort: {'*' * len(password) if password else 'None'}")
|
||||||
if password == STATIC_PASSWORD:
|
if password == STATIC_PASSWORD:
|
||||||
session['logged_in'] = True
|
session['logged_in'] = True
|
||||||
logger.info("Erfolgreicher Login")
|
session.permanent = True # Session bleibt bestehen
|
||||||
|
logger.info("Login erfolgreich, Session gesetzt")
|
||||||
return redirect(url_for('index'))
|
return redirect(url_for('index'))
|
||||||
else:
|
else:
|
||||||
logger.warning("Falsches Passwort eingegeben")
|
logger.warning("Falsches Passwort eingegeben")
|
||||||
@@ -211,218 +287,84 @@ def index():
|
|||||||
logger.info("Benutzer nicht eingeloggt, Weiterleitung zum Login")
|
logger.info("Benutzer nicht eingeloggt, Weiterleitung zum Login")
|
||||||
return redirect(url_for('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)
|
client_ip = request.headers.get('X-Forwarded-For', request.remote_addr)
|
||||||
logger.info(f"Client-IP: {client_ip}")
|
logger.info(f"Client-IP: {client_ip}")
|
||||||
logger.info(f"Erlaubte IP-Bereiche: {ALLOWED_IP_RANGES}")
|
logger.info(f"Erlaubte IP-Bereiche: {allowed_ip_ranges}")
|
||||||
return render_template('index.html', allowed_ip_ranges=','.join(ALLOWED_IP_RANGES), version=VERSION)
|
return render_template('index.html', allowed_ip_ranges=allowed_ip_ranges)
|
||||||
|
|
||||||
@app.route('/search', methods=['GET', 'POST'])
|
@app.route('/search')
|
||||||
def search():
|
def search():
|
||||||
if not session.get('logged_in'):
|
|
||||||
return jsonify({'error': 'Nicht eingeloggt'}), 401
|
|
||||||
|
|
||||||
try:
|
try:
|
||||||
if request.method == 'POST':
|
# Hole die Suchparameter aus der Anfrage
|
||||||
data = request.get_json()
|
search_params = {
|
||||||
search_query = data.get('query', '')
|
'name': request.args.get('name', ''),
|
||||||
tag = data.get('tag', 'medisoft')
|
'ort': request.args.get('ort', ''),
|
||||||
else:
|
'nummer': request.args.get('nummer', ''),
|
||||||
search_query = request.args.get('q', '')
|
'plz': request.args.get('plz', ''),
|
||||||
name = request.args.get('name', '')
|
'telefon': request.args.get('telefon', ''),
|
||||||
ort = request.args.get('ort', '')
|
'email': request.args.get('email', ''),
|
||||||
nummer = request.args.get('nummer', '')
|
'q': request.args.get('q', ''),
|
||||||
plz = request.args.get('plz', '')
|
'fachrichtung': request.args.get('fachrichtung', ''),
|
||||||
fachrichtung = request.args.get('fachrichtung', '')
|
'operator': request.args.get('operator', 'or')
|
||||||
tag = request.args.get('tag', 'medisoft')
|
}
|
||||||
|
|
||||||
conn = get_db_connection()
|
# Führe die Suche in der Datenbank durch
|
||||||
c = conn.cursor()
|
results = search_customers(search_params)
|
||||||
|
|
||||||
# Baue die SQL-Abfrage
|
# Protokolliere die Anzahl der gefundenen Ergebnisse
|
||||||
sql_query = '''
|
logger.info(f'Suchergebnisse gefunden: {len(results)}')
|
||||||
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)
|
|
||||||
|
|
||||||
conn.close()
|
|
||||||
return jsonify(formatted_results)
|
|
||||||
|
|
||||||
|
return jsonify(results)
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
logger.error(f"Fehler bei der Suche: {str(e)}")
|
logger.error(f'Fehler bei der Suche: {str(e)}')
|
||||||
return jsonify({'error': str(e)}), 500
|
return jsonify({"error": str(e)}), 500
|
||||||
|
|
||||||
@app.route('/api/fachrichtungen')
|
@app.route('/sw.js')
|
||||||
def get_fachrichtungen():
|
def sw():
|
||||||
|
response = make_response(send_from_directory('static', 'sw.js'))
|
||||||
|
response.headers['Content-Type'] = 'application/javascript'
|
||||||
|
return response
|
||||||
|
|
||||||
|
@app.route('/offline')
|
||||||
|
def offline():
|
||||||
|
return render_template('offline.html')
|
||||||
|
|
||||||
|
@app.route('/api/search', methods=['POST'])
|
||||||
|
def api_search():
|
||||||
|
"""API-Endpunkt für die Kundensuche"""
|
||||||
try:
|
try:
|
||||||
search_term = request.args.get('q', '').lower()
|
search_params = request.get_json()
|
||||||
conn = get_db_connection()
|
results = search_customers(search_params)
|
||||||
c = conn.cursor()
|
return jsonify(results)
|
||||||
|
|
||||||
# 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)
|
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
logger.error(f"Fehler beim Abrufen der Fachrichtungen: {str(e)}")
|
return jsonify({"error": str(e)}), 500
|
||||||
return jsonify([])
|
|
||||||
|
|
||||||
@app.route('/api/orte')
|
@app.route('/api/customers')
|
||||||
def get_orte():
|
def api_customers():
|
||||||
|
"""API-Endpunkt für alle Kunden"""
|
||||||
try:
|
try:
|
||||||
search_term = request.args.get('q', '').lower()
|
conn = sqlite3.connect(DB_FILE)
|
||||||
conn = get_db_connection()
|
|
||||||
c = conn.cursor()
|
c = conn.cursor()
|
||||||
|
c.execute('SELECT * FROM customers')
|
||||||
# Hole alle eindeutigen Orte, die mit dem Suchbegriff übereinstimmen
|
columns = [description[0] for description in c.description]
|
||||||
c.execute('''
|
results = []
|
||||||
SELECT DISTINCT ort
|
for row in c.fetchall():
|
||||||
FROM customers
|
customer = dict(zip(columns, row))
|
||||||
WHERE ort IS NOT NULL
|
results.append(customer)
|
||||||
AND ort != ''
|
|
||||||
AND LOWER(ort) LIKE ?
|
|
||||||
ORDER BY ort
|
|
||||||
LIMIT 10
|
|
||||||
''', (f'%{search_term}%',))
|
|
||||||
|
|
||||||
orte = [row[0] for row in c.fetchall()]
|
|
||||||
conn.close()
|
conn.close()
|
||||||
|
return jsonify(results)
|
||||||
return jsonify(orte)
|
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
logger.error(f"Fehler beim Abrufen der Orte: {str(e)}")
|
return jsonify({"error": str(e)}), 500
|
||||||
return jsonify([])
|
|
||||||
|
|
||||||
def init_app(app):
|
def init_app(app):
|
||||||
"""Initialisiert die Anwendung mit allen notwendigen Einstellungen."""
|
"""Initialisiert die Anwendung mit allen notwendigen Einstellungen."""
|
||||||
with app.app_context():
|
with app.app_context():
|
||||||
try:
|
# Initialisiere die Datenbank
|
||||||
# Stelle sicher, dass der data-Ordner existiert
|
init_db()
|
||||||
os.makedirs('data', exist_ok=True)
|
# Importiere die CSV-Daten
|
||||||
|
import_csv()
|
||||||
# Lösche die alte Datenbank, falls sie existiert
|
logger.info("Anwendung erfolgreich initialisiert")
|
||||||
if os.path.exists(DB_FILE):
|
|
||||||
try:
|
|
||||||
os.remove(DB_FILE)
|
|
||||||
logger.info(f"Alte Datenbank {DB_FILE} 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
|
# Initialisiere die App
|
||||||
init_app(app)
|
init_app(app)
|
||||||
|
1172
data/customers.csv
Normal file
1172
data/customers.csv
Normal file
File diff suppressed because it is too large
Load Diff
39
scripts/generate_icons.py
Normal file
39
scripts/generate_icons.py
Normal file
@@ -0,0 +1,39 @@
|
|||||||
|
from PIL import Image, ImageDraw, ImageFont
|
||||||
|
import os
|
||||||
|
|
||||||
|
def create_icon(size):
|
||||||
|
# Erstelle ein neues Bild mit grünem Hintergrund
|
||||||
|
image = Image.new('RGB', (size, size), '#4CAF50')
|
||||||
|
draw = ImageDraw.Draw(image)
|
||||||
|
|
||||||
|
# Versuche, eine Schriftart zu laden
|
||||||
|
try:
|
||||||
|
font = ImageFont.truetype("arial.ttf", size // 3)
|
||||||
|
except:
|
||||||
|
font = ImageFont.load_default()
|
||||||
|
|
||||||
|
# Text "MEDI" zeichnen
|
||||||
|
text = "MEDI"
|
||||||
|
text_bbox = draw.textbbox((0, 0), text, font=font)
|
||||||
|
text_width = text_bbox[2] - text_bbox[0]
|
||||||
|
text_height = text_bbox[3] - text_bbox[1]
|
||||||
|
x = (size - text_width) // 2
|
||||||
|
y = (size - text_height) // 2
|
||||||
|
draw.text((x, y), text, fill='white', font=font)
|
||||||
|
|
||||||
|
# Speichere das Icon
|
||||||
|
output_file = f'static/images/icon-{size}x{size}.png'
|
||||||
|
image.save(output_file, 'PNG')
|
||||||
|
print(f'Icon {size}x{size} generiert: {output_file}')
|
||||||
|
|
||||||
|
def main():
|
||||||
|
# Erstelle das Verzeichnis, falls es nicht existiert
|
||||||
|
os.makedirs('static/images', exist_ok=True)
|
||||||
|
|
||||||
|
# Generiere Icons in verschiedenen Größen
|
||||||
|
sizes = [192, 512]
|
||||||
|
for size in sizes:
|
||||||
|
create_icon(size)
|
||||||
|
|
||||||
|
if __name__ == '__main__':
|
||||||
|
main()
|
@@ -1,24 +0,0 @@
|
|||||||
.result-header {
|
|
||||||
display: flex;
|
|
||||||
justify-content: space-between;
|
|
||||||
align-items: center;
|
|
||||||
margin-bottom: 10px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.result-tag {
|
|
||||||
padding: 4px 8px;
|
|
||||||
border-radius: 4px;
|
|
||||||
font-size: 0.9em;
|
|
||||||
font-weight: 500;
|
|
||||||
text-transform: uppercase;
|
|
||||||
}
|
|
||||||
|
|
||||||
.tag-medisoft {
|
|
||||||
background-color: #e3f2fd;
|
|
||||||
color: #1976d2;
|
|
||||||
}
|
|
||||||
|
|
||||||
.tag-mediconsult {
|
|
||||||
background-color: #f3e5f5;
|
|
||||||
color: #7b1fa2;
|
|
||||||
}
|
|
@@ -255,39 +255,80 @@ body {
|
|||||||
user-select: none;
|
user-select: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
.result-tag {
|
/* Offline-Indikator */
|
||||||
padding: 4px 8px;
|
.offline-indicator {
|
||||||
border-radius: 4px;
|
position: fixed;
|
||||||
font-size: 0.9em;
|
bottom: 20px;
|
||||||
font-weight: 500;
|
right: 20px;
|
||||||
text-transform: uppercase;
|
|
||||||
color: white;
|
|
||||||
}
|
|
||||||
|
|
||||||
.tag-medisoft {
|
|
||||||
background-color: #1976d2;
|
|
||||||
}
|
|
||||||
|
|
||||||
.tag-mediconsult {
|
|
||||||
background-color: #ff9800;
|
background-color: #ff9800;
|
||||||
|
color: white;
|
||||||
|
padding: 10px 20px;
|
||||||
|
border-radius: 5px;
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 10px;
|
||||||
|
box-shadow: 0 2px 5px rgba(0,0,0,0.2);
|
||||||
|
z-index: 1000;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Adress-Links */
|
.offline-icon {
|
||||||
.address-text {
|
font-size: 1.2em;
|
||||||
margin-right: 5px;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.address-link, .route-link {
|
/* Synchronisations-Status */
|
||||||
|
.sync-status {
|
||||||
|
position: fixed;
|
||||||
|
bottom: 20px;
|
||||||
|
right: 20px;
|
||||||
|
background-color: #4CAF50;
|
||||||
|
color: white;
|
||||||
|
padding: 10px 20px;
|
||||||
|
border-radius: 5px;
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 10px;
|
||||||
|
box-shadow: 0 2px 5px rgba(0,0,0,0.2);
|
||||||
|
z-index: 1000;
|
||||||
|
}
|
||||||
|
|
||||||
|
.sync-icon {
|
||||||
|
font-size: 1.2em;
|
||||||
|
animation: spin 1s linear infinite;
|
||||||
|
}
|
||||||
|
|
||||||
|
@keyframes spin {
|
||||||
|
from { transform: rotate(0deg); }
|
||||||
|
to { transform: rotate(360deg); }
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Offline-Modus Styling */
|
||||||
|
body.offline {
|
||||||
|
filter: grayscale(20%);
|
||||||
|
}
|
||||||
|
|
||||||
|
body.offline .search-container {
|
||||||
|
opacity: 0.9;
|
||||||
|
}
|
||||||
|
|
||||||
|
body.offline .footer::after {
|
||||||
|
content: "Offline-Modus";
|
||||||
|
display: block;
|
||||||
|
text-align: center;
|
||||||
|
color: #ff9800;
|
||||||
|
font-size: 0.8em;
|
||||||
|
margin-top: 5px;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Offline-Fallback für Bilder */
|
||||||
|
.offline img {
|
||||||
|
opacity: 0.8;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Verbesserte Sichtbarkeit im Offline-Modus */
|
||||||
|
.offline .search-field input {
|
||||||
|
background-color: rgba(255, 255, 255, 0.9);
|
||||||
|
}
|
||||||
|
|
||||||
|
.offline .result-count {
|
||||||
color: #666;
|
color: #666;
|
||||||
text-decoration: none;
|
|
||||||
margin-left: 5px;
|
|
||||||
transition: color 0.2s;
|
|
||||||
}
|
|
||||||
|
|
||||||
.address-link:hover, .route-link:hover {
|
|
||||||
color: #0d6efd;
|
|
||||||
}
|
|
||||||
|
|
||||||
.location-pin, .route-pin {
|
|
||||||
font-size: 1.1em;
|
|
||||||
}
|
}
|
BIN
static/images/icon-192x192.png
Normal file
BIN
static/images/icon-192x192.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 2.5 KiB |
BIN
static/images/icon-512x512.png
Normal file
BIN
static/images/icon-512x512.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 6.9 KiB |
25
static/images/icon.svg
Normal file
25
static/images/icon.svg
Normal file
@@ -0,0 +1,25 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<svg width="512" height="512" viewBox="0 0 512 512" xmlns="http://www.w3.org/2000/svg">
|
||||||
|
<!-- Hintergrund -->
|
||||||
|
<rect width="512" height="512" fill="#4CAF50"/>
|
||||||
|
|
||||||
|
<!-- MEDI Text -->
|
||||||
|
<text x="256" y="300"
|
||||||
|
font-family="Arial, sans-serif"
|
||||||
|
font-size="200"
|
||||||
|
font-weight="bold"
|
||||||
|
fill="white"
|
||||||
|
text-anchor="middle">
|
||||||
|
MEDI
|
||||||
|
</text>
|
||||||
|
|
||||||
|
<!-- Herz-Symbol -->
|
||||||
|
<path d="M256 150
|
||||||
|
C 256 150, 200 100, 150 100
|
||||||
|
C 100 100, 50 150, 50 200
|
||||||
|
C 50 250, 256 350, 256 350
|
||||||
|
C 256 350, 462 250, 462 200
|
||||||
|
C 462 150, 412 100, 362 100
|
||||||
|
C 312 100, 256 150, 256 150"
|
||||||
|
fill="white"/>
|
||||||
|
</svg>
|
After Width: | Height: | Size: 775 B |
144
static/js/db.js
Normal file
144
static/js/db.js
Normal file
@@ -0,0 +1,144 @@
|
|||||||
|
// IndexedDB Konfiguration
|
||||||
|
const DB_NAME = 'mediCustomersDB';
|
||||||
|
const DB_VERSION = 1;
|
||||||
|
const STORE_NAME = 'customers';
|
||||||
|
|
||||||
|
// Datenbank initialisieren
|
||||||
|
const initDB = () => {
|
||||||
|
return new Promise((resolve, reject) => {
|
||||||
|
const request = indexedDB.open(DB_NAME, DB_VERSION);
|
||||||
|
|
||||||
|
request.onerror = () => {
|
||||||
|
console.error('Fehler beim Öffnen der Datenbank:', request.error);
|
||||||
|
reject(request.error);
|
||||||
|
};
|
||||||
|
|
||||||
|
request.onsuccess = () => {
|
||||||
|
console.log('Datenbank erfolgreich geöffnet');
|
||||||
|
resolve(request.result);
|
||||||
|
};
|
||||||
|
|
||||||
|
request.onupgradeneeded = (event) => {
|
||||||
|
const db = event.target.result;
|
||||||
|
if (!db.objectStoreNames.contains(STORE_NAME)) {
|
||||||
|
const store = db.createObjectStore(STORE_NAME, { keyPath: 'nummer' });
|
||||||
|
// Indizes für die Suche erstellen
|
||||||
|
store.createIndex('name', 'name', { unique: false });
|
||||||
|
store.createIndex('ort', 'ort', { unique: false });
|
||||||
|
store.createIndex('plz', 'plz', { unique: false });
|
||||||
|
store.createIndex('fachrichtung', 'fachrichtung', { unique: false });
|
||||||
|
}
|
||||||
|
};
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
// Kunden in IndexedDB speichern
|
||||||
|
const saveCustomers = async (customers) => {
|
||||||
|
const db = await initDB();
|
||||||
|
const tx = db.transaction(STORE_NAME, 'readwrite');
|
||||||
|
const store = tx.objectStore(STORE_NAME);
|
||||||
|
|
||||||
|
return Promise.all(customers.map(customer => {
|
||||||
|
return new Promise((resolve, reject) => {
|
||||||
|
const request = store.put(customer);
|
||||||
|
request.onsuccess = () => resolve();
|
||||||
|
request.onerror = () => reject(request.error);
|
||||||
|
});
|
||||||
|
}));
|
||||||
|
};
|
||||||
|
|
||||||
|
// Kunden aus IndexedDB suchen
|
||||||
|
const searchCustomersOffline = async (searchParams) => {
|
||||||
|
const db = await initDB();
|
||||||
|
const tx = db.transaction(STORE_NAME, 'readonly');
|
||||||
|
const store = tx.objectStore(STORE_NAME);
|
||||||
|
|
||||||
|
return new Promise((resolve, reject) => {
|
||||||
|
const request = store.getAll();
|
||||||
|
|
||||||
|
request.onsuccess = () => {
|
||||||
|
let results = request.result;
|
||||||
|
|
||||||
|
// Filtern basierend auf den Suchparametern
|
||||||
|
if (searchParams.q) {
|
||||||
|
const searchTerms = searchParams.q.toLowerCase().split(' ');
|
||||||
|
const operator = searchParams.operator || 'or';
|
||||||
|
|
||||||
|
results = results.filter(customer => {
|
||||||
|
const searchableText = `${customer.name} ${customer.ort} ${customer.nummer} ${customer.plz} ${customer.fachrichtung}`.toLowerCase();
|
||||||
|
|
||||||
|
if (operator === 'and') {
|
||||||
|
return searchTerms.every(term => searchableText.includes(term));
|
||||||
|
} else {
|
||||||
|
return searchTerms.some(term => searchableText.includes(term));
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
// Spezifische Feldsuche
|
||||||
|
if (searchParams.name) {
|
||||||
|
results = results.filter(c => c.name.toLowerCase().includes(searchParams.name.toLowerCase()));
|
||||||
|
}
|
||||||
|
if (searchParams.ort) {
|
||||||
|
results = results.filter(c => c.ort.toLowerCase().includes(searchParams.ort.toLowerCase()));
|
||||||
|
}
|
||||||
|
if (searchParams.nummer) {
|
||||||
|
results = results.filter(c => c.nummer.toString().includes(searchParams.nummer));
|
||||||
|
}
|
||||||
|
if (searchParams.plz) {
|
||||||
|
results = results.filter(c => c.plz.includes(searchParams.plz));
|
||||||
|
}
|
||||||
|
if (searchParams.fachrichtung) {
|
||||||
|
results = results.filter(c => c.fachrichtung.toLowerCase().includes(searchParams.fachrichtung.toLowerCase()));
|
||||||
|
}
|
||||||
|
|
||||||
|
resolve(results);
|
||||||
|
};
|
||||||
|
|
||||||
|
request.onerror = () => {
|
||||||
|
reject(request.error);
|
||||||
|
};
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
// Synchronisationsstatus speichern
|
||||||
|
const syncStatus = {
|
||||||
|
lastSync: null,
|
||||||
|
isOnline: navigator.onLine
|
||||||
|
};
|
||||||
|
|
||||||
|
// Event Listener für Online/Offline Status
|
||||||
|
window.addEventListener('online', () => {
|
||||||
|
syncStatus.isOnline = true;
|
||||||
|
document.body.classList.remove('offline');
|
||||||
|
synchronizeData();
|
||||||
|
});
|
||||||
|
|
||||||
|
window.addEventListener('offline', () => {
|
||||||
|
syncStatus.isOnline = false;
|
||||||
|
document.body.classList.add('offline');
|
||||||
|
});
|
||||||
|
|
||||||
|
// Daten mit dem Server synchronisieren
|
||||||
|
const synchronizeData = async () => {
|
||||||
|
if (!syncStatus.isOnline) return;
|
||||||
|
|
||||||
|
try {
|
||||||
|
const response = await fetch('/api/customers');
|
||||||
|
const customers = await response.json();
|
||||||
|
await saveCustomers(customers);
|
||||||
|
syncStatus.lastSync = new Date();
|
||||||
|
console.log('Daten erfolgreich synchronisiert');
|
||||||
|
} catch (error) {
|
||||||
|
console.error('Fehler bei der Synchronisation:', error);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
// Export der Funktionen
|
||||||
|
window.dbHelper = {
|
||||||
|
initDB,
|
||||||
|
saveCustomers,
|
||||||
|
searchCustomersOffline,
|
||||||
|
synchronizeData,
|
||||||
|
syncStatus
|
||||||
|
};
|
28
static/manifest.json
Normal file
28
static/manifest.json
Normal file
@@ -0,0 +1,28 @@
|
|||||||
|
{
|
||||||
|
"name": "MEDI Kunden",
|
||||||
|
"short_name": "MEDI",
|
||||||
|
"description": "MEDI Kundenverwaltung - Offline-fähige PWA",
|
||||||
|
"start_url": "/",
|
||||||
|
"display": "standalone",
|
||||||
|
"background_color": "#ffffff",
|
||||||
|
"theme_color": "#4CAF50",
|
||||||
|
"orientation": "portrait",
|
||||||
|
"icons": [
|
||||||
|
{
|
||||||
|
"src": "/static/images/icon-192x192.png",
|
||||||
|
"sizes": "192x192",
|
||||||
|
"type": "image/png",
|
||||||
|
"purpose": "any maskable"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"src": "/static/images/icon-512x512.png",
|
||||||
|
"sizes": "512x512",
|
||||||
|
"type": "image/png",
|
||||||
|
"purpose": "any maskable"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"categories": ["business", "productivity"],
|
||||||
|
"lang": "de-DE",
|
||||||
|
"dir": "ltr",
|
||||||
|
"prefer_related_applications": false
|
||||||
|
}
|
75
static/sw.js
Normal file
75
static/sw.js
Normal file
@@ -0,0 +1,75 @@
|
|||||||
|
const CACHE_NAME = 'medi-customers-v1';
|
||||||
|
const urlsToCache = [
|
||||||
|
'/',
|
||||||
|
'/static/css/styles.css',
|
||||||
|
'/static/js/script.js',
|
||||||
|
'/static/images/logo.png',
|
||||||
|
'/static/images/icon-192x192.png',
|
||||||
|
'/static/images/icon-512x512.png'
|
||||||
|
];
|
||||||
|
|
||||||
|
// Installation des Service Workers
|
||||||
|
self.addEventListener('install', event => {
|
||||||
|
event.waitUntil(
|
||||||
|
caches.open(CACHE_NAME)
|
||||||
|
.then(cache => {
|
||||||
|
console.log('Cache geöffnet');
|
||||||
|
return cache.addAll(urlsToCache);
|
||||||
|
})
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
// Aktivierung des Service Workers
|
||||||
|
self.addEventListener('activate', event => {
|
||||||
|
event.waitUntil(
|
||||||
|
caches.keys().then(cacheNames => {
|
||||||
|
return Promise.all(
|
||||||
|
cacheNames.map(cacheName => {
|
||||||
|
if (cacheName !== CACHE_NAME) {
|
||||||
|
console.log('Lösche alten Cache:', cacheName);
|
||||||
|
return caches.delete(cacheName);
|
||||||
|
}
|
||||||
|
})
|
||||||
|
);
|
||||||
|
})
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
// Fetch-Event-Handler
|
||||||
|
self.addEventListener('fetch', event => {
|
||||||
|
event.respondWith(
|
||||||
|
caches.match(event.request)
|
||||||
|
.then(response => {
|
||||||
|
// Cache-Treffer - gib die Antwort zurück
|
||||||
|
if (response) {
|
||||||
|
return response;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Kein Cache-Treffer - führe Netzwerkanfrage durch
|
||||||
|
return fetch(event.request)
|
||||||
|
.then(response => {
|
||||||
|
// Prüfe, ob wir eine gültige Antwort erhalten haben
|
||||||
|
if (!response || response.status !== 200 || response.type !== 'basic') {
|
||||||
|
return response;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Klone die Antwort
|
||||||
|
const responseToCache = response.clone();
|
||||||
|
|
||||||
|
// Speichere die Antwort im Cache
|
||||||
|
caches.open(CACHE_NAME)
|
||||||
|
.then(cache => {
|
||||||
|
cache.put(event.request, responseToCache);
|
||||||
|
});
|
||||||
|
|
||||||
|
return response;
|
||||||
|
})
|
||||||
|
.catch(() => {
|
||||||
|
// Fallback für Offline-Zugriff
|
||||||
|
if (event.request.mode === 'navigate') {
|
||||||
|
return caches.match('/offline.html');
|
||||||
|
}
|
||||||
|
});
|
||||||
|
})
|
||||||
|
);
|
||||||
|
});
|
@@ -5,9 +5,16 @@
|
|||||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||||
<title>medisoftware Kundensuche</title>
|
<title>medisoftware Kundensuche</title>
|
||||||
<link rel="icon" type="image/x-icon" href="{{ url_for('static', filename='favicon.ico') }}">
|
<link rel="icon" type="image/x-icon" href="{{ url_for('static', filename='favicon.ico') }}">
|
||||||
|
<link rel="manifest" href="{{ url_for('static', filename='manifest.json') }}">
|
||||||
|
<meta name="theme-color" content="#4CAF50">
|
||||||
|
<meta name="apple-mobile-web-app-capable" content="yes">
|
||||||
|
<meta name="apple-mobile-web-app-status-bar-style" content="black">
|
||||||
|
<meta name="apple-mobile-web-app-title" content="MEDI">
|
||||||
|
<link rel="apple-touch-icon" href="{{ url_for('static', filename='images/icon-192x192.png') }}">
|
||||||
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/css/bootstrap.min.css" rel="stylesheet">
|
<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 href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.5.1/css/all.min.css" rel="stylesheet">
|
||||||
<link href="{{ url_for('static', filename='css/styles.css') }}" rel="stylesheet">
|
<link href="{{ url_for('static', filename='css/styles.css') }}" rel="stylesheet">
|
||||||
|
<script src="{{ url_for('static', filename='js/db.js') }}"></script>
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
<div class="main-content">
|
<div class="main-content">
|
||||||
@@ -24,6 +31,16 @@
|
|||||||
<i class="fas fa-times reset-icon" onclick="clearInput('q')"></i>
|
<i class="fas fa-times reset-icon" onclick="clearInput('q')"></i>
|
||||||
<i class="fas fa-search search-icon"></i>
|
<i class="fas fa-search search-icon"></i>
|
||||||
</div>
|
</div>
|
||||||
|
<div class="search-options mt-2">
|
||||||
|
<div class="form-check form-check-inline">
|
||||||
|
<input class="form-check-input" type="radio" name="searchOperator" id="searchOr" value="or" checked>
|
||||||
|
<label class="form-check-label" for="searchOr">ODER</label>
|
||||||
|
</div>
|
||||||
|
<div class="form-check form-check-inline">
|
||||||
|
<input class="form-check-input" type="radio" name="searchOperator" id="searchAnd" value="and">
|
||||||
|
<label class="form-check-label" for="searchAnd">UND</label>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="search-fields">
|
<div class="search-fields">
|
||||||
@@ -66,16 +83,6 @@
|
|||||||
<i class="fas fa-search search-icon"></i>
|
<i class="fas fa-search search-icon"></i>
|
||||||
</div>
|
</div>
|
||||||
</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>
|
||||||
|
|
||||||
<div class="result-counts">
|
<div class="result-counts">
|
||||||
@@ -100,18 +107,59 @@
|
|||||||
<footer class="footer">
|
<footer class="footer">
|
||||||
<div class="footer-content">
|
<div class="footer-content">
|
||||||
Proudly made with ❤️ and 🍺 by <a href="https://www.medisoftware.de" target="_blank" class="footer-link">medisoftware</a>
|
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: {{ version }}</div>
|
<div style="font-size: 0.8em;">Version: v1.2.6</div>
|
||||||
</div>
|
</div>
|
||||||
</footer>
|
</footer>
|
||||||
|
|
||||||
|
<div id="syncStatus" class="sync-status" style="display: none;">
|
||||||
|
<span class="sync-icon">🔄</span>
|
||||||
|
<span class="sync-text">Synchronisiere Daten...</span>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div id="offlineIndicator" class="offline-indicator" style="display: none;">
|
||||||
|
<span class="offline-icon">📡</span>
|
||||||
|
<span class="offline-text">Offline-Modus</span>
|
||||||
|
</div>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
|
// Service Worker und IndexedDB initialisieren
|
||||||
|
if ('serviceWorker' in navigator) {
|
||||||
|
window.addEventListener('load', async () => {
|
||||||
|
try {
|
||||||
|
const registration = await navigator.serviceWorker.register('/sw.js');
|
||||||
|
console.log('ServiceWorker registration successful');
|
||||||
|
|
||||||
|
// IndexedDB initialisieren und erste Synchronisation starten
|
||||||
|
await window.dbHelper.initDB();
|
||||||
|
await window.dbHelper.synchronizeData();
|
||||||
|
} catch (err) {
|
||||||
|
console.log('ServiceWorker registration failed: ', err);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
// Offline-Status-Anzeige aktualisieren
|
||||||
|
const updateOfflineStatus = () => {
|
||||||
|
const offlineIndicator = document.getElementById('offlineIndicator');
|
||||||
|
const syncStatus = document.getElementById('syncStatus');
|
||||||
|
|
||||||
|
if (!navigator.onLine) {
|
||||||
|
offlineIndicator.style.display = 'block';
|
||||||
|
syncStatus.style.display = 'none';
|
||||||
|
} else {
|
||||||
|
offlineIndicator.style.display = 'none';
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
window.addEventListener('online', updateOfflineStatus);
|
||||||
|
window.addEventListener('offline', updateOfflineStatus);
|
||||||
|
updateOfflineStatus();
|
||||||
|
|
||||||
let searchTimeout;
|
let searchTimeout;
|
||||||
let lastResults = [];
|
let lastResults = [];
|
||||||
let fachrichtungTimeout;
|
|
||||||
let ortTimeout;
|
|
||||||
|
|
||||||
function createPhoneLink(phone) {
|
function createPhoneLink(phone) {
|
||||||
if (!phone) return '';
|
if (!phone) return 'N/A';
|
||||||
|
|
||||||
const clientIP = '{{ request.headers.get("X-Forwarded-For", request.remote_addr) }}';
|
const clientIP = '{{ request.headers.get("X-Forwarded-For", request.remote_addr) }}';
|
||||||
const allowedIPRanges = '{{ allowed_ip_ranges }}'.split(',');
|
const allowedIPRanges = '{{ allowed_ip_ranges }}'.split(',');
|
||||||
@@ -122,6 +170,11 @@
|
|||||||
// Entferne alle nicht-numerischen Zeichen
|
// Entferne alle nicht-numerischen Zeichen
|
||||||
let cleanNumber = phone.replace(/\D/g, '');
|
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
|
// Formatiere die Nummer
|
||||||
let formattedNumber = cleanNumber;
|
let formattedNumber = cleanNumber;
|
||||||
if (cleanNumber.length === 11) {
|
if (cleanNumber.length === 11) {
|
||||||
@@ -135,21 +188,18 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
function createEmailLink(email) {
|
function createEmailLink(email) {
|
||||||
if (!email) return '';
|
if (!email) return 'N/A';
|
||||||
return `<a href="mailto:${email}" class="email-link">${email}</a>`;
|
return `<a href="mailto:${email}" class="email-link">${email}</a>`;
|
||||||
}
|
}
|
||||||
|
|
||||||
function highlightText(text, searchTerm) {
|
function highlightText(text, searchTerm) {
|
||||||
if (!searchTerm || !text) return text;
|
if (!searchTerm) return text;
|
||||||
// Escapen von Sonderzeichen im Suchbegriff
|
const regex = new RegExp(`(${searchTerm})`, 'gi');
|
||||||
const escapedSearchTerm = searchTerm.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
|
return text.replace(regex, '<mark>$1</mark>');
|
||||||
// Erstelle einen regulären Ausdruck ohne Wortgrenzen
|
|
||||||
const regex = new RegExp(escapedSearchTerm, 'gi');
|
|
||||||
return text.replace(regex, '<mark>$&</mark>');
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function createAddressLink(street, plz, city) {
|
function createAddressLink(street, plz, city) {
|
||||||
if (!street || !plz || !city) return '';
|
if (!street || !plz || !city) return 'N/A';
|
||||||
const address = `${street}, ${plz} ${city}`;
|
const address = `${street}, ${plz} ${city}`;
|
||||||
const searchQuery = encodeURIComponent(address);
|
const searchQuery = encodeURIComponent(address);
|
||||||
const routeQuery = encodeURIComponent(address);
|
const routeQuery = encodeURIComponent(address);
|
||||||
@@ -157,11 +207,11 @@
|
|||||||
return `<span class="address-text">${address}</span>
|
return `<span class="address-text">${address}</span>
|
||||||
<a href="https://www.google.com/maps/search/?api=1&query=${searchQuery}"
|
<a href="https://www.google.com/maps/search/?api=1&query=${searchQuery}"
|
||||||
class="address-link" target="_blank" rel="noopener noreferrer">
|
class="address-link" target="_blank" rel="noopener noreferrer">
|
||||||
<i class="fa-solid fa-location-dot location-pin"></i>
|
<i class="fa-solid fa-location-pin location-pin"></i>
|
||||||
</a>
|
</a>
|
||||||
<a href="https://www.google.com/maps/dir/?api=1&destination=${routeQuery}"
|
<a href="https://www.google.com/maps/dir/?api=1&destination=${routeQuery}"
|
||||||
class="route-link" target="_blank" rel="noopener noreferrer">
|
class="route-link" target="_blank" rel="noopener noreferrer">
|
||||||
<i class="fa-solid fa-route route-pin"></i>
|
<i class="fa-solid fa-car route-pin"></i>
|
||||||
</a>`;
|
</a>`;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -196,8 +246,8 @@
|
|||||||
return isIPInSubnet(clientIP, trimmedRange);
|
return isIPInSubnet(clientIP, trimmedRange);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
const adjustedNumber = adjustCustomerNumber(nummer);
|
||||||
if (isAllowed) {
|
if (isAllowed) {
|
||||||
const adjustedNumber = adjustCustomerNumber(nummer);
|
|
||||||
return `<a href="medisw:openkkbefe/P${adjustedNumber}?NetGrp=4" class="customer-link">${nummer}</a>`;
|
return `<a href="medisw:openkkbefe/P${adjustedNumber}?NetGrp=4" class="customer-link">${nummer}</a>`;
|
||||||
} else {
|
} else {
|
||||||
return nummer;
|
return nummer;
|
||||||
@@ -236,124 +286,93 @@
|
|||||||
|
|
||||||
function displayResults(results) {
|
function displayResults(results) {
|
||||||
const resultsDiv = document.getElementById('results');
|
const resultsDiv = document.getElementById('results');
|
||||||
const resultCount = document.getElementById('resultCount');
|
resultsDiv.innerHTML = '';
|
||||||
const generalSearchTerm = document.getElementById('q').value;
|
|
||||||
const nameSearchTerm = document.getElementById('nameInput').value;
|
|
||||||
const fachrichtungSearchTerm = document.getElementById('fachrichtungInput').value;
|
|
||||||
|
|
||||||
if (!results || results.length === 0) {
|
if (results.length === 0) {
|
||||||
resultsDiv.innerHTML = '<p>Keine Ergebnisse gefunden.</p>';
|
resultsDiv.innerHTML = '<p>Keine Ergebnisse gefunden.</p>';
|
||||||
resultCount.textContent = '0 Ergebnisse';
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
resultCount.textContent = `${results.length} Ergebnisse`;
|
// 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
|
||||||
|
};
|
||||||
|
|
||||||
const resultsList = results.map(customer => {
|
results.forEach(customer => {
|
||||||
// Hilfsfunktion zum Erstellen von Feldern nur wenn sie Werte haben
|
const card = document.createElement('div');
|
||||||
const createFieldIfValue = (label, value, formatter = (v) => v) => {
|
card.className = 'customer-card';
|
||||||
if (!value || value === 'N/A' || value === 'n/a' || value === 'N/a' || (typeof value === 'string' && value.trim() === '')) return '';
|
card.innerHTML = `
|
||||||
const formattedValue = formatter(value);
|
<div class="customer-info">
|
||||||
return `<p class="mb-1"><strong>${label}:</strong> ${formattedValue}</p>`;
|
<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(
|
||||||
return `
|
customer.strasse,
|
||||||
<div class="card mb-1">
|
highlightText(customer.plz, searchTerms.general || searchTerms.plz),
|
||||||
<div class="card-body py-1">
|
highlightText(customer.ort, searchTerms.general || searchTerms.ort)
|
||||||
<div class="d-flex justify-content-between align-items-start">
|
)}</p>
|
||||||
<h5 class="card-title mb-1">${highlightText(customer.name, generalSearchTerm || nameSearchTerm)}</h5>
|
<p class="mb-1">Tel: ${createPhoneLink(customer.telefon)}</p>
|
||||||
<div class="d-flex align-items-center gap-2">
|
${customer.mobil ? `<p class="mb-1">Mobil: ${createPhoneLink(customer.mobil)}</p>` : ''}
|
||||||
<span class="badge ${(customer.tag || 'medisoft') === 'medisoft' ? 'bg-primary' : 'bg-warning text-dark'}">${(customer.tag || 'medisoft').toUpperCase()}</span>
|
${customer.email ? `<p class="mb-1">E-Mail: ${createEmailLink(customer.email)}</p>` : ''}
|
||||||
<button class="btn btn-sm btn-outline-primary" onclick="copyCustomerLink('${customer.nummer}')">
|
${customer.bemerkung ? `<p class="mb-1">Bemerkung: ${customer.bemerkung}</p>` : ''}
|
||||||
<i class="fas fa-share-alt"></i> Teilen
|
${customer.fachrichtung ? `<p class="mb-1">Fachrichtung: ${highlightText(customer.fachrichtung, searchTerms.general || searchTerms.fachrichtung)}</p>` : ''}
|
||||||
</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>
|
||||||
</div>
|
<div class="card-actions">
|
||||||
`}).join('');
|
<button class="share-button" onclick="copyCustomerLink('${customer.nummer}')">
|
||||||
|
<i class="fas fa-share-alt"></i> Teilen
|
||||||
resultsDiv.innerHTML = resultsList;
|
</button>
|
||||||
|
</div>
|
||||||
|
`;
|
||||||
|
resultsDiv.appendChild(card);
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
function searchCustomers() {
|
async function searchCustomers() {
|
||||||
const q = document.getElementById('q').value;
|
const searchParams = {
|
||||||
const name = document.getElementById('nameInput').value;
|
q: document.getElementById('q').value,
|
||||||
const ort = document.getElementById('ortInput').value;
|
name: document.getElementById('nameInput').value,
|
||||||
const nummer = document.getElementById('nummerInput').value;
|
ort: document.getElementById('ortInput').value,
|
||||||
const plz = document.getElementById('plzInput').value;
|
nummer: document.getElementById('nummerInput').value,
|
||||||
const fachrichtung = document.getElementById('fachrichtungInput').value;
|
plz: document.getElementById('plzInput').value,
|
||||||
const selectedTag = document.getElementById('tagFilter').value;
|
fachrichtung: document.getElementById('fachrichtungInput').value,
|
||||||
|
operator: document.querySelector('input[name="searchOperator"]:checked').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';
|
document.getElementById('loading').style.display = 'block';
|
||||||
|
|
||||||
// Baue die Suchanfrage
|
try {
|
||||||
const params = new URLSearchParams();
|
let results;
|
||||||
if (q) params.append('q', q);
|
if (navigator.onLine) {
|
||||||
if (name) params.append('name', name);
|
// Online: Server-Suche
|
||||||
if (ort) params.append('ort', ort);
|
const response = await fetch('/api/search', {
|
||||||
if (nummer) params.append('nummer', nummer);
|
method: 'POST',
|
||||||
if (plz) params.append('plz', plz);
|
headers: {
|
||||||
if (fachrichtung) params.append('fachrichtung', fachrichtung);
|
'Content-Type': 'application/json',
|
||||||
if (selectedTag) params.append('tag', selectedTag);
|
},
|
||||||
|
body: JSON.stringify(searchParams)
|
||||||
|
});
|
||||||
|
results = await response.json();
|
||||||
|
|
||||||
// Führe die Suche durch
|
// Speichere die Ergebnisse in IndexedDB
|
||||||
fetch('/search?' + params.toString())
|
await window.dbHelper.saveCustomers(results);
|
||||||
.then(response => {
|
} else {
|
||||||
if (!response.ok) {
|
// Offline: Lokale Suche
|
||||||
throw new Error('Netzwerk-Antwort war nicht ok');
|
results = await window.dbHelper.searchCustomersOffline(searchParams);
|
||||||
}
|
}
|
||||||
return response.json();
|
|
||||||
})
|
|
||||||
.then(data => {
|
|
||||||
// Verstecke das Lade-Icon
|
|
||||||
document.getElementById('loading').style.display = 'none';
|
|
||||||
|
|
||||||
if (data.error) {
|
lastResults = results;
|
||||||
console.error('Fehler bei der Suche:', data.error);
|
displayResults(results);
|
||||||
return;
|
updateResultCounts();
|
||||||
}
|
} catch (error) {
|
||||||
|
console.error('Fehler bei der Suche:', error);
|
||||||
lastResults = data;
|
document.getElementById('results').innerHTML = '<p>Ein Fehler ist aufgetreten. Bitte versuchen Sie es später erneut.</p>';
|
||||||
updateResultCounts();
|
} finally {
|
||||||
displayResults(data);
|
document.getElementById('loading').style.display = 'none';
|
||||||
})
|
}
|
||||||
.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
|
// Event-Listener für die Live-Suche
|
||||||
@@ -378,8 +397,7 @@
|
|||||||
searchInputs.forEach((input, index) => {
|
searchInputs.forEach((input, index) => {
|
||||||
input.addEventListener('input', function() {
|
input.addEventListener('input', function() {
|
||||||
clearTimeout(searchTimeout);
|
clearTimeout(searchTimeout);
|
||||||
// Erhöhe das Debounce-Intervall auf 500ms
|
searchTimeout = setTimeout(searchCustomers, 300);
|
||||||
searchTimeout = setTimeout(searchCustomers, 500);
|
|
||||||
|
|
||||||
// Reset-Icon anzeigen/verstecken
|
// Reset-Icon anzeigen/verstecken
|
||||||
resetIcons[index].classList.toggle('visible', this.value.length > 0);
|
resetIcons[index].classList.toggle('visible', this.value.length > 0);
|
||||||
@@ -409,103 +427,6 @@
|
|||||||
searchCustomers();
|
searchCustomers();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
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';
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
document.addEventListener('DOMContentLoaded', function() {
|
|
||||||
setupFachrichtungAutocomplete();
|
|
||||||
setupOrtAutocomplete();
|
|
||||||
});
|
|
||||||
</script>
|
</script>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
58
templates/offline.html
Normal file
58
templates/offline.html
Normal file
@@ -0,0 +1,58 @@
|
|||||||
|
<!DOCTYPE html>
|
||||||
|
<html lang="de">
|
||||||
|
<head>
|
||||||
|
<meta charset="UTF-8">
|
||||||
|
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||||
|
<title>Offline - MEDI Kunden</title>
|
||||||
|
<link rel="stylesheet" href="{{ url_for('static', filename='css/styles.css') }}">
|
||||||
|
<style>
|
||||||
|
.offline-container {
|
||||||
|
text-align: center;
|
||||||
|
padding: 2rem;
|
||||||
|
max-width: 600px;
|
||||||
|
margin: 2rem auto;
|
||||||
|
}
|
||||||
|
.offline-icon {
|
||||||
|
font-size: 4rem;
|
||||||
|
color: #666;
|
||||||
|
margin-bottom: 1rem;
|
||||||
|
}
|
||||||
|
.offline-message {
|
||||||
|
font-size: 1.2rem;
|
||||||
|
color: #333;
|
||||||
|
margin-bottom: 1.5rem;
|
||||||
|
}
|
||||||
|
.retry-button {
|
||||||
|
background-color: #4CAF50;
|
||||||
|
color: white;
|
||||||
|
padding: 0.8rem 1.5rem;
|
||||||
|
border: none;
|
||||||
|
border-radius: 4px;
|
||||||
|
cursor: pointer;
|
||||||
|
font-size: 1rem;
|
||||||
|
}
|
||||||
|
.retry-button:hover {
|
||||||
|
background-color: #45a049;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
|
</head>
|
||||||
|
<body>
|
||||||
|
<div class="offline-container">
|
||||||
|
<div class="offline-icon">📡</div>
|
||||||
|
<h1>Sie sind offline</h1>
|
||||||
|
<p class="offline-message">
|
||||||
|
Es scheint, dass Sie keine Internetverbindung haben.
|
||||||
|
Bitte überprüfen Sie Ihre Verbindung und versuchen Sie es erneut.
|
||||||
|
</p>
|
||||||
|
<button class="retry-button" onclick="window.location.reload()">
|
||||||
|
Erneut versuchen
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
<script>
|
||||||
|
// Automatische Überprüfung der Verbindung
|
||||||
|
window.addEventListener('online', function() {
|
||||||
|
window.location.reload();
|
||||||
|
});
|
||||||
|
</script>
|
||||||
|
</body>
|
||||||
|
</html>
|
Reference in New Issue
Block a user